Mercurial > emacs
annotate src/xdisp.c @ 27389:0eff88dd2524
*** empty log message ***
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 22 Jan 2000 03:45:48 +0000 |
parents | 2efb49dc860b |
children | d26783d86d5f |
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 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
251 Lisp_Object Qdisplay, Qrelative_width, Qalign_to; |
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
252 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 253 |
254 /* Symbols used in text property values. */ | |
255 | |
256 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
257 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
258 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
259 extern Lisp_Object Qheight; |
25012 | 260 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
261 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
262 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
263 Lisp_Object Vshow_trailing_whitespace; |
25012 | 264 |
265 /* Name of the face used to highlight trailing whitespace. */ | |
266 | |
267 Lisp_Object Qtrailing_whitespace; | |
268 | |
269 /* The symbol `image' which is the car of the lists used to represent | |
270 images in Lisp. */ | |
271 | |
272 Lisp_Object Qimage; | |
273 | |
274 /* Non-zero means print newline to stdout before next mini-buffer | |
275 message. */ | |
277 | 276 |
277 int noninteractive_need_newline; | |
278 | |
25012 | 279 /* 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
|
280 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
281 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
282 |
25012 | 283 |
284 /* The buffer position of the first character appearing entirely or | |
285 partially on the line of the selected window which contains the | |
286 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
287 redisplay optimization in redisplay_internal. */ | |
288 | |
289 static struct text_pos this_line_start_pos; | |
290 | |
291 /* Number of characters past the end of the line above, including the | |
292 terminating newline. */ | |
293 | |
294 static struct text_pos this_line_end_pos; | |
295 | |
296 /* The vertical positions and the height of this line. */ | |
297 | |
277 | 298 static int this_line_vpos; |
25012 | 299 static int this_line_y; |
300 static int this_line_pixel_height; | |
301 | |
302 /* X position at which this display line starts. Usually zero; | |
303 negative if first character is partially visible. */ | |
304 | |
305 static int this_line_start_x; | |
306 | |
307 /* Buffer that this_line_.* variables are referring to. */ | |
308 | |
277 | 309 static struct buffer *this_line_buffer; |
310 | |
25012 | 311 /* Nonzero means truncate lines in all windows less wide than the |
312 frame. */ | |
313 | |
277 | 314 int truncate_partial_width_windows; |
315 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
316 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 317 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
318 int unibyte_display_via_language_environment; |
25012 | 319 |
320 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
321 Not guaranteed to be accurate except while parsing | |
322 frame-title-format. */ | |
323 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
324 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
325 |
277 | 326 Lisp_Object Vglobal_mode_string; |
327 | |
328 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 329 |
277 | 330 Lisp_Object Voverlay_arrow_position; |
331 | |
25012 | 332 /* String to display for the arrow. Only used on terminal frames. */ |
333 | |
277 | 334 Lisp_Object Voverlay_arrow_string; |
335 | |
25012 | 336 /* Values of those variables at last redisplay. However, if |
337 Voverlay_arrow_position is a marker, last_arrow_position is its | |
338 numerical position. */ | |
339 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
340 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
341 |
25012 | 342 /* Like mode-line-format, but for the title bar on a visible frame. */ |
343 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
344 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
|
345 |
25012 | 346 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
347 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
348 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
|
349 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
350 /* 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
|
351 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
|
352 have changed. */ |
25012 | 353 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
354 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
355 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
356 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
|
357 |
277 | 358 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 359 |
277 | 360 static int overlay_arrow_seen; |
361 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
362 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 363 |
364 int highlight_nonselected_windows; | |
365 | |
366 /* If cursor motion alone moves point off frame, try scrolling this | |
367 many lines up or down if that will bring it back. */ | |
368 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
369 static int scroll_step; |
277 | 370 |
25012 | 371 /* Non-0 means scroll just far enough to bring point back on the |
372 screen, when appropriate. */ | |
373 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
374 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
375 |
25012 | 376 /* Recenter the window whenever point gets within this many lines of |
377 the top or bottom of the window. This value is translated into a | |
378 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
379 there is really a fixed pixel height scroll margin. */ | |
380 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
381 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
382 |
25012 | 383 /* Number of windows showing the buffer of the selected window (or |
384 another buffer with the same base buffer). keyboard.c refers to | |
385 this. */ | |
386 | |
277 | 387 int buffer_shared; |
388 | |
25012 | 389 /* Vector containing glyphs for an ellipsis `...'. */ |
390 | |
391 static Lisp_Object default_invis_vector[3]; | |
392 | |
393 /* Nonzero means display mode line highlighted. */ | |
394 | |
277 | 395 int mode_line_inverse_video; |
396 | |
25012 | 397 /* Prompt to display in front of the mini-buffer contents. */ |
398 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
399 Lisp_Object minibuf_prompt; |
277 | 400 |
25012 | 401 /* Width of current mini-buffer prompt. Only set after display_line |
402 of the line that contains the prompt. */ | |
403 | |
277 | 404 int minibuf_prompt_width; |
25012 | 405 int minibuf_prompt_pixel_width; |
406 | |
407 /* This is the window where the echo area message was displayed. It | |
408 is always a mini-buffer window, but it may not be the same window | |
409 currently active as a mini-buffer. */ | |
410 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
411 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
|
412 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
413 /* 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
|
414 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
|
415 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
|
416 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
|
417 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
418 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
419 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
420 /* 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
|
421 message was specified. */ |
25012 | 422 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
423 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
424 |
25012 | 425 /* True if we should redraw the mode lines on the next redisplay. */ |
426 | |
277 | 427 int update_mode_lines; |
428 | |
25012 | 429 /* Nonzero if window sizes or contents have changed since last |
430 redisplay that finished */ | |
431 | |
277 | 432 int windows_or_buffers_changed; |
433 | |
25012 | 434 /* Nonzero after display_mode_line if %l was used and it displayed a |
435 line number. */ | |
436 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
437 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
438 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
439 /* Maximum buffer size for which to display line numbers. */ |
25012 | 440 |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
441 static int line_number_display_limit; |
10393 | 442 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
443 /* 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
|
444 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
445 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
446 |
25012 | 447 /* Number of lines to keep in the message log buffer. t means |
448 infinite. nil means don't log at all. */ | |
449 | |
10393 | 450 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
451 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
452 /* 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
|
453 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
|
454 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
455 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
|
456 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
457 /* 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
|
458 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
459 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
|
460 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
461 /* 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
|
462 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
463 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
|
464 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
465 /* 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
|
466 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
|
467 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 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
|
469 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
470 /* 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
|
471 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
474 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
475 /* 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
|
476 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
|
477 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
|
478 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
479 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
|
480 |
25012 | 481 /* A scratch glyph row with contents used for generating truncation |
482 glyphs. Also used in direct_output_for_insert. */ | |
483 | |
484 #define MAX_SCRATCH_GLYPHS 100 | |
485 struct glyph_row scratch_glyph_row; | |
486 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
487 | |
488 /* Ascent and height of the last line processed by move_it_to. */ | |
489 | |
490 static int last_max_ascent, last_height; | |
491 | |
492 /* The maximum distance to look ahead for text properties. Values | |
493 that are too small let us call compute_char_face and similar | |
494 functions too often which is expensive. Values that are too large | |
495 let us call compute_char_face and alike too often because we | |
496 might not be interested in text properties that far away. */ | |
497 | |
498 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
499 | |
500 /* Non-zero means print traces of redisplay if compiled with | |
501 GLYPH_DEBUG != 0. */ | |
502 | |
503 #if GLYPH_DEBUG | |
504 int trace_redisplay_p; | |
505 #endif | |
506 | |
507 /* Value returned from text property handlers (see below). */ | |
508 | |
509 enum prop_handled | |
510 { | |
511 HANDLED_NORMALLY, | |
512 HANDLED_RECOMPUTE_PROPS, | |
513 HANDLED_OVERLAY_STRING_CONSUMED, | |
514 HANDLED_RETURN | |
515 }; | |
516 | |
517 /* A description of text properties that redisplay is interested | |
518 in. */ | |
519 | |
520 struct props | |
521 { | |
522 /* The name of the property. */ | |
523 Lisp_Object *name; | |
524 | |
525 /* A unique index for the property. */ | |
526 enum prop_idx idx; | |
527 | |
528 /* A handler function called to set up iterator IT from the property | |
529 at IT's current position. Value is used to steer handle_stop. */ | |
530 enum prop_handled (*handler) P_ ((struct it *it)); | |
531 }; | |
532 | |
533 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
534 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
535 static enum prop_handled handle_display_prop P_ ((struct it *)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
536 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 537 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
538 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
539 | |
540 /* Properties handled by iterators. */ | |
541 | |
542 static struct props it_props[] = | |
543 { | |
544 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
545 /* Handle `face' before `display' because some sub-properties of | |
546 `display' need to know the face. */ | |
547 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
548 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
549 {&Qinvisible, INVISIBLE_PROP_IDX, handle_invisible_prop}, | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
550 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 551 {NULL, 0, NULL} |
552 }; | |
553 | |
554 /* Value is the position described by X. If X is a marker, value is | |
555 the marker_position of X. Otherwise, value is X. */ | |
556 | |
557 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
558 | |
559 /* Enumeration returned by some move_it_.* functions internally. */ | |
560 | |
561 enum move_it_result | |
562 { | |
563 /* Not used. Undefined value. */ | |
564 MOVE_UNDEFINED, | |
565 | |
566 /* Move ended at the requested buffer position or ZV. */ | |
567 MOVE_POS_MATCH_OR_ZV, | |
568 | |
569 /* Move ended at the requested X pixel position. */ | |
570 MOVE_X_REACHED, | |
571 | |
572 /* Move within a line ended at the end of a line that must be | |
573 continued. */ | |
574 MOVE_LINE_CONTINUED, | |
575 | |
576 /* Move within a line ended at the end of a line that would | |
577 be displayed truncated. */ | |
578 MOVE_LINE_TRUNCATED, | |
579 | |
580 /* Move within a line ended at a line end. */ | |
581 MOVE_NEWLINE_OR_CR | |
582 }; | |
583 | |
584 | |
585 | |
586 /* Function prototypes. */ | |
587 | |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
588 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 589 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
590 struct glyph_row *, | |
591 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
592 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
|
593 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
|
594 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
|
595 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
|
596 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
|
597 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
|
598 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
|
599 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
|
600 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
|
601 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 602 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
603 struct text_pos)); | |
604 static int compute_window_start_on_continuation_line P_ ((struct window *)); | |
605 static Lisp_Object eval_handler P_ ((Lisp_Object)); | |
606 static Lisp_Object eval_form P_ ((Lisp_Object)); | |
607 static void insert_left_trunc_glyphs P_ ((struct it *)); | |
608 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
609 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
|
610 static int append_space P_ ((struct it *, int)); |
25012 | 611 static void make_cursor_line_fully_visible P_ ((struct window *)); |
612 static int try_scrolling P_ ((Lisp_Object, int, int, int, int)); | |
613 static int trailing_whitespace_p P_ ((int)); | |
614 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
615 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
616 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
617 static void push_it P_ ((struct it *)); | |
618 static void pop_it P_ ((struct it *)); | |
619 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
620 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
|
621 static int echo_area_display P_ ((int)); |
25012 | 622 static void redisplay_windows P_ ((Lisp_Object)); |
623 static void redisplay_window P_ ((Lisp_Object, int)); | |
624 static void update_menu_bar P_ ((struct frame *, int)); | |
625 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
626 static int try_window_id P_ ((struct window *)); | |
627 static int display_line P_ ((struct it *)); | |
628 static void display_mode_lines P_ ((struct window *)); | |
629 static void display_mode_line P_ ((struct window *, enum face_id, | |
630 Lisp_Object)); | |
631 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
|
632 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 633 static void display_menu_bar P_ ((struct window *)); |
634 static int display_count_lines P_ ((int, int, int, int, int *)); | |
635 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
636 int, int, struct it *, int, int, int, int)); | |
637 static void compute_line_metrics P_ ((struct it *)); | |
638 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
639 static int get_overlay_strings P_ ((struct it *)); | |
640 static void next_overlay_string P_ ((struct it *)); | |
641 void set_iterator_to_next P_ ((struct it *)); | |
642 static void reseat P_ ((struct it *, struct text_pos, int)); | |
643 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
644 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
645 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
|
646 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 647 static int next_element_from_display_vector P_ ((struct it *)); |
648 static int next_element_from_string P_ ((struct it *)); | |
649 static int next_element_from_c_string P_ ((struct it *)); | |
650 static int next_element_from_buffer P_ ((struct it *)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
651 static int next_element_from_composition P_ ((struct it *)); |
25012 | 652 static int next_element_from_image P_ ((struct it *)); |
653 static int next_element_from_stretch P_ ((struct it *)); | |
654 static void load_overlay_strings P_ ((struct it *)); | |
655 static void init_from_display_pos P_ ((struct it *, struct window *, | |
656 struct display_pos *)); | |
657 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
658 Lisp_Object, int, int, int, int)); | |
659 static int charset_at_position P_ ((struct text_pos)); | |
660 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
661 int, int, int)); | |
662 void move_it_vertically_backward P_ ((struct it *, int)); | |
663 static void init_to_row_start P_ ((struct it *, struct window *, | |
664 struct glyph_row *)); | |
665 static void init_to_row_end P_ ((struct it *, struct window *, | |
666 struct glyph_row *)); | |
667 static void back_to_previous_line_start P_ ((struct it *)); | |
668 static void forward_to_next_line_start P_ ((struct it *)); | |
669 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, | |
670 Lisp_Object, int)); | |
671 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
672 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
673 static int number_of_chars P_ ((unsigned char *, int)); | |
674 static void compute_stop_pos P_ ((struct it *)); | |
675 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
676 Lisp_Object)); | |
677 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
678 static int next_overlay_change P_ ((int)); | |
679 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
680 Lisp_Object, struct text_pos *)); | |
681 | |
682 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
683 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
684 | |
685 #ifdef HAVE_WINDOW_SYSTEM | |
686 | |
25543 | 687 static void update_tool_bar P_ ((struct frame *, int)); |
688 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
689 static int redisplay_tool_bar P_ ((struct frame *)); | |
690 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 691 |
692 #endif /* HAVE_WINDOW_SYSTEM */ | |
693 | |
694 | |
695 /*********************************************************************** | |
696 Window display dimensions | |
697 ***********************************************************************/ | |
698 | |
699 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
700 text in window W. This is the height of W minus the height of a | |
701 mode line, if any. */ | |
702 | |
703 INLINE int | |
704 window_text_bottom_y (w) | |
705 struct window *w; | |
706 { | |
707 struct frame *f = XFRAME (w->frame); | |
708 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
709 | |
710 if (WINDOW_WANTS_MODELINE_P (w)) | |
711 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
712 return height; | |
713 } | |
714 | |
715 | |
716 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
717 means return the total width of W, not including bitmap areas to | |
718 the left and right of the window. */ | |
719 | |
720 INLINE int | |
721 window_box_width (w, area) | |
722 struct window *w; | |
723 int area; | |
724 { | |
725 struct frame *f = XFRAME (w->frame); | |
726 int width = XFASTINT (w->width); | |
727 | |
728 if (!w->pseudo_window_p) | |
729 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
730 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 731 |
732 if (area == TEXT_AREA) | |
733 { | |
734 if (INTEGERP (w->left_margin_width)) | |
735 width -= XFASTINT (w->left_margin_width); | |
736 if (INTEGERP (w->right_margin_width)) | |
737 width -= XFASTINT (w->right_margin_width); | |
738 } | |
739 else if (area == LEFT_MARGIN_AREA) | |
740 width = (INTEGERP (w->left_margin_width) | |
741 ? XFASTINT (w->left_margin_width) : 0); | |
742 else if (area == RIGHT_MARGIN_AREA) | |
743 width = (INTEGERP (w->right_margin_width) | |
744 ? XFASTINT (w->right_margin_width) : 0); | |
745 } | |
746 | |
747 return width * CANON_X_UNIT (f); | |
748 } | |
749 | |
750 | |
751 /* Return the pixel height of the display area of window W, not | |
752 including mode lines of W, if any.. */ | |
753 | |
754 INLINE int | |
755 window_box_height (w) | |
756 struct window *w; | |
757 { | |
758 struct frame *f = XFRAME (w->frame); | |
759 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
760 | |
761 if (WINDOW_WANTS_MODELINE_P (w)) | |
762 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
763 | |
25546 | 764 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
765 height -= CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 766 |
767 return height; | |
768 } | |
769 | |
770 | |
771 /* Return the frame-relative coordinate of the left edge of display | |
772 area AREA of window W. AREA < 0 means return the left edge of the | |
773 whole window, to the right of any bitmap area at the left side of | |
774 W. */ | |
775 | |
776 INLINE int | |
777 window_box_left (w, area) | |
778 struct window *w; | |
779 int area; | |
780 { | |
781 struct frame *f = XFRAME (w->frame); | |
782 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
783 | |
784 if (!w->pseudo_window_p) | |
785 { | |
786 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
|
787 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 788 |
789 if (area == TEXT_AREA) | |
790 x += window_box_width (w, LEFT_MARGIN_AREA); | |
791 else if (area == RIGHT_MARGIN_AREA) | |
792 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
793 + window_box_width (w, TEXT_AREA)); | |
794 } | |
795 | |
796 return x; | |
797 } | |
798 | |
799 | |
800 /* Return the frame-relative coordinate of the right edge of display | |
801 area AREA of window W. AREA < 0 means return the left edge of the | |
802 whole window, to the left of any bitmap area at the right side of | |
803 W. */ | |
804 | |
805 INLINE int | |
806 window_box_right (w, area) | |
807 struct window *w; | |
808 int area; | |
809 { | |
810 return window_box_left (w, area) + window_box_width (w, area); | |
811 } | |
812 | |
813 | |
814 /* Get the bounding box of the display area AREA of window W, without | |
815 mode lines, in frame-relative coordinates. AREA < 0 means the | |
816 whole window, not including bitmap areas to the left and right of | |
817 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
818 coordinates of the upper-left corner of the box. Return in | |
819 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
820 | |
821 INLINE void | |
822 window_box (w, area, box_x, box_y, box_width, box_height) | |
823 struct window *w; | |
824 int area; | |
825 int *box_x, *box_y, *box_width, *box_height; | |
826 { | |
827 struct frame *f = XFRAME (w->frame); | |
828 | |
829 *box_width = window_box_width (w, area); | |
830 *box_height = window_box_height (w); | |
831 *box_x = window_box_left (w, area); | |
832 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
833 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 834 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
835 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 836 } |
837 | |
838 | |
839 /* Get the bounding box of the display area AREA of window W, without | |
840 mode lines. AREA < 0 means the whole window, not including bitmap | |
841 areas to the left and right of the window. Return in *TOP_LEFT_X | |
842 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
843 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
844 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
845 box. */ | |
846 | |
847 INLINE void | |
848 window_box_edges (w, area, top_left_x, top_left_y, | |
849 bottom_right_x, bottom_right_y) | |
850 struct window *w; | |
851 int area; | |
852 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
853 { | |
854 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
855 bottom_right_y); | |
856 *bottom_right_x += *top_left_x; | |
857 *bottom_right_y += *top_left_y; | |
858 } | |
859 | |
860 | |
861 | |
862 /*********************************************************************** | |
863 Utilities | |
864 ***********************************************************************/ | |
865 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
866 /* 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
|
867 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
|
868 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
|
869 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
|
870 character. */ |
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 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
873 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
|
874 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
875 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
876 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
877 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
878 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
879 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
|
880 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
881 /* 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
|
882 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
|
883 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
884 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
885 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
886 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
887 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
888 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
889 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
890 |
25012 | 891 /* Given a position POS containing a valid character and byte position |
892 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
893 | |
894 static struct text_pos | |
895 string_pos_nchars_ahead (pos, string, nchars) | |
896 struct text_pos pos; | |
897 Lisp_Object string; | |
898 int nchars; | |
899 { | |
900 xassert (STRINGP (string) && nchars >= 0); | |
901 | |
902 if (STRING_MULTIBYTE (string)) | |
903 { | |
904 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
905 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
906 int len; | |
907 | |
908 while (nchars--) | |
909 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
910 string_char_and_length (p, rest, &len); |
25012 | 911 p += len, rest -= len; |
912 xassert (rest >= 0); | |
913 CHARPOS (pos) += 1; | |
914 BYTEPOS (pos) += len; | |
915 } | |
916 } | |
917 else | |
918 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
919 | |
920 return pos; | |
921 } | |
922 | |
923 | |
924 /* Value is the text position, i.e. character and byte position, | |
925 for character position CHARPOS in STRING. */ | |
926 | |
927 static INLINE struct text_pos | |
928 string_pos (charpos, string) | |
929 int charpos; | |
930 Lisp_Object string; | |
931 { | |
932 struct text_pos pos; | |
933 xassert (STRINGP (string)); | |
934 xassert (charpos >= 0); | |
935 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
936 return pos; | |
937 } | |
938 | |
939 | |
940 /* Value is a text position, i.e. character and byte position, for | |
941 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
942 means recognize multibyte characters. */ | |
943 | |
944 static struct text_pos | |
945 c_string_pos (charpos, s, multibyte_p) | |
946 int charpos; | |
947 unsigned char *s; | |
948 int multibyte_p; | |
949 { | |
950 struct text_pos pos; | |
951 | |
952 xassert (s != NULL); | |
953 xassert (charpos >= 0); | |
954 | |
955 if (multibyte_p) | |
956 { | |
957 int rest = strlen (s), len; | |
958 | |
959 SET_TEXT_POS (pos, 0, 0); | |
960 while (charpos--) | |
961 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
962 string_char_and_length (s, rest, &len); |
25012 | 963 s += len, rest -= len; |
964 xassert (rest >= 0); | |
965 CHARPOS (pos) += 1; | |
966 BYTEPOS (pos) += len; | |
967 } | |
968 } | |
969 else | |
970 SET_TEXT_POS (pos, charpos, charpos); | |
971 | |
972 return pos; | |
973 } | |
974 | |
975 | |
976 /* Value is the number of characters in C string S. MULTIBYTE_P | |
977 non-zero means recognize multibyte characters. */ | |
978 | |
979 static int | |
980 number_of_chars (s, multibyte_p) | |
981 unsigned char *s; | |
982 int multibyte_p; | |
983 { | |
984 int nchars; | |
985 | |
986 if (multibyte_p) | |
987 { | |
988 int rest = strlen (s), len; | |
989 unsigned char *p = (unsigned char *) s; | |
990 | |
991 for (nchars = 0; rest > 0; ++nchars) | |
992 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
993 string_char_and_length (p, rest, &len); |
25012 | 994 rest -= len, p += len; |
995 } | |
996 } | |
997 else | |
998 nchars = strlen (s); | |
999 | |
1000 return nchars; | |
1001 } | |
1002 | |
1003 | |
1004 /* Compute byte position NEWPOS->bytepos corresponding to | |
1005 NEWPOS->charpos. POS is a known position in string STRING. | |
1006 NEWPOS->charpos must be >= POS.charpos. */ | |
1007 | |
1008 static void | |
1009 compute_string_pos (newpos, pos, string) | |
1010 struct text_pos *newpos, pos; | |
1011 Lisp_Object string; | |
1012 { | |
1013 xassert (STRINGP (string)); | |
1014 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1015 | |
1016 if (STRING_MULTIBYTE (string)) | |
1017 *newpos = string_pos_nchars_ahead (pos, CHARPOS (*newpos) - CHARPOS (pos), | |
1018 string); | |
1019 else | |
1020 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1021 } | |
1022 | |
1023 | |
1024 /* Return the charset of the character at position POS in | |
1025 current_buffer. */ | |
1026 | |
1027 static int | |
1028 charset_at_position (pos) | |
1029 struct text_pos pos; | |
1030 { | |
1031 int c, multibyte_p; | |
1032 unsigned char *p = BYTE_POS_ADDR (BYTEPOS (pos)); | |
1033 | |
1034 multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1035 if (multibyte_p) | |
1036 { | |
1037 int maxlen = ((BYTEPOS (pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
1038 - BYTEPOS (pos)); | |
1039 int len; | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1040 c = string_char_and_length (p, maxlen, &len); |
25012 | 1041 } |
1042 else | |
1043 c = *p; | |
1044 | |
1045 return CHAR_CHARSET (c); | |
1046 } | |
1047 | |
1048 | |
1049 | |
1050 /*********************************************************************** | |
1051 Lisp form evaluation | |
1052 ***********************************************************************/ | |
1053 | |
1054 /* Error handler for eval_form. */ | |
1055 | |
1056 static Lisp_Object | |
1057 eval_handler (arg) | |
1058 Lisp_Object arg; | |
1059 { | |
1060 return Qnil; | |
1061 } | |
1062 | |
1063 | |
1064 /* Evaluate SEXPR and return the result, or nil if something went | |
1065 wrong. */ | |
1066 | |
1067 static Lisp_Object | |
1068 eval_form (sexpr) | |
1069 Lisp_Object sexpr; | |
1070 { | |
1071 int count = specpdl_ptr - specpdl; | |
1072 Lisp_Object val; | |
1073 specbind (Qinhibit_redisplay, Qt); | |
1074 val = internal_condition_case_1 (Feval, sexpr, Qerror, eval_handler); | |
1075 return unbind_to (count, val); | |
1076 } | |
1077 | |
1078 | |
1079 | |
1080 /*********************************************************************** | |
1081 Debugging | |
1082 ***********************************************************************/ | |
1083 | |
1084 #if 0 | |
1085 | |
1086 /* Define CHECK_IT to perform sanity checks on iterators. | |
1087 This is for debugging. It is too slow to do unconditionally. */ | |
1088 | |
1089 static void | |
1090 check_it (it) | |
1091 struct it *it; | |
1092 { | |
1093 if (it->method == next_element_from_string) | |
1094 { | |
1095 xassert (STRINGP (it->string)); | |
1096 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1097 } | |
1098 else if (it->method == next_element_from_buffer) | |
1099 { | |
1100 /* Check that character and byte positions agree. */ | |
1101 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1102 } | |
1103 | |
1104 if (it->dpvec) | |
1105 xassert (it->current.dpvec_index >= 0); | |
1106 else | |
1107 xassert (it->current.dpvec_index < 0); | |
1108 } | |
1109 | |
1110 #define CHECK_IT(IT) check_it ((IT)) | |
1111 | |
1112 #else /* not 0 */ | |
1113 | |
1114 #define CHECK_IT(IT) (void) 0 | |
1115 | |
1116 #endif /* not 0 */ | |
1117 | |
1118 | |
1119 #if GLYPH_DEBUG | |
1120 | |
1121 /* Check that the window end of window W is what we expect it | |
1122 to be---the last row in the current matrix displaying text. */ | |
1123 | |
1124 static void | |
1125 check_window_end (w) | |
1126 struct window *w; | |
1127 { | |
1128 if (!MINI_WINDOW_P (w) | |
1129 && !NILP (w->window_end_valid)) | |
1130 { | |
1131 struct glyph_row *row; | |
1132 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1133 XFASTINT (w->window_end_vpos)), | |
1134 !row->enabled_p | |
1135 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1136 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1137 } | |
1138 } | |
1139 | |
1140 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1141 | |
1142 #else /* not GLYPH_DEBUG */ | |
1143 | |
1144 #define CHECK_WINDOW_END(W) (void) 0 | |
1145 | |
1146 #endif /* not GLYPH_DEBUG */ | |
1147 | |
1148 | |
1149 | |
1150 /*********************************************************************** | |
1151 Iterator initialization | |
1152 ***********************************************************************/ | |
1153 | |
1154 /* Initialize IT for displaying current_buffer in window W, starting | |
1155 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1156 position is specified which is useful when the iterator is assigned | |
1157 a position later. BYTEPOS is the byte position corresponding to | |
1158 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1159 | |
1160 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1161 will produce glyphs in that row. | |
1162 | |
1163 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1164 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1165 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1166 displaying the tool-bar. |
25012 | 1167 |
1168 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1169 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1170 corresponding mode line glyph row of the desired matrix of W. */ |
1171 | |
1172 void | |
1173 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1174 struct it *it; | |
1175 struct window *w; | |
1176 int charpos, bytepos; | |
1177 struct glyph_row *row; | |
1178 enum face_id base_face_id; | |
1179 { | |
1180 int highlight_region_p; | |
1181 | |
1182 /* Some precondition checks. */ | |
1183 xassert (w != NULL && it != NULL); | |
1184 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1185 | |
1186 /* If face attributes have been changed since the last redisplay, | |
1187 free realized faces now because they depend on face definitions | |
1188 that might have changed. */ | |
1189 if (face_change_count) | |
1190 { | |
1191 face_change_count = 0; | |
1192 free_all_realized_faces (Qnil); | |
1193 } | |
1194 | |
1195 /* Use one of the mode line rows of W's desired matrix if | |
1196 appropriate. */ | |
1197 if (row == NULL) | |
1198 { | |
1199 if (base_face_id == MODE_LINE_FACE_ID) | |
1200 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1201 else if (base_face_id == HEADER_LINE_FACE_ID) |
1202 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1203 } |
1204 | |
1205 /* Clear IT. */ | |
1206 bzero (it, sizeof *it); | |
1207 it->current.overlay_string_index = -1; | |
1208 it->current.dpvec_index = -1; | |
1209 it->charset = CHARSET_ASCII; | |
1210 it->base_face_id = base_face_id; | |
1211 | |
1212 /* The window in which we iterate over current_buffer: */ | |
1213 XSETWINDOW (it->window, w); | |
1214 it->w = w; | |
1215 it->f = XFRAME (w->frame); | |
1216 | |
1217 /* If realized faces have been removed, e.g. because of face | |
1218 attribute changes of named faces, recompute them. */ | |
1219 if (FRAME_FACE_CACHE (it->f)->used == 0) | |
1220 recompute_basic_faces (it->f); | |
1221 | |
1222 /* Current value of the `space-width', and 'height' properties. */ | |
1223 it->space_width = Qnil; | |
1224 it->font_height = Qnil; | |
1225 | |
1226 /* Are control characters displayed as `^C'? */ | |
1227 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1228 | |
1229 /* -1 means everything between a CR and the following line end | |
1230 is invisible. >0 means lines indented more than this value are | |
1231 invisible. */ | |
1232 it->selective = (INTEGERP (current_buffer->selective_display) | |
1233 ? XFASTINT (current_buffer->selective_display) | |
1234 : (!NILP (current_buffer->selective_display) | |
1235 ? -1 : 0)); | |
1236 it->selective_display_ellipsis_p | |
1237 = !NILP (current_buffer->selective_display_ellipses); | |
1238 | |
1239 /* Display table to use. */ | |
1240 it->dp = window_display_table (w); | |
1241 | |
1242 /* Are multibyte characters enabled in current_buffer? */ | |
1243 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1244 | |
1245 /* Non-zero if we should highlight the region. */ | |
1246 highlight_region_p | |
1247 = (!NILP (Vtransient_mark_mode) | |
1248 && !NILP (current_buffer->mark_active) | |
1249 && XMARKER (current_buffer->mark)->buffer != 0); | |
1250 | |
1251 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1252 start and end of a visible region in window IT->w. Set both to | |
1253 -1 to indicate no region. */ | |
1254 if (highlight_region_p | |
1255 /* Maybe highlight only in selected window. */ | |
1256 && (/* Either show region everywhere. */ | |
1257 highlight_nonselected_windows | |
1258 /* Or show region in the selected window. */ | |
1259 || w == XWINDOW (selected_window) | |
1260 /* Or show the region if we are in the mini-buffer and W is | |
1261 the window the mini-buffer refers to. */ | |
1262 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1263 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1264 { | |
1265 int charpos = marker_position (current_buffer->mark); | |
1266 it->region_beg_charpos = min (PT, charpos); | |
1267 it->region_end_charpos = max (PT, charpos); | |
1268 } | |
1269 else | |
1270 it->region_beg_charpos = it->region_end_charpos = -1; | |
1271 | |
1272 /* Get the position at which the redisplay_end_trigger hook should | |
1273 be run, if it is to be run at all. */ | |
1274 if (MARKERP (w->redisplay_end_trigger) | |
1275 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1276 it->redisplay_end_trigger_charpos | |
1277 = marker_position (w->redisplay_end_trigger); | |
1278 else if (INTEGERP (w->redisplay_end_trigger)) | |
1279 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1280 | |
1281 /* Correct bogus values of tab_width. */ | |
1282 it->tab_width = XINT (current_buffer->tab_width); | |
1283 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1284 it->tab_width = 8; | |
1285 | |
1286 /* Are lines in the display truncated? */ | |
1287 it->truncate_lines_p | |
1288 = (base_face_id != DEFAULT_FACE_ID | |
1289 || XINT (it->w->hscroll) | |
1290 || (truncate_partial_width_windows | |
1291 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1292 || !NILP (current_buffer->truncate_lines)); | |
1293 | |
1294 /* Get dimensions of truncation and continuation glyphs. These are | |
1295 displayed as bitmaps under X, so we don't need them for such | |
1296 frames. */ | |
1297 if (!FRAME_WINDOW_P (it->f)) | |
1298 { | |
1299 if (it->truncate_lines_p) | |
1300 { | |
1301 /* We will need the truncation glyph. */ | |
1302 xassert (it->glyph_row == NULL); | |
1303 produce_special_glyphs (it, IT_TRUNCATION); | |
1304 it->truncation_pixel_width = it->pixel_width; | |
1305 } | |
1306 else | |
1307 { | |
1308 /* We will need the continuation glyph. */ | |
1309 xassert (it->glyph_row == NULL); | |
1310 produce_special_glyphs (it, IT_CONTINUATION); | |
1311 it->continuation_pixel_width = it->pixel_width; | |
1312 } | |
1313 | |
1314 /* Reset these values to zero becaue the produce_special_glyphs | |
1315 above has changed them. */ | |
1316 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
|
1317 it->phys_ascent = it->phys_descent = 0; |
25012 | 1318 } |
1319 | |
1320 /* Set this after getting the dimensions of truncation and | |
1321 continuation glyphs, so that we don't produce glyphs when calling | |
1322 produce_special_glyphs, above. */ | |
1323 it->glyph_row = row; | |
1324 it->area = TEXT_AREA; | |
1325 | |
1326 /* Get the dimensions of the display area. The display area | |
1327 consists of the visible window area plus a horizontally scrolled | |
1328 part to the left of the window. All x-values are relative to the | |
1329 start of this total display area. */ | |
1330 if (base_face_id != DEFAULT_FACE_ID) | |
1331 { | |
1332 /* Mode lines, menu bar in terminal frames. */ | |
1333 it->first_visible_x = 0; | |
1334 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1335 } | |
1336 else | |
1337 { | |
1338 it->first_visible_x | |
1339 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1340 it->last_visible_x = (it->first_visible_x | |
1341 + window_box_width (w, TEXT_AREA)); | |
1342 | |
1343 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1344 the right margin. Otherwise, leave room for the continuation | |
1345 glyph(s). Truncation and continuation glyphs are not inserted | |
1346 for window-based redisplay. */ | |
1347 if (!FRAME_WINDOW_P (it->f)) | |
1348 { | |
1349 if (it->truncate_lines_p) | |
1350 it->last_visible_x -= it->truncation_pixel_width; | |
1351 else | |
1352 it->last_visible_x -= it->continuation_pixel_width; | |
1353 } | |
1354 | |
25546 | 1355 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1356 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1357 } |
1358 | |
1359 /* Leave room for a border glyph. */ | |
1360 if (!FRAME_WINDOW_P (it->f) | |
1361 && !WINDOW_RIGHTMOST_P (it->w)) | |
1362 it->last_visible_x -= 1; | |
1363 | |
1364 it->last_visible_y = window_text_bottom_y (w); | |
1365 | |
1366 /* For mode lines and alike, arrange for the first glyph having a | |
1367 left box line if the face specifies a box. */ | |
1368 if (base_face_id != DEFAULT_FACE_ID) | |
1369 { | |
1370 struct face *face; | |
1371 | |
1372 it->face_id = base_face_id; | |
1373 | |
1374 /* If we have a boxed mode line, make the first character appear | |
1375 with a left box line. */ | |
1376 face = FACE_FROM_ID (it->f, base_face_id); | |
1377 if (face->box != FACE_NO_BOX) | |
1378 it->start_of_box_run_p = 1; | |
1379 } | |
1380 | |
1381 /* If a buffer position was specified, set the iterator there, | |
1382 getting overlays and face properties from that position. */ | |
1383 if (charpos > 0) | |
1384 { | |
1385 it->end_charpos = ZV; | |
1386 it->face_id = -1; | |
1387 IT_CHARPOS (*it) = charpos; | |
1388 | |
1389 /* Compute byte position if not specified. */ | |
1390 if (bytepos <= 0) | |
1391 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1392 else | |
1393 IT_BYTEPOS (*it) = bytepos; | |
1394 | |
1395 /* Compute faces etc. */ | |
1396 reseat (it, it->current.pos, 1); | |
1397 } | |
1398 | |
1399 CHECK_IT (it); | |
1400 } | |
1401 | |
1402 | |
1403 /* Initialize IT for the display of window W with window start POS. */ | |
1404 | |
1405 void | |
1406 start_display (it, w, pos) | |
1407 struct it *it; | |
1408 struct window *w; | |
1409 struct text_pos pos; | |
1410 { | |
1411 int start_at_line_beg_p; | |
1412 struct glyph_row *row; | |
25546 | 1413 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1414 int first_y; |
1415 | |
1416 row = w->desired_matrix->rows + first_vpos; | |
1417 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1418 first_y = it->current_y; | |
1419 | |
1420 /* If window start is not at a line start, move back to the line | |
1421 start. This makes sure that we take continuation lines into | |
1422 account. */ | |
1423 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1424 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1425 if (!start_at_line_beg_p) | |
1426 reseat_at_previous_visible_line_start (it); | |
1427 | |
1428 /* If window start is not at a line start, skip forward to POS to | |
1429 get the correct continuation_lines_width and current_x. */ | |
1430 if (!start_at_line_beg_p) | |
1431 { | |
1432 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1433 | |
1434 /* If lines are continued, this line may end in the middle of a | |
1435 multi-glyph character (e.g. a control character displayed as | |
1436 \003, or in the middle of an overlay string). In this case | |
1437 move_it_to above will not have taken us to the start of | |
1438 the continuation line but to the end of the continued line. */ | |
1439 if (!it->truncate_lines_p && it->current_x > 0) | |
1440 { | |
1441 if (it->current.dpvec_index >= 0 | |
1442 || it->current.overlay_string_index >= 0) | |
1443 { | |
1444 set_iterator_to_next (it); | |
1445 move_it_in_display_line_to (it, -1, -1, 0); | |
1446 } | |
1447 it->continuation_lines_width += it->current_x; | |
1448 } | |
1449 | |
1450 it->current_y = first_y; | |
1451 it->vpos = 0; | |
1452 it->current_x = it->hpos = 0; | |
1453 } | |
1454 | |
1455 #if 0 /* Don't assert the following because start_display is sometimes | |
1456 called intentionally with a window start that is not at a | |
1457 line start. Please leave this code in as a comment. */ | |
1458 | |
1459 /* Window start should be on a line start, now. */ | |
1460 xassert (it->continuation_lines_width | |
1461 || IT_CHARPOS (it) == BEGV | |
1462 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1463 #endif /* 0 */ | |
1464 } | |
1465 | |
1466 | |
1467 /* Initialize IT for stepping through current_buffer in window W, | |
1468 starting at position POS that includes overlay string and display | |
1469 vector/ control character translation position information. */ | |
1470 | |
1471 static void | |
1472 init_from_display_pos (it, w, pos) | |
1473 struct it *it; | |
1474 struct window *w; | |
1475 struct display_pos *pos; | |
1476 { | |
1477 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1478 text, so we might end up at a position different from POS. This | |
1479 is only a problem when POS is a row start after a newline and an | |
1480 overlay starts there with an after-string, and the overlay has an | |
1481 invisible property. Since we don't skip invisible text in | |
1482 display_line and elsewhere immediately after consuming the | |
1483 newline before the row start, such a POS will not be in a string, | |
1484 but the call to init_iterator below will move us to the | |
1485 after-string. */ | |
1486 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1487 NULL, DEFAULT_FACE_ID); | |
1488 | |
1489 /* If position is within an overlay string, set up IT to | |
1490 the right overlay string. */ | |
1491 if (pos->overlay_string_index >= 0) | |
1492 { | |
1493 int relative_index; | |
1494 | |
1495 /* We already have the first chunk of overlay strings in | |
1496 IT->overlay_strings. Load more until the one for | |
1497 pos->overlay_string_index is in IT->overlay_strings. */ | |
1498 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1499 { | |
1500 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1501 it->current.overlay_string_index = 0; | |
1502 while (n--) | |
1503 { | |
1504 load_overlay_strings (it); | |
1505 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1506 } | |
1507 } | |
1508 | |
1509 it->current.overlay_string_index = pos->overlay_string_index; | |
1510 relative_index = (it->current.overlay_string_index | |
1511 % OVERLAY_STRING_CHUNK_SIZE); | |
1512 it->string = it->overlay_strings[relative_index]; | |
1513 it->current.string_pos = pos->string_pos; | |
1514 it->method = next_element_from_string; | |
1515 } | |
1516 else if (CHARPOS (pos->string_pos) >= 0) | |
1517 { | |
1518 /* Recorded position is not in an overlay string, but in another | |
1519 string. This can only be a string from a `display' property. | |
1520 IT should already be filled with that string. */ | |
1521 it->current.string_pos = pos->string_pos; | |
1522 xassert (STRINGP (it->string)); | |
1523 } | |
1524 | |
1525 /* Restore position in display vector translations or control | |
1526 character translations. */ | |
1527 if (pos->dpvec_index >= 0) | |
1528 { | |
1529 /* This fills IT->dpvec. */ | |
1530 get_next_display_element (it); | |
1531 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1532 it->current.dpvec_index = pos->dpvec_index; | |
1533 } | |
1534 | |
1535 CHECK_IT (it); | |
1536 } | |
1537 | |
1538 | |
1539 /* Initialize IT for stepping through current_buffer in window W | |
1540 starting at ROW->start. */ | |
1541 | |
1542 static void | |
1543 init_to_row_start (it, w, row) | |
1544 struct it *it; | |
1545 struct window *w; | |
1546 struct glyph_row *row; | |
1547 { | |
1548 init_from_display_pos (it, w, &row->start); | |
1549 it->continuation_lines_width = row->continuation_lines_width; | |
1550 CHECK_IT (it); | |
1551 } | |
1552 | |
1553 | |
1554 /* Initialize IT for stepping through current_buffer in window W | |
1555 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1556 | |
1557 static void | |
1558 init_to_row_end (it, w, row) | |
1559 struct it *it; | |
1560 struct window *w; | |
1561 struct glyph_row *row; | |
1562 { | |
1563 init_from_display_pos (it, w, &row->end); | |
1564 | |
1565 if (row->continued_p) | |
1566 it->continuation_lines_width = (row->continuation_lines_width | |
1567 + row->pixel_width); | |
1568 CHECK_IT (it); | |
1569 } | |
1570 | |
1571 | |
1572 | |
1573 | |
1574 /*********************************************************************** | |
1575 Text properties | |
1576 ***********************************************************************/ | |
1577 | |
1578 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1579 overlay changes. Set IT->stop_charpos to the next position where | |
1580 to stop. */ | |
1581 | |
1582 static void | |
1583 handle_stop (it) | |
1584 struct it *it; | |
1585 { | |
1586 enum prop_handled handled; | |
1587 int handle_overlay_change_p = 1; | |
1588 struct props *p; | |
1589 | |
1590 it->dpvec = NULL; | |
1591 it->current.dpvec_index = -1; | |
1592 | |
1593 do | |
1594 { | |
1595 handled = HANDLED_NORMALLY; | |
1596 | |
1597 /* Call text property handlers. */ | |
1598 for (p = it_props; p->handler; ++p) | |
1599 { | |
1600 handled = p->handler (it); | |
1601 | |
1602 if (handled == HANDLED_RECOMPUTE_PROPS) | |
1603 break; | |
1604 else if (handled == HANDLED_RETURN) | |
1605 return; | |
1606 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1607 handle_overlay_change_p = 0; | |
1608 } | |
1609 | |
1610 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1611 { | |
1612 /* Don't check for overlay strings below when set to deliver | |
1613 characters from a display vector. */ | |
1614 if (it->method == next_element_from_display_vector) | |
1615 handle_overlay_change_p = 0; | |
1616 | |
1617 /* Handle overlay changes. */ | |
1618 if (handle_overlay_change_p) | |
1619 handled = handle_overlay_change (it); | |
1620 | |
1621 /* Determine where to stop next. */ | |
1622 if (handled == HANDLED_NORMALLY) | |
1623 compute_stop_pos (it); | |
1624 } | |
1625 } | |
1626 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1627 } | |
1628 | |
1629 | |
1630 /* Compute IT->stop_charpos from text property and overlay change | |
1631 information for IT's current position. */ | |
1632 | |
1633 static void | |
1634 compute_stop_pos (it) | |
1635 struct it *it; | |
1636 { | |
1637 register INTERVAL iv, next_iv; | |
1638 Lisp_Object object, limit, position; | |
1639 | |
1640 /* If nowhere else, stop at the end. */ | |
1641 it->stop_charpos = it->end_charpos; | |
1642 | |
1643 if (STRINGP (it->string)) | |
1644 { | |
1645 /* Strings are usually short, so don't limit the search for | |
1646 properties. */ | |
1647 object = it->string; | |
1648 limit = Qnil; | |
1649 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1650 } | |
1651 else | |
1652 { | |
1653 int charpos; | |
1654 | |
1655 /* If next overlay change is in front of the current stop pos | |
1656 (which is IT->end_charpos), stop there. Note: value of | |
1657 next_overlay_change is point-max if no overlay change | |
1658 follows. */ | |
1659 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1660 if (charpos < it->stop_charpos) | |
1661 it->stop_charpos = charpos; | |
1662 | |
1663 /* If showing the region, we have to stop at the region | |
1664 start or end because the face might change there. */ | |
1665 if (it->region_beg_charpos > 0) | |
1666 { | |
1667 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1668 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1669 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1670 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1671 } | |
1672 | |
1673 /* Set up variables for computing the stop position from text | |
1674 property changes. */ | |
1675 XSETBUFFER (object, current_buffer); | |
1676 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1677 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1678 | |
1679 } | |
1680 | |
1681 /* Get the interval containing IT's position. Value is a null | |
1682 interval if there isn't such an interval. */ | |
1683 iv = validate_interval_range (object, &position, &position, 0); | |
1684 if (!NULL_INTERVAL_P (iv)) | |
1685 { | |
1686 Lisp_Object values_here[LAST_PROP_IDX]; | |
1687 struct props *p; | |
1688 | |
1689 /* Get properties here. */ | |
1690 for (p = it_props; p->handler; ++p) | |
1691 values_here[p->idx] = textget (iv->plist, *p->name); | |
1692 | |
1693 /* Look for an interval following iv that has different | |
1694 properties. */ | |
1695 for (next_iv = next_interval (iv); | |
1696 (!NULL_INTERVAL_P (next_iv) | |
1697 && (NILP (limit) | |
1698 || XFASTINT (limit) > next_iv->position)); | |
1699 next_iv = next_interval (next_iv)) | |
1700 { | |
1701 for (p = it_props; p->handler; ++p) | |
1702 { | |
1703 Lisp_Object new_value; | |
1704 | |
1705 new_value = textget (next_iv->plist, *p->name); | |
1706 if (!EQ (values_here[p->idx], new_value)) | |
1707 break; | |
1708 } | |
1709 | |
1710 if (p->handler) | |
1711 break; | |
1712 } | |
1713 | |
1714 if (!NULL_INTERVAL_P (next_iv)) | |
1715 { | |
1716 if (INTEGERP (limit) | |
1717 && next_iv->position >= XFASTINT (limit)) | |
1718 /* No text property change up to limit. */ | |
1719 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1720 else | |
1721 /* Text properties change in next_iv. */ | |
1722 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1723 } | |
1724 } | |
1725 | |
1726 xassert (STRINGP (it->string) | |
1727 || (it->stop_charpos >= BEGV | |
1728 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1729 } | |
1730 | |
1731 | |
1732 /* Return the position of the next overlay change after POS in | |
1733 current_buffer. Value is point-max if no overlay change | |
1734 follows. This is like `next-overlay-change' but doesn't use | |
1735 xmalloc. */ | |
1736 | |
1737 static int | |
1738 next_overlay_change (pos) | |
1739 int pos; | |
1740 { | |
1741 int noverlays; | |
1742 int endpos; | |
1743 Lisp_Object *overlays; | |
1744 int len; | |
1745 int i; | |
1746 | |
1747 /* Get all overlays at the given position. */ | |
1748 len = 10; | |
1749 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
1750 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL); | |
1751 if (noverlays > len) | |
1752 { | |
1753 len = noverlays; | |
1754 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
1755 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL); | |
1756 } | |
1757 | |
1758 /* If any of these overlays ends before endpos, | |
1759 use its ending point instead. */ | |
1760 for (i = 0; i < noverlays; ++i) | |
1761 { | |
1762 Lisp_Object oend; | |
1763 int oendpos; | |
1764 | |
1765 oend = OVERLAY_END (overlays[i]); | |
1766 oendpos = OVERLAY_POSITION (oend); | |
1767 endpos = min (endpos, oendpos); | |
1768 } | |
1769 | |
1770 return endpos; | |
1771 } | |
1772 | |
1773 | |
1774 | |
1775 /*********************************************************************** | |
1776 Fontification | |
1777 ***********************************************************************/ | |
1778 | |
1779 /* Handle changes in the `fontified' property of the current buffer by | |
1780 calling hook functions from Qfontification_functions to fontify | |
1781 regions of text. */ | |
1782 | |
1783 static enum prop_handled | |
1784 handle_fontified_prop (it) | |
1785 struct it *it; | |
1786 { | |
1787 Lisp_Object prop, pos; | |
1788 enum prop_handled handled = HANDLED_NORMALLY; | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1789 struct gcpro gcpro1; |
25012 | 1790 |
1791 /* Get the value of the `fontified' property at IT's current buffer | |
1792 position. (The `fontified' property doesn't have a special | |
1793 meaning in strings.) If the value is nil, call functions from | |
1794 Qfontification_functions. */ | |
1795 if (!STRINGP (it->string) | |
1796 && it->s == NULL | |
1797 && !NILP (Vfontification_functions) | |
1798 && (pos = make_number (IT_CHARPOS (*it)), | |
1799 prop = Fget_char_property (pos, Qfontified, Qnil), | |
1800 NILP (prop))) | |
1801 { | |
1802 Lisp_Object args[2]; | |
1803 | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1804 GCPRO1 (pos); |
25012 | 1805 /* Run the hook functions. */ |
1806 args[0] = Qfontification_functions; | |
1807 args[1] = pos; | |
1808 Frun_hook_with_args (make_number (2), args); | |
1809 | |
1810 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
1811 something. This avoids an endless loop if they failed to | |
1812 fontify the text for which reason ever. */ | |
1813 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
1814 handled = HANDLED_RECOMPUTE_PROPS; | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1815 UNGCPRO; |
25012 | 1816 } |
1817 | |
1818 return handled; | |
1819 } | |
1820 | |
1821 | |
1822 | |
1823 /*********************************************************************** | |
1824 Faces | |
1825 ***********************************************************************/ | |
1826 | |
1827 /* Set up iterator IT from face properties at its current position. | |
1828 Called from handle_stop. */ | |
1829 | |
1830 static enum prop_handled | |
1831 handle_face_prop (it) | |
1832 struct it *it; | |
1833 { | |
1834 int new_face_id, next_stop; | |
1835 | |
1836 if (!STRINGP (it->string)) | |
1837 { | |
1838 new_face_id | |
1839 = face_at_buffer_position (it->w, | |
1840 IT_CHARPOS (*it), | |
1841 it->region_beg_charpos, | |
1842 it->region_end_charpos, | |
1843 &next_stop, | |
1844 (IT_CHARPOS (*it) | |
1845 + TEXT_PROP_DISTANCE_LIMIT), | |
1846 0); | |
1847 | |
1848 /* Is this a start of a run of characters with box face? | |
1849 Caveat: this can be called for a freshly initialized | |
1850 iterator; face_id is -1 is this case. We know that the new | |
1851 face will not change until limit, i.e. if the new face has a | |
1852 box, all characters up to limit will have one. But, as | |
1853 usual, we don't know whether limit is really the end. */ | |
1854 if (new_face_id != it->face_id) | |
1855 { | |
1856 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1857 | |
1858 /* If new face has a box but old face has not, this is | |
1859 the start of a run of characters with box, i.e. it has | |
1860 a shadow on the left side. The value of face_id of the | |
1861 iterator will be -1 if this is the initial call that gets | |
1862 the face. In this case, we have to look in front of IT's | |
1863 position and see whether there is a face != new_face_id. */ | |
1864 it->start_of_box_run_p | |
1865 = (new_face->box != FACE_NO_BOX | |
1866 && (it->face_id >= 0 | |
1867 || IT_CHARPOS (*it) == BEG | |
1868 || new_face_id != face_before_it_pos (it))); | |
1869 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1870 } | |
1871 } | |
1872 else | |
1873 { | |
1874 new_face_id | |
1875 = face_at_string_position (it->w, | |
1876 it->string, | |
1877 IT_STRING_CHARPOS (*it), | |
1878 (it->current.overlay_string_index >= 0 | |
1879 ? IT_CHARPOS (*it) | |
1880 : 0), | |
1881 it->region_beg_charpos, | |
1882 it->region_end_charpos, | |
1883 &next_stop, | |
1884 it->base_face_id); | |
1885 | |
1886 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
1887 /* If IT is used to display a mode line we would really like to | |
1888 use the mode line face instead of the frame's default face. */ | |
1889 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
1890 && new_face_id == DEFAULT_FACE_ID) | |
1891 new_face_id = MODE_LINE_FACE_ID; | |
1892 #endif | |
1893 | |
1894 /* Is this a start of a run of characters with box? Caveat: | |
1895 this can be called for a freshly allocated iterator; face_id | |
1896 is -1 is this case. We know that the new face will not | |
1897 change until the next check pos, i.e. if the new face has a | |
1898 box, all characters up to that position will have a | |
1899 box. But, as usual, we don't know whether that position | |
1900 is really the end. */ | |
1901 if (new_face_id != it->face_id) | |
1902 { | |
1903 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1904 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
1905 | |
1906 /* If new face has a box but old face hasn't, this is the | |
1907 start of a run of characters with box, i.e. it has a | |
1908 shadow on the left side. */ | |
1909 it->start_of_box_run_p | |
1910 = new_face->box && (old_face == NULL || !old_face->box); | |
1911 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1912 } | |
1913 } | |
1914 | |
1915 it->face_id = new_face_id; | |
1916 it->charset = CHARSET_ASCII; | |
1917 return HANDLED_NORMALLY; | |
1918 } | |
1919 | |
1920 | |
1921 /* Compute the face one character before or after the current position | |
1922 of IT. BEFORE_P non-zero means get the face in front of IT's | |
1923 position. Value is the id of the face. */ | |
1924 | |
1925 static int | |
1926 face_before_or_after_it_pos (it, before_p) | |
1927 struct it *it; | |
1928 int before_p; | |
1929 { | |
1930 int face_id, limit; | |
1931 int next_check_charpos; | |
1932 struct text_pos pos; | |
1933 | |
1934 xassert (it->s == NULL); | |
1935 | |
1936 if (STRINGP (it->string)) | |
1937 { | |
1938 /* No face change past the end of the string (for the case | |
1939 we are padding with spaces). No face change before the | |
1940 string start. */ | |
1941 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
1942 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
1943 return it->face_id; | |
1944 | |
1945 /* Set pos to the position before or after IT's current position. */ | |
1946 if (before_p) | |
1947 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
1948 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1949 /* For composition, we must check the character after the |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1950 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1951 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1952 ? string_pos (IT_STRING_CHARPOS (*it) + it->cmp_len, it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1953 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 1954 |
1955 /* Get the face for ASCII, or unibyte. */ | |
1956 face_id | |
1957 = face_at_string_position (it->w, | |
1958 it->string, | |
1959 CHARPOS (pos), | |
1960 (it->current.overlay_string_index >= 0 | |
1961 ? IT_CHARPOS (*it) | |
1962 : 0), | |
1963 it->region_beg_charpos, | |
1964 it->region_end_charpos, | |
1965 &next_check_charpos, | |
1966 it->base_face_id); | |
1967 | |
1968 /* Correct the face for charsets different from ASCII. Do it | |
1969 for the multibyte case only. The face returned above is | |
1970 suitable for unibyte text if IT->string is unibyte. */ | |
1971 if (STRING_MULTIBYTE (it->string)) | |
1972 { | |
1973 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
1974 int rest = STRING_BYTES (XSTRING (it->string)) - BYTEPOS (pos); | |
1975 int c, len, charset; | |
1976 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1977 c = string_char_and_length (p, rest, &len); |
25012 | 1978 charset = CHAR_CHARSET (c); |
1979 if (charset != CHARSET_ASCII) | |
1980 face_id = FACE_FOR_CHARSET (it->f, face_id, charset); | |
1981 } | |
1982 } | |
1983 else | |
1984 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1985 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
|
1986 || (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
|
1987 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1988 |
25012 | 1989 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
1990 pos = it->current.pos; | |
1991 | |
1992 if (before_p) | |
1993 DEC_TEXT_POS (pos); | |
1994 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1995 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1996 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1997 /* For composition, we must check the position after the |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1998 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
1999 pos.charpos += it->cmp_len, pos.bytepos += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2000 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2001 INC_TEXT_POS (pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2002 } |
25012 | 2003 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2004 face_id = face_at_buffer_position (it->w, | |
2005 CHARPOS (pos), | |
2006 it->region_beg_charpos, | |
2007 it->region_end_charpos, | |
2008 &next_check_charpos, | |
2009 limit, 0); | |
2010 | |
2011 /* Correct the face for charsets different from ASCII. Do it | |
2012 for the multibyte case only. The face returned above is | |
2013 suitable for unibyte text if current_buffer is unibyte. */ | |
2014 if (it->multibyte_p) | |
2015 { | |
2016 int charset = charset_at_position (pos); | |
2017 if (charset != CHARSET_ASCII) | |
2018 face_id = FACE_FOR_CHARSET (it->f, face_id, charset); | |
2019 } | |
2020 } | |
2021 | |
2022 return face_id; | |
2023 } | |
2024 | |
2025 | |
2026 | |
2027 /*********************************************************************** | |
2028 Invisible text | |
2029 ***********************************************************************/ | |
2030 | |
2031 /* Set up iterator IT from invisible properties at its current | |
2032 position. Called from handle_stop. */ | |
2033 | |
2034 static enum prop_handled | |
2035 handle_invisible_prop (it) | |
2036 struct it *it; | |
2037 { | |
2038 enum prop_handled handled = HANDLED_NORMALLY; | |
2039 | |
2040 if (STRINGP (it->string)) | |
2041 { | |
2042 extern Lisp_Object Qinvisible; | |
2043 Lisp_Object prop, end_charpos, limit, charpos; | |
2044 | |
2045 /* Get the value of the invisible text property at the | |
2046 current position. Value will be nil if there is no such | |
2047 property. */ | |
2048 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2049 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2050 | |
2051 if (!NILP (prop)) | |
2052 { | |
2053 handled = HANDLED_RECOMPUTE_PROPS; | |
2054 | |
2055 /* Get the position at which the next change of the | |
2056 invisible text property can be found in IT->string. | |
2057 Value will be nil if the property value is the same for | |
2058 all the rest of IT->string. */ | |
2059 XSETINT (limit, XSTRING (it->string)->size); | |
2060 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2061 it->string, limit); | |
2062 | |
2063 /* Text at current position is invisible. The next | |
2064 change in the property is at position end_charpos. | |
2065 Move IT's current position to that position. */ | |
2066 if (INTEGERP (end_charpos) | |
2067 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2068 { | |
2069 struct text_pos old; | |
2070 old = it->current.string_pos; | |
2071 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2072 compute_string_pos (&it->current.string_pos, old, it->string); | |
2073 } | |
2074 else | |
2075 { | |
2076 /* The rest of the string is invisible. If this is an | |
2077 overlay string, proceed with the next overlay string | |
2078 or whatever comes and return a character from there. */ | |
2079 if (it->current.overlay_string_index >= 0) | |
2080 { | |
2081 next_overlay_string (it); | |
2082 /* Don't check for overlay strings when we just | |
2083 finished processing them. */ | |
2084 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2085 } | |
2086 else | |
2087 { | |
2088 struct Lisp_String *s = XSTRING (it->string); | |
2089 IT_STRING_CHARPOS (*it) = s->size; | |
2090 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2091 } | |
2092 } | |
2093 } | |
2094 } | |
2095 else | |
2096 { | |
2097 int visible_p, newpos, next_stop; | |
2098 Lisp_Object pos, prop; | |
2099 | |
2100 /* First of all, is there invisible text at this position? */ | |
2101 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2102 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2103 | |
2104 /* If we are on invisible text, skip over it. */ | |
2105 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
2106 { | |
2107 /* Record whether we have to display an ellipsis for the | |
2108 invisible text. */ | |
2109 int display_ellipsis_p | |
2110 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2111 | |
2112 handled = HANDLED_RECOMPUTE_PROPS; | |
2113 | |
2114 /* Loop skipping over invisible text. The loop is left at | |
2115 ZV or with IT on the first char being visible again. */ | |
2116 do | |
2117 { | |
2118 /* Try to skip some invisible text. Return value is the | |
2119 position reached which can be equal to IT's position | |
2120 if there is nothing invisible here. This skips both | |
2121 over invisible text properties and overlays with | |
2122 invisible property. */ | |
2123 newpos = skip_invisible (IT_CHARPOS (*it), | |
2124 &next_stop, ZV, it->window); | |
2125 | |
2126 /* If we skipped nothing at all we weren't at invisible | |
2127 text in the first place. If everything to the end of | |
2128 the buffer was skipped, end the loop. */ | |
2129 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2130 visible_p = 1; | |
2131 else | |
2132 { | |
2133 /* We skipped some characters but not necessarily | |
2134 all there are. Check if we ended up on visible | |
2135 text. Fget_char_property returns the property of | |
2136 the char before the given position, i.e. if we | |
2137 get visible_p = 1, this means that the char at | |
2138 newpos is visible. */ | |
2139 XSETFASTINT (pos, newpos); | |
2140 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2141 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2142 } | |
2143 | |
2144 /* If we ended up on invisible text, proceed to | |
2145 skip starting with next_stop. */ | |
2146 if (!visible_p) | |
2147 IT_CHARPOS (*it) = next_stop; | |
2148 } | |
2149 while (!visible_p); | |
2150 | |
2151 /* The position newpos is now either ZV or on visible text. */ | |
2152 IT_CHARPOS (*it) = newpos; | |
2153 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2154 | |
2155 /* Maybe return `...' next for the end of the invisible text. */ | |
2156 if (display_ellipsis_p) | |
2157 { | |
2158 if (it->dp | |
2159 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2160 { | |
2161 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2162 it->dpvec = v->contents; | |
2163 it->dpend = v->contents + v->size; | |
2164 } | |
2165 else | |
2166 { | |
2167 /* Default `...'. */ | |
2168 it->dpvec = default_invis_vector; | |
2169 it->dpend = default_invis_vector + 3; | |
2170 } | |
2171 | |
2172 /* The ellipsis display does not replace the display of | |
2173 the character at the new position. Indicate this by | |
2174 setting IT->dpvec_char_len to zero. */ | |
2175 it->dpvec_char_len = 0; | |
2176 | |
2177 it->current.dpvec_index = 0; | |
2178 it->method = next_element_from_display_vector; | |
2179 } | |
2180 } | |
2181 } | |
2182 | |
2183 return handled; | |
2184 } | |
2185 | |
2186 | |
277 | 2187 |
25012 | 2188 /*********************************************************************** |
2189 'display' property | |
2190 ***********************************************************************/ | |
2191 | |
2192 /* Set up iterator IT from `display' property at its current position. | |
2193 Called from handle_stop. */ | |
2194 | |
2195 static enum prop_handled | |
2196 handle_display_prop (it) | |
2197 struct it *it; | |
2198 { | |
2199 Lisp_Object prop, object; | |
2200 struct text_pos *position; | |
2201 int space_or_image_found_p; | |
2202 | |
2203 if (STRINGP (it->string)) | |
2204 { | |
2205 object = it->string; | |
2206 position = &it->current.string_pos; | |
2207 } | |
2208 else | |
2209 { | |
2210 object = Qnil; | |
2211 position = &it->current.pos; | |
2212 } | |
2213 | |
2214 /* Reset those iterator values set from display property values. */ | |
2215 it->font_height = Qnil; | |
2216 it->space_width = Qnil; | |
2217 it->voffset = 0; | |
2218 | |
2219 /* We don't support recursive `display' properties, i.e. string | |
2220 values that have a string `display' property, that have a string | |
2221 `display' property etc. */ | |
2222 if (!it->string_from_display_prop_p) | |
2223 it->area = TEXT_AREA; | |
2224 | |
2225 prop = Fget_char_property (make_number (position->charpos), | |
2226 Qdisplay, object); | |
2227 if (NILP (prop)) | |
2228 return HANDLED_NORMALLY; | |
2229 | |
2230 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
|
2231 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2232 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2233 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2234 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2235 /* A list of sub-properties. */ |
25012 | 2236 while (CONSP (prop)) |
2237 { | |
2238 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2239 space_or_image_found_p = 1; | |
2240 prop = XCDR (prop); | |
2241 } | |
2242 } | |
2243 else if (VECTORP (prop)) | |
2244 { | |
2245 int i; | |
2246 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2247 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2248 object, position)) | |
2249 space_or_image_found_p = 1; | |
2250 } | |
2251 else | |
2252 { | |
2253 if (handle_single_display_prop (it, prop, object, position)) | |
2254 space_or_image_found_p = 1; | |
2255 } | |
2256 | |
2257 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2258 } | |
2259 | |
2260 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2261 /* Value is the position of the end of the `display' property starting |
25012 | 2262 at START_POS in OBJECT. */ |
2263 | |
2264 static struct text_pos | |
2265 display_prop_end (it, object, start_pos) | |
2266 struct it *it; | |
2267 Lisp_Object object; | |
2268 struct text_pos start_pos; | |
2269 { | |
2270 Lisp_Object end; | |
2271 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2272 |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2273 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
|
2274 Qdisplay, object, Qnil); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2275 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2276 if (STRINGP (object)) |
25012 | 2277 compute_string_pos (&end_pos, start_pos, it->string); |
2278 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2279 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2280 |
2281 return end_pos; | |
2282 } | |
2283 | |
2284 | |
2285 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2286 is the object in which the `display' property was found. *POSITION | |
2287 is the position at which it was found. | |
2288 | |
2289 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2290 end position of the `display' property. | |
2291 | |
2292 Value is non-zero if a `space' or `image' property value was found. */ | |
2293 | |
2294 static int | |
2295 handle_single_display_prop (it, prop, object, position) | |
2296 struct it *it; | |
2297 Lisp_Object prop; | |
2298 Lisp_Object object; | |
2299 struct text_pos *position; | |
2300 { | |
2301 Lisp_Object value; | |
2302 int space_or_image_found_p = 0; | |
2303 | |
2304 Lisp_Object form; | |
2305 | |
25614 | 2306 /* 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
|
2307 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2308 form = Qt; |
25614 | 2309 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2310 { |
2311 prop = XCDR (prop); | |
2312 if (!CONSP (prop)) | |
2313 return 0; | |
2314 form = XCAR (prop); | |
2315 prop = XCDR (prop); | |
2316 } | |
2317 | |
2318 if (!NILP (form) && !EQ (form, Qt)) | |
2319 { | |
2320 struct gcpro gcpro1; | |
2321 struct text_pos end_pos, pt; | |
2322 | |
2323 end_pos = display_prop_end (it, object, *position); | |
2324 GCPRO1 (form); | |
2325 | |
2326 /* Temporarily set point to the end position, and then evaluate | |
2327 the form. This makes `(eolp)' work as FORM. */ | |
2328 CHARPOS (pt) = PT; | |
2329 BYTEPOS (pt) = PT_BYTE; | |
2330 TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos)); | |
2331 form = eval_form (form); | |
2332 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); | |
2333 UNGCPRO; | |
2334 } | |
2335 | |
2336 if (NILP (form)) | |
2337 return 0; | |
2338 | |
2339 if (CONSP (prop) | |
2340 && EQ (XCAR (prop), Qheight) | |
2341 && CONSP (XCDR (prop))) | |
2342 { | |
2343 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2344 return 0; | |
2345 | |
2346 /* `(height HEIGHT)'. */ | |
2347 it->font_height = XCAR (XCDR (prop)); | |
2348 if (!NILP (it->font_height)) | |
2349 { | |
2350 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2351 int new_height = -1; | |
2352 | |
2353 if (CONSP (it->font_height) | |
2354 && (EQ (XCAR (it->font_height), Qplus) | |
2355 || EQ (XCAR (it->font_height), Qminus)) | |
2356 && CONSP (XCDR (it->font_height)) | |
2357 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2358 { | |
2359 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2360 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2361 if (EQ (XCAR (it->font_height), Qplus)) | |
2362 steps = - steps; | |
2363 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2364 } | |
2365 else if (SYMBOLP (it->font_height)) | |
2366 { | |
2367 /* Call function with current height as argument. | |
2368 Value is the new height. */ | |
2369 Lisp_Object form, height; | |
2370 struct gcpro gcpro1; | |
2371 | |
2372 height = face->lface[LFACE_HEIGHT_INDEX]; | |
2373 form = Fcons (it->font_height, Fcons (height, Qnil)); | |
2374 GCPRO1 (form); | |
2375 height = eval_form (form); | |
2376 if (NUMBERP (height)) | |
2377 new_height = XFLOATINT (height); | |
2378 UNGCPRO; | |
2379 } | |
2380 else if (NUMBERP (it->font_height)) | |
2381 { | |
2382 /* Value is a multiple of the canonical char height. */ | |
2383 struct face *face; | |
2384 | |
2385 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2386 new_height = (XFLOATINT (it->font_height) | |
2387 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2388 } | |
2389 else | |
2390 { | |
2391 /* Evaluate IT->font_height with `height' bound to the | |
2392 current specified height to get the new height. */ | |
2393 Lisp_Object value; | |
2394 int count = specpdl_ptr - specpdl; | |
2395 | |
2396 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); | |
2397 value = eval_form (it->font_height); | |
2398 unbind_to (count, Qnil); | |
2399 | |
2400 if (NUMBERP (value)) | |
2401 new_height = XFLOATINT (value); | |
2402 } | |
2403 | |
2404 if (new_height > 0) | |
2405 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2406 } | |
2407 } | |
2408 else if (CONSP (prop) | |
2409 && EQ (XCAR (prop), Qspace_width) | |
2410 && CONSP (XCDR (prop))) | |
2411 { | |
2412 /* `(space_width WIDTH)'. */ | |
2413 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2414 return 0; | |
2415 | |
2416 value = XCAR (XCDR (prop)); | |
2417 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2418 it->space_width = value; | |
2419 } | |
2420 else if (CONSP (prop) | |
2421 && EQ (XCAR (prop), Qraise) | |
2422 && CONSP (XCDR (prop))) | |
2423 { | |
2424 /* `(raise FACTOR)'. */ | |
2425 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2426 return 0; | |
2427 | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2428 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2429 value = XCAR (XCDR (prop)); |
2430 if (NUMBERP (value)) | |
2431 { | |
2432 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2433 it->voffset = - (XFLOATINT (value) | |
2434 * (face->font->ascent + face->font->descent)); | |
2435 } | |
2436 #endif /* HAVE_WINDOW_SYSTEM */ | |
2437 } | |
2438 else if (!it->string_from_display_prop_p) | |
2439 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2440 /* `((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
|
2441 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2442 Lisp_Object location, value; |
2443 struct text_pos start_pos; | |
2444 int valid_p; | |
2445 | |
2446 /* Characters having this form of property are not displayed, so | |
2447 we have to find the end of the property. */ | |
2448 space_or_image_found_p = 1; | |
2449 start_pos = *position; | |
2450 *position = display_prop_end (it, object, start_pos); | |
2451 | |
2452 /* Let's stop at the new position and assume that all | |
2453 text properties change there. */ | |
2454 it->stop_charpos = position->charpos; | |
2455 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2456 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2457 if (CONSP (prop) && CONSP (XCAR (prop))) |
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 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2460 |
25012 | 2461 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2462 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2463 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2464 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2465 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2466 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2467 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2468 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2469 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2470 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2471 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2472 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2473 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2474 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2475 if (EQ (location, Qunbound)) |
25012 | 2476 { |
2477 location = Qnil; | |
2478 value = prop; | |
2479 } | |
2480 | |
2481 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2482 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2483 valid_p = STRINGP (value); |
2484 else | |
2485 valid_p = (STRINGP (value) | |
2486 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2487 || valid_image_p (value)); | |
2488 #else /* not HAVE_WINDOW_SYSTEM */ | |
2489 valid_p = STRINGP (value); | |
2490 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2491 | |
2492 if ((EQ (location, Qleft_margin) | |
2493 || EQ (location, Qright_margin) | |
2494 || NILP (location)) | |
2495 && valid_p) | |
2496 { | |
2497 /* Save current settings of IT so that we can restore them | |
2498 when we are finished with the glyph property value. */ | |
2499 push_it (it); | |
2500 | |
2501 if (NILP (location)) | |
2502 it->area = TEXT_AREA; | |
2503 else if (EQ (location, Qleft_margin)) | |
2504 it->area = LEFT_MARGIN_AREA; | |
2505 else | |
2506 it->area = RIGHT_MARGIN_AREA; | |
2507 | |
2508 if (STRINGP (value)) | |
2509 { | |
2510 it->string = value; | |
2511 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2512 it->current.overlay_string_index = -1; | |
2513 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2514 it->end_charpos = it->string_nchars | |
2515 = XSTRING (it->string)->size; | |
2516 it->method = next_element_from_string; | |
2517 it->stop_charpos = 0; | |
2518 it->string_from_display_prop_p = 1; | |
2519 } | |
2520 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2521 { | |
2522 it->method = next_element_from_stretch; | |
2523 it->object = value; | |
2524 it->current.pos = it->position = start_pos; | |
2525 } | |
2526 #ifdef HAVE_WINDOW_SYSTEM | |
2527 else | |
2528 { | |
2529 it->what = IT_IMAGE; | |
2530 it->image_id = lookup_image (it->f, value); | |
2531 it->position = start_pos; | |
2532 it->object = NILP (object) ? it->w->buffer : object; | |
2533 it->method = next_element_from_image; | |
2534 | |
2535 /* Say that we don't have consumed the characters with | |
2536 `display' property yet. The call to pop_it in | |
2537 set_iterator_to_next will clean this up. */ | |
2538 *position = start_pos; | |
2539 } | |
2540 #endif /* HAVE_WINDOW_SYSTEM */ | |
2541 } | |
2542 } | |
2543 | |
2544 return space_or_image_found_p; | |
2545 } | |
2546 | |
2547 | |
2548 | |
2549 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2550 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2551 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2552 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2553 /* Set up iterator IT from `composition' property at its current |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2554 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2555 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2556 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2557 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2558 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2559 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2560 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2561 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2562 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2563 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2564 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2565 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2566 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2567 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2568 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2569 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2570 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2571 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2572 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2573 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2574 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2575 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2576 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2577 /* If there's a valid composition and point is not inside of the |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2578 composition (in the case that the composition is from the current |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2579 buffer), draw a glyph composed from the composition components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2580 if (find_composition (pos, -1, &pos, &end, &prop, string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2581 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2582 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2583 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2584 int id = get_composition_id (pos, pos_byte, end - pos, prop, string); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2585 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2586 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2587 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2588 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2589 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2590 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2591 /* For a terminal, draw only the first character of the |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2592 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2593 it->c = COMPOSITION_GLYPH (composition_table[id], 0); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2594 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2595 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2596 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2597 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2598 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2599 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2600 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2601 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2602 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2603 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2604 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2605 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2606 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2607 /*********************************************************************** |
25012 | 2608 Overlay strings |
2609 ***********************************************************************/ | |
2610 | |
2611 /* The following structure is used to record overlay strings for | |
2612 later sorting in load_overlay_strings. */ | |
2613 | |
2614 struct overlay_entry | |
2615 { | |
2616 Lisp_Object string; | |
2617 int priority; | |
2618 int after_string_p; | |
2619 }; | |
2620 | |
2621 | |
2622 /* Set up iterator IT from overlay strings at its current position. | |
2623 Called from handle_stop. */ | |
2624 | |
2625 static enum prop_handled | |
2626 handle_overlay_change (it) | |
2627 struct it *it; | |
2628 { | |
2629 /* Overlays are handled in current_buffer only. */ | |
2630 if (STRINGP (it->string)) | |
2631 return HANDLED_NORMALLY; | |
2632 else | |
2633 return (get_overlay_strings (it) | |
2634 ? HANDLED_RECOMPUTE_PROPS | |
2635 : HANDLED_NORMALLY); | |
2636 } | |
2637 | |
2638 | |
2639 /* Set up the next overlay string for delivery by IT, if there is an | |
2640 overlay string to deliver. Called by set_iterator_to_next when the | |
2641 end of the current overlay string is reached. If there are more | |
2642 overlay strings to display, IT->string and | |
2643 IT->current.overlay_string_index are set appropriately here. | |
2644 Otherwise IT->string is set to nil. */ | |
2645 | |
2646 static void | |
2647 next_overlay_string (it) | |
2648 struct it *it; | |
2649 { | |
2650 ++it->current.overlay_string_index; | |
2651 if (it->current.overlay_string_index == it->n_overlay_strings) | |
2652 { | |
2653 /* No more overlay strings. Restore IT's settings to what | |
2654 they were before overlay strings were processed, and | |
2655 continue to deliver from current_buffer. */ | |
2656 pop_it (it); | |
2657 xassert (it->stop_charpos >= BEGV | |
2658 && it->stop_charpos <= it->end_charpos); | |
2659 it->string = Qnil; | |
2660 it->current.overlay_string_index = -1; | |
2661 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
2662 it->n_overlay_strings = 0; | |
2663 it->method = next_element_from_buffer; | |
2664 } | |
2665 else | |
2666 { | |
2667 /* There are more overlay strings to process. If | |
2668 IT->current.overlay_string_index has advanced to a position | |
2669 where we must load IT->overlay_strings with more strings, do | |
2670 it. */ | |
2671 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
2672 | |
2673 if (it->current.overlay_string_index && i == 0) | |
2674 load_overlay_strings (it); | |
2675 | |
2676 /* Initialize IT to deliver display elements from the overlay | |
2677 string. */ | |
2678 it->string = it->overlay_strings[i]; | |
2679 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2680 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
2681 it->method = next_element_from_string; | |
2682 it->stop_charpos = 0; | |
2683 } | |
2684 | |
2685 CHECK_IT (it); | |
2686 } | |
2687 | |
2688 | |
2689 /* Compare two overlay_entry structures E1 and E2. Used as a | |
2690 comparison function for qsort in load_overlay_strings. Overlay | |
2691 strings for the same position are sorted so that | |
2692 | |
2693 1. All after-strings come in front of before-strings. | |
2694 | |
2695 2. Within after-strings, strings are sorted so that overlay strings | |
2696 from overlays with higher priorities come first. | |
2697 | |
2698 2. Within before-strings, strings are sorted so that overlay | |
2699 strings from overlays with higher priorities come last. | |
2700 | |
2701 Value is analogous to strcmp. */ | |
2702 | |
2703 | |
2704 static int | |
2705 compare_overlay_entries (e1, e2) | |
2706 void *e1, *e2; | |
2707 { | |
2708 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
2709 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
2710 int result; | |
2711 | |
2712 if (entry1->after_string_p != entry2->after_string_p) | |
2713 /* Let after-strings appear in front of before-strings. */ | |
2714 result = entry1->after_string_p ? -1 : 1; | |
2715 else if (entry1->after_string_p) | |
2716 /* After-strings sorted in order of decreasing priority. */ | |
2717 result = entry2->priority - entry1->priority; | |
2718 else | |
2719 /* Before-strings sorted in order of increasing priority. */ | |
2720 result = entry1->priority - entry2->priority; | |
2721 | |
2722 return result; | |
2723 } | |
2724 | |
2725 | |
2726 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
2727 current buffer position. Set IT->n_overlays to the total number of | |
2728 overlay strings found. | |
2729 | |
2730 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
2731 a time. On entry into load_overlay_strings, | |
2732 IT->current.overlay_string_index gives the number of overlay | |
2733 strings that have already been loaded by previous calls to this | |
2734 function. | |
2735 | |
2736 Overlay strings are sorted so that after-string strings come in | |
2737 front of before-string strings. Within before and after-strings, | |
2738 strings are sorted by overlay priority. See also function | |
2739 compare_overlay_entries. */ | |
2740 | |
2741 static void | |
2742 load_overlay_strings (it) | |
2743 struct it *it; | |
2744 { | |
2745 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority; | |
2746 Lisp_Object ov, overlay, window, str; | |
2747 int start, end; | |
2748 int size = 20; | |
2749 int n = 0, i, j; | |
2750 struct overlay_entry *entries | |
2751 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
2752 | |
2753 /* Append the overlay string STRING of overlay OVERLAY to vector | |
2754 `entries' which has size `size' and currently contains `n' | |
2755 elements. AFTER_P non-zero means STRING is an after-string of | |
2756 OVERLAY. */ | |
2757 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
2758 do \ | |
2759 { \ | |
2760 Lisp_Object priority; \ | |
2761 \ | |
2762 if (n == size) \ | |
2763 { \ | |
2764 int new_size = 2 * size; \ | |
2765 struct overlay_entry *old = entries; \ | |
2766 entries = \ | |
2767 (struct overlay_entry *) alloca (new_size \ | |
2768 * sizeof *entries); \ | |
2769 bcopy (old, entries, size * sizeof *entries); \ | |
2770 size = new_size; \ | |
2771 } \ | |
2772 \ | |
2773 entries[n].string = (STRING); \ | |
2774 priority = Foverlay_get ((OVERLAY), Qpriority); \ | |
2775 entries[n].priority \ | |
2776 = INTEGERP (priority) ? XFASTINT (priority) : 0; \ | |
2777 entries[n].after_string_p = (AFTER_P); \ | |
2778 ++n; \ | |
2779 } \ | |
2780 while (0) | |
2781 | |
2782 /* Process overlay before the overlay center. */ | |
2783 for (ov = current_buffer->overlays_before; | |
2784 CONSP (ov); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2785 ov = XCDR (ov)) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2786 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2787 overlay = XCAR (ov); |
25012 | 2788 xassert (OVERLAYP (overlay)); |
2789 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
2790 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
2791 | |
2792 if (end < IT_CHARPOS (*it)) | |
2793 break; | |
2794 | |
2795 /* Skip this overlay if it doesn't start or end at IT's current | |
2796 position. */ | |
2797 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it)) | |
2798 continue; | |
2799 | |
2800 /* Skip this overlay if it doesn't apply to IT->w. */ | |
2801 window = Foverlay_get (overlay, Qwindow); | |
2802 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
2803 continue; | |
2804 | |
2805 /* If overlay has a non-empty before-string, record it. */ | |
2806 if (start == IT_CHARPOS (*it) | |
2807 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) | |
2808 && XSTRING (str)->size) | |
2809 RECORD_OVERLAY_STRING (overlay, str, 0); | |
2810 | |
2811 /* If overlay has a non-empty after-string, record it. */ | |
2812 if (end == IT_CHARPOS (*it) | |
2813 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
2814 && XSTRING (str)->size) | |
2815 RECORD_OVERLAY_STRING (overlay, str, 1); | |
2816 } | |
2817 | |
2818 /* Process overlays after the overlay center. */ | |
2819 for (ov = current_buffer->overlays_after; | |
2820 CONSP (ov); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2821 ov = XCDR (ov)) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2822 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2823 overlay = XCAR (ov); |
25012 | 2824 xassert (OVERLAYP (overlay)); |
2825 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
2826 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
2827 | |
2828 if (start > IT_CHARPOS (*it)) | |
2829 break; | |
2830 | |
2831 /* Skip this overlay if it doesn't start or end at IT's current | |
2832 position. */ | |
2833 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it)) | |
2834 continue; | |
2835 | |
2836 /* Skip this overlay if it doesn't apply to IT->w. */ | |
2837 window = Foverlay_get (overlay, Qwindow); | |
2838 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
2839 continue; | |
2840 | |
2841 /* If overlay has a non-empty before-string, record it. */ | |
2842 if (start == IT_CHARPOS (*it) | |
2843 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) | |
2844 && XSTRING (str)->size) | |
2845 RECORD_OVERLAY_STRING (overlay, str, 0); | |
2846 | |
2847 /* If overlay has a non-empty after-string, record it. */ | |
2848 if (end == IT_CHARPOS (*it) | |
2849 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
2850 && XSTRING (str)->size) | |
2851 RECORD_OVERLAY_STRING (overlay, str, 1); | |
2852 } | |
2853 | |
2854 #undef RECORD_OVERLAY_STRING | |
2855 | |
2856 /* Sort entries. */ | |
2857 qsort (entries, n, sizeof *entries, compare_overlay_entries); | |
2858 | |
2859 /* Record the total number of strings to process. */ | |
2860 it->n_overlay_strings = n; | |
2861 | |
2862 /* IT->current.overlay_string_index is the number of overlay strings | |
2863 that have already been consumed by IT. Copy some of the | |
2864 remaining overlay strings to IT->overlay_strings. */ | |
2865 i = 0; | |
2866 j = it->current.overlay_string_index; | |
2867 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
2868 it->overlay_strings[i++] = entries[j++].string; | |
2869 | |
2870 CHECK_IT (it); | |
2871 } | |
2872 | |
2873 | |
2874 /* Get the first chunk of overlay strings at IT's current buffer | |
2875 position. Value is non-zero if at least one overlay string was | |
2876 found. */ | |
2877 | |
2878 static int | |
2879 get_overlay_strings (it) | |
2880 struct it *it; | |
2881 { | |
2882 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
2883 process. This fills IT->overlay_strings with strings, and sets | |
2884 IT->n_overlay_strings to the total number of strings to process. | |
2885 IT->pos.overlay_string_index has to be set temporarily to zero | |
2886 because load_overlay_strings needs this; it must be set to -1 | |
2887 when no overlay strings are found because a zero value would | |
2888 indicate a position in the first overlay string. */ | |
2889 it->current.overlay_string_index = 0; | |
2890 load_overlay_strings (it); | |
2891 | |
2892 /* If we found overlay strings, set up IT to deliver display | |
2893 elements from the first one. Otherwise set up IT to deliver | |
2894 from current_buffer. */ | |
2895 if (it->n_overlay_strings) | |
2896 { | |
2897 /* Make sure we know settings in current_buffer, so that we can | |
2898 restore meaningful values when we're done with the overlay | |
2899 strings. */ | |
2900 compute_stop_pos (it); | |
2901 xassert (it->face_id >= 0); | |
2902 | |
2903 /* Save IT's settings. They are restored after all overlay | |
2904 strings have been processed. */ | |
2905 xassert (it->sp == 0); | |
2906 push_it (it); | |
2907 | |
2908 /* Set up IT to deliver display elements from the first overlay | |
2909 string. */ | |
2910 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2911 it->stop_charpos = 0; | |
2912 it->string = it->overlay_strings[0]; | |
2913 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2914 xassert (STRINGP (it->string)); | |
2915 it->method = next_element_from_string; | |
2916 } | |
2917 else | |
2918 { | |
2919 it->string = Qnil; | |
2920 it->current.overlay_string_index = -1; | |
2921 it->method = next_element_from_buffer; | |
2922 } | |
2923 | |
2924 CHECK_IT (it); | |
2925 | |
2926 /* Value is non-zero if we found at least one overlay string. */ | |
2927 return STRINGP (it->string); | |
2928 } | |
2929 | |
2930 | |
2931 | |
2932 /*********************************************************************** | |
2933 Saving and restoring state | |
2934 ***********************************************************************/ | |
2935 | |
2936 /* Save current settings of IT on IT->stack. Called, for example, | |
2937 before setting up IT for an overlay string, to be able to restore | |
2938 IT's settings to what they were after the overlay string has been | |
2939 processed. */ | |
2940 | |
2941 static void | |
2942 push_it (it) | |
2943 struct it *it; | |
2944 { | |
2945 struct iterator_stack_entry *p; | |
2946 | |
2947 xassert (it->sp < 2); | |
2948 p = it->stack + it->sp; | |
2949 | |
2950 p->stop_charpos = it->stop_charpos; | |
2951 xassert (it->face_id >= 0); | |
2952 p->face_id = it->face_id; | |
2953 p->string = it->string; | |
2954 p->pos = it->current; | |
2955 p->end_charpos = it->end_charpos; | |
2956 p->string_nchars = it->string_nchars; | |
2957 p->area = it->area; | |
2958 p->multibyte_p = it->multibyte_p; | |
2959 p->space_width = it->space_width; | |
2960 p->font_height = it->font_height; | |
2961 p->voffset = it->voffset; | |
2962 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
2963 ++it->sp; | |
2964 } | |
2965 | |
2966 | |
2967 /* Restore IT's settings from IT->stack. Called, for example, when no | |
2968 more overlay strings must be processed, and we return to delivering | |
2969 display elements from a buffer, or when the end of a string from a | |
2970 `display' property is reached and we return to delivering display | |
2971 elements from an overlay string, or from a buffer. */ | |
2972 | |
2973 static void | |
2974 pop_it (it) | |
2975 struct it *it; | |
2976 { | |
2977 struct iterator_stack_entry *p; | |
2978 | |
2979 xassert (it->sp > 0); | |
2980 --it->sp; | |
2981 p = it->stack + it->sp; | |
2982 it->stop_charpos = p->stop_charpos; | |
2983 it->face_id = p->face_id; | |
2984 it->string = p->string; | |
2985 it->current = p->pos; | |
2986 it->end_charpos = p->end_charpos; | |
2987 it->string_nchars = p->string_nchars; | |
2988 it->area = p->area; | |
2989 it->multibyte_p = p->multibyte_p; | |
2990 it->space_width = p->space_width; | |
2991 it->font_height = p->font_height; | |
2992 it->voffset = p->voffset; | |
2993 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
2994 } | |
2995 | |
2996 | |
2997 | |
2998 /*********************************************************************** | |
2999 Moving over lines | |
3000 ***********************************************************************/ | |
3001 | |
3002 /* Set IT's current position to the previous line start. */ | |
3003 | |
3004 static void | |
3005 back_to_previous_line_start (it) | |
3006 struct it *it; | |
3007 { | |
3008 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3009 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3010 } | |
3011 | |
3012 | |
3013 /* Set IT's current position to the next line start. */ | |
3014 | |
3015 static void | |
3016 forward_to_next_line_start (it) | |
3017 struct it *it; | |
3018 { | |
3019 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), 1); | |
3020 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3021 } | |
3022 | |
3023 | |
3024 /* Set IT's current position to the previous visible line start. Skip | |
3025 invisible text that is so either due to text properties or due to | |
3026 selective display. Caution: this does not change IT->current_x and | |
3027 IT->hpos. */ | |
3028 | |
3029 static void | |
3030 back_to_previous_visible_line_start (it) | |
3031 struct it *it; | |
3032 { | |
3033 int visible_p = 0; | |
3034 | |
3035 /* Go back one newline if not on BEGV already. */ | |
3036 if (IT_CHARPOS (*it) > BEGV) | |
3037 back_to_previous_line_start (it); | |
3038 | |
3039 /* Move over lines that are invisible because of selective display | |
3040 or text properties. */ | |
3041 while (IT_CHARPOS (*it) > BEGV | |
3042 && !visible_p) | |
3043 { | |
3044 visible_p = 1; | |
3045 | |
3046 /* If selective > 0, then lines indented more than that values | |
3047 are invisible. */ | |
3048 if (it->selective > 0 | |
3049 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3050 it->selective)) | |
3051 visible_p = 0; | |
3052 else | |
3053 { | |
3054 Lisp_Object prop; | |
3055 | |
3056 prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window); | |
3057 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
3058 visible_p = 0; | |
3059 } | |
3060 | |
3061 /* Back one more newline if the current one is invisible. */ | |
3062 if (!visible_p) | |
3063 back_to_previous_line_start (it); | |
3064 } | |
3065 | |
3066 xassert (IT_CHARPOS (*it) >= BEGV); | |
3067 xassert (IT_CHARPOS (*it) == BEGV | |
3068 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3069 CHECK_IT (it); | |
3070 } | |
3071 | |
3072 | |
3073 /* Reseat iterator IT at the previous visible line start. Skip | |
3074 invisible text that is so either due to text properties or due to | |
3075 selective display. At the end, update IT's overlay information, | |
3076 face information etc. */ | |
3077 | |
3078 static void | |
3079 reseat_at_previous_visible_line_start (it) | |
3080 struct it *it; | |
3081 { | |
3082 back_to_previous_visible_line_start (it); | |
3083 reseat (it, it->current.pos, 1); | |
3084 CHECK_IT (it); | |
3085 } | |
3086 | |
3087 | |
3088 /* 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
|
3089 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
|
3090 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
|
3091 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
|
3092 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
|
3093 is invisible because of text properties. */ |
25012 | 3094 |
3095 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3096 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3097 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3098 int on_newline_p; |
25012 | 3099 { |
3100 /* Restore the buffer position when currently not delivering display | |
3101 elements from the current buffer. This is the case, for example, | |
3102 when called at the end of a truncated overlay string. */ | |
3103 while (it->sp) | |
3104 pop_it (it); | |
3105 it->method = next_element_from_buffer; | |
3106 | |
3107 /* Otherwise, scan_buffer would not work. */ | |
3108 if (IT_CHARPOS (*it) < ZV) | |
3109 { | |
3110 /* If on a newline, advance past it. Otherwise, find the next | |
3111 newline which automatically gives us the position following | |
3112 the newline. */ | |
3113 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n') | |
3114 { | |
3115 ++IT_CHARPOS (*it); | |
3116 ++IT_BYTEPOS (*it); | |
3117 } | |
3118 else | |
3119 forward_to_next_line_start (it); | |
3120 | |
3121 /* We must either have reached the end of the buffer or end up | |
3122 after a newline. */ | |
3123 xassert (IT_CHARPOS (*it) == ZV | |
3124 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3125 | |
3126 /* Skip over lines that are invisible because they are indented | |
3127 more than the value of IT->selective. */ | |
3128 if (it->selective > 0) | |
3129 while (IT_CHARPOS (*it) < ZV | |
3130 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3131 it->selective)) | |
3132 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
|
3133 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3134 /* Position on the newline if we should. */ |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3135 if (on_newline_p |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3136 && IT_CHARPOS (*it) > BEGV |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3137 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n') |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3138 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3139 --IT_CHARPOS (*it); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3140 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
|
3141 } |
25012 | 3142 |
3143 /* Set the iterator there. The 0 as the last parameter of | |
3144 reseat means don't force a text property lookup. The lookup | |
3145 is then only done if we've skipped past the iterator's | |
3146 check_charpos'es. This optimization is important because | |
3147 text property lookups tend to be expensive. */ | |
3148 reseat (it, it->current.pos, 0); | |
3149 } | |
3150 | |
3151 CHECK_IT (it); | |
3152 } | |
3153 | |
3154 | |
3155 | |
3156 /*********************************************************************** | |
3157 Changing an iterator's position | |
3158 ***********************************************************************/ | |
3159 | |
3160 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3161 is non-zero, always check for text properties at the new position. | |
3162 Otherwise, text properties are only looked up if POS >= | |
3163 IT->check_charpos of a property. */ | |
3164 | |
3165 static void | |
3166 reseat (it, pos, force_p) | |
3167 struct it *it; | |
3168 struct text_pos pos; | |
3169 int force_p; | |
3170 { | |
3171 int original_pos = IT_CHARPOS (*it); | |
3172 | |
3173 reseat_1 (it, pos, 0); | |
3174 | |
3175 /* Determine where to check text properties. Avoid doing it | |
3176 where possible because text property lookup is very expensive. */ | |
3177 if (force_p | |
3178 || CHARPOS (pos) > it->stop_charpos | |
3179 || CHARPOS (pos) < original_pos) | |
3180 handle_stop (it); | |
3181 | |
3182 CHECK_IT (it); | |
3183 } | |
3184 | |
3185 | |
3186 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3187 IT->stop_pos to POS, also. */ | |
3188 | |
3189 static void | |
3190 reseat_1 (it, pos, set_stop_p) | |
3191 struct it *it; | |
3192 struct text_pos pos; | |
3193 int set_stop_p; | |
3194 { | |
3195 /* Don't call this function when scanning a C string. */ | |
3196 xassert (it->s == NULL); | |
3197 | |
3198 /* POS must be a reasonable value. */ | |
3199 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3200 | |
3201 it->current.pos = it->position = pos; | |
3202 XSETBUFFER (it->object, current_buffer); | |
3203 it->dpvec = NULL; | |
3204 it->current.dpvec_index = -1; | |
3205 it->current.overlay_string_index = -1; | |
3206 IT_STRING_CHARPOS (*it) = -1; | |
3207 IT_STRING_BYTEPOS (*it) = -1; | |
3208 it->string = Qnil; | |
3209 it->method = next_element_from_buffer; | |
3210 it->sp = 0; | |
3211 | |
3212 if (set_stop_p) | |
3213 it->stop_charpos = CHARPOS (pos); | |
3214 } | |
3215 | |
3216 | |
3217 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3218 If S is non-null, it is a C string to iterate over. Otherwise, | |
3219 STRING gives a Lisp string to iterate over. | |
3220 | |
3221 If PRECISION > 0, don't return more then PRECISION number of | |
3222 characters from the string. | |
3223 | |
3224 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3225 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3226 field width. | |
3227 | |
3228 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3229 MULTIBYTE > 0 means enable it, | |
3230 MULTIBYTE < 0 means use IT->multibyte_p. | |
3231 | |
3232 IT must be initialized via a prior call to init_iterator before | |
3233 calling this function. */ | |
3234 | |
3235 static void | |
3236 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3237 struct it *it; | |
3238 unsigned char *s; | |
3239 Lisp_Object string; | |
3240 int charpos; | |
3241 int precision, field_width, multibyte; | |
3242 { | |
3243 /* No region in strings. */ | |
3244 it->region_beg_charpos = it->region_end_charpos = -1; | |
3245 | |
3246 /* No text property checks performed by default, but see below. */ | |
3247 it->stop_charpos = -1; | |
3248 | |
3249 /* Set iterator position and end position. */ | |
3250 bzero (&it->current, sizeof it->current); | |
3251 it->current.overlay_string_index = -1; | |
3252 it->current.dpvec_index = -1; | |
3253 it->charset = CHARSET_ASCII; | |
3254 xassert (charpos >= 0); | |
3255 | |
3256 /* Use the setting of MULTIBYTE if specified. */ | |
3257 if (multibyte >= 0) | |
3258 it->multibyte_p = multibyte > 0; | |
3259 | |
3260 if (s == NULL) | |
3261 { | |
3262 xassert (STRINGP (string)); | |
3263 it->string = string; | |
3264 it->s = NULL; | |
3265 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3266 it->method = next_element_from_string; | |
3267 it->current.string_pos = string_pos (charpos, string); | |
3268 } | |
3269 else | |
3270 { | |
3271 it->s = s; | |
3272 it->string = Qnil; | |
3273 | |
3274 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3275 for displaying C strings. */ | |
3276 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3277 if (it->multibyte_p) | |
3278 { | |
3279 it->current.pos = c_string_pos (charpos, s, 1); | |
3280 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3281 } | |
3282 else | |
3283 { | |
3284 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3285 it->end_charpos = it->string_nchars = strlen (s); | |
3286 } | |
3287 | |
3288 it->method = next_element_from_c_string; | |
3289 } | |
3290 | |
3291 /* PRECISION > 0 means don't return more than PRECISION characters | |
3292 from the string. */ | |
3293 if (precision > 0 && it->end_charpos - charpos > precision) | |
3294 it->end_charpos = it->string_nchars = charpos + precision; | |
3295 | |
3296 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3297 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3298 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3299 padding with `-' at the end of a mode line. */ | |
3300 if (field_width < 0) | |
3301 field_width = INFINITY; | |
3302 if (field_width > it->end_charpos - charpos) | |
3303 it->end_charpos = charpos + field_width; | |
3304 | |
3305 /* Use the standard display table for displaying strings. */ | |
3306 if (DISP_TABLE_P (Vstandard_display_table)) | |
3307 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3308 | |
3309 it->stop_charpos = charpos; | |
3310 CHECK_IT (it); | |
3311 } | |
3312 | |
3313 | |
3314 | |
3315 /*********************************************************************** | |
3316 Iteration | |
3317 ***********************************************************************/ | |
3318 | |
3319 /* Load IT's display element fields with information about the next | |
3320 display element from the current position of IT. Value is zero if | |
3321 end of buffer (or C string) is reached. */ | |
3322 | |
3323 int | |
3324 get_next_display_element (it) | |
3325 struct it *it; | |
3326 { | |
3327 /* Non-zero means that we found an display element. Zero means that | |
3328 we hit the end of what we iterate over. Performance note: the | |
3329 function pointer `method' used here turns out to be faster than | |
3330 using a sequence of if-statements. */ | |
3331 int success_p = (*it->method) (it); | |
3332 int charset; | |
3333 | |
3334 if (it->what == IT_CHARACTER) | |
3335 { | |
3336 /* Map via display table or translate control characters. | |
3337 IT->c, IT->len etc. have been set to the next character by | |
3338 the function call above. If we have a display table, and it | |
3339 contains an entry for IT->c, translate it. Don't do this if | |
3340 IT->c itself comes from a display table, otherwise we could | |
3341 end up in an infinite recursion. (An alternative could be to | |
3342 count the recursion depth of this function and signal an | |
3343 error when a certain maximum depth is reached.) Is it worth | |
3344 it? */ | |
3345 if (success_p && it->dpvec == NULL) | |
3346 { | |
3347 Lisp_Object dv; | |
3348 | |
3349 if (it->dp | |
3350 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3351 VECTORP (dv))) | |
3352 { | |
3353 struct Lisp_Vector *v = XVECTOR (dv); | |
3354 | |
3355 /* Return the first character from the display table | |
3356 entry, if not empty. If empty, don't display the | |
3357 current character. */ | |
3358 if (v->size) | |
3359 { | |
3360 it->dpvec_char_len = it->len; | |
3361 it->dpvec = v->contents; | |
3362 it->dpend = v->contents + v->size; | |
3363 it->current.dpvec_index = 0; | |
3364 it->method = next_element_from_display_vector; | |
3365 } | |
3366 | |
3367 success_p = get_next_display_element (it); | |
3368 } | |
3369 | |
3370 /* Translate control characters into `\003' or `^C' form. | |
3371 Control characters coming from a display table entry are | |
3372 currently not translated because we use IT->dpvec to hold | |
3373 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
|
3374 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
|
3375 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3376 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3377 octal form. */ |
25012 | 3378 else if ((it->c < ' ' |
3379 && (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
|
3380 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3381 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3382 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3383 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3384 { |
3385 /* IT->c is a control character which must be displayed | |
3386 either as '\003' or as `^C' where the '\\' and '^' | |
3387 can be defined in the display table. Fill | |
3388 IT->ctl_chars with glyphs for what we have to | |
3389 display. Then, set IT->dpvec to these glyphs. */ | |
3390 GLYPH g; | |
3391 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3392 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3393 { |
3394 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3395 if (it->dp | |
3396 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3397 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3398 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3399 else | |
3400 g = FAST_MAKE_GLYPH ('^', 0); | |
3401 XSETINT (it->ctl_chars[0], g); | |
3402 | |
3403 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3404 XSETINT (it->ctl_chars[1], g); | |
3405 | |
3406 /* Set up IT->dpvec and return first character from it. */ | |
3407 it->dpvec_char_len = it->len; | |
3408 it->dpvec = it->ctl_chars; | |
3409 it->dpend = it->dpvec + 2; | |
3410 it->current.dpvec_index = 0; | |
3411 it->method = next_element_from_display_vector; | |
3412 get_next_display_element (it); | |
3413 } | |
3414 else | |
3415 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3416 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3417 int len = CHAR_STRING (it->c, str); |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3418 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3419 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3420 |
25012 | 3421 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3422 if (it->dp | |
3423 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3424 && 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
|
3425 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3426 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3427 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3428 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3429 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3430 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3431 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
|
3432 /* 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
|
3433 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3434 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
|
3435 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
|
3436 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
|
3437 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
|
3438 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
|
3439 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
|
3440 } |
25012 | 3441 |
3442 /* Set up IT->dpvec and return the first character | |
3443 from it. */ | |
3444 it->dpvec_char_len = it->len; | |
3445 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3446 it->dpend = it->dpvec + len * 4; |
25012 | 3447 it->current.dpvec_index = 0; |
3448 it->method = next_element_from_display_vector; | |
3449 get_next_display_element (it); | |
3450 } | |
3451 } | |
3452 } | |
3453 | |
3454 /* Adjust face id if charset changes. There are no charset | |
3455 changes in unibyte text because Emacs' charsets are not | |
3456 applicable there. */ | |
3457 if (it->multibyte_p | |
3458 && success_p | |
3459 && (charset = CHAR_CHARSET (it->c), | |
3460 charset != it->charset)) | |
3461 { | |
3462 it->charset = charset; | |
3463 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, charset); | |
3464 } | |
3465 } | |
3466 | |
3467 /* Is this character the last one of a run of characters with | |
3468 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3469 if (it->face_box_p | |
3470 && it->s == NULL) | |
3471 { | |
3472 int face_id; | |
3473 struct face *face; | |
3474 | |
3475 it->end_of_box_run_p | |
3476 = ((face_id = face_after_it_pos (it), | |
3477 face_id != it->face_id) | |
3478 && (face = FACE_FROM_ID (it->f, face_id), | |
3479 face->box == FACE_NO_BOX)); | |
3480 } | |
3481 | |
3482 /* Value is 0 if end of buffer or string reached. */ | |
3483 return success_p; | |
3484 } | |
3485 | |
3486 | |
3487 /* Move IT to the next display element. | |
3488 | |
3489 Functions get_next_display_element and set_iterator_to_next are | |
3490 separate because I find this arrangement easier to handle than a | |
3491 get_next_display_element function that also increments IT's | |
3492 position. The way it is we can first look at an iterator's current | |
3493 display element, decide whether it fits on a line, and if it does, | |
3494 increment the iterator position. The other way around we probably | |
3495 would either need a flag indicating whether the iterator has to be | |
3496 incremented the next time, or we would have to implement a | |
3497 decrement position function which would not be easy to write. */ | |
3498 | |
3499 void | |
3500 set_iterator_to_next (it) | |
3501 struct it *it; | |
3502 { | |
3503 if (it->method == next_element_from_buffer) | |
3504 { | |
3505 /* The current display element of IT is a character from | |
3506 current_buffer. Advance in the buffer, and maybe skip over | |
3507 invisible lines that are so because of selective display. */ | |
3508 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
|
3509 reseat_at_next_visible_line_start (it, 0); |
25012 | 3510 else |
3511 { | |
3512 xassert (it->len != 0); | |
3513 IT_BYTEPOS (*it) += it->len; | |
3514 IT_CHARPOS (*it) += 1; | |
3515 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
3516 } | |
3517 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3518 else if (it->method == next_element_from_composition) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3519 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3520 xassert (it->cmp_id >= 0 && it ->cmp_id < n_compositions); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3521 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3522 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3523 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3524 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3525 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3526 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3527 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3528 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3529 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3530 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3531 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3532 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3533 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3534 } |
25012 | 3535 else if (it->method == next_element_from_c_string) |
3536 { | |
3537 /* Current display element of IT is from a C string. */ | |
3538 IT_BYTEPOS (*it) += it->len; | |
3539 IT_CHARPOS (*it) += 1; | |
3540 } | |
3541 else if (it->method == next_element_from_display_vector) | |
3542 { | |
3543 /* Current display element of IT is from a display table entry. | |
3544 Advance in the display table definition. Reset it to null if | |
3545 end reached, and continue with characters from buffers/ | |
3546 strings. */ | |
3547 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3548 |
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3549 /* 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
|
3550 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
|
3551 faces, and of course characters of different charsets). */ |
25012 | 3552 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
|
3553 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
|
3554 |
25012 | 3555 if (it->dpvec + it->current.dpvec_index == it->dpend) |
3556 { | |
3557 if (it->s) | |
3558 it->method = next_element_from_c_string; | |
3559 else if (STRINGP (it->string)) | |
3560 it->method = next_element_from_string; | |
3561 else | |
3562 it->method = next_element_from_buffer; | |
3563 | |
3564 it->dpvec = NULL; | |
3565 it->current.dpvec_index = -1; | |
3566 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3567 /* 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
|
3568 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
|
3569 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
|
3570 else if (it->dpvec_char_len > 0) |
25012 | 3571 { |
3572 it->len = it->dpvec_char_len; | |
3573 set_iterator_to_next (it); | |
3574 } | |
3575 } | |
3576 } | |
3577 else if (it->method == next_element_from_string) | |
3578 { | |
3579 /* Current display element is a character from a Lisp string. */ | |
3580 xassert (it->s == NULL && STRINGP (it->string)); | |
3581 IT_STRING_BYTEPOS (*it) += it->len; | |
3582 IT_STRING_CHARPOS (*it) += 1; | |
3583 | |
3584 consider_string_end: | |
3585 | |
3586 if (it->current.overlay_string_index >= 0) | |
3587 { | |
3588 /* IT->string is an overlay string. Advance to the | |
3589 next, if there is one. */ | |
3590 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3591 next_overlay_string (it); | |
3592 } | |
3593 else | |
3594 { | |
3595 /* IT->string is not an overlay string. If we reached | |
3596 its end, and there is something on IT->stack, proceed | |
3597 with what is on the stack. This can be either another | |
3598 string, this time an overlay string, or a buffer. */ | |
3599 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
3600 && it->sp > 0) | |
3601 { | |
3602 pop_it (it); | |
3603 if (!STRINGP (it->string)) | |
3604 it->method = next_element_from_buffer; | |
3605 } | |
3606 } | |
3607 } | |
3608 else if (it->method == next_element_from_image | |
3609 || it->method == next_element_from_stretch) | |
3610 { | |
3611 /* The position etc with which we have to proceed are on | |
3612 the stack. The position may be at the end of a string, | |
3613 if the `display' property takes up the whole string. */ | |
3614 pop_it (it); | |
3615 it->image_id = 0; | |
3616 if (STRINGP (it->string)) | |
3617 { | |
3618 it->method = next_element_from_string; | |
3619 goto consider_string_end; | |
3620 } | |
3621 else | |
3622 it->method = next_element_from_buffer; | |
3623 } | |
3624 else | |
3625 /* There are no other methods defined, so this should be a bug. */ | |
3626 abort (); | |
3627 | |
3628 /* Reset flags indicating start and end of a sequence of | |
3629 characters with box. */ | |
3630 it->start_of_box_run_p = it->end_of_box_run_p = 0; | |
3631 | |
3632 xassert (it->method != next_element_from_string | |
3633 || (STRINGP (it->string) | |
3634 && IT_STRING_CHARPOS (*it) >= 0)); | |
3635 } | |
3636 | |
3637 | |
3638 /* Load IT's display element fields with information about the next | |
3639 display element which comes from a display table entry or from the | |
3640 result of translating a control character to one of the forms `^C' | |
3641 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
3642 | |
3643 static int | |
3644 next_element_from_display_vector (it) | |
3645 struct it *it; | |
3646 { | |
3647 /* Precondition. */ | |
3648 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
3649 | |
3650 /* Remember the current face id in case glyphs specify faces. | |
3651 IT's face is restored in set_iterator_to_next. */ | |
3652 it->saved_face_id = it->face_id; | |
3653 | |
3654 if (INTEGERP (*it->dpvec) | |
3655 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
3656 { | |
3657 int lface_id; | |
3658 GLYPH g; | |
3659 | |
3660 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
3661 it->c = FAST_GLYPH_CHAR (g); | |
3662 it->len = CHAR_LEN (it->c); | |
3663 | |
3664 /* The entry may contain a face id to use. Such a face id is | |
3665 the id of a Lisp face, not a realized face. A face id of | |
3666 zero means no face. */ | |
3667 lface_id = FAST_GLYPH_FACE (g); | |
3668 if (lface_id) | |
3669 { | |
3670 int face_id = ascii_face_of_lisp_face (it->f, lface_id); | |
3671 if (face_id >= 0) | |
3672 { | |
3673 it->face_id = face_id; | |
3674 it->charset = CHARSET_ASCII; | |
3675 } | |
3676 } | |
3677 } | |
3678 else | |
3679 /* Display table entry is invalid. Return a space. */ | |
3680 it->c = ' ', it->len = 1; | |
3681 | |
3682 /* Don't change position and object of the iterator here. They are | |
3683 still the values of the character that had this display table | |
3684 entry or was translated, and that's what we want. */ | |
3685 it->what = IT_CHARACTER; | |
3686 return 1; | |
3687 } | |
3688 | |
3689 | |
3690 /* Load IT with the next display element from Lisp string IT->string. | |
3691 IT->current.string_pos is the current position within the string. | |
3692 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
3693 overlay string. */ | |
3694 | |
3695 static int | |
3696 next_element_from_string (it) | |
3697 struct it *it; | |
3698 { | |
3699 struct text_pos position; | |
3700 | |
3701 xassert (STRINGP (it->string)); | |
3702 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
3703 position = it->current.string_pos; | |
3704 | |
3705 /* Time to check for invisible text? */ | |
3706 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
3707 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
3708 { | |
3709 handle_stop (it); | |
3710 | |
3711 /* Since a handler may have changed IT->method, we must | |
3712 recurse here. */ | |
3713 return get_next_display_element (it); | |
3714 } | |
3715 | |
3716 if (it->current.overlay_string_index >= 0) | |
3717 { | |
3718 /* Get the next character from an overlay string. In overlay | |
3719 strings, There is no field width or padding with spaces to | |
3720 do. */ | |
3721 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3722 { | |
3723 it->what = IT_EOB; | |
3724 return 0; | |
3725 } | |
3726 else if (STRING_MULTIBYTE (it->string)) | |
3727 { | |
3728 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
3729 - IT_STRING_BYTEPOS (*it)); | |
3730 unsigned char *s = (XSTRING (it->string)->data | |
3731 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3732 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 3733 } |
3734 else | |
3735 { | |
3736 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3737 it->len = 1; | |
3738 } | |
3739 } | |
3740 else | |
3741 { | |
3742 /* Get the next character from a Lisp string that is not an | |
3743 overlay string. Such strings come from the mode line, for | |
3744 example. We may have to pad with spaces, or truncate the | |
3745 string. See also next_element_from_c_string. */ | |
3746 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
3747 { | |
3748 it->what = IT_EOB; | |
3749 return 0; | |
3750 } | |
3751 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
3752 { | |
3753 /* Pad with spaces. */ | |
3754 it->c = ' ', it->len = 1; | |
3755 CHARPOS (position) = BYTEPOS (position) = -1; | |
3756 } | |
3757 else if (STRING_MULTIBYTE (it->string)) | |
3758 { | |
3759 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
3760 - IT_STRING_BYTEPOS (*it)); | |
3761 unsigned char *s = (XSTRING (it->string)->data | |
3762 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3763 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 3764 } |
3765 else | |
3766 { | |
3767 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3768 it->len = 1; | |
3769 } | |
3770 } | |
3771 | |
3772 /* Record what we have and where it came from. Note that we store a | |
3773 buffer position in IT->position although it could arguably be a | |
3774 string position. */ | |
3775 it->what = IT_CHARACTER; | |
3776 it->object = it->string; | |
3777 it->position = position; | |
3778 return 1; | |
3779 } | |
3780 | |
3781 | |
3782 /* Load IT with next display element from C string IT->s. | |
3783 IT->string_nchars is the maximum number of characters to return | |
3784 from the string. IT->end_charpos may be greater than | |
3785 IT->string_nchars when this function is called, in which case we | |
3786 may have to return padding spaces. Value is zero if end of string | |
3787 reached, including padding spaces. */ | |
3788 | |
3789 static int | |
3790 next_element_from_c_string (it) | |
3791 struct it *it; | |
3792 { | |
3793 int success_p = 1; | |
3794 | |
3795 xassert (it->s); | |
3796 it->what = IT_CHARACTER; | |
3797 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
3798 it->object = Qnil; | |
3799 | |
3800 /* IT's position can be greater IT->string_nchars in case a field | |
3801 width or precision has been specified when the iterator was | |
3802 initialized. */ | |
3803 if (IT_CHARPOS (*it) >= it->end_charpos) | |
3804 { | |
3805 /* End of the game. */ | |
3806 it->what = IT_EOB; | |
3807 success_p = 0; | |
3808 } | |
3809 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
3810 { | |
3811 /* Pad with spaces. */ | |
3812 it->c = ' ', it->len = 1; | |
3813 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
3814 } | |
3815 else if (it->multibyte_p) | |
3816 { | |
3817 /* Implementation note: The calls to strlen apparently aren't a | |
3818 performance problem because there is no noticeable performance | |
3819 difference between Emacs running in unibyte or multibyte mode. */ | |
3820 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
|
3821 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
|
3822 maxlen, &it->len); |
25012 | 3823 } |
3824 else | |
3825 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
3826 | |
3827 return success_p; | |
3828 } | |
3829 | |
3830 | |
3831 /* Set up IT to return characters from an ellipsis, if appropriate. | |
3832 The definition of the ellipsis glyphs may come from a display table | |
3833 entry. This function Fills IT with the first glyph from the | |
3834 ellipsis if an ellipsis is to be displayed. */ | |
3835 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3836 static int |
25012 | 3837 next_element_from_ellipsis (it) |
3838 struct it *it; | |
3839 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3840 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3841 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3842 if (it->dp && VECTORP (DISP_INVIS_VECTOR (it->dp))) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3843 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3844 /* Use the display table definition for `...'. Invalid glyphs |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3845 will be handled by the method returning elements from dpvec. */ |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3846 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3847 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3848 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3849 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3850 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3851 it->method = next_element_from_display_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3852 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3853 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3854 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3855 /* Use default `...' which is stored in default_invis_vector. */ |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3856 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3857 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3858 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3859 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3860 it->method = next_element_from_display_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3861 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3862 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3863 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3864 reseat_at_next_visible_line_start (it, 1); |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3865 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3866 return get_next_display_element (it); |
25012 | 3867 } |
3868 | |
3869 | |
3870 /* Deliver an image display element. The iterator IT is already | |
3871 filled with image information (done in handle_display_prop). Value | |
3872 is always 1. */ | |
3873 | |
3874 | |
3875 static int | |
3876 next_element_from_image (it) | |
3877 struct it *it; | |
3878 { | |
3879 it->what = IT_IMAGE; | |
3880 return 1; | |
3881 } | |
3882 | |
3883 | |
3884 /* Fill iterator IT with next display element from a stretch glyph | |
3885 property. IT->object is the value of the text property. Value is | |
3886 always 1. */ | |
3887 | |
3888 static int | |
3889 next_element_from_stretch (it) | |
3890 struct it *it; | |
3891 { | |
3892 it->what = IT_STRETCH; | |
3893 return 1; | |
3894 } | |
3895 | |
3896 | |
3897 /* Load IT with the next display element from current_buffer. Value | |
3898 is zero if end of buffer reached. IT->stop_charpos is the next | |
3899 position at which to stop and check for text properties or buffer | |
3900 end. */ | |
3901 | |
3902 static int | |
3903 next_element_from_buffer (it) | |
3904 struct it *it; | |
3905 { | |
3906 int success_p = 1; | |
3907 | |
3908 /* Check this assumption, otherwise, we would never enter the | |
3909 if-statement, below. */ | |
3910 xassert (IT_CHARPOS (*it) >= BEGV | |
3911 && IT_CHARPOS (*it) <= it->stop_charpos); | |
3912 | |
3913 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
3914 { | |
3915 if (IT_CHARPOS (*it) >= it->end_charpos) | |
3916 { | |
3917 int overlay_strings_follow_p; | |
3918 | |
3919 /* End of the game, except when overlay strings follow that | |
3920 haven't been returned yet. */ | |
3921 if (it->overlay_strings_at_end_processed_p) | |
3922 overlay_strings_follow_p = 0; | |
3923 else | |
3924 { | |
3925 it->overlay_strings_at_end_processed_p = 1; | |
27056
8cf3702104b5
(next_element_from_buffer): Change assertion at the end
Gerd Moellmann <gerd@gnu.org>
parents:
27015
diff
changeset
|
3926 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 3927 } |
3928 | |
3929 if (overlay_strings_follow_p) | |
3930 success_p = get_next_display_element (it); | |
3931 else | |
3932 { | |
3933 it->what = IT_EOB; | |
3934 it->position = it->current.pos; | |
3935 success_p = 0; | |
3936 } | |
3937 } | |
3938 else | |
3939 { | |
3940 handle_stop (it); | |
3941 return get_next_display_element (it); | |
3942 } | |
3943 } | |
3944 else | |
3945 { | |
3946 /* No face changes, overlays etc. in sight, so just return a | |
3947 character from current_buffer. */ | |
3948 unsigned char *p; | |
3949 | |
3950 /* Maybe run the redisplay end trigger hook. Performance note: | |
3951 This doesn't seem to cost measurable time. */ | |
3952 if (it->redisplay_end_trigger_charpos | |
3953 && it->glyph_row | |
3954 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
3955 run_redisplay_end_trigger_hook (it); | |
3956 | |
3957 /* Get the next character, maybe multibyte. */ | |
3958 p = BYTE_POS_ADDR (IT_BYTEPOS (*it)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3959 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 3960 { |
3961 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
3962 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3963 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 3964 } |
3965 else | |
3966 it->c = *p, it->len = 1; | |
3967 | |
3968 /* Record what we have and where it came from. */ | |
3969 it->what = IT_CHARACTER;; | |
3970 it->object = it->w->buffer; | |
3971 it->position = it->current.pos; | |
3972 | |
3973 /* Normally we return the character found above, except when we | |
3974 really want to return an ellipsis for selective display. */ | |
3975 if (it->selective) | |
3976 { | |
3977 if (it->c == '\n') | |
3978 { | |
3979 /* A value of selective > 0 means hide lines indented more | |
3980 than that number of columns. */ | |
3981 if (it->selective > 0 | |
3982 && IT_CHARPOS (*it) + 1 < ZV | |
3983 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
3984 IT_BYTEPOS (*it) + 1, | |
3985 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3986 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3987 success_p = 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
|
3988 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3989 } |
25012 | 3990 } |
3991 else if (it->c == '\r' && it->selective == -1) | |
3992 { | |
3993 /* A value of selective == -1 means that everything from the | |
3994 CR to the end of the line is invisible, with maybe an | |
3995 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3996 success_p = 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
|
3997 it->dpvec_char_len = -1; |
25012 | 3998 } |
3999 } | |
4000 } | |
4001 | |
4002 /* Value is zero if end of buffer reached. */ | |
27056
8cf3702104b5
(next_element_from_buffer): Change assertion at the end
Gerd Moellmann <gerd@gnu.org>
parents:
27015
diff
changeset
|
4003 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4004 return success_p; |
4005 } | |
4006 | |
4007 | |
4008 /* Run the redisplay end trigger hook for IT. */ | |
4009 | |
4010 static void | |
4011 run_redisplay_end_trigger_hook (it) | |
4012 struct it *it; | |
4013 { | |
4014 Lisp_Object args[3]; | |
4015 | |
4016 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4017 displaying something, or otherwise we should not run the hook. */ | |
4018 xassert (it->glyph_row); | |
4019 | |
4020 /* Set up hook arguments. */ | |
4021 args[0] = Qredisplay_end_trigger_functions; | |
4022 args[1] = it->window; | |
4023 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4024 it->redisplay_end_trigger_charpos = 0; | |
4025 | |
4026 /* Since we are *trying* to run these functions, don't try to run | |
4027 them again, even if they get an error. */ | |
4028 it->w->redisplay_end_trigger = Qnil; | |
4029 Frun_hook_with_args (3, args); | |
4030 | |
4031 /* Notice if it changed the face of the character we are on. */ | |
4032 handle_face_prop (it); | |
4033 } | |
4034 | |
4035 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4036 /* Deliver a composition display element. The iterator IT is already |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4037 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4038 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4039 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4040 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4041 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4042 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4043 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4044 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4045 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4046 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4047 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4048 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4049 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4050 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4051 |
25012 | 4052 |
4053 /*********************************************************************** | |
4054 Moving an iterator without producing glyphs | |
4055 ***********************************************************************/ | |
4056 | |
4057 /* Move iterator IT to a specified buffer or X position within one | |
4058 line on the display without producing glyphs. | |
4059 | |
4060 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4061 whichever is reached first. | |
4062 | |
4063 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4064 | |
4065 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4066 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4067 TO_X includes the amount by which a window is horizontally | |
4068 scrolled. | |
4069 | |
4070 Value is | |
4071 | |
4072 MOVE_POS_MATCH_OR_ZV | |
4073 - when TO_POS or ZV was reached. | |
4074 | |
4075 MOVE_X_REACHED | |
4076 -when TO_X was reached before TO_POS or ZV were reached. | |
4077 | |
4078 MOVE_LINE_CONTINUED | |
4079 - when we reached the end of the display area and the line must | |
4080 be continued. | |
4081 | |
4082 MOVE_LINE_TRUNCATED | |
4083 - when we reached the end of the display area and the line is | |
4084 truncated. | |
4085 | |
4086 MOVE_NEWLINE_OR_CR | |
4087 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4088 display is on. */ | |
4089 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4090 static enum move_it_result |
25012 | 4091 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4092 struct it *it; | |
4093 int to_charpos, to_x, op; | |
4094 { | |
4095 enum move_it_result result = MOVE_UNDEFINED; | |
4096 struct glyph_row *saved_glyph_row; | |
4097 | |
4098 /* Don't produce glyphs in produce_glyphs. */ | |
4099 saved_glyph_row = it->glyph_row; | |
4100 it->glyph_row = NULL; | |
4101 | |
4102 while (1) | |
4103 { | |
4104 int x, i; | |
4105 | |
4106 /* Stop when ZV or TO_CHARPOS reached. */ | |
4107 if (!get_next_display_element (it) | |
4108 || ((op & MOVE_TO_POS) != 0 | |
4109 && BUFFERP (it->object) | |
4110 && IT_CHARPOS (*it) >= to_charpos)) | |
4111 { | |
4112 result = MOVE_POS_MATCH_OR_ZV; | |
4113 break; | |
4114 } | |
4115 | |
4116 /* The call to produce_glyphs will get the metrics of the | |
4117 display element IT is loaded with. We record in x the | |
4118 x-position before this display element in case it does not | |
4119 fit on the line. */ | |
4120 x = it->current_x; | |
4121 PRODUCE_GLYPHS (it); | |
4122 | |
4123 if (it->area != TEXT_AREA) | |
4124 { | |
4125 set_iterator_to_next (it); | |
4126 continue; | |
4127 } | |
4128 | |
4129 /* The number of glyphs we get back in IT->nglyphs will normally | |
4130 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4131 character on a terminal frame, or (iii) a line end. For the | |
4132 second case, IT->nglyphs - 1 padding glyphs will be present | |
4133 (on X frames, there is only one glyph produced for a | |
4134 composite character. | |
4135 | |
4136 The behavior implemented below means, for continuation lines, | |
4137 that as many spaces of a TAB as fit on the current line are | |
4138 displayed there. For terminal frames, as many glyphs of a | |
4139 multi-glyph character are displayed in the current line, too. | |
4140 This is what the old redisplay code did, and we keep it that | |
4141 way. Under X, the whole shape of a complex character must | |
4142 fit on the line or it will be completely displayed in the | |
4143 next line. | |
4144 | |
4145 Note that both for tabs and padding glyphs, all glyphs have | |
4146 the same width. */ | |
4147 if (it->nglyphs) | |
4148 { | |
4149 /* More than one glyph or glyph doesn't fit on line. All | |
4150 glyphs have the same width. */ | |
4151 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4152 int new_x; | |
4153 | |
4154 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4155 { | |
4156 new_x = x + single_glyph_width; | |
4157 | |
4158 /* We want to leave anything reaching TO_X to the caller. */ | |
4159 if ((op & MOVE_TO_X) && new_x > to_x) | |
4160 { | |
4161 it->current_x = x; | |
4162 result = MOVE_X_REACHED; | |
4163 break; | |
4164 } | |
4165 else if (/* Lines are continued. */ | |
4166 !it->truncate_lines_p | |
4167 && (/* And glyph doesn't fit on the line. */ | |
4168 new_x > it->last_visible_x | |
4169 /* Or it fits exactly and we're on a window | |
4170 system frame. */ | |
4171 || (new_x == it->last_visible_x | |
4172 && FRAME_WINDOW_P (it->f)))) | |
4173 { | |
4174 if (/* IT->hpos == 0 means the very first glyph | |
4175 doesn't fit on the line, e.g. a wide image. */ | |
4176 it->hpos == 0 | |
4177 || (new_x == it->last_visible_x | |
4178 && FRAME_WINDOW_P (it->f))) | |
4179 { | |
4180 ++it->hpos; | |
4181 it->current_x = new_x; | |
4182 if (i == it->nglyphs - 1) | |
4183 set_iterator_to_next (it); | |
4184 } | |
4185 else | |
4186 it->current_x = x; | |
4187 | |
4188 result = MOVE_LINE_CONTINUED; | |
4189 break; | |
4190 } | |
4191 else if (new_x > it->first_visible_x) | |
4192 { | |
4193 /* Glyph is visible. Increment number of glyphs that | |
4194 would be displayed. */ | |
4195 ++it->hpos; | |
4196 } | |
4197 else | |
4198 { | |
4199 /* Glyph is completely off the left margin of the display | |
4200 area. Nothing to do. */ | |
4201 } | |
4202 } | |
4203 | |
4204 if (result != MOVE_UNDEFINED) | |
4205 break; | |
4206 } | |
4207 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4208 { | |
4209 /* Stop when TO_X specified and reached. This check is | |
4210 necessary here because of lines consisting of a line end, | |
4211 only. The line end will not produce any glyphs and we | |
4212 would never get MOVE_X_REACHED. */ | |
4213 xassert (it->nglyphs == 0); | |
4214 result = MOVE_X_REACHED; | |
4215 break; | |
4216 } | |
4217 | |
4218 /* Is this a line end? If yes, we're done. */ | |
4219 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4220 { | |
4221 result = MOVE_NEWLINE_OR_CR; | |
4222 break; | |
4223 } | |
4224 | |
4225 /* The current display element has been consumed. Advance | |
4226 to the next. */ | |
4227 set_iterator_to_next (it); | |
4228 | |
4229 /* Stop if lines are truncated and IT's current x-position is | |
4230 past the right edge of the window now. */ | |
4231 if (it->truncate_lines_p | |
4232 && it->current_x >= it->last_visible_x) | |
4233 { | |
4234 result = MOVE_LINE_TRUNCATED; | |
4235 break; | |
4236 } | |
4237 } | |
4238 | |
4239 /* Restore the iterator settings altered at the beginning of this | |
4240 function. */ | |
4241 it->glyph_row = saved_glyph_row; | |
4242 return result; | |
4243 } | |
4244 | |
4245 | |
4246 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4247 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4248 the description of enum move_operation_enum. | |
4249 | |
4250 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4251 screen line, this function will set IT to the next position > | |
4252 TO_CHARPOS. */ | |
4253 | |
4254 void | |
4255 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4256 struct it *it; | |
4257 int to_charpos, to_x, to_y, to_vpos; | |
4258 int op; | |
4259 { | |
4260 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4261 int line_height; | |
4262 | |
4263 while (1) | |
4264 { | |
4265 if (op & MOVE_TO_VPOS) | |
4266 { | |
4267 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4268 start of the line TO_VPOS. */ | |
4269 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4270 { | |
4271 if (it->vpos == to_vpos) | |
4272 break; | |
4273 skip = move_it_in_display_line_to (it, -1, -1, 0); | |
4274 } | |
4275 else | |
4276 { | |
4277 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4278 TO_VPOS, or at TO_POS, whichever comes first. */ | |
4279 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); | |
4280 | |
4281 if (skip == MOVE_POS_MATCH_OR_ZV || it->vpos == to_vpos) | |
4282 break; | |
4283 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) | |
4284 { | |
4285 /* We have reached TO_X but not in the line we want. */ | |
4286 skip = move_it_in_display_line_to (it, to_charpos, | |
4287 -1, MOVE_TO_POS); | |
4288 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4289 break; | |
4290 } | |
4291 } | |
4292 } | |
4293 else if (op & MOVE_TO_Y) | |
4294 { | |
4295 struct it it_backup; | |
4296 int done_p; | |
4297 | |
4298 /* TO_Y specified means stop at TO_X in the line containing | |
4299 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4300 problem is that we can't really tell whether the line | |
4301 contains TO_Y before we have completely scanned it, and | |
4302 this may skip past TO_X. What we do is to first scan to | |
4303 TO_X. | |
4304 | |
4305 If TO_X is not specified, use a TO_X of zero. The reason | |
4306 is to make the outcome of this function more predictable. | |
4307 If we didn't use TO_X == 0, we would stop at the end of | |
4308 the line which is probably not what a caller would expect | |
4309 to happen. */ | |
4310 skip = move_it_in_display_line_to (it, to_charpos, | |
4311 ((op & MOVE_TO_X) | |
4312 ? to_x : 0), | |
4313 (MOVE_TO_X | |
4314 | (op & MOVE_TO_POS))); | |
4315 | |
4316 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4317 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4318 break; | |
4319 | |
4320 /* If TO_X was reached, we would like to know whether TO_Y | |
4321 is in the line. This can only be said if we know the | |
4322 total line height which requires us to scan the rest of | |
4323 the line. */ | |
4324 done_p = 0; | |
4325 if (skip == MOVE_X_REACHED) | |
4326 { | |
4327 it_backup = *it; | |
4328 skip2 = move_it_in_display_line_to (it, to_charpos, -1, | |
4329 op & MOVE_TO_POS); | |
4330 } | |
4331 | |
4332 /* Now, decide whether TO_Y is in this line. */ | |
4333 line_height = it->max_ascent + it->max_descent; | |
4334 | |
4335 if (to_y >= it->current_y | |
4336 && to_y < it->current_y + line_height) | |
4337 { | |
4338 if (skip == MOVE_X_REACHED) | |
4339 /* If TO_Y is in this line and TO_X was reached above, | |
4340 we scanned too far. We have to restore IT's settings | |
4341 to the ones before skipping. */ | |
4342 *it = it_backup; | |
4343 done_p = 1; | |
4344 } | |
4345 else if (skip == MOVE_X_REACHED) | |
4346 { | |
4347 skip = skip2; | |
4348 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4349 done_p = 1; | |
4350 } | |
4351 | |
4352 if (done_p) | |
4353 break; | |
4354 } | |
4355 else | |
4356 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4357 | |
4358 switch (skip) | |
4359 { | |
4360 case MOVE_POS_MATCH_OR_ZV: | |
4361 return; | |
4362 | |
4363 case MOVE_NEWLINE_OR_CR: | |
4364 set_iterator_to_next (it); | |
4365 it->continuation_lines_width = 0; | |
4366 break; | |
4367 | |
4368 case MOVE_LINE_TRUNCATED: | |
4369 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
|
4370 reseat_at_next_visible_line_start (it, 0); |
25012 | 4371 if ((op & MOVE_TO_POS) != 0 |
4372 && IT_CHARPOS (*it) > to_charpos) | |
4373 goto out; | |
4374 break; | |
4375 | |
4376 case MOVE_LINE_CONTINUED: | |
4377 it->continuation_lines_width += it->current_x; | |
4378 break; | |
4379 | |
4380 default: | |
4381 abort (); | |
4382 } | |
4383 | |
4384 /* Reset/increment for the next run. */ | |
4385 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4386 it->current_x = it->hpos = 0; | |
4387 it->current_y += it->max_ascent + it->max_descent; | |
4388 ++it->vpos; | |
4389 last_height = it->max_ascent + it->max_descent; | |
4390 last_max_ascent = it->max_ascent; | |
4391 it->max_ascent = it->max_descent = 0; | |
4392 } | |
4393 out:; | |
4394 } | |
4395 | |
4396 | |
4397 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4398 | |
4399 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4400 means move IT backward to the preceding line start or BEGV. This | |
4401 function may move over more than DY pixels if IT->current_y - DY | |
4402 ends up in the middle of a line; in this case IT->current_y will be | |
4403 set to the top of the line moved to. */ | |
4404 | |
4405 void | |
4406 move_it_vertically_backward (it, dy) | |
4407 struct it *it; | |
4408 int dy; | |
4409 { | |
4410 int nlines, h, line_height; | |
4411 struct it it2; | |
4412 int start_pos = IT_CHARPOS (*it); | |
4413 | |
4414 xassert (dy >= 0); | |
4415 | |
4416 /* Estimate how many newlines we must move back. */ | |
4417 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4418 | |
4419 /* Set the iterator's position that many lines back. */ | |
4420 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4421 back_to_previous_visible_line_start (it); | |
4422 | |
4423 /* Reseat the iterator here. When moving backward, we don't want | |
4424 reseat to skip forward over invisible text, set up the iterator | |
4425 to deliver from overlay strings at the new position etc. So, | |
4426 use reseat_1 here. */ | |
4427 reseat_1 (it, it->current.pos, 1); | |
4428 | |
4429 /* We are now surely at a line start. */ | |
4430 it->current_x = it->hpos = 0; | |
4431 | |
4432 /* Move forward and see what y-distance we moved. First move to the | |
4433 start of the next line so that we get its height. We need this | |
4434 height to be able to tell whether we reached the specified | |
4435 y-distance. */ | |
4436 it2 = *it; | |
4437 it2.max_ascent = it2.max_descent = 0; | |
4438 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
4439 MOVE_TO_POS | MOVE_TO_VPOS); | |
4440 xassert (IT_CHARPOS (*it) >= BEGV); | |
4441 line_height = it2.max_ascent + it2.max_descent; | |
4442 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); | |
4443 xassert (IT_CHARPOS (*it) >= BEGV); | |
4444 h = it2.current_y - it->current_y; | |
4445 nlines = it2.vpos - it->vpos; | |
4446 | |
4447 /* Correct IT's y and vpos position. */ | |
4448 it->vpos -= nlines; | |
4449 it->current_y -= h; | |
4450 | |
4451 if (dy == 0) | |
4452 { | |
4453 /* DY == 0 means move to the start of the screen line. The | |
4454 value of nlines is > 0 if continuation lines were involved. */ | |
4455 if (nlines > 0) | |
4456 move_it_by_lines (it, nlines, 1); | |
4457 xassert (IT_CHARPOS (*it) <= start_pos); | |
4458 } | |
4459 else if (nlines) | |
4460 { | |
4461 /* The y-position we try to reach. Note that h has been | |
4462 subtracted in front of the if-statement. */ | |
4463 int target_y = it->current_y + h - dy; | |
4464 | |
4465 /* If we did not reach target_y, try to move further backward if | |
4466 we can. If we moved too far backward, try to move forward. */ | |
4467 if (target_y < it->current_y | |
4468 && IT_CHARPOS (*it) > BEGV) | |
4469 { | |
4470 move_it_vertically (it, target_y - it->current_y); | |
4471 xassert (IT_CHARPOS (*it) >= BEGV); | |
4472 } | |
4473 else if (target_y >= it->current_y + line_height | |
4474 && IT_CHARPOS (*it) < ZV) | |
4475 { | |
4476 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
4477 xassert (IT_CHARPOS (*it) >= BEGV); | |
4478 } | |
4479 } | |
4480 } | |
4481 | |
4482 | |
4483 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
4484 move backwards. DY = 0 means move to start of screen line. At the | |
4485 end, IT will be on the start of a screen line. */ | |
4486 | |
4487 void | |
4488 move_it_vertically (it, dy) | |
4489 struct it *it; | |
4490 int dy; | |
4491 { | |
4492 if (dy <= 0) | |
4493 move_it_vertically_backward (it, -dy); | |
4494 else if (dy > 0) | |
4495 { | |
4496 move_it_to (it, ZV, -1, it->current_y + dy, -1, | |
4497 MOVE_TO_POS | MOVE_TO_Y); | |
4498 | |
4499 /* If buffer ends in ZV without a newline, move to the start of | |
4500 the line to satisfy the post-condition. */ | |
4501 if (IT_CHARPOS (*it) == ZV | |
4502 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
4503 move_it_by_lines (it, 0, 0); | |
4504 } | |
4505 } | |
4506 | |
4507 | |
4508 /* Return non-zero if some text between buffer positions START_CHARPOS | |
4509 and END_CHARPOS is invisible. IT->window is the window for text | |
4510 property lookup. */ | |
4511 | |
4512 static int | |
4513 invisible_text_between_p (it, start_charpos, end_charpos) | |
4514 struct it *it; | |
4515 int start_charpos, end_charpos; | |
4516 { | |
4517 Lisp_Object prop, limit; | |
4518 int invisible_found_p; | |
4519 | |
4520 xassert (it != NULL && start_charpos <= end_charpos); | |
4521 | |
4522 /* Is text at START invisible? */ | |
4523 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
4524 it->window); | |
4525 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
4526 invisible_found_p = 1; | |
4527 else | |
4528 { | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
4529 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
|
4530 Qinvisible, Qnil, |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
4531 make_number (end_charpos)); |
25012 | 4532 invisible_found_p = XFASTINT (limit) < end_charpos; |
4533 } | |
4534 | |
4535 return invisible_found_p; | |
4536 } | |
4537 | |
4538 | |
4539 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
4540 negative means move up. DVPOS == 0 means move to the start of the | |
4541 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
4542 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
4543 | |
4544 Further optimization ideas: If we would know that IT->f doesn't use | |
4545 a face with proportional font, we could be faster for | |
4546 truncate-lines nil. */ | |
4547 | |
4548 void | |
4549 move_it_by_lines (it, dvpos, need_y_p) | |
4550 struct it *it; | |
4551 int dvpos, need_y_p; | |
4552 { | |
4553 struct position pos; | |
4554 | |
4555 if (!FRAME_WINDOW_P (it->f)) | |
4556 { | |
4557 struct text_pos textpos; | |
4558 | |
4559 /* We can use vmotion on frames without proportional fonts. */ | |
4560 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
4561 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
4562 reseat (it, textpos, 1); | |
4563 it->vpos += pos.vpos; | |
4564 it->current_y += pos.vpos; | |
4565 } | |
4566 else if (dvpos == 0) | |
4567 { | |
4568 /* DVPOS == 0 means move to the start of the screen line. */ | |
4569 move_it_vertically_backward (it, 0); | |
4570 xassert (it->current_x == 0 && it->hpos == 0); | |
4571 } | |
4572 else if (dvpos > 0) | |
4573 { | |
4574 /* If there are no continuation lines, and if there is no | |
4575 selective display, try the simple method of moving forward | |
4576 DVPOS newlines, then see where we are. */ | |
4577 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4578 { | |
4579 int shortage = 0, charpos; | |
4580 | |
4581 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n')) | |
4582 charpos = IT_CHARPOS (*it) + 1; | |
4583 else | |
4584 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
4585 &shortage, 0); | |
4586 | |
4587 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
4588 { | |
4589 struct text_pos pos; | |
4590 CHARPOS (pos) = charpos; | |
4591 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4592 reseat (it, pos, 1); | |
4593 it->vpos += dvpos - shortage; | |
4594 it->hpos = it->current_x = 0; | |
4595 return; | |
4596 } | |
4597 } | |
4598 | |
4599 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
4600 } | |
4601 else | |
4602 { | |
4603 struct it it2; | |
4604 int start_charpos, i; | |
4605 | |
4606 /* If there are no continuation lines, and if there is no | |
4607 selective display, try the simple method of moving backward | |
4608 -DVPOS newlines. */ | |
4609 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4610 { | |
4611 int shortage; | |
4612 int charpos = IT_CHARPOS (*it); | |
4613 int bytepos = IT_BYTEPOS (*it); | |
4614 | |
4615 /* If in the middle of a line, go to its start. */ | |
4616 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
4617 { | |
4618 charpos = find_next_newline_no_quit (charpos, -1); | |
4619 bytepos = CHAR_TO_BYTE (charpos); | |
4620 } | |
4621 | |
4622 if (charpos == BEGV) | |
4623 { | |
4624 struct text_pos pos; | |
4625 CHARPOS (pos) = charpos; | |
4626 BYTEPOS (pos) = bytepos; | |
4627 reseat (it, pos, 1); | |
4628 it->hpos = it->current_x = 0; | |
4629 return; | |
4630 } | |
4631 else | |
4632 { | |
4633 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
4634 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
4635 { | |
4636 struct text_pos pos; | |
4637 CHARPOS (pos) = charpos; | |
4638 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4639 reseat (it, pos, 1); | |
4640 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
4641 it->hpos = it->current_x = 0; | |
4642 return; | |
4643 } | |
4644 } | |
4645 } | |
4646 | |
4647 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
4648 start_charpos = IT_CHARPOS (*it); | |
4649 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
4650 back_to_previous_visible_line_start (it); | |
4651 reseat (it, it->current.pos, 1); | |
4652 it->current_x = it->hpos = 0; | |
4653 | |
4654 /* Above call may have moved too far if continuation lines | |
4655 are involved. Scan forward and see if it did. */ | |
4656 it2 = *it; | |
4657 it2.vpos = it2.current_y = 0; | |
4658 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
4659 it->vpos -= it2.vpos; | |
4660 it->current_y -= it2.current_y; | |
4661 it->current_x = it->hpos = 0; | |
4662 | |
4663 /* If we moved too far, move IT some lines forward. */ | |
4664 if (it2.vpos > -dvpos) | |
4665 { | |
4666 int delta = it2.vpos + dvpos; | |
4667 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
4668 } | |
4669 } | |
4670 } | |
4671 | |
4672 | |
4673 | |
4674 /*********************************************************************** | |
4675 Messages | |
4676 ***********************************************************************/ | |
4677 | |
4678 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4679 /* 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
|
4680 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4681 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4682 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4683 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
|
4684 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4685 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4686 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4687 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4688 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4689 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4690 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4691 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
|
4692 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4693 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4694 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4695 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4696 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
|
4697 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4698 args[2] = arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4699 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
|
4700 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4701 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
|
4702 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4703 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4704 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4705 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
|
4706 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4707 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4708 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4709 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4710 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4711 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4712 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4713 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4714 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4715 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4716 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
|
4717 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4718 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4719 |
25012 | 4720 /* Add a string M of length LEN to the message log, optionally |
4721 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
4722 nonzero, means interpret the contents of M as multibyte. This | |
4723 function calls low-level routines in order to bypass text property | |
4724 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
|
4725 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4726 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4727 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4728 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4729 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4730 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4731 if (!NILP (Vmessage_log_max)) |
10393 | 4732 { |
4733 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4734 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
|
4735 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
|
4736 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
|
4737 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
|
4738 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
|
4739 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
|
4740 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4741 old_deactivate_mark = Vdeactivate_mark; |
10393 | 4742 oldbuf = current_buffer; |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4743 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
|
4744 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4745 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4746 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4747 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4748 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4749 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4750 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4751 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
|
4752 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4753 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
|
4754 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4755 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4756 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4757 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4758 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4759 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4760 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
|
4761 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4762 /* 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
|
4763 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
|
4764 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
|
4765 && 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
|
4766 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4767 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4768 unsigned char work[1]; |
25012 | 4769 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4770 /* 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
|
4771 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
|
4772 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
|
4773 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4774 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
|
4775 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
|
4776 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4777 : 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
|
4778 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
|
4779 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4780 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4781 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
|
4782 && ! 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
|
4783 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4784 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
|
4785 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4786 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4787 /* 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
|
4788 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
|
4789 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
|
4790 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4791 c = unibyte_char_to_multibyte (msg[i]); |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4792 nbytes = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4793 insert_1_both (str, 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
|
4794 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4795 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4796 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4797 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
|
4798 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4799 if (nlflag) |
10393 | 4800 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4801 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
|
4802 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4803 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4804 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
|
4805 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4806 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4807 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4808 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4809 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4810 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
|
4811 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4812 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4813 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
4814 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
|
4815 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4816 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4817 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4818 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4819 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4820 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4821 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4822 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4823 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4824 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4825 /* 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
|
4826 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4827 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4828 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4829 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
|
4830 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4831 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4832 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4833 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4834 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4835 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4836 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4837 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4838 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4839 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
|
4840 } |
10393 | 4841 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4842 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4843 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4844 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4845 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4846 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4847 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4848 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4849 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4850 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4851 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4852 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4853 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4854 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4855 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4856 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4857 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
|
4858 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4859 /* 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
|
4860 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4861 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
|
4862 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4863 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4864 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4865 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4866 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4867 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4868 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4869 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 4870 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4871 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4872 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
|
4873 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4874 Vdeactivate_mark = old_deactivate_mark; |
10393 | 4875 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4876 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4877 |
25012 | 4878 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4879 /* 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
|
4880 (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
|
4881 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
|
4882 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
|
4883 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
|
4884 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4885 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4886 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
|
4887 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4888 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4889 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4890 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
4891 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
|
4892 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4893 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
|
4894 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
|
4895 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4896 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4897 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4898 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
|
4899 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4900 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4901 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4902 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4903 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4904 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4905 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4906 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4907 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4908 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4909 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4910 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4911 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4912 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4913 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4914 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4915 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4916 } |
25012 | 4917 |
4918 | |
4919 /* Display an echo area message M with a specified length of LEN | |
4920 chars. The string may include null characters. If M is 0, clear | |
4921 out any existing message, and let the mini-buffer text show through. | |
4922 | |
4923 The buffer M must continue to exist until after the echo area gets | |
4924 cleared or some other message gets displayed there. This means do | |
4925 not pass text that is stored in a Lisp string; do not pass text in | |
4926 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4927 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4928 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4929 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4930 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4931 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4932 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4933 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4934 /* 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
|
4935 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4936 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4937 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4938 message2_nolog (m, len, multibyte); |
10393 | 4939 } |
4940 | |
4941 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4942 /* The non-logging counterpart of message2. */ |
10393 | 4943 |
4944 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
4945 message2_nolog (m, len, multibyte) |
10393 | 4946 char *m; |
4947 int len; | |
4948 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4949 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
4950 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4951 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4952 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4953 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4954 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4955 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4956 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
|
4957 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
4958 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4959 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4960 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4961 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4962 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4963 /* 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
|
4964 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4965 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 4966 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4967 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4968 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4969 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4970 Lisp_Object mini_window; |
25012 | 4971 struct frame *f; |
4972 | |
4973 /* 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
|
4974 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4975 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
|
4976 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
|
4977 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4978 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4979 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
|
4980 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4981 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
|
4982 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4983 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4984 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4985 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
4986 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
4987 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4988 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4989 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4990 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4991 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4992 do_pending_window_change (0); |
25012 | 4993 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
|
4994 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
|
4995 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
|
4996 (*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
|
4997 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4998 } |
25012 | 4999 |
5000 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5001 /* 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
|
5002 bytes. The string may include null characters. If M is not a |
25012 | 5003 string, clear out any existing message, and let the mini-buffer |
5004 text show through. */ | |
5005 | |
5006 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5007 message3 (m, nbytes, multibyte) |
25012 | 5008 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5009 int nbytes; |
25012 | 5010 int multibyte; |
5011 { | |
5012 struct gcpro gcpro1; | |
5013 | |
5014 GCPRO1 (m); | |
5015 | |
5016 /* First flush out any partial line written with print. */ | |
5017 message_log_maybe_newline (); | |
5018 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5019 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
|
5020 message3_nolog (m, nbytes, multibyte); |
25012 | 5021 |
5022 UNGCPRO; | |
5023 } | |
5024 | |
5025 | |
5026 /* The non-logging version of message3. */ | |
5027 | |
5028 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5029 message3_nolog (m, nbytes, multibyte) |
25012 | 5030 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5031 int nbytes, multibyte; |
25012 | 5032 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5033 struct frame *sf = SELECTED_FRAME (); |
25012 | 5034 message_enable_multibyte = multibyte; |
5035 | |
5036 if (noninteractive) | |
5037 { | |
5038 if (noninteractive_need_newline) | |
5039 putc ('\n', stderr); | |
5040 noninteractive_need_newline = 0; | |
5041 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5042 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5043 if (cursor_in_echo_area == 0) |
5044 fprintf (stderr, "\n"); | |
5045 fflush (stderr); | |
5046 } | |
5047 /* A null message buffer means that the frame hasn't really been | |
5048 initialized yet. Error messages get reported properly by | |
5049 cmd_error, so this must be just an informative message; toss it. */ | |
5050 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5051 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5052 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5053 { |
5054 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
|
5055 Lisp_Object frame; |
25012 | 5056 struct frame *f; |
5057 | |
5058 /* Get the frame containing the mini-buffer | |
5059 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5060 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
|
5061 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
|
5062 f = XFRAME (frame); |
25012 | 5063 |
5064 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5065 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
|
5066 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5067 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5068 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5069 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
|
5070 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5071 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
|
5072 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5073 Fraise_frame (frame); |
25012 | 5074 } |
5075 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5076 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5077 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5078 do_pending_window_change (0); |
25012 | 5079 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
|
5080 do_pending_window_change (0); |
25012 | 5081 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5082 (*frame_up_to_date_hook) (f); | |
5083 } | |
5084 } | |
5085 | |
5086 | |
5087 /* Display a null-terminated echo area message M. If M is 0, clear | |
5088 out any existing message, and let the mini-buffer text show through. | |
5089 | |
5090 The buffer M must continue to exist until after the echo area gets | |
5091 cleared or some other message gets displayed there. Do not pass | |
5092 text that is stored in a Lisp string. Do not pass text in a buffer | |
5093 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
|
5094 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5095 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5096 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5097 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5098 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5099 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
|
5100 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5101 |
25012 | 5102 |
5103 /* The non-logging counterpart of message1. */ | |
5104 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5105 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5106 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5107 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5108 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5109 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
|
5110 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5111 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5112 /* 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
|
5113 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5114 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5115 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5116 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5117 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5118 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5119 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5120 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5121 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5122 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5123 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5124 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5125 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5126 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5127 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5128 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5129 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5130 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5131 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5132 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5133 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5134 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5135 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5136 /* 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
|
5137 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
|
5138 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
|
5139 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5140 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5141 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5142 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5143 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5144 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5145 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5146 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5147 /* 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
|
5148 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
|
5149 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
|
5150 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5151 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5152 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5153 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5154 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5155 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5156 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5157 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
|
5158 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5159 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5160 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5161 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5162 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5163 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5164 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5165 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5166 /* 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
|
5167 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5168 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5169 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5170 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5171 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5172 |
25012 | 5173 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5174 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5175 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
|
5176 |
277 | 5177 /* VARARGS 1 */ |
5178 void | |
5179 message (m, a1, a2, a3) | |
5180 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5181 EMACS_INT a1, a2, a3; |
277 | 5182 { |
5183 if (noninteractive) | |
5184 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5185 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5186 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5187 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
|
5188 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
|
5189 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
|
5190 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5191 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5192 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
|
5193 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5194 } |
277 | 5195 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5196 else if (INTERACTIVE) |
277 | 5197 { |
25012 | 5198 /* The frame whose mini-buffer we're going to display the message |
5199 on. It may be larger than the selected frame, so we need to | |
5200 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
|
5201 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5202 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5203 |
5204 /* 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
|
5205 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5206 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
|
5207 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5208 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5209 /* 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
|
5210 initialized yet. Error messages get reported properly by |
25012 | 5211 cmd_error, so this must be just an informative message; toss |
5212 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5213 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
|
5214 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5215 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5216 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5217 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
|
5218 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5219 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5220 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5221 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5222 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5223 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5224 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5225 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
|
5226 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5227 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5228 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
|
5229 (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
|
5230 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5231 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5232 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
|
5233 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5234 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5235 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5236 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5237 /* 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
|
5238 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
|
5239 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
|
5240 } |
277 | 5241 } |
5242 } | |
5243 | |
25012 | 5244 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5245 /* The non-logging version of message. */ |
25012 | 5246 |
11193 | 5247 void |
5248 message_nolog (m, a1, a2, a3) | |
5249 char *m; | |
5250 EMACS_INT a1, a2, a3; | |
5251 { | |
5252 Lisp_Object old_log_max; | |
5253 old_log_max = Vmessage_log_max; | |
5254 Vmessage_log_max = Qnil; | |
5255 message (m, a1, a2, a3); | |
5256 Vmessage_log_max = old_log_max; | |
5257 } | |
5258 | |
25012 | 5259 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5260 /* 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
|
5261 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
|
5262 critical. */ |
25012 | 5263 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5264 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5265 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5266 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5267 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
|
5268 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5269 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5270 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5271 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
|
5272 !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
|
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 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5277 /* Make sure echo area buffers in echo_buffers[] are life. If they |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5278 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5279 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5280 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5281 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5282 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5283 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5284 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5285 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5286 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5287 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5288 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5289 char name[30]; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5290 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5291 echo_buffer[i] = Fget_buffer_create (build_string (name)); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5292 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5293 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5294 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5295 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5296 /* 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
|
5297 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
|
5298 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5299 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
|
5300 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
|
5301 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
|
5302 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5303 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
|
5304 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
|
5305 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5306 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
|
5307 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
|
5308 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
|
5309 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5310 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
|
5311 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5312 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5313 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
|
5314 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5315 int which; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5316 int (*fn) (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5317 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
|
5318 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5319 Lisp_Object buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5320 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
|
5321 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
|
5322 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5323 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5324 ensure_echo_area_buffers (); |
25358
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 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5327 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5328 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5329 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
|
5330 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5331 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
|
5332 else |
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 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
|
5335 clear_buffer_p = 1; |
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 /* 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
|
5338 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
|
5339 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
|
5340 && 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
|
5341 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
|
5342 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5343 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5344 /* 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
|
5345 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5346 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
|
5347 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5348 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
|
5349 = (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
|
5350 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5351 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5352 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5353 } |
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 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
|
5356 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5357 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
|
5358 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
|
5359 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5360 /* 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
|
5361 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
|
5362 == 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
|
5363 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
|
5364 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
|
5365 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
|
5366 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5367 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
|
5368 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5369 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5370 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5371 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
|
5372 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5373 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
|
5374 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
|
5375 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
|
5376 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5377 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
|
5378 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5379 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5380 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5381 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
|
5382 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5383 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
|
5384 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5385 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5386 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
|
5387 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5388 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5389 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5390 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5391 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5392 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5393 /* 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
|
5394 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
|
5395 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5396 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5397 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
|
5398 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5399 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5400 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5401 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5402 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5403 /* 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
|
5404 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
|
5405 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
|
5406 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
|
5407 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5408 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5409 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
|
5410 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5411 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
|
5412 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
|
5413 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
|
5414 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5415 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5416 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5417 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
|
5418 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
|
5419 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5420 = 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
|
5421 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5422 = 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
|
5423 } |
25012 | 5424 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5425 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5426 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5427 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5428 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
|
5429 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5430 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5431 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
|
5432 return vector; |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5435 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5436 /* 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
|
5437 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
|
5438 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5439 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5440 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
|
5441 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5442 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5443 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5444 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5445 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
|
5446 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
|
5447 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
|
5448 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5449 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
|
5450 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5451 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5452 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
|
5453 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5454 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
|
5455 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
|
5456 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
|
5457 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
|
5458 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5459 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5460 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
|
5461 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5462 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5463 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5464 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
|
5465 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5466 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5467 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5468 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5469 /* 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
|
5470 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
|
5471 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5472 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5473 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
|
5474 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5475 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5476 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5477 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5478 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5479 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5480 /* 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
|
5481 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
|
5482 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
|
5483 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
|
5484 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5485 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
|
5486 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5487 /* 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
|
5488 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
|
5489 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5490 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5491 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
|
5492 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5493 /* 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
|
5494 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5495 != !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
|
5496 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
|
5497 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5498 /* 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
|
5499 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5500 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5501 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
|
5502 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5503 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
|
5504 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
|
5505 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5506 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5507 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5508 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5509 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
|
5510 /* 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
|
5511 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
|
5512 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5513 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5514 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5515 /* 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
|
5516 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
|
5517 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
|
5518 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
|
5519 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5520 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5521 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5522 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5523 { |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5524 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
|
5525 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5526 /* 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
|
5527 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
|
5528 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
|
5529 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
|
5530 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
|
5531 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
|
5532 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5533 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5534 = 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
|
5535 (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
|
5536 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5537 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5538 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
|
5539 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5540 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
|
5541 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5542 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5543 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5544 /* 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
|
5545 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
|
5546 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
|
5547 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
|
5548 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5549 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5550 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
|
5551 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5552 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5553 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5554 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5555 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
|
5556 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5557 /* 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
|
5558 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5559 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
|
5560 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5561 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5562 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
|
5563 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5564 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
|
5565 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5566 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5567 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
|
5568 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5569 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5570 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5571 /* 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
|
5572 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
|
5573 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5574 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5575 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5576 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5577 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5578 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5579 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5580 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
|
5581 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5582 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5583 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
|
5584 (int (*) ()) resize_mini_window, |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5585 w, 1); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5586 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5587 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5588 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5589 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5590 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5591 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5592 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5593 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5594 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5595 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5596 /* 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
|
5597 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
|
5598 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
|
5599 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
|
5600 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5601 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5602 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
|
5603 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5604 int exact_p; |
25358
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 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
|
5607 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
|
5608 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5609 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5610 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5611 /* 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
|
5612 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
|
5613 || (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
|
5614 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5615 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5616 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
|
5617 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5618 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5619 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
|
5620 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
|
5621 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5622 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
|
5623 struct text_pos start; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5624 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5625 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
|
5626 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5627 /* 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
|
5628 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
|
5629 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
|
5630 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
|
5631 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
|
5632 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5633 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
|
5634 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5635 /* 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
|
5636 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
|
5637 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
|
5638 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5639 /* Find out the height of the text in the window. */ |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5640 last_height = 0; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5641 move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS); |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5642 if (it.max_ascent == 0 && it.max_descent == 0) |
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5643 height = it.current_y + last_height; |
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5644 else |
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5645 height = it.current_y + it.max_ascent + it.max_descent; |
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5646 height = (height + unit - 1) / unit; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5647 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5648 /* 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
|
5649 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5650 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5651 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5652 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
|
5653 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
|
5654 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5655 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5656 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5657 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
|
5658 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
|
5659 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5660 /* 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
|
5661 case the window shrinks again. */ |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5662 if (height > XFASTINT (w->height)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5663 { |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5664 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
|
5665 freeze_window_starts (f, 1); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5666 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
|
5667 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
|
5668 } |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5669 else if (height < XFASTINT (w->height) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5670 && (exact_p || BEGV == ZV)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5671 { |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5672 int old_height = XFASTINT (w->height); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5673 freeze_window_starts (f, 0); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5674 shrink_mini_window (w); |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5675 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
|
5676 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5677 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5678 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5679 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
|
5680 } |
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 /* 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
|
5684 current message. */ |
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 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5687 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5688 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5689 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5690 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5691 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
|
5692 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5693 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5694 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5695 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
|
5696 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5697 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
|
5698 } |
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 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5701 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5702 |
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 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5705 current_message_1 (msg) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5706 Lisp_Object *msg; |
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 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5709 *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
|
5710 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5711 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5712 return 0; |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5715 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5716 /* 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
|
5717 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
|
5718 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
|
5719 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5720 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5721 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5722 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5723 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5724 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5725 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5726 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
|
5727 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5728 } |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5731 /* 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
|
5732 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5733 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5734 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5735 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5736 Lisp_Object msg; |
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 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5739 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5740 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5741 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
|
5742 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5743 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
|
5744 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5745 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5746 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5747 /* 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
|
5748 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5749 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5750 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5751 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5752 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5753 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
|
5754 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5755 |
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 /* 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
|
5758 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
|
5759 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5760 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5761 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5762 check_message_stack () |
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 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5765 abort (); |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5768 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5769 /* 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
|
5770 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
|
5771 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5772 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5773 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5774 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5775 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5776 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5777 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
|
5778 /* 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
|
5779 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
|
5780 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
|
5781 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5782 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5783 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5784 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5785 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5786 if (FRAME_MESSAGE_BUF (sf)) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5787 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
|
5788 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5789 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5790 |
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 /* 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
|
5793 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
|
5794 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5795 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5796 truncate_message_1 (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5797 int nchars; |
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 (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5800 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
|
5801 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5802 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
|
5803 return 0; |
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 |
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 /* 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
|
5808 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5809 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
|
5810 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
|
5811 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
|
5812 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5813 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
|
5814 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
|
5815 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
|
5816 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5817 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5818 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
|
5819 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5820 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5821 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5822 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5823 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5824 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5825 || (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
|
5826 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5827 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
|
5828 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
|
5829 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5830 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5831 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5832 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5833 /* 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
|
5834 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
|
5835 current. */ |
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 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5838 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
|
5839 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5840 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5841 int nbytes, multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5842 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5843 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5844 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5845 /* 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
|
5846 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5847 != !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
|
5848 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
|
5849 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5850 /* 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
|
5851 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
|
5852 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5853 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5854 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5855 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5856 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5857 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5858 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
|
5859 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
|
5860 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5861 /* 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
|
5862 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
|
5863 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
|
5864 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
|
5865 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5866 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5867 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5868 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5869 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5870 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5871 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
|
5872 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5873 /* 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
|
5874 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5875 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5876 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5877 /* 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
|
5878 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
|
5879 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5880 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
|
5881 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
|
5882 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5883 : 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
|
5884 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
|
5885 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5886 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5887 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5888 && !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
|
5889 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5890 /* 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
|
5891 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5892 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5893 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5894 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5895 /* 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
|
5896 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
|
5897 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5898 c = unibyte_char_to_multibyte (msg[i]); |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5899 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5900 insert_1_both (str, 1, n, 1, 0, 0); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5901 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5902 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5903 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5904 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
|
5905 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5906 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5907 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5908 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5909 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5910 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5911 /* 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
|
5912 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
|
5913 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5914 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5915 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5916 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
|
5917 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
|
5918 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5919 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5920 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
|
5921 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5922 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5923 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
|
5924 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5925 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5926 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5927 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5928 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5929 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5930 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
|
5931 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
|
5932 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
|
5933 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
|
5934 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
|
5935 and ensure a complete redisplay of all windows. */ |
25012 | 5936 |
277 | 5937 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5938 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5939 { |
769 | 5940 if (frame_garbaged) |
277 | 5941 { |
25012 | 5942 Lisp_Object tail, frame; |
5943 | |
5944 FOR_EACH_FRAME (tail, frame) | |
5945 { | |
5946 struct frame *f = XFRAME (frame); | |
5947 | |
5948 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
5949 { | |
5950 clear_current_matrices (f); | |
5951 f->garbaged = 0; | |
5952 } | |
5953 } | |
5954 | |
769 | 5955 frame_garbaged = 0; |
25012 | 5956 ++windows_or_buffers_changed; |
5957 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5958 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5959 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5960 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5961 /* 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
|
5962 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
|
5963 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
|
5964 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5965 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5966 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
|
5967 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5968 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5969 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5970 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5971 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5972 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5973 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5974 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5975 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
|
5976 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5977 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
|
5978 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5979 /* 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
|
5980 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
|
5981 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5982 |
26103
90a7cc56474f
(echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents:
26088
diff
changeset
|
5983 #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
|
5984 /* 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
|
5985 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
|
5986 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
|
5987 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
|
5988 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5989 return 0; |
26103
90a7cc56474f
(echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents:
26088
diff
changeset
|
5990 #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
|
5991 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5992 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5993 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5994 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5995 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 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
|
5997 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5998 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
|
5999 window_height_changed_p = display_echo_area (w); |
25012 | 6000 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
|
6001 |
25012 | 6002 if (update_frame_p) |
6003 { | |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6004 /* 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
|
6005 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
|
6006 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
|
6007 above. */ |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6008 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
|
6009 { |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6010 ++windows_or_buffers_changed; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6011 ++update_mode_lines; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6012 redisplay_internal (0); |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6013 } |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6014 else if (FRAME_WINDOW_P (f)) |
25012 | 6015 { |
6016 update_single_window (w, 1); | |
6017 rif->flush_display (f); | |
6018 } | |
6019 else | |
6020 update_frame (f, 1, 1); | |
6021 } | |
277 | 6022 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6023 else if (!EQ (mini_window, selected_window)) |
277 | 6024 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
|
6025 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6026 /* 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
|
6027 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
|
6028 |
25012 | 6029 /* Prevent redisplay optimization in redisplay_internal by resetting |
6030 this_line_start_pos. This is done because the mini-buffer now | |
6031 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
|
6032 if (EQ (mini_window, selected_window)) |
25012 | 6033 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
|
6034 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6035 return window_height_changed_p; |
25012 | 6036 } |
6037 | |
6038 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6039 |
25012 | 6040 /*********************************************************************** |
6041 Frame Titles | |
6042 ***********************************************************************/ | |
6043 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6044 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6045 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6046 |
6047 /* A buffer for constructing frame titles in it; allocated from the | |
6048 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6049 | |
6050 static char *frame_title_buf; | |
6051 | |
6052 /* The buffer's end, and a current output position in it. */ | |
6053 | |
6054 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
|
6055 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
|
6056 |
25012 | 6057 |
6058 /* Store a single character C for the frame title in frame_title_buf. | |
6059 Re-allocate frame_title_buf if necessary. */ | |
6060 | |
6061 static void | |
6062 store_frame_title_char (c) | |
6063 char c; | |
6064 { | |
6065 /* If output position has reached the end of the allocated buffer, | |
6066 double the buffer's size. */ | |
6067 if (frame_title_ptr == frame_title_buf_end) | |
6068 { | |
6069 int len = frame_title_ptr - frame_title_buf; | |
6070 int new_size = 2 * len * sizeof *frame_title_buf; | |
6071 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6072 frame_title_buf_end = frame_title_buf + new_size; | |
6073 frame_title_ptr = frame_title_buf + len; | |
6074 } | |
6075 | |
6076 *frame_title_ptr++ = c; | |
6077 } | |
6078 | |
6079 | |
6080 /* Store part of a frame title in frame_title_buf, beginning at | |
6081 frame_title_ptr. STR is the string to store. Do not copy more | |
6082 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
6083 the whole string. Pad with spaces until FIELD_WIDTH number of | |
6084 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
6085 Called from display_mode_element when it is used to build a frame | |
6086 title. */ | |
6087 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6088 static int |
25012 | 6089 store_frame_title (str, field_width, precision) |
6090 unsigned char *str; | |
6091 int field_width, precision; | |
6092 { | |
6093 int n = 0; | |
6094 | |
6095 /* Copy at most PRECISION chars from STR. */ | |
6096 while ((precision <= 0 || n < precision) | |
6097 && *str) | |
6098 { | |
6099 store_frame_title_char (*str++); | |
6100 ++n; | |
6101 } | |
6102 | |
6103 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6104 while (field_width > 0 | |
6105 && n < field_width) | |
6106 { | |
6107 store_frame_title_char (' '); | |
6108 ++n; | |
6109 } | |
6110 | |
6111 return n; | |
6112 } | |
6113 | |
6114 | |
6115 /* Set the title of FRAME, if it has changed. The title format is | |
6116 Vicon_title_format if FRAME is iconified, otherwise it is | |
6117 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6118 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6119 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6120 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
|
6121 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6122 { |
25012 | 6123 struct frame *f = XFRAME (frame); |
6124 | |
6125 if (FRAME_WINDOW_P (f) | |
6126 || FRAME_MINIBUF_ONLY_P (f) | |
6127 || f->explicit_name) | |
6128 { | |
6129 /* Do we have more than one visible frame on this X display? */ | |
6130 Lisp_Object tail; | |
6131 Lisp_Object fmt; | |
6132 struct buffer *obuf; | |
6133 int len; | |
6134 struct it it; | |
6135 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6136 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
|
6137 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6138 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6139 |
6140 if (tf != f | |
6141 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6142 && !FRAME_MINIBUF_ONLY_P (tf) | |
6143 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6144 break; | |
6145 } | |
6146 | |
6147 /* Set global variable indicating that multiple frames exist. */ | |
6148 multiple_frames = CONSP (tail); | |
6149 | |
6150 /* Switch to the buffer of selected window of the frame. Set up | |
6151 frame_title_ptr so that display_mode_element will output into it; | |
6152 then display the title. */ | |
6153 obuf = current_buffer; | |
6154 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6155 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6156 frame_title_ptr = frame_title_buf; | |
6157 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6158 NULL, DEFAULT_FACE_ID); | |
6159 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6160 frame_title_ptr = NULL; | |
6161 set_buffer_internal (obuf); | |
6162 | |
6163 /* Set the title only if it's changed. This avoids consing in | |
6164 the common case where it hasn't. (If it turns out that we've | |
6165 already wasted too much time by walking through the list with | |
6166 display_mode_element, then we might need to optimize at a | |
6167 higher level than this.) */ | |
6168 if (! STRINGP (f->name) | |
6169 || STRING_BYTES (XSTRING (f->name)) != len | |
6170 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6171 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6172 } | |
6173 } | |
6174 | |
6175 #else /* not HAVE_WINDOW_SYSTEM */ | |
6176 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6177 #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
|
6178 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6179 |
6180 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6181 | |
6182 | |
6183 | |
277 | 6184 |
25012 | 6185 /*********************************************************************** |
6186 Menu Bars | |
6187 ***********************************************************************/ | |
6188 | |
6189 | |
6190 /* Prepare for redisplay by updating menu-bar item lists when | |
6191 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6192 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6193 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6194 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6195 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6196 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6197 struct gcpro gcpro1, gcpro2; |
25012 | 6198 struct frame *f; |
6199 struct frame *tooltip_frame; | |
6200 | |
6201 #ifdef HAVE_X_WINDOWS | |
6202 tooltip_frame = tip_frame; | |
6203 #else | |
6204 tooltip_frame = NULL; | |
6205 #endif | |
6206 | |
6207 /* Update all frame titles based on their buffer names, etc. We do | |
6208 this before the menu bars so that the buffer-menu will show the | |
6209 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6210 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6211 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
|
6212 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6213 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6214 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6215 FOR_EACH_FRAME (tail, frame) |
25012 | 6216 { |
6217 f = XFRAME (frame); | |
6218 if (f != tooltip_frame | |
6219 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) | |
6220 x_consider_frame_title (frame); | |
6221 } | |
6222 } | |
6223 #endif /* HAVE_WINDOW_SYSTEM */ | |
6224 | |
6225 /* Update the menu bar item lists, if appropriate. This has to be | |
6226 done before any actual redisplay or generation of display lines. */ | |
6227 all_windows = (update_mode_lines | |
6228 || buffer_shared > 1 | |
6229 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6230 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6231 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6232 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
|
6233 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
|
6234 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6235 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
|
6236 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6237 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6238 { |
25012 | 6239 f = XFRAME (frame); |
6240 | |
6241 /* Ignore tooltip frame. */ | |
6242 if (f == tooltip_frame) | |
6243 continue; | |
6244 | |
6245 /* If a window on this frame changed size, report that to | |
6246 the user and clear the size-change flag. */ | |
6247 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6248 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6249 Lisp_Object functions; |
25012 | 6250 |
6251 /* Clear flag first in case we get an error below. */ | |
6252 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6253 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6254 GCPRO2 (tail, functions); |
25012 | 6255 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6256 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6257 { |
25012 | 6258 call1 (XCAR (functions), frame); |
6259 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6260 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6261 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6262 } |
25012 | 6263 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6264 GCPRO1 (tail); |
25012 | 6265 update_menu_bar (f, 0); |
6266 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6267 update_tool_bar (f, 0); |
25012 | 6268 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6269 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6270 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6271 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6272 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6273 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6274 else |
25012 | 6275 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6276 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6277 update_menu_bar (sf, 1); |
25012 | 6278 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6279 update_tool_bar (sf, 1); |
25012 | 6280 #endif |
6281 } | |
6282 | |
6283 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6284 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6285 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6286 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6287 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6288 } |
25012 | 6289 |
6290 | |
6291 /* Update the menu bar item list for frame F. This has to be done | |
6292 before we start to fill in any display lines, because it can call | |
6293 eval. | |
6294 | |
6295 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
|
6296 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6297 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6298 update_menu_bar (f, save_match_data) |
25012 | 6299 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6300 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6301 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6302 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6303 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
|
6304 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6305 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6306 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6307 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6308 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6309 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6310 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6311 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
|
6312 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
6313 #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
|
6314 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
|
6315 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6316 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
|
6317 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6318 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6319 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6320 /* 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
|
6321 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
|
6322 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
|
6323 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
|
6324 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
|
6325 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
|
6326 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6327 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
|
6328 || !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
|
6329 || ((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
|
6330 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6331 != !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
|
6332 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6333 && !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
|
6334 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6335 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6336 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
|
6337 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
|
6338 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6339 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
|
6340 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6341 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
|
6342 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6343 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6344 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6345 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6346 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6347 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6348 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6349 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 6350 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6351 /* If it has changed current-menubar from previous value, |
25012 | 6352 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
|
6353 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6354 call0 (Qrecompute_lucid_menubar); |
25012 | 6355 |
14299 | 6356 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
|
6357 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 6358 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6359 /* 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
|
6360 #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
|
6361 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
|
6362 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
|
6363 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6364 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 6365 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
|
6366 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6367 #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
|
6368 /* 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
|
6369 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
|
6370 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6371 #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
|
6372 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6373 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
|
6374 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6375 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6376 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6377 } |
25012 | 6378 |
6379 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6380 |
25012 | 6381 /*********************************************************************** |
25543 | 6382 Tool-bars |
25012 | 6383 ***********************************************************************/ |
6384 | |
6385 #ifdef HAVE_WINDOW_SYSTEM | |
6386 | |
25543 | 6387 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 6388 before we start to fill in any display lines. Called from |
6389 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
6390 and restore it here. */ | |
6391 | |
6392 static void | |
25543 | 6393 update_tool_bar (f, save_match_data) |
25012 | 6394 struct frame *f; |
6395 int save_match_data; | |
6396 { | |
25543 | 6397 if (WINDOWP (f->tool_bar_window) |
6398 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 6399 { |
6400 Lisp_Object window; | |
6401 struct window *w; | |
6402 | |
6403 window = FRAME_SELECTED_WINDOW (f); | |
6404 w = XWINDOW (window); | |
6405 | |
6406 /* If the user has switched buffers or windows, we need to | |
6407 recompute to reflect the new bindings. But we'll | |
6408 recompute when update_mode_lines is set too; that means | |
6409 that people can use force-mode-line-update to request | |
6410 that the menu bar be recomputed. The adverse effect on | |
6411 the rest of the redisplay algorithm is about the same as | |
6412 windows_or_buffers_changed anyway. */ | |
6413 if (windows_or_buffers_changed | |
6414 || !NILP (w->update_mode_line) | |
6415 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
6416 < BUF_MODIFF (XBUFFER (w->buffer))) | |
6417 != !NILP (w->last_had_star)) | |
6418 || ((!NILP (Vtransient_mark_mode) | |
6419 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
6420 != !NILP (w->region_showing))) | |
6421 { | |
6422 struct buffer *prev = current_buffer; | |
6423 int count = specpdl_ptr - specpdl; | |
6424 | |
6425 /* Set current_buffer to the buffer of the selected | |
6426 window of the frame, so that we get the right local | |
6427 keymaps. */ | |
6428 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
6429 | |
6430 /* Save match data, if we must. */ | |
6431 if (save_match_data) | |
6432 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
6433 | |
6434 /* Make sure that we don't accidentally use bogus keymaps. */ | |
6435 if (NILP (Voverriding_local_map_menu_flag)) | |
6436 { | |
6437 specbind (Qoverriding_terminal_local_map, Qnil); | |
6438 specbind (Qoverriding_local_map, Qnil); | |
6439 } | |
6440 | |
25543 | 6441 /* Build desired tool-bar items from keymaps. */ |
6442 f->desired_tool_bar_items | |
6443 = tool_bar_items (f->desired_tool_bar_items, | |
6444 &f->n_desired_tool_bar_items); | |
25012 | 6445 |
25543 | 6446 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 6447 w->update_mode_line = Qt; |
6448 | |
6449 unbind_to (count, Qnil); | |
6450 set_buffer_internal_1 (prev); | |
6451 } | |
6452 } | |
6453 } | |
6454 | |
6455 | |
25543 | 6456 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
6457 F's desired tool-bar contents. F->desired_tool_bar_items must have | |
25012 | 6458 been set up previously by calling prepare_menu_bars. */ |
6459 | |
6460 static void | |
25543 | 6461 build_desired_tool_bar_string (f) |
25012 | 6462 struct frame *f; |
6463 { | |
6464 int i, size, size_needed, string_idx; | |
6465 struct gcpro gcpro1, gcpro2, gcpro3; | |
6466 Lisp_Object image, plist, props; | |
6467 | |
6468 image = plist = props = Qnil; | |
6469 GCPRO3 (image, plist, props); | |
6470 | |
25543 | 6471 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 6472 Otherwise, make a new string. */ |
6473 | |
6474 /* The size of the string we might be able to reuse. */ | |
25543 | 6475 size = (STRINGP (f->desired_tool_bar_string) |
6476 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 6477 : 0); |
6478 | |
6479 /* Each image in the string we build is preceded by a space, | |
6480 and there is a space at the end. */ | |
25543 | 6481 size_needed = f->n_desired_tool_bar_items + 1; |
6482 | |
6483 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 6484 if (size < size_needed) |
25543 | 6485 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), ' '); |
25012 | 6486 else |
6487 { | |
6488 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
6489 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 6490 props, f->desired_tool_bar_string); |
25012 | 6491 } |
6492 | |
6493 /* Put a `display' property on the string for the images to display, | |
25543 | 6494 put a `menu_item' property on tool-bar items with a value that |
6495 is the index of the item in F's tool-bar item vector. */ | |
25012 | 6496 for (i = 0, string_idx = 0; |
25543 | 6497 i < f->n_desired_tool_bar_items; |
25012 | 6498 ++i, string_idx += 1) |
6499 { | |
6500 #define PROP(IDX) \ | |
25543 | 6501 (XVECTOR (f->desired_tool_bar_items) \ |
6502 ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)]) | |
6503 | |
6504 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
6505 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
25012 | 6506 int margin, relief; |
6507 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; | |
6508 extern Lisp_Object Qlaplace; | |
6509 | |
6510 /* If image is a vector, choose the image according to the | |
6511 button state. */ | |
25543 | 6512 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 6513 if (VECTORP (image)) |
6514 { | |
25543 | 6515 enum tool_bar_item_image idx; |
25012 | 6516 |
6517 if (enabled_p) | |
6518 idx = (selected_p | |
25543 | 6519 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
6520 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 6521 else |
6522 idx = (selected_p | |
25543 | 6523 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
6524 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 6525 |
6526 xassert (XVECTOR (image)->size >= idx); | |
6527 image = XVECTOR (image)->contents[idx]; | |
6528 } | |
6529 | |
6530 /* Ignore invalid image specifications. */ | |
6531 if (!valid_image_p (image)) | |
6532 continue; | |
6533 | |
25543 | 6534 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 6535 plist = Fcopy_sequence (XCDR (image)); |
6536 | |
6537 /* Compute margin and relief to draw. */ | |
25543 | 6538 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
6539 margin = relief + max (0, tool_bar_button_margin); | |
6540 | |
6541 if (auto_raise_tool_bar_buttons_p) | |
25012 | 6542 { |
6543 /* Add a `:relief' property to the image spec if the item is | |
6544 selected. */ | |
6545 if (selected_p) | |
6546 { | |
6547 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
6548 margin -= relief; | |
6549 } | |
6550 } | |
6551 else | |
6552 { | |
6553 /* If image is selected, display it pressed, i.e. with a | |
6554 negative relief. If it's not selected, display it with a | |
6555 raised relief. */ | |
6556 plist = Fplist_put (plist, QCrelief, | |
6557 (selected_p | |
6558 ? make_number (-relief) | |
6559 : make_number (relief))); | |
6560 margin -= relief; | |
6561 } | |
6562 | |
6563 /* Put a margin around the image. */ | |
6564 if (margin) | |
6565 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
6566 | |
6567 /* If button is not enabled, make the image appear disabled by | |
6568 applying an appropriate algorithm to it. */ | |
6569 if (!enabled_p) | |
6570 plist = Fplist_put (plist, QCalgorithm, Qlaplace); | |
6571 | |
6572 /* Put a `display' text property on the string for the image to | |
6573 display. Put a `menu-item' property on the string that gives | |
25543 | 6574 the start of this item's properties in the tool-bar items |
25012 | 6575 vector. */ |
6576 image = Fcons (Qimage, plist); | |
6577 props = list4 (Qdisplay, image, | |
25543 | 6578 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 6579 Fadd_text_properties (make_number (string_idx), |
6580 make_number (string_idx + 1), | |
25543 | 6581 props, f->desired_tool_bar_string); |
25012 | 6582 #undef PROP |
6583 } | |
6584 | |
6585 UNGCPRO; | |
6586 } | |
6587 | |
6588 | |
25543 | 6589 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 6590 |
6591 static void | |
25543 | 6592 display_tool_bar_line (it) |
25012 | 6593 struct it *it; |
6594 { | |
6595 struct glyph_row *row = it->glyph_row; | |
6596 int max_x = it->last_visible_x; | |
6597 struct glyph *last; | |
6598 | |
6599 prepare_desired_row (row); | |
6600 row->y = it->current_y; | |
6601 | |
6602 while (it->current_x < max_x) | |
6603 { | |
6604 int x_before, x, n_glyphs_before, i, nglyphs; | |
6605 | |
6606 /* Get the next display element. */ | |
6607 if (!get_next_display_element (it)) | |
6608 break; | |
6609 | |
6610 /* Produce glyphs. */ | |
6611 x_before = it->current_x; | |
6612 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
6613 PRODUCE_GLYPHS (it); | |
6614 | |
6615 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
6616 i = 0; | |
6617 x = x_before; | |
6618 while (i < nglyphs) | |
6619 { | |
6620 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
6621 | |
6622 if (x + glyph->pixel_width > max_x) | |
6623 { | |
6624 /* Glyph doesn't fit on line. */ | |
6625 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
6626 it->current_x = x; | |
6627 goto out; | |
6628 } | |
6629 | |
6630 ++it->hpos; | |
6631 x += glyph->pixel_width; | |
6632 ++i; | |
6633 } | |
6634 | |
6635 /* Stop at line ends. */ | |
6636 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
6637 break; | |
6638 | |
6639 set_iterator_to_next (it); | |
6640 } | |
6641 | |
6642 out:; | |
6643 | |
6644 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
6645 extend_face_to_end_of_line (it); | |
6646 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
6647 last->right_box_line_p = 1; | |
6648 compute_line_metrics (it); | |
6649 | |
25543 | 6650 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 6651 if (!row->displays_text_p) |
6652 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
6653 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
|
6654 row->ascent = row->phys_ascent = 0; |
25012 | 6655 } |
6656 | |
6657 row->full_width_p = 1; | |
6658 row->continued_p = 0; | |
6659 row->truncated_on_left_p = 0; | |
6660 row->truncated_on_right_p = 0; | |
6661 | |
6662 it->current_x = it->hpos = 0; | |
6663 it->current_y += row->height; | |
6664 ++it->vpos; | |
6665 ++it->glyph_row; | |
6666 } | |
6667 | |
6668 | |
25543 | 6669 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 6670 items of frame F visible. */ |
6671 | |
6672 static int | |
25543 | 6673 tool_bar_lines_needed (f) |
25012 | 6674 struct frame *f; |
6675 { | |
25543 | 6676 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 6677 struct it it; |
6678 | |
25543 | 6679 /* Initialize an iterator for iteration over |
6680 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
6681 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 6682 it.first_visible_x = 0; |
6683 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 6684 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 6685 |
6686 while (!ITERATOR_AT_END_P (&it)) | |
6687 { | |
6688 it.glyph_row = w->desired_matrix->rows; | |
6689 clear_glyph_row (it.glyph_row); | |
25543 | 6690 display_tool_bar_line (&it); |
25012 | 6691 } |
6692 | |
6693 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
6694 } | |
6695 | |
6696 | |
25543 | 6697 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 6698 height should be changed. */ |
6699 | |
6700 static int | |
25543 | 6701 redisplay_tool_bar (f) |
25012 | 6702 struct frame *f; |
6703 { | |
6704 struct window *w; | |
6705 struct it it; | |
6706 struct glyph_row *row; | |
6707 int change_height_p = 0; | |
6708 | |
25543 | 6709 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
6710 do anything. This means you must start with tool-bar-lines | |
25012 | 6711 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 6712 can turn off tool-bars by specifying tool-bar-lines zero. */ |
6713 if (!WINDOWP (f->tool_bar_window) | |
6714 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 6715 XFASTINT (w->height) == 0)) |
6716 return 0; | |
6717 | |
25543 | 6718 /* Set up an iterator for the tool-bar window. */ |
6719 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 6720 it.first_visible_x = 0; |
6721 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
6722 row = it.glyph_row; | |
6723 | |
25543 | 6724 /* Build a string that represents the contents of the tool-bar. */ |
6725 build_desired_tool_bar_string (f); | |
6726 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
6727 | |
6728 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 6729 while (it.current_y < it.last_visible_y) |
25543 | 6730 display_tool_bar_line (&it); |
6731 | |
6732 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 6733 window, so don't do it. */ |
6734 w->desired_matrix->no_scrolling_p = 1; | |
6735 w->must_be_updated_p = 1; | |
6736 | |
25543 | 6737 if (auto_resize_tool_bars_p) |
25012 | 6738 { |
6739 int nlines; | |
6740 | |
6741 /* If there are blank lines at the end, except for a partially | |
6742 visible blank line at the end that is smaller than | |
25543 | 6743 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 6744 row = it.glyph_row - 1; |
6745 if (!row->displays_text_p | |
6746 && row->height >= CANON_Y_UNIT (f)) | |
6747 change_height_p = 1; | |
6748 | |
25543 | 6749 /* If row displays tool-bar items, but is partially visible, |
6750 change the tool-bar's height. */ | |
25012 | 6751 if (row->displays_text_p |
6752 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
6753 change_height_p = 1; | |
6754 | |
25543 | 6755 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 6756 frame parameter. */ |
6757 if (change_height_p | |
25543 | 6758 && (nlines = tool_bar_lines_needed (f), |
25012 | 6759 nlines != XFASTINT (w->height))) |
6760 { | |
25543 | 6761 extern Lisp_Object Qtool_bar_lines; |
25012 | 6762 Lisp_Object frame; |
6763 | |
6764 XSETFRAME (frame, f); | |
6765 clear_glyph_matrix (w->desired_matrix); | |
6766 Fmodify_frame_parameters (frame, | |
25543 | 6767 Fcons (Fcons (Qtool_bar_lines, |
25012 | 6768 make_number (nlines)), |
6769 Qnil)); | |
6770 fonts_changed_p = 1; | |
6771 } | |
6772 } | |
6773 | |
6774 return change_height_p; | |
6775 } | |
6776 | |
6777 | |
25543 | 6778 /* Get information about the tool-bar item which is displayed in GLYPH |
6779 on frame F. Return in *PROP_IDX the index where tool-bar item | |
6780 properties start in F->current_tool_bar_items. Value is zero if | |
6781 GLYPH doesn't display a tool-bar item. */ | |
25012 | 6782 |
6783 int | |
25543 | 6784 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 6785 struct frame *f; |
6786 struct glyph *glyph; | |
6787 int *prop_idx; | |
6788 { | |
6789 Lisp_Object prop; | |
6790 int success_p; | |
6791 | |
6792 /* Get the text property `menu-item' at pos. The value of that | |
6793 property is the start index of this item's properties in | |
25543 | 6794 F->current_tool_bar_items. */ |
25012 | 6795 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 6796 Qmenu_item, f->current_tool_bar_string); |
25012 | 6797 if (INTEGERP (prop)) |
6798 { | |
6799 *prop_idx = XINT (prop); | |
6800 success_p = 1; | |
6801 } | |
6802 else | |
6803 success_p = 0; | |
6804 | |
6805 return success_p; | |
6806 } | |
6807 | |
6808 #endif /* HAVE_WINDOW_SYSTEM */ | |
6809 | |
6810 | |
6811 | |
6812 /************************************************************************ | |
6813 Horizontal scrolling | |
6814 ************************************************************************/ | |
6815 | |
6816 static int hscroll_window_tree P_ ((Lisp_Object)); | |
6817 static int hscroll_windows P_ ((Lisp_Object)); | |
6818 | |
6819 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
6820 hscroll value so that PT is (i) visible in the window, and (ii) so | |
6821 that it is not within a certain margin at the window's left and | |
6822 right border. Value is non-zero if any window's hscroll has been | |
6823 changed. */ | |
6824 | |
6825 static int | |
6826 hscroll_window_tree (window) | |
6827 Lisp_Object window; | |
6828 { | |
6829 int hscrolled_p = 0; | |
6830 | |
6831 while (WINDOWP (window)) | |
6832 { | |
6833 struct window *w = XWINDOW (window); | |
6834 | |
6835 if (WINDOWP (w->hchild)) | |
6836 hscrolled_p |= hscroll_window_tree (w->hchild); | |
6837 else if (WINDOWP (w->vchild)) | |
6838 hscrolled_p |= hscroll_window_tree (w->vchild); | |
6839 else if (w->cursor.vpos >= 0) | |
6840 { | |
6841 int hscroll_margin, text_area_x, text_area_y; | |
6842 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
|
6843 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6844 = 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
|
6845 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6846 = 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
|
6847 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6848 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6849 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6850 : current_cursor_row); |
25012 | 6851 |
6852 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
6853 &text_area_width, &text_area_height); | |
6854 | |
6855 /* Scroll when cursor is inside this scroll margin. */ | |
6856 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
6857 | |
6858 if ((XFASTINT (w->hscroll) | |
6859 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6860 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6861 && cursor_row->truncated_on_right_p |
25012 | 6862 && (w->cursor.x > text_area_width - hscroll_margin))) |
6863 { | |
6864 struct it it; | |
6865 int hscroll; | |
6866 struct buffer *saved_current_buffer; | |
6867 int pt; | |
6868 | |
6869 /* Find point in a display of infinite width. */ | |
6870 saved_current_buffer = current_buffer; | |
6871 current_buffer = XBUFFER (w->buffer); | |
6872 | |
6873 if (w == XWINDOW (selected_window)) | |
6874 pt = BUF_PT (current_buffer); | |
6875 else | |
6876 { | |
6877 pt = marker_position (w->pointm); | |
6878 pt = max (BEGV, pt); | |
6879 pt = min (ZV, pt); | |
6880 } | |
6881 | |
6882 /* Move iterator to pt starting at cursor_row->start in | |
6883 a line with infinite width. */ | |
6884 init_to_row_start (&it, w, cursor_row); | |
6885 it.last_visible_x = INFINITY; | |
6886 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
6887 current_buffer = saved_current_buffer; | |
6888 | |
6889 /* Center cursor in window. */ | |
6890 hscroll = (max (0, it.current_x - text_area_width / 2) | |
6891 / CANON_X_UNIT (it.f)); | |
6892 | |
6893 /* Don't call Fset_window_hscroll if value hasn't | |
6894 changed because it will prevent redisplay | |
6895 optimizations. */ | |
6896 if (XFASTINT (w->hscroll) != hscroll) | |
6897 { | |
6898 Fset_window_hscroll (window, make_number (hscroll)); | |
6899 hscrolled_p = 1; | |
6900 } | |
6901 } | |
6902 } | |
6903 | |
6904 window = w->next; | |
6905 } | |
6906 | |
6907 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
6908 return hscrolled_p; | |
6909 } | |
6910 | |
6911 | |
6912 /* Set hscroll so that cursor is visible and not inside horizontal | |
6913 scroll margins for all windows in the tree rooted at WINDOW. See | |
6914 also hscroll_window_tree above. Value is non-zero if any window's | |
6915 hscroll has been changed. If it has, desired matrices on the frame | |
6916 of WINDOW are cleared. */ | |
6917 | |
6918 static int | |
6919 hscroll_windows (window) | |
6920 Lisp_Object window; | |
6921 { | |
6922 int hscrolled_p = hscroll_window_tree (window); | |
6923 if (hscrolled_p) | |
6924 clear_desired_matrices (XFRAME (WINDOW_FRAME (XWINDOW (window)))); | |
6925 return hscrolled_p; | |
6926 } | |
6927 | |
6928 | |
6929 | |
6930 /************************************************************************ | |
6931 Redisplay | |
6932 ************************************************************************/ | |
6933 | |
6934 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
6935 to a non-zero value. This is sometimes handy to have in a debugger | |
6936 session. */ | |
6937 | |
6938 #if GLYPH_DEBUG | |
6939 | |
6940 /* First and last unchanged row for try_window_id. */ | |
6941 | |
6942 int debug_first_unchanged_at_end_vpos; | |
6943 int debug_last_unchanged_at_beg_vpos; | |
6944 | |
6945 /* Delta vpos and y. */ | |
6946 | |
6947 int debug_dvpos, debug_dy; | |
6948 | |
6949 /* Delta in characters and bytes for try_window_id. */ | |
6950 | |
6951 int debug_delta, debug_delta_bytes; | |
6952 | |
6953 /* Values of window_end_pos and window_end_vpos at the end of | |
6954 try_window_id. */ | |
6955 | |
6956 int debug_end_pos, debug_end_vpos; | |
6957 | |
6958 /* Append a string to W->desired_matrix->method. FMT is a printf | |
6959 format string. A1...A9 are a supplement for a variable-length | |
6960 argument list. If trace_redisplay_p is non-zero also printf the | |
6961 resulting string to stderr. */ | |
6962 | |
6963 static void | |
6964 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
6965 struct window *w; | |
6966 char *fmt; | |
6967 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
6968 { | |
6969 char buffer[512]; | |
6970 char *method = w->desired_matrix->method; | |
6971 int len = strlen (method); | |
6972 int size = sizeof w->desired_matrix->method; | |
6973 int remaining = size - len - 1; | |
6974 | |
6975 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
6976 if (len && remaining) | |
6977 { | |
6978 method[len] = '|'; | |
6979 --remaining, ++len; | |
6980 } | |
6981 | |
6982 strncpy (method + len, buffer, remaining); | |
6983 | |
6984 if (trace_redisplay_p) | |
6985 fprintf (stderr, "%p (%s): %s\n", | |
6986 w, | |
6987 ((BUFFERP (w->buffer) | |
6988 && STRINGP (XBUFFER (w->buffer)->name)) | |
6989 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
6990 : "no buffer"), | |
6991 buffer); | |
6992 } | |
6993 | |
6994 #endif /* GLYPH_DEBUG */ | |
6995 | |
6996 | |
6997 /* This counter is used to clear the face cache every once in a while | |
6998 in redisplay_internal. It is incremented for each redisplay. | |
6999 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7000 cleared. */ | |
7001 | |
7002 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7003 static int clear_face_cache_count; | |
7004 | |
7005 /* Record the previous terminal frame we displayed. */ | |
7006 | |
7007 static struct frame *previous_terminal_frame; | |
7008 | |
7009 /* Non-zero while redisplay_internal is in progress. */ | |
7010 | |
7011 int redisplaying_p; | |
7012 | |
7013 | |
7014 /* Value is non-zero if all changes in window W, which displays | |
7015 current_buffer, are in the text between START and END. START is a | |
7016 buffer position, END is given as a distance from Z. Used in | |
7017 redisplay_internal for display optimization. */ | |
7018 | |
7019 static INLINE int | |
7020 text_outside_line_unchanged_p (w, start, end) | |
7021 struct window *w; | |
7022 int start, end; | |
7023 { | |
7024 int unchanged_p = 1; | |
7025 | |
7026 /* If text or overlays have changed, see where. */ | |
7027 if (XFASTINT (w->last_modified) < MODIFF | |
7028 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7029 { | |
7030 /* Gap in the line? */ | |
7031 if (GPT < start || Z - GPT < end) | |
7032 unchanged_p = 0; | |
7033 | |
7034 /* Changes start in front of the line, or end after it? */ | |
7035 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7036 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7037 || END_UNCHANGED < end)) |
25012 | 7038 unchanged_p = 0; |
7039 | |
7040 /* If selective display, can't optimize if changes start at the | |
7041 beginning of the line. */ | |
7042 if (unchanged_p | |
7043 && INTEGERP (current_buffer->selective_display) | |
7044 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7045 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7046 unchanged_p = 0; |
7047 } | |
7048 | |
7049 return unchanged_p; | |
7050 } | |
7051 | |
7052 | |
7053 /* Do a frame update, taking possible shortcuts into account. This is | |
7054 the main external entry point for redisplay. | |
7055 | |
7056 If the last redisplay displayed an echo area message and that message | |
7057 is no longer requested, we clear the echo area or bring back the | |
7058 mini-buffer if that is in use. */ | |
7059 | |
7060 void | |
7061 redisplay () | |
7062 { | |
7063 redisplay_internal (0); | |
7064 } | |
7065 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7066 /* Return 1 if point moved out of or into a composition. Otherwise |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7067 return 0. PREV_BUF and PREV_PT are the last point buffer and |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7068 position. BUF and PT are the current point buffer and position. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7069 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7070 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7071 check_point_in_composition (prev_buf, prev_pt, buf, pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7072 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7073 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7074 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7075 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7076 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7077 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7078 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7079 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7080 /* Check a composition at the last point if point moved within the |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7081 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7082 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7083 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7084 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7085 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7086 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7087 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7088 if (prev_pt > BUF_BEGV (buf) && prev_pt < BUF_ZV (buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7089 && find_composition (prev_pt, -1, &start, &end, &prop, buffer) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7090 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7091 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7092 /* The last point was within the composition. Return 1 iff |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7093 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7094 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7095 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7096 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7097 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7098 return (pt > BUF_BEGV (buf) && pt < BUF_ZV (buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7099 && find_composition (pt, -1, &start, &end, &prop, buffer) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7100 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7101 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7102 } |
25012 | 7103 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7104 /* 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
|
7105 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7106 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7107 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7108 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7109 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7110 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7111 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7112 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7113 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7114 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7115 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7116 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7117 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7118 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7119 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7120 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7121 /* If display wasn't paused, and W is not a tool bar window, see if |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7122 point has been moved into or out of a composition. In that case, |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7123 we set b->clip_changed to 1 to force updating the screen. If |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7124 b->clip_changed has already been set to 1, we can skip this |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7125 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7126 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7127 && BUFFERP (w->buffer) && !NILP (w->window_end_valid)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7128 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7129 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7130 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7131 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7132 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7133 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7134 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7135 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7136 if ((w->current_matrix->buffer != XBUFFER (w->buffer) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7137 || pt != w->last_point) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7138 && check_point_in_composition (w->current_matrix->buffer, |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7139 w->last_point, |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7140 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7141 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7142 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7143 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7144 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7145 |
25012 | 7146 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7147 response to any user action; therefore, we should preserve the echo | |
7148 area. (Actually, our caller does that job.) Perhaps in the future | |
7149 avoid recentering windows if it is not necessary; currently that | |
7150 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7151 |
277 | 7152 static void |
25012 | 7153 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7154 int preserve_echo_area; |
277 | 7155 { |
25012 | 7156 struct window *w = XWINDOW (selected_window); |
7157 struct frame *f = XFRAME (w->frame); | |
7158 int pause; | |
7159 int must_finish = 0; | |
7160 struct text_pos tlbufpos, tlendpos; | |
7161 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7162 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7163 struct frame *sf = SELECTED_FRAME (); |
25012 | 7164 |
7165 /* Non-zero means redisplay has to consider all windows on all | |
7166 frames. Zero means, only selected_window is considered. */ | |
7167 int consider_all_windows_p; | |
7168 | |
7169 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7170 | |
7171 /* No redisplay if running in batch mode or frame is not yet fully | |
7172 initialized, or redisplay is explicitly turned off by setting | |
7173 Vinhibit_redisplay. */ | |
7174 if (noninteractive | |
7175 || !NILP (Vinhibit_redisplay) | |
7176 || !f->glyphs_initialized_p) | |
7177 return; | |
7178 | |
7179 /* The flag redisplay_performed_directly_p is set by | |
7180 direct_output_for_insert when it already did the whole screen | |
7181 update necessary. */ | |
7182 if (redisplay_performed_directly_p) | |
7183 { | |
7184 redisplay_performed_directly_p = 0; | |
7185 if (!hscroll_windows (selected_window)) | |
7186 return; | |
7187 } | |
7188 | |
7189 #ifdef USE_X_TOOLKIT | |
7190 if (popup_activated ()) | |
7191 return; | |
7192 #endif | |
7193 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7194 /* I don't think this happens but let's be paranoid. */ |
25012 | 7195 if (redisplaying_p) |
7196 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7197 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7198 /* 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
|
7199 when we leave this function. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7200 count = specpdl_ptr - specpdl; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7201 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7202 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7203 |
25012 | 7204 retry: |
7205 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7206 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7207 |
25012 | 7208 /* If new fonts have been loaded that make a glyph matrix adjustment |
7209 necessary, do it. */ | |
7210 if (fonts_changed_p) | |
7211 { | |
7212 adjust_glyphs (NULL); | |
7213 ++windows_or_buffers_changed; | |
7214 fonts_changed_p = 0; | |
7215 } | |
7216 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7217 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7218 && previous_terminal_frame != sf) |
25012 | 7219 { |
7220 /* Since frames on an ASCII terminal share the same display | |
7221 area, displaying a different frame means redisplay the whole | |
7222 thing. */ | |
7223 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7224 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7225 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7226 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7227 previous_terminal_frame = sf; |
25012 | 7228 |
7229 /* Set the visible flags for all frames. Do this before checking | |
7230 for resized or garbaged frames; they want to know if their frames | |
7231 are visible. See the comment in frame.h for | |
7232 FRAME_SAMPLE_VISIBILITY. */ | |
7233 { | |
7234 Lisp_Object tail, frame; | |
7235 | |
7236 number_of_visible_frames = 0; | |
7237 | |
7238 FOR_EACH_FRAME (tail, frame) | |
7239 { | |
7240 struct frame *f = XFRAME (frame); | |
7241 | |
7242 FRAME_SAMPLE_VISIBILITY (f); | |
7243 if (FRAME_VISIBLE_P (f)) | |
7244 ++number_of_visible_frames; | |
7245 clear_desired_matrices (f); | |
7246 } | |
7247 } | |
7248 | |
7249 /* 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
|
7250 do_pending_window_change (1); |
25012 | 7251 |
7252 /* Clear frames marked as garbaged. */ | |
7253 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7254 clear_garbaged_frames (); |
25012 | 7255 |
25543 | 7256 /* Build menubar and tool-bar items. */ |
25012 | 7257 prepare_menu_bars (); |
7258 | |
7259 if (windows_or_buffers_changed) | |
7260 update_mode_lines++; | |
7261 | |
7262 /* Detect case that we need to write or remove a star in the mode line. */ | |
7263 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7264 { | |
7265 w->update_mode_line = Qt; | |
7266 if (buffer_shared > 1) | |
7267 update_mode_lines++; | |
7268 } | |
7269 | |
7270 /* If %c is in the mode line, update it if needed. */ | |
7271 if (!NILP (w->column_number_displayed) | |
7272 /* This alternative quickly identifies a common case | |
7273 where no change is needed. */ | |
7274 && !(PT == XFASTINT (w->last_point) | |
7275 && XFASTINT (w->last_modified) >= MODIFF | |
7276 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7277 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7278 w->update_mode_line = Qt; | |
7279 | |
7280 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
7281 | |
7282 /* The variable buffer_shared is set in redisplay_window and | |
7283 indicates that we redisplay a buffer in different windows. See | |
7284 there. */ | |
7285 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
7286 | |
7287 /* If specs for an arrow have changed, do thorough redisplay | |
7288 to ensure we remove any arrow that should no longer exist. */ | |
7289 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
7290 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
7291 consider_all_windows_p = windows_or_buffers_changed = 1; | |
7292 | |
7293 /* Normally the message* functions will have already displayed and | |
7294 updated the echo area, but the frame may have been trashed, or | |
7295 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
|
7296 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
|
7297 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
|
7298 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
|
7299 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7300 int window_height_changed_p = echo_area_display (0); |
25012 | 7301 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7302 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7303 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7304 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7305 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
|
7306 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7307 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
|
7308 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7309 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7310 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7311 /* 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
|
7312 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7313 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7314 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7315 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7316 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7317 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7318 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
|
7319 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7320 || 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
|
7321 || 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
|
7322 && 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
|
7323 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7324 /* 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
|
7325 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
|
7326 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7327 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
|
7328 ++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
|
7329 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7330 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7331 /* 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
|
7332 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7333 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7334 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7335 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7336 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7337 |
25012 | 7338 |
7339 /* If showing the region, and mark has changed, we must redisplay | |
7340 the whole window. The assignment to this_line_start_pos prevents | |
7341 the optimization directly below this if-statement. */ | |
7342 if (((!NILP (Vtransient_mark_mode) | |
7343 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7344 != !NILP (w->region_showing)) | |
7345 || (!NILP (w->region_showing) | |
7346 && !EQ (w->region_showing, | |
7347 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
7348 CHARPOS (this_line_start_pos) = 0; | |
7349 | |
7350 /* Optimize the case that only the line containing the cursor in the | |
7351 selected window has changed. Variables starting with this_ are | |
7352 set in display_line and record information about the line | |
7353 containing the cursor. */ | |
7354 tlbufpos = this_line_start_pos; | |
7355 tlendpos = this_line_end_pos; | |
7356 if (!consider_all_windows_p | |
7357 && CHARPOS (tlbufpos) > 0 | |
7358 && NILP (w->update_mode_line) | |
7359 && !current_buffer->clip_changed | |
7360 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
7361 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
7362 /* Make sure recorded data applies to current buffer, etc. */ | |
7363 && this_line_buffer == current_buffer | |
7364 && current_buffer == XBUFFER (w->buffer) | |
7365 && NILP (w->force_start) | |
7366 /* Point must be on the line that we have info recorded about. */ | |
7367 && PT >= CHARPOS (tlbufpos) | |
7368 && PT <= Z - CHARPOS (tlendpos) | |
7369 /* All text outside that line, including its final newline, | |
7370 must be unchanged */ | |
7371 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
7372 CHARPOS (tlendpos))) | |
7373 { | |
7374 if (CHARPOS (tlbufpos) > BEGV | |
7375 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
7376 && (CHARPOS (tlbufpos) == ZV | |
7377 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
7378 /* Former continuation line has disappeared by becoming empty */ | |
7379 goto cancel; | |
7380 else if (XFASTINT (w->last_modified) < MODIFF | |
7381 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
7382 || MINI_WINDOW_P (w)) | |
7383 { | |
7384 /* We have to handle the case of continuation around a | |
7385 wide-column character (See the comment in indent.c around | |
7386 line 885). | |
7387 | |
7388 For instance, in the following case: | |
7389 | |
7390 -------- Insert -------- | |
7391 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
7392 J_I_ ==> J_I_ `^^' are cursors. | |
7393 ^^ ^^ | |
7394 -------- -------- | |
7395 | |
7396 As we have to redraw the line above, we should goto cancel. */ | |
7397 | |
7398 struct it it; | |
7399 int line_height_before = this_line_pixel_height; | |
7400 | |
7401 /* Note that start_display will handle the case that the | |
7402 line starting at tlbufpos is a continuation lines. */ | |
7403 start_display (&it, w, tlbufpos); | |
7404 | |
7405 /* Implementation note: It this still necessary? */ | |
7406 if (it.current_x != this_line_start_x) | |
7407 goto cancel; | |
7408 | |
7409 TRACE ((stderr, "trying display optimization 1\n")); | |
7410 w->cursor.vpos = -1; | |
7411 overlay_arrow_seen = 0; | |
7412 it.vpos = this_line_vpos; | |
7413 it.current_y = this_line_y; | |
7414 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
7415 display_line (&it); | |
7416 | |
7417 /* If line contains point, is not continued, | |
7418 and ends at same distance from eob as before, we win */ | |
7419 if (w->cursor.vpos >= 0 | |
7420 /* Line is not continued, otherwise this_line_start_pos | |
7421 would have been set to 0 in display_line. */ | |
7422 && CHARPOS (this_line_start_pos) | |
7423 /* Line ends as before. */ | |
7424 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
7425 /* Line has same height as before. Otherwise other lines | |
7426 would have to be shifted up or down. */ | |
7427 && this_line_pixel_height == line_height_before) | |
7428 { | |
7429 /* If this is not the window's last line, we must adjust | |
7430 the charstarts of the lines below. */ | |
7431 if (it.current_y < it.last_visible_y) | |
7432 { | |
7433 struct glyph_row *row | |
7434 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
7435 int delta, delta_bytes; | |
7436 | |
7437 if (Z - CHARPOS (tlendpos) == ZV) | |
7438 { | |
7439 /* This line ends at end of (accessible part of) | |
7440 buffer. There is no newline to count. */ | |
7441 delta = (Z | |
7442 - CHARPOS (tlendpos) | |
7443 - MATRIX_ROW_START_CHARPOS (row)); | |
7444 delta_bytes = (Z_BYTE | |
7445 - BYTEPOS (tlendpos) | |
7446 - MATRIX_ROW_START_BYTEPOS (row)); | |
7447 } | |
7448 else | |
7449 { | |
7450 /* This line ends in a newline. Must take | |
7451 account of the newline and the rest of the | |
7452 text that follows. */ | |
7453 delta = (Z | |
7454 - CHARPOS (tlendpos) | |
7455 - MATRIX_ROW_START_CHARPOS (row)); | |
7456 delta_bytes = (Z_BYTE | |
7457 - BYTEPOS (tlendpos) | |
7458 - MATRIX_ROW_START_BYTEPOS (row)); | |
7459 } | |
7460 | |
7461 increment_glyph_matrix_buffer_positions (w->current_matrix, | |
7462 this_line_vpos + 1, | |
7463 w->current_matrix->nrows, | |
7464 delta, delta_bytes); | |
7465 } | |
7466 | |
7467 /* If this row displays text now but previously didn't, | |
7468 or vice versa, w->window_end_vpos may have to be | |
7469 adjusted. */ | |
7470 if ((it.glyph_row - 1)->displays_text_p) | |
7471 { | |
7472 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
7473 XSETINT (w->window_end_vpos, this_line_vpos); | |
7474 } | |
7475 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
7476 && this_line_vpos > 0) | |
7477 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
7478 w->window_end_valid = Qnil; | |
7479 | |
7480 /* Update hint: No need to try to scroll in update_window. */ | |
7481 w->desired_matrix->no_scrolling_p = 1; | |
7482 | |
7483 #if GLYPH_DEBUG | |
7484 *w->desired_matrix->method = 0; | |
7485 debug_method_add (w, "optimization 1"); | |
7486 #endif | |
7487 goto update; | |
7488 } | |
7489 else | |
7490 goto cancel; | |
7491 } | |
7492 else if (/* Cursor position hasn't changed. */ | |
7493 PT == XFASTINT (w->last_point) | |
7494 /* Make sure the cursor was last displayed | |
7495 in this window. Otherwise we have to reposition it. */ | |
7496 && 0 <= w->cursor.vpos | |
7497 && XINT (w->height) > w->cursor.vpos) | |
7498 { | |
7499 if (!must_finish) | |
7500 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7501 do_pending_window_change (1); |
25012 | 7502 |
7503 /* We used to always goto end_of_redisplay here, but this | |
7504 isn't enough if we have a blinking cursor. */ | |
7505 if (w->cursor_off_p == w->last_cursor_off_p) | |
7506 goto end_of_redisplay; | |
7507 } | |
7508 goto update; | |
7509 } | |
7510 /* If highlighting the region, or if the cursor is in the echo area, | |
7511 then we can't just move the cursor. */ | |
7512 else if (! (!NILP (Vtransient_mark_mode) | |
7513 && !NILP (current_buffer->mark_active)) | |
7514 && (w == XWINDOW (current_buffer->last_selected_window) | |
7515 || highlight_nonselected_windows) | |
7516 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
7517 && NILP (Vshow_trailing_whitespace) |
25012 | 7518 && !cursor_in_echo_area) |
7519 { | |
7520 struct it it; | |
7521 struct glyph_row *row; | |
7522 | |
7523 /* Skip from tlbufpos to PT and see where it is. Note that | |
7524 PT may be in invisible text. If so, we will end at the | |
7525 next visible position. */ | |
7526 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
7527 NULL, DEFAULT_FACE_ID); | |
7528 it.current_x = this_line_start_x; | |
7529 it.current_y = this_line_y; | |
7530 it.vpos = this_line_vpos; | |
7531 | |
7532 /* The call to move_it_to stops in front of PT, but | |
7533 moves over before-strings. */ | |
7534 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
7535 | |
7536 if (it.vpos == this_line_vpos | |
7537 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
7538 row->enabled_p)) | |
7539 { | |
7540 xassert (this_line_vpos == it.vpos); | |
7541 xassert (this_line_y == it.current_y); | |
7542 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
7543 goto update; | |
7544 } | |
7545 else | |
7546 goto cancel; | |
7547 } | |
7548 | |
7549 cancel: | |
7550 /* Text changed drastically or point moved off of line. */ | |
7551 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
7552 } | |
7553 | |
7554 CHARPOS (this_line_start_pos) = 0; | |
7555 consider_all_windows_p |= buffer_shared > 1; | |
7556 ++clear_face_cache_count; | |
7557 | |
7558 | |
7559 /* Build desired matrices. If consider_all_windows_p is non-zero, | |
7560 do it for all windows on all frames. Otherwise do it for | |
7561 selected_window, only. */ | |
7562 | |
7563 if (consider_all_windows_p) | |
7564 { | |
7565 Lisp_Object tail, frame; | |
7566 | |
7567 /* Clear the face cache eventually. */ | |
7568 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
7569 { | |
7570 clear_face_cache (0); | |
7571 clear_face_cache_count = 0; | |
7572 } | |
7573 | |
7574 /* Recompute # windows showing selected buffer. This will be | |
7575 incremented each time such a window is displayed. */ | |
7576 buffer_shared = 0; | |
7577 | |
7578 FOR_EACH_FRAME (tail, frame) | |
7579 { | |
7580 struct frame *f = XFRAME (frame); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7581 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 7582 { |
7583 /* Mark all the scroll bars to be removed; we'll redeem | |
7584 the ones we want when we redisplay their windows. */ | |
7585 if (condemn_scroll_bars_hook) | |
7586 (*condemn_scroll_bars_hook) (f); | |
7587 | |
7588 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
7589 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
7590 | |
7591 /* Any scroll bars which redisplay_windows should have | |
7592 nuked should now go away. */ | |
7593 if (judge_scroll_bars_hook) | |
7594 (*judge_scroll_bars_hook) (f); | |
7595 } | |
7596 } | |
7597 } | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7598 else if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7599 && !FRAME_OBSCURED_P (sf)) |
25012 | 7600 redisplay_window (selected_window, 1); |
7601 | |
7602 | |
7603 /* Compare desired and current matrices, perform output. */ | |
7604 | |
7605 update: | |
7606 | |
7607 /* If fonts changed, display again. */ | |
7608 if (fonts_changed_p) | |
7609 goto retry; | |
7610 | |
7611 /* Prevent various kinds of signals during display update. | |
7612 stdio is not robust about handling signals, | |
7613 which can cause an apparent I/O error. */ | |
7614 if (interrupt_input) | |
7615 unrequest_sigio (); | |
7616 stop_polling (); | |
7617 | |
7618 if (consider_all_windows_p) | |
7619 { | |
7620 Lisp_Object tail; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7621 struct frame *f; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7622 int hscrolled_p; |
25012 | 7623 |
7624 pause = 0; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7625 hscrolled_p = 0; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7626 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7627 /* See if we have to hscroll. */ |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7628 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
|
7629 if (FRAMEP (XCAR (tail))) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7630 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7631 f = XFRAME (XCAR (tail)); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7632 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7633 if ((FRAME_WINDOW_P (f) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7634 || f == sf) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7635 && FRAME_VISIBLE_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7636 && !FRAME_OBSCURED_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7637 && hscroll_windows (f->root_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7638 hscrolled_p = 1; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7639 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7640 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7641 if (hscrolled_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7642 goto retry; |
25012 | 7643 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7644 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
25012 | 7645 { |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7646 if (!FRAMEP (XCAR (tail))) |
25012 | 7647 continue; |
7648 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7649 f = XFRAME (XCAR (tail)); |
25012 | 7650 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7651 if ((FRAME_WINDOW_P (f) || f == sf) |
25012 | 7652 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
7653 { | |
7654 /* Mark all windows as to be updated. */ | |
7655 set_window_update_flags (XWINDOW (f->root_window), 1); | |
7656 pause |= update_frame (f, 0, 0); | |
7657 if (!pause) | |
7658 { | |
7659 mark_window_display_accurate (f->root_window, 1); | |
7660 if (frame_up_to_date_hook != 0) | |
7661 (*frame_up_to_date_hook) (f); | |
7662 } | |
7663 } | |
7664 } | |
7665 } | |
7666 else | |
7667 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7668 if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7669 && !FRAME_OBSCURED_P (sf)) |
25012 | 7670 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7671 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7672 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7673 |
25012 | 7674 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
|
7675 pause = update_frame (sf, 0, 0); |
25012 | 7676 } |
7677 else | |
7678 pause = 0; | |
7679 | |
7680 /* We may have called echo_area_display at the top of this | |
7681 function. If the echo area is on another frame, that may | |
7682 have put text on a frame other than the selected one, so the | |
7683 above call to update_frame would not have caught it. Catch | |
7684 it here. */ | |
7685 { | |
7686 Lisp_Object mini_window; | |
7687 struct frame *mini_frame; | |
7688 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7689 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25012 | 7690 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
7691 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7692 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame)) |
25012 | 7693 { |
7694 XWINDOW (mini_window)->must_be_updated_p = 1; | |
7695 pause |= update_frame (mini_frame, 0, 0); | |
7696 if (!pause && hscroll_windows (mini_window)) | |
7697 goto retry; | |
7698 } | |
7699 } | |
7700 } | |
7701 | |
7702 /* If display was paused because of pending input, make sure we do a | |
7703 thorough update the next time. */ | |
7704 if (pause) | |
7705 { | |
7706 /* Prevent the optimization at the beginning of | |
7707 redisplay_internal that tries a single-line update of the | |
7708 line containing the cursor in the selected window. */ | |
7709 CHARPOS (this_line_start_pos) = 0; | |
7710 | |
7711 /* Let the overlay arrow be updated the next time. */ | |
7712 if (!NILP (last_arrow_position)) | |
7713 { | |
7714 last_arrow_position = Qt; | |
7715 last_arrow_string = Qt; | |
7716 } | |
7717 | |
7718 /* If we pause after scrolling, some rows in the current | |
7719 matrices of some windows are not valid. */ | |
7720 if (!WINDOW_FULL_WIDTH_P (w) | |
7721 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
7722 update_mode_lines = 1; | |
7723 } | |
7724 | |
7725 /* Now text on frame agrees with windows, so put info into the | |
7726 windows for partial redisplay to follow. */ | |
7727 if (!pause) | |
7728 { | |
7729 register struct buffer *b = XBUFFER (w->buffer); | |
7730 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7731 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7732 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
|
7733 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
|
7734 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 7735 |
7736 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7737 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 7738 else |
7739 { | |
7740 XSETFASTINT (w->last_point, BUF_PT (b)); | |
7741 w->last_cursor = w->cursor; | |
7742 w->last_cursor_off_p = w->cursor_off_p; | |
7743 | |
7744 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7745 b->prevent_redisplay_optimizations_p = 0; |
25012 | 7746 w->update_mode_line = Qnil; |
7747 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
7748 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
7749 w->last_had_star | |
7750 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
7751 ? Qt : Qnil); | |
7752 | |
7753 /* Record if we are showing a region, so can make sure to | |
7754 update it fully at next redisplay. */ | |
7755 w->region_showing = (!NILP (Vtransient_mark_mode) | |
7756 && (w == XWINDOW (current_buffer->last_selected_window) | |
7757 || highlight_nonselected_windows) | |
7758 && !NILP (XBUFFER (w->buffer)->mark_active) | |
7759 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
7760 : Qnil); | |
7761 | |
7762 w->window_end_valid = w->buffer; | |
7763 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
7764 last_arrow_string = Voverlay_arrow_string; | |
7765 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7766 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7767 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7768 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7769 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7770 w->current_matrix->zv = BUF_ZV (b); |
25012 | 7771 } |
7772 | |
7773 update_mode_lines = 0; | |
7774 windows_or_buffers_changed = 0; | |
7775 } | |
7776 | |
7777 /* Start SIGIO interrupts coming again. Having them off during the | |
7778 code above makes it less likely one will discard output, but not | |
7779 impossible, since there might be stuff in the system buffer here. | |
7780 But it is much hairier to try to do anything about that. */ | |
7781 if (interrupt_input) | |
7782 request_sigio (); | |
7783 start_polling (); | |
7784 | |
7785 /* If a frame has become visible which was not before, redisplay | |
7786 again, so that we display it. Expose events for such a frame | |
7787 (which it gets when becoming visible) don't call the parts of | |
7788 redisplay constructing glyphs, so simply exposing a frame won't | |
7789 display anything in this case. So, we have to display these | |
7790 frames here explicitly. */ | |
7791 if (!pause) | |
7792 { | |
7793 Lisp_Object tail, frame; | |
7794 int new_count = 0; | |
7795 | |
7796 FOR_EACH_FRAME (tail, frame) | |
7797 { | |
7798 int this_is_visible = 0; | |
7799 | |
7800 if (XFRAME (frame)->visible) | |
7801 this_is_visible = 1; | |
7802 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
7803 if (XFRAME (frame)->visible) | |
7804 this_is_visible = 1; | |
7805 | |
7806 if (this_is_visible) | |
7807 new_count++; | |
7808 } | |
7809 | |
7810 if (new_count != number_of_visible_frames) | |
7811 windows_or_buffers_changed++; | |
7812 } | |
7813 | |
7814 /* 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
|
7815 do_pending_window_change (1); |
25012 | 7816 |
7817 /* If we just did a pending size change, or have additional | |
7818 visible frames, redisplay again. */ | |
7819 if (windows_or_buffers_changed && !pause) | |
7820 goto retry; | |
7821 | |
7822 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7823 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7824 unbind_to (count, Qnil); |
25012 | 7825 } |
7826 | |
7827 | |
7828 /* Redisplay, but leave alone any recent echo area message unless | |
7829 another message has been requested in its place. | |
7830 | |
7831 This is useful in situations where you need to redisplay but no | |
7832 user action has occurred, making it inappropriate for the message | |
7833 area to be cleared. See tracking_off and | |
7834 wait_reading_process_input for examples of these situations. */ | |
7835 | |
7836 void | |
7837 redisplay_preserve_echo_area () | |
7838 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7839 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
|
7840 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7841 /* 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
|
7842 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
|
7843 display_last_displayed_message_p = 1; |
25012 | 7844 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7845 display_last_displayed_message_p = 0; |
25012 | 7846 } |
7847 else | |
7848 redisplay_internal (1); | |
7849 } | |
7850 | |
7851 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7852 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7853 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
|
7854 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7855 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7856 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7857 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7858 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7859 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7860 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
|
7861 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7862 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7863 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7864 |
25012 | 7865 /* Mark the display of windows in the window tree rooted at WINDOW as |
7866 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
7867 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
7868 the next time redisplay_internal is called. */ | |
7869 | |
7870 void | |
7871 mark_window_display_accurate (window, accurate_p) | |
7872 Lisp_Object window; | |
7873 int accurate_p; | |
7874 { | |
7875 struct window *w; | |
7876 | |
7877 for (; !NILP (window); window = w->next) | |
7878 { | |
7879 w = XWINDOW (window); | |
7880 | |
7881 if (BUFFERP (w->buffer)) | |
7882 { | |
7883 struct buffer *b = XBUFFER (w->buffer); | |
7884 | |
7885 XSETFASTINT (w->last_modified, | |
7886 accurate_p ? BUF_MODIFF (b) : 0); | |
7887 XSETFASTINT (w->last_overlay_modified, | |
7888 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
7889 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
7890 ? Qt : Qnil); | |
7891 | |
7892 #if 0 /* I don't think this is necessary because display_line does it. | |
7893 Let's check it. */ | |
7894 /* Record if we are showing a region, so can make sure to | |
7895 update it fully at next redisplay. */ | |
7896 w->region_showing | |
7897 = (!NILP (Vtransient_mark_mode) | |
7898 && (w == XWINDOW (current_buffer->last_selected_window) | |
7899 || highlight_nonselected_windows) | |
7900 && (!NILP (b->mark_active) | |
7901 ? Fmarker_position (b->mark) | |
7902 : Qnil)); | |
7903 #endif | |
7904 | |
7905 if (accurate_p) | |
7906 { | |
7907 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7908 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7909 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7910 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7911 w->current_matrix->zv = BUF_ZV (b); |
25012 | 7912 w->last_cursor = w->cursor; |
7913 w->last_cursor_off_p = w->cursor_off_p; | |
7914 if (w == XWINDOW (selected_window)) | |
7915 w->last_point = BUF_PT (b); | |
7916 else | |
7917 w->last_point = XMARKER (w->pointm)->charpos; | |
7918 } | |
7919 } | |
7920 | |
7921 w->window_end_valid = w->buffer; | |
7922 w->update_mode_line = Qnil; | |
7923 | |
7924 if (!NILP (w->vchild)) | |
7925 mark_window_display_accurate (w->vchild, accurate_p); | |
7926 if (!NILP (w->hchild)) | |
7927 mark_window_display_accurate (w->hchild, accurate_p); | |
7928 } | |
7929 | |
7930 if (accurate_p) | |
7931 { | |
7932 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
7933 last_arrow_string = Voverlay_arrow_string; | |
7934 } | |
7935 else | |
7936 { | |
7937 /* Force a thorough redisplay the next time by setting | |
7938 last_arrow_position and last_arrow_string to t, which is | |
7939 unequal to any useful value of Voverlay_arrow_... */ | |
7940 last_arrow_position = Qt; | |
7941 last_arrow_string = Qt; | |
7942 } | |
7943 } | |
7944 | |
277 | 7945 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7946 /* 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
|
7947 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
|
7948 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
|
7949 macro DISP_CHAR_VECTOR. */ |
25012 | 7950 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7951 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7952 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
|
7953 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
|
7954 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7955 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7956 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7957 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7958 |
25012 | 7959 if (SINGLE_BYTE_CHAR_P (c)) |
7960 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
|
7961 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7962 SPLIT_NON_ASCII_CHAR (c, code[0], code[1], code[2]); |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7963 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7964 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7965 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7966 code[2] = -1; |
25012 | 7967 |
7968 /* Here, the possible range of code[0] (== charset ID) is | |
7969 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
|
7970 for multibyte characters after 256th element, we must increment |
25012 | 7971 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
|
7972 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7973 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7974 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7975 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
|
7976 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7977 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
|
7978 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
|
7979 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
|
7980 } |
25012 | 7981 |
7982 /* Here, val is a sub char table. We return the default value of | |
7983 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7984 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7985 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7986 |
25012 | 7987 |
7988 | |
7989 /*********************************************************************** | |
7990 Window Redisplay | |
7991 ***********************************************************************/ | |
7992 | |
7993 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
7994 | |
7995 static void | |
7996 redisplay_windows (window) | |
7997 Lisp_Object window; | |
7998 { | |
7999 while (!NILP (window)) | |
8000 { | |
8001 struct window *w = XWINDOW (window); | |
8002 | |
8003 if (!NILP (w->hchild)) | |
8004 redisplay_windows (w->hchild); | |
8005 else if (!NILP (w->vchild)) | |
8006 redisplay_windows (w->vchild); | |
8007 else | |
8008 redisplay_window (window, 0); | |
8009 | |
8010 window = w->next; | |
8011 } | |
8012 } | |
8013 | |
8014 | |
8015 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8016 DELTA is the number of bytes by which positions recorded in ROW | |
8017 differ from current buffer positions. */ | |
8018 | |
8019 void | |
8020 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8021 struct window *w; | |
8022 struct glyph_row *row; | |
8023 struct glyph_matrix *matrix; | |
8024 int delta, delta_bytes, dy, dvpos; | |
8025 { | |
8026 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8027 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8028 int x = row->x; | |
8029 int pt_old = PT - delta; | |
8030 | |
8031 /* Skip over glyphs not having an object at the start of the row. | |
8032 These are special glyphs like truncation marks on terminal | |
8033 frames. */ | |
8034 if (row->displays_text_p) | |
8035 while (glyph < end | |
8036 && !glyph->object | |
8037 && glyph->charpos < 0) | |
8038 { | |
8039 x += glyph->pixel_width; | |
8040 ++glyph; | |
8041 } | |
8042 | |
8043 while (glyph < end | |
8044 && glyph->object | |
8045 && (!BUFFERP (glyph->object) | |
8046 || glyph->charpos < pt_old)) | |
8047 { | |
8048 x += glyph->pixel_width; | |
8049 ++glyph; | |
8050 } | |
8051 | |
8052 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8053 w->cursor.x = x; | |
8054 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8055 w->cursor.y = row->y + dy; | |
8056 | |
8057 if (w == XWINDOW (selected_window)) | |
8058 { | |
8059 if (!row->continued_p | |
8060 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8061 && row->x == 0) | |
8062 { | |
8063 this_line_buffer = XBUFFER (w->buffer); | |
8064 | |
8065 CHARPOS (this_line_start_pos) | |
8066 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8067 BYTEPOS (this_line_start_pos) | |
8068 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8069 | |
8070 CHARPOS (this_line_end_pos) | |
8071 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8072 BYTEPOS (this_line_end_pos) | |
8073 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8074 | |
8075 this_line_y = w->cursor.y; | |
8076 this_line_pixel_height = row->height; | |
8077 this_line_vpos = w->cursor.vpos; | |
8078 this_line_start_x = row->x; | |
8079 } | |
8080 else | |
8081 CHARPOS (this_line_start_pos) = 0; | |
8082 } | |
8083 } | |
8084 | |
8085 | |
8086 /* 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
|
8087 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
|
8088 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8089 We assume that the window's buffer is really current. */ |
25012 | 8090 |
8091 static INLINE struct text_pos | |
8092 run_window_scroll_functions (window, startp) | |
8093 Lisp_Object window; | |
8094 struct text_pos startp; | |
8095 { | |
8096 struct window *w = XWINDOW (window); | |
8097 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
|
8098 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8099 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
|
8100 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8101 |
25012 | 8102 if (!NILP (Vwindow_scroll_functions)) |
8103 { | |
8104 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8105 make_number (CHARPOS (startp))); | |
8106 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
|
8107 /* 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
|
8108 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
|
8109 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8110 } |
8111 | |
8112 return startp; | |
8113 } | |
8114 | |
8115 | |
8116 /* Modify the desired matrix of window W and W->vscroll so that the | |
8117 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8118 |
277 | 8119 static void |
25012 | 8120 make_cursor_line_fully_visible (w) |
8121 struct window *w; | |
8122 { | |
8123 struct glyph_matrix *matrix; | |
8124 struct glyph_row *row; | |
25546 | 8125 int header_line_height; |
25012 | 8126 |
8127 /* It's not always possible to find the cursor, e.g, when a window | |
8128 is full of overlay strings. Don't do anything in that case. */ | |
8129 if (w->cursor.vpos < 0) | |
8130 return; | |
8131 | |
8132 matrix = w->desired_matrix; | |
8133 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8134 | |
8135 /* If row->y == top y of window display area, the window isn't tall | |
8136 enough to display a single line. There is nothing we can do | |
8137 about it. */ | |
25546 | 8138 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
8139 if (row->y == header_line_height) | |
25012 | 8140 return; |
8141 | |
8142 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) | |
8143 { | |
8144 int dy = row->height - row->visible_height; | |
8145 w->vscroll = 0; | |
8146 w->cursor.y += dy; | |
8147 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8148 } | |
8149 else if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) | |
8150 { | |
8151 int dy = - (row->height - row->visible_height); | |
8152 w->vscroll = dy; | |
8153 w->cursor.y += dy; | |
8154 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8155 } | |
8156 | |
8157 /* When we change the cursor y-position of the selected window, | |
8158 change this_line_y as well so that the display optimization for | |
8159 the cursor line of the selected window in redisplay_internal uses | |
8160 the correct y-position. */ | |
8161 if (w == XWINDOW (selected_window)) | |
8162 this_line_y = w->cursor.y; | |
8163 } | |
8164 | |
8165 | |
8166 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8167 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8168 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8169 in redisplay_window to bring a partially visible line into view in | |
8170 the case that only the cursor has moved. | |
8171 | |
8172 Value is | |
8173 | |
8174 1 if scrolling succeeded | |
8175 | |
8176 0 if scrolling didn't find point. | |
8177 | |
8178 -1 if new fonts have been loaded so that we must interrupt | |
8179 redisplay, adjust glyph matrices, and try again. */ | |
8180 | |
8181 static int | |
8182 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8183 scroll_step, temp_scroll_step) | |
277 | 8184 Lisp_Object window; |
25012 | 8185 int just_this_one_p; |
8186 int scroll_conservatively, scroll_step; | |
8187 int temp_scroll_step; | |
8188 { | |
8189 struct window *w = XWINDOW (window); | |
8190 struct frame *f = XFRAME (w->frame); | |
8191 struct text_pos scroll_margin_pos; | |
8192 struct text_pos pos; | |
8193 struct text_pos startp; | |
8194 struct it it; | |
8195 Lisp_Object window_end; | |
8196 int this_scroll_margin; | |
8197 int dy = 0; | |
8198 int scroll_max; | |
8199 int line_height, rc; | |
8200 int amount_to_scroll = 0; | |
8201 Lisp_Object aggressive; | |
277 | 8202 int height; |
25012 | 8203 |
8204 #if GLYPH_DEBUG | |
8205 debug_method_add (w, "try_scrolling"); | |
8206 #endif | |
8207 | |
8208 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8209 | |
8210 /* Compute scroll margin height in pixels. We scroll when point is | |
8211 within this distance from the top or bottom of the window. */ | |
8212 if (scroll_margin > 0) | |
8213 { | |
8214 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8215 this_scroll_margin *= CANON_Y_UNIT (f); | |
8216 } | |
8217 else | |
8218 this_scroll_margin = 0; | |
8219 | |
8220 /* Compute how much we should try to scroll maximally to bring point | |
8221 into view. */ | |
8222 if (scroll_step) | |
8223 scroll_max = scroll_step; | |
8224 else if (scroll_conservatively) | |
8225 scroll_max = scroll_conservatively; | |
8226 else if (temp_scroll_step) | |
8227 scroll_max = temp_scroll_step; | |
8228 else if (NUMBERP (current_buffer->scroll_down_aggressively) | |
8229 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8230 /* We're trying to scroll because of aggressive scrolling | |
8231 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8232 there should be a variable for this. */ | |
8233 scroll_max = 10; | |
8234 else | |
8235 scroll_max = 0; | |
8236 scroll_max *= CANON_Y_UNIT (f); | |
8237 | |
8238 /* Decide whether we have to scroll down. Start at the window end | |
8239 and move this_scroll_margin up to find the position of the scroll | |
8240 margin. */ | |
8241 window_end = Fwindow_end (window, Qt); | |
8242 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8243 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8244 if (this_scroll_margin) | |
8245 { | |
8246 start_display (&it, w, scroll_margin_pos); | |
8247 move_it_vertically (&it, - this_scroll_margin); | |
8248 scroll_margin_pos = it.current.pos; | |
8249 } | |
8250 | |
8251 if (PT >= CHARPOS (scroll_margin_pos)) | |
8252 { | |
8253 int y0; | |
8254 | |
8255 /* Point is in the scroll margin at the bottom of the window, or | |
8256 below. Compute a new window start that makes point visible. */ | |
8257 | |
8258 /* Compute the distance from the scroll margin to PT. | |
8259 Give up if the distance is greater than scroll_max. */ | |
8260 start_display (&it, w, scroll_margin_pos); | |
8261 y0 = it.current_y; | |
8262 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8263 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8264 line_height = (it.max_ascent + it.max_descent | |
8265 ? it.max_ascent + it.max_descent | |
8266 : last_height); | |
8267 dy = it.current_y + line_height - y0; | |
8268 if (dy > scroll_max) | |
8269 return 0; | |
8270 | |
8271 /* Move the window start down. If scrolling conservatively, | |
8272 move it just enough down to make point visible. If | |
8273 scroll_step is set, move it down by scroll_step. */ | |
8274 start_display (&it, w, startp); | |
8275 | |
8276 if (scroll_conservatively) | |
8277 amount_to_scroll = dy; | |
8278 else if (scroll_step || temp_scroll_step) | |
8279 amount_to_scroll = scroll_max; | |
8280 else | |
8281 { | |
8282 aggressive = current_buffer->scroll_down_aggressively; | |
8283 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8284 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8285 if (NUMBERP (aggressive)) |
8286 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8287 } | |
8288 | |
8289 if (amount_to_scroll <= 0) | |
8290 return 0; | |
8291 | |
8292 move_it_vertically (&it, amount_to_scroll); | |
8293 startp = it.current.pos; | |
8294 } | |
8295 else | |
8296 { | |
8297 /* See if point is inside the scroll margin at the top of the | |
8298 window. */ | |
8299 scroll_margin_pos = startp; | |
8300 if (this_scroll_margin) | |
8301 { | |
8302 start_display (&it, w, startp); | |
8303 move_it_vertically (&it, this_scroll_margin); | |
8304 scroll_margin_pos = it.current.pos; | |
8305 } | |
8306 | |
8307 if (PT < CHARPOS (scroll_margin_pos)) | |
8308 { | |
8309 /* Point is in the scroll margin at the top of the window or | |
8310 above what is displayed in the window. */ | |
8311 int y0; | |
8312 | |
8313 /* Compute the vertical distance from PT to the scroll | |
8314 margin position. Give up if distance is greater than | |
8315 scroll_max. */ | |
8316 SET_TEXT_POS (pos, PT, PT_BYTE); | |
8317 start_display (&it, w, pos); | |
8318 y0 = it.current_y; | |
8319 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
8320 it.last_visible_y, -1, | |
8321 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8322 dy = it.current_y - y0; | |
8323 if (dy > scroll_max) | |
8324 return 0; | |
8325 | |
8326 /* Compute new window start. */ | |
8327 start_display (&it, w, startp); | |
8328 | |
8329 if (scroll_conservatively) | |
8330 amount_to_scroll = dy; | |
8331 else if (scroll_step || temp_scroll_step) | |
8332 amount_to_scroll = scroll_max; | |
8333 else | |
8334 { | |
8335 aggressive = current_buffer->scroll_up_aggressively; | |
8336 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8337 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8338 if (NUMBERP (aggressive)) |
8339 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8340 } | |
8341 | |
8342 if (amount_to_scroll <= 0) | |
8343 return 0; | |
8344 | |
8345 move_it_vertically (&it, - amount_to_scroll); | |
8346 startp = it.current.pos; | |
8347 } | |
8348 } | |
8349 | |
8350 /* Run window scroll functions. */ | |
8351 startp = run_window_scroll_functions (window, startp); | |
8352 | |
8353 /* Display the window. Give up if new fonts are loaded, or if point | |
8354 doesn't appear. */ | |
8355 if (!try_window (window, startp)) | |
8356 rc = -1; | |
8357 else if (w->cursor.vpos < 0) | |
8358 { | |
8359 clear_glyph_matrix (w->desired_matrix); | |
8360 rc = 0; | |
8361 } | |
8362 else | |
8363 { | |
8364 /* Maybe forget recorded base line for line number display. */ | |
8365 if (!just_this_one_p | |
8366 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8367 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 8368 w->base_line_number = Qnil; |
8369 | |
8370 /* If cursor ends up on a partially visible line, shift display | |
8371 lines up or down. */ | |
8372 make_cursor_line_fully_visible (w); | |
8373 rc = 1; | |
8374 } | |
8375 | |
8376 return rc; | |
8377 } | |
8378 | |
8379 | |
8380 /* Compute a suitable window start for window W if display of W starts | |
8381 on a continuation line. Value is non-zero if a new window start | |
8382 was computed. | |
8383 | |
8384 The new window start will be computed, based on W's width, starting | |
8385 from the start of the continued line. It is the start of the | |
8386 screen line with the minimum distance from the old start W->start. */ | |
8387 | |
8388 static int | |
8389 compute_window_start_on_continuation_line (w) | |
8390 struct window *w; | |
8391 { | |
8392 struct text_pos pos, start_pos; | |
8393 int window_start_changed_p = 0; | |
8394 | |
8395 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
8396 | |
8397 /* If window start is on a continuation line... Window start may be | |
8398 < BEGV in case there's invisible text at the start of the | |
8399 buffer (M-x rmail, for example). */ | |
8400 if (CHARPOS (start_pos) > BEGV | |
8401 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
8402 { | |
8403 struct it it; | |
8404 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8405 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8406 /* 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
|
8407 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8408 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
|
8409 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8410 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 8411 |
8412 /* Find the start of the continued line. This should be fast | |
8413 because scan_buffer is fast (newline cache). */ | |
25546 | 8414 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 8415 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
8416 row, DEFAULT_FACE_ID); | |
8417 reseat_at_previous_visible_line_start (&it); | |
8418 | |
8419 /* If the line start is "too far" away from the window start, | |
8420 say it takes too much time to compute a new window start. */ | |
8421 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
8422 < XFASTINT (w->height) * XFASTINT (w->width)) | |
8423 { | |
8424 int min_distance, distance; | |
8425 | |
8426 /* Move forward by display lines to find the new window | |
8427 start. If window width was enlarged, the new start can | |
8428 be expected to be > the old start. If window width was | |
8429 decreased, the new window start will be < the old start. | |
8430 So, we're looking for the display line start with the | |
8431 minimum distance from the old window start. */ | |
8432 pos = it.current.pos; | |
8433 min_distance = INFINITY; | |
8434 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
8435 distance < min_distance) | |
8436 { | |
8437 min_distance = distance; | |
8438 pos = it.current.pos; | |
8439 move_it_by_lines (&it, 1, 0); | |
8440 } | |
8441 | |
8442 /* Set the window start there. */ | |
8443 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
8444 window_start_changed_p = 1; | |
8445 } | |
8446 } | |
8447 | |
8448 return window_start_changed_p; | |
8449 } | |
8450 | |
8451 | |
8452 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only | |
8453 selected_window is redisplayed. */ | |
8454 | |
8455 static void | |
8456 redisplay_window (window, just_this_one_p) | |
8457 Lisp_Object window; | |
8458 int just_this_one_p; | |
8459 { | |
8460 struct window *w = XWINDOW (window); | |
8461 struct frame *f = XFRAME (w->frame); | |
8462 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 8463 struct buffer *old = current_buffer; |
25012 | 8464 struct text_pos lpoint, opoint, startp; |
8465 int update_mode_line; | |
277 | 8466 int tem; |
25012 | 8467 struct it it; |
8468 /* Record it now because it's overwritten. */ | |
8469 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
|
8470 int really_switched_buffer = 0; |
25012 | 8471 int temp_scroll_step = 0; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8472 int count = specpdl_ptr - specpdl; |
277 | 8473 |
25012 | 8474 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
8475 opoint = lpoint; | |
8476 | |
8477 /* W must be a leaf window here. */ | |
8478 xassert (!NILP (w->buffer)); | |
8479 #if GLYPH_DEBUG | |
8480 *w->desired_matrix->method = 0; | |
8481 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8482 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8483 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8484 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8485 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8486 |
25012 | 8487 /* Has the mode line to be updated? */ |
8488 update_mode_line = (!NILP (w->update_mode_line) | |
8489 || update_mode_lines | |
8490 || buffer->clip_changed); | |
433 | 8491 |
8492 if (MINI_WINDOW_P (w)) | |
8493 { | |
25012 | 8494 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
|
8495 && !NILP (echo_area_buffer[0])) |
25012 | 8496 { |
8497 if (update_mode_line) | |
8498 /* We may have to update a tty frame's menu bar or a | |
25543 | 8499 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 8500 goto finish_menu_bars; |
8501 else | |
8502 /* We've already displayed the echo area glyphs in this window. */ | |
8503 goto finish_scroll_bars; | |
8504 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
8505 else if (w != XWINDOW (minibuf_window)) |
433 | 8506 { |
25012 | 8507 /* W is a mini-buffer window, but it's not the currently |
8508 active one, so clear it. */ | |
8509 int yb = window_text_bottom_y (w); | |
8510 struct glyph_row *row; | |
8511 int y; | |
8512 | |
8513 for (y = 0, row = w->desired_matrix->rows; | |
8514 y < yb; | |
8515 y += row->height, ++row) | |
8516 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
|
8517 goto finish_scroll_bars; |
433 | 8518 } |
8519 } | |
277 | 8520 |
25012 | 8521 /* Otherwise set up data on this window; select its buffer and point |
8522 value. */ | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8523 if (update_mode_line) |
25012 | 8524 { |
8525 /* Really select the buffer, for the sake of buffer-local | |
8526 variables. */ | |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8527 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8528 really_switched_buffer = 1; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8529 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8530 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8531 set_buffer_temp (XBUFFER (w->buffer)); |
25012 | 8532 SET_TEXT_POS (opoint, PT, PT_BYTE); |
8533 | |
8534 current_matrix_up_to_date_p | |
8535 = (!NILP (w->window_end_valid) | |
8536 && !current_buffer->clip_changed | |
8537 && XFASTINT (w->last_modified) >= MODIFF | |
8538 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
8539 | |
8540 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
8541 the window end being valid, so set it to nil there. */ | |
8542 if (windows_or_buffers_changed) | |
8543 { | |
8544 /* If window starts on a continuation line, maybe adjust the | |
8545 window start in case the window's width changed. */ | |
8546 if (XMARKER (w->start)->buffer == current_buffer) | |
8547 compute_window_start_on_continuation_line (w); | |
8548 | |
8549 w->window_end_valid = Qnil; | |
8550 } | |
8551 | |
8552 /* Some sanity checks. */ | |
8553 CHECK_WINDOW_END (w); | |
8554 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
|
8555 abort (); |
25012 | 8556 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8557 abort (); |
277 | 8558 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8559 /* 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
|
8560 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8561 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8562 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8563 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8564 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8565 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8566 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8567 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8568 |
25012 | 8569 /* Count number of windows showing the selected buffer. An indirect |
8570 buffer counts as its base buffer. */ | |
8571 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8572 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8573 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8574 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8575 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
|
8576 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8577 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8578 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8579 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8580 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8581 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8582 } |
277 | 8583 |
25012 | 8584 /* Point refers normally to the selected window. For any other |
8585 window, set up appropriate value. */ | |
277 | 8586 if (!EQ (window, selected_window)) |
8587 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8588 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8589 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
|
8590 if (new_pt < BEGV) |
277 | 8591 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8592 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8593 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8594 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 8595 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8596 else if (new_pt > (ZV - 1)) |
277 | 8597 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8598 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8599 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8600 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 8601 } |
25012 | 8602 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8603 /* 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
|
8604 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 8605 } |
8606 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8607 /* If any of the character widths specified in the display table |
25012 | 8608 have changed, invalidate the width run cache. It's true that |
8609 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
|
8610 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
|
8611 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
|
8612 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
|
8613 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
8614 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
|
8615 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8616 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
|
8617 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
|
8618 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8619 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
|
8620 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
|
8621 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8622 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
|
8623 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8624 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8625 |
277 | 8626 /* If window-start is screwed up, choose a new one. */ |
8627 if (XMARKER (w->start)->buffer != current_buffer) | |
8628 goto recenter; | |
8629 | |
25012 | 8630 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 8631 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8632 /* 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
|
8633 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
8634 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
8635 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
8636 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8637 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8638 w->optional_new_start = Qnil; |
25012 | 8639 /* This takes a mini-buffer prompt into account. */ |
8640 start_display (&it, w, startp); | |
8641 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8642 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8643 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8644 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8645 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8646 |
433 | 8647 /* 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
|
8648 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
|
8649 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
8650 || w->frozen_window_start_p) |
277 | 8651 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8652 w->force_start = Qnil; |
25012 | 8653 w->vscroll = 0; |
8654 w->window_end_valid = Qnil; | |
8655 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8656 /* Forget any recorded base line for line number display. */ |
25012 | 8657 if (!current_matrix_up_to_date_p |
8658 || current_buffer->clip_changed) | |
8659 w->base_line_number = Qnil; | |
8660 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8661 /* 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
|
8662 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
|
8663 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8664 /* 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
|
8665 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
|
8666 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
|
8667 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
|
8668 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8669 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8670 { |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8671 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8672 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8673 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8674 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8675 really_switched_buffer = 1; |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8676 } |
25012 | 8677 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8678 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8679 w->update_mode_line = Qt; |
25012 | 8680 startp = run_window_scroll_functions (window, startp); |
8681 } | |
8682 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
8683 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8684 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 8685 if (CHARPOS (startp) < BEGV) |
8686 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
8687 else if (CHARPOS (startp) > ZV) | |
8688 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
8689 | |
8690 /* Redisplay, then check if cursor has been set during the | |
8691 redisplay. Give up if new fonts were loaded. */ | |
8692 if (!try_window (window, startp)) | |
8693 { | |
8694 w->force_start = Qt; | |
8695 clear_glyph_matrix (w->desired_matrix); | |
8696 goto restore_buffers; | |
8697 } | |
8698 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
8699 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 8700 { |
8701 /* If point does not appear, or on a line that is not fully | |
8702 visible, move point so it does appear. The desired | |
8703 matrix has been built above, so we can use it. */ | |
8704 int height = window_box_height (w) / 2; | |
8705 struct glyph_row *row = MATRIX_ROW (w->desired_matrix, 0); | |
8706 | |
8707 while (row->y < height) | |
8708 ++row; | |
8709 | |
8710 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
8711 MATRIX_ROW_START_BYTEPOS (row)); | |
8712 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8713 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8714 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 8715 else if (current_buffer == old) |
8716 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
8717 | |
8718 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
8719 | |
8720 /* If we are highlighting the region, then we just changed | |
8721 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
|
8722 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
|
8723 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
8724 { |
25012 | 8725 clear_glyph_matrix (w->desired_matrix); |
8726 if (!try_window (window, startp)) | |
8727 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
8728 } |
277 | 8729 } |
25012 | 8730 |
8731 make_cursor_line_fully_visible (w); | |
8732 #if GLYPH_DEBUG | |
8733 debug_method_add (w, "forced window start"); | |
8734 #endif | |
277 | 8735 goto done; |
8736 } | |
8737 | |
25012 | 8738 /* Handle case where text has not changed, only point, and it has |
8739 not moved off the frame. */ | |
8740 if (current_matrix_up_to_date_p | |
8741 /* Point may be in this window. */ | |
8742 && PT >= CHARPOS (startp) | |
8743 /* If we don't check this, we are called to move the cursor in a | |
8744 horizontally split window with a current matrix that doesn't | |
8745 fit the display. */ | |
8746 && !windows_or_buffers_changed | |
8747 /* Selective display hasn't changed. */ | |
8748 && !current_buffer->clip_changed | |
11085
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
8749 /* 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
|
8750 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
|
8751 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
|
8752 && NILP (w->update_mode_line) |
25012 | 8753 /* Can't use this case if highlighting a region. When a |
8754 region exists, cursor movement has to do more than just | |
8755 set the cursor. */ | |
8756 && !(!NILP (Vtransient_mark_mode) | |
8757 && !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
|
8758 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8759 && NILP (Vshow_trailing_whitespace) |
25012 | 8760 /* Right after splitting windows, last_point may be nil. */ |
8761 && INTEGERP (w->last_point) | |
8762 /* This code is not used for mini-buffer for the sake of the case | |
8763 of redisplaying to replace an echo area message; since in | |
8764 that case the mini-buffer contents per se are usually | |
8765 unchanged. This code is of no real use in the mini-buffer | |
8766 since the handling of this_line_start_pos, etc., in redisplay | |
8767 handles the same cases. */ | |
8768 && !EQ (window, minibuf_window) | |
8769 /* When splitting windows or for new windows, it happens that | |
8770 redisplay is called with a nil window_end_vpos or one being | |
8771 larger than the window. This should really be fixed in | |
8772 window.c. I don't have this on my list, now, so we do | |
8773 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
|
8774 && INTEGERP (w->window_end_vpos) |
25012 | 8775 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows |
8776 && (FRAME_WINDOW_P (f) | |
8777 || !MARKERP (Voverlay_arrow_position) | |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
8778 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
277 | 8779 { |
25012 | 8780 int this_scroll_margin; |
8781 struct glyph_row *row; | |
8782 int scroll_p; | |
8783 | |
8784 #if GLYPH_DEBUG | |
8785 debug_method_add (w, "cursor movement"); | |
8786 #endif | |
8787 | |
8788 /* Scroll if point within this distance from the top or bottom | |
8789 of the window. This is a pixel value. */ | |
8790 this_scroll_margin = max (0, scroll_margin); | |
8791 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4); | |
8792 this_scroll_margin *= CANON_Y_UNIT (f); | |
8793 | |
8794 /* Start with the row the cursor was displayed during the last | |
8795 not paused redisplay. Give up if that row is not valid. */ | |
8796 if (w->last_cursor.vpos >= w->current_matrix->nrows) | |
8797 goto try_to_scroll; | |
8798 row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos); | |
8799 if (row->mode_line_p) | |
8800 ++row; | |
8801 if (!row->enabled_p) | |
8802 goto try_to_scroll; | |
8803 | |
8804 scroll_p = 0; | |
8805 if (PT > XFASTINT (w->last_point)) | |
8806 { | |
8807 /* Point has moved forward. */ | |
8808 int last_y = window_text_bottom_y (w) - this_scroll_margin; | |
8809 | |
8810 while ((MATRIX_ROW_END_CHARPOS (row) < PT | |
8811 /* The end position of a row equals the start | |
8812 position of the next row. If PT is there, we | |
8813 would rather display it in the next line, except | |
8814 when this line ends in ZV. */ | |
8815 || (MATRIX_ROW_END_CHARPOS (row) == PT | |
8816 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
8817 || !row->ends_at_zv_p))) | |
8818 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
277 | 8819 { |
25012 | 8820 xassert (row->enabled_p); |
8821 ++row; | |
8822 } | |
8823 | |
8824 /* If within the scroll margin, scroll. Note that | |
8825 MATRIX_ROW_BOTTOM_Y gives the pixel position at which the | |
8826 next line would be drawn, and that this_scroll_margin can | |
8827 be zero. */ | |
8828 if (MATRIX_ROW_BOTTOM_Y (row) > last_y | |
8829 || PT > MATRIX_ROW_END_CHARPOS (row) | |
8830 /* Line is completely visible last line in window and PT | |
8831 is to be set in the next line. */ | |
8832 || (MATRIX_ROW_BOTTOM_Y (row) == last_y | |
8833 && PT == MATRIX_ROW_END_CHARPOS (row) | |
8834 && !row->ends_at_zv_p | |
8835 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))) | |
8836 scroll_p = 1; | |
8837 } | |
8838 else if (PT < XFASTINT (w->last_point)) | |
8839 { | |
8840 /* Cursor has to be moved backward. Note that PT >= | |
8841 CHARPOS (startp) because of the outer if-statement. */ | |
8842 while (!row->mode_line_p | |
8843 && (MATRIX_ROW_START_CHARPOS (row) > PT | |
8844 || (MATRIX_ROW_START_CHARPOS (row) == PT | |
8845 && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row))) | |
8846 && (row->y > this_scroll_margin | |
8847 || CHARPOS (startp) == BEGV)) | |
8848 { | |
8849 xassert (row->enabled_p); | |
8850 --row; | |
277 | 8851 } |
25012 | 8852 |
8853 /* Consider the following case: Window starts at BEGV, there | |
8854 is invisible, intangible text at BEGV, so that display | |
8855 starts at some point START > BEGV. It can happen that | |
8856 we are called with PT somewhere between BEGV and START. | |
8857 Try to handle that case. */ | |
8858 if (row < w->current_matrix->rows | |
8859 || row->mode_line_p) | |
8860 { | |
8861 row = w->current_matrix->rows; | |
8862 if (row->mode_line_p) | |
8863 ++row; | |
8864 } | |
8865 | |
8866 /* Due to newlines in overlay strings, we may have to skip | |
8867 forward over overlay strings. */ | |
8868 while (MATRIX_ROW_END_CHARPOS (row) == PT | |
8869 && MATRIX_ROW_ENDS_IN_OVERLAY_STRING_P (row) | |
8870 && !row->ends_at_zv_p) | |
8871 ++row; | |
8872 | |
8873 /* If within the scroll margin, scroll. */ | |
8874 if (row->y < this_scroll_margin | |
8875 && CHARPOS (startp) != BEGV) | |
8876 scroll_p = 1; | |
8877 } | |
8878 | |
8879 /* if PT is not in the glyph row, give up. */ | |
8880 if (PT < MATRIX_ROW_START_CHARPOS (row) | |
8881 || PT > MATRIX_ROW_END_CHARPOS (row)) | |
8882 goto try_to_scroll; | |
8883 | |
8884 /* If we end up in a partially visible line, let's make it fully | |
8885 visible. This can be done most easily by using the existing | |
8886 scrolling code. */ | |
8887 if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) | |
8888 { | |
8889 temp_scroll_step = 1; | |
8890 goto try_to_scroll; | |
8891 } | |
8892 else if (scroll_p) | |
8893 goto try_to_scroll; | |
8894 | |
8895 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8896 goto done; | |
8897 } | |
8898 | |
277 | 8899 /* If current starting point was originally the beginning of a line |
8900 but no longer is, find a new starting point. */ | |
485 | 8901 else if (!NILP (w->start_at_line_beg) |
25012 | 8902 && !(CHARPOS (startp) <= BEGV |
8903 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
8904 { | |
8905 #if GLYPH_DEBUG | |
8906 debug_method_add (w, "recenter 1"); | |
8907 #endif | |
277 | 8908 goto recenter; |
8909 } | |
25012 | 8910 |
8911 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8912 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8913 !windows_or_buffers_changed |
25012 | 8914 /* Window must be either use window-based redisplay or |
8915 be full width. */ | |
8916 && (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
|
8917 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 8918 && !MINI_WINDOW_P (w) |
8919 /* Point is not known NOT to appear in window. */ | |
8920 && PT >= CHARPOS (startp) | |
277 | 8921 && XFASTINT (w->last_modified) |
25012 | 8922 /* Window is not hscrolled. */ |
8923 && XFASTINT (w->hscroll) == 0 | |
8924 /* Selective display has not changed. */ | |
8925 && !current_buffer->clip_changed | |
8926 /* Current matrix is up to date. */ | |
8927 && !NILP (w->window_end_valid) | |
8928 /* Can't use this case if highlighting a region because | |
8929 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
|
8930 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8931 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8932 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8933 && NILP (Vshow_trailing_whitespace) |
25012 | 8934 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
8935 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 8936 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 8937 /* Value is > 0 if update has been done, it is -1 if we |
8938 know that the same window start will not work. It is 0 | |
8939 if unsuccessful for some other reason. */ | |
8940 && (tem = try_window_id (w)) != 0) | |
8941 { | |
8942 #if GLYPH_DEBUG | |
8943 debug_method_add (w, "try_window_id"); | |
8944 #endif | |
8945 | |
8946 if (fonts_changed_p) | |
8947 goto restore_buffers; | |
277 | 8948 if (tem > 0) |
8949 goto done; | |
25012 | 8950 /* Otherwise try_window_id has returned -1 which means that we |
8951 don't want the alternative below this comment to execute. */ | |
8952 } | |
8953 else if (CHARPOS (startp) >= BEGV | |
8954 && CHARPOS (startp) <= ZV | |
8955 && PT >= CHARPOS (startp) | |
8956 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
8957 /* Avoid starting at end of buffer. */ |
25012 | 8958 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8959 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8960 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 8961 { |
25012 | 8962 #if GLYPH_DEBUG |
8963 debug_method_add (w, "same window start"); | |
8964 #endif | |
8965 | |
8966 /* Try to redisplay starting at same place as before. | |
8967 If point has not moved off frame, accept the results. */ | |
8968 if (!current_matrix_up_to_date_p | |
8969 /* Don't use try_window_reusing_current_matrix in this case | |
8970 because it can have changed the buffer. */ | |
8971 || !NILP (Vwindow_scroll_functions) | |
8972 || MINI_WINDOW_P (w) | |
8973 || !try_window_reusing_current_matrix (w)) | |
8974 { | |
8975 IF_DEBUG (debug_method_add (w, "1")); | |
8976 try_window (window, startp); | |
8977 } | |
8978 | |
8979 if (fonts_changed_p) | |
8980 goto restore_buffers; | |
8981 | |
8982 if (w->cursor.vpos >= 0) | |
8983 { | |
8984 if (!just_this_one_p | |
8985 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8986 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8987 /* 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
|
8988 w->base_line_number = Qnil; |
25012 | 8989 |
8990 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8991 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8992 } |
277 | 8993 else |
25012 | 8994 clear_glyph_matrix (w->desired_matrix); |
8995 } | |
8996 | |
8997 try_to_scroll: | |
277 | 8998 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
8999 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9000 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9001 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9002 /* 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
|
9003 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9004 { |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9005 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9006 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9007 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9008 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9009 really_switched_buffer = 1; |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9010 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9011 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9012 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9013 } |
277 | 9014 |
25012 | 9015 /* Try to scroll by specified few lines. */ |
9016 if ((scroll_conservatively | |
9017 || scroll_step | |
9018 || temp_scroll_step | |
9019 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9020 || 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
|
9021 && !current_buffer->clip_changed |
25012 | 9022 && CHARPOS (startp) >= BEGV |
9023 && CHARPOS (startp) <= ZV) | |
9024 { | |
9025 /* The function returns -1 if new fonts were loaded, 1 if | |
9026 successful, 0 if not successful. */ | |
9027 int rc = try_scrolling (window, just_this_one_p, | |
9028 scroll_conservatively, | |
9029 scroll_step, | |
9030 temp_scroll_step); | |
9031 if (rc > 0) | |
9032 goto done; | |
9033 else if (rc < 0) | |
9034 goto restore_buffers; | |
9035 } | |
9036 | |
9037 /* Finally, just choose place to start which centers point */ | |
9038 | |
9039 recenter: | |
9040 | |
9041 #if GLYPH_DEBUG | |
9042 debug_method_add (w, "recenter"); | |
9043 #endif | |
9044 | |
9045 /* w->vscroll = 0; */ | |
9046 | |
9047 /* Forget any previously recorded base line for line number display. */ | |
9048 if (!current_matrix_up_to_date_p | |
9049 || current_buffer->clip_changed) | |
9050 w->base_line_number = Qnil; | |
9051 | |
9052 /* Move backward half the height of the window. */ | |
9053 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9054 it.current_y = it.last_visible_y; | |
9055 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9056 xassert (IT_CHARPOS (it) >= BEGV); | |
9057 | |
9058 /* The function move_it_vertically_backward may move over more | |
9059 than the specified y-distance. If it->w is small, e.g. a | |
9060 mini-buffer window, we may end up in front of the window's | |
9061 display area. Start displaying at the start of the line | |
9062 containing PT in this case. */ | |
9063 if (it.current_y <= 0) | |
9064 { | |
9065 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9066 move_it_vertically (&it, 0); | |
9067 xassert (IT_CHARPOS (it) <= PT); | |
9068 it.current_y = 0; | |
9069 } | |
9070 | |
9071 it.current_x = it.hpos = 0; | |
9072 | |
9073 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9074 in case the window-scroll-functions functions get errors. */ | |
9075 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9076 | |
9077 /* Run scroll hooks. */ | |
9078 startp = run_window_scroll_functions (window, it.current.pos); | |
9079 | |
9080 /* Redisplay the window. */ | |
9081 if (!current_matrix_up_to_date_p | |
9082 || windows_or_buffers_changed | |
9083 /* Don't use try_window_reusing_current_matrix in this case | |
9084 because it can have changed the buffer. */ | |
9085 || !NILP (Vwindow_scroll_functions) | |
9086 || !just_this_one_p | |
9087 || MINI_WINDOW_P (w) | |
9088 || !try_window_reusing_current_matrix (w)) | |
9089 try_window (window, startp); | |
9090 | |
9091 /* If new fonts have been loaded (due to fontsets), give up. We | |
9092 have to start a new redisplay since we need to re-adjust glyph | |
9093 matrices. */ | |
9094 if (fonts_changed_p) | |
9095 goto restore_buffers; | |
9096 | |
9097 /* If cursor did not appear assume that the middle of the window is | |
9098 in the first line of the window. Do it again with the next line. | |
9099 (Imagine a window of height 100, displaying two lines of height | |
9100 60. Moving back 50 from it->last_visible_y will end in the first | |
9101 line.) */ | |
9102 if (w->cursor.vpos < 0) | |
9103 { | |
9104 if (!NILP (w->window_end_valid) | |
9105 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9106 { | |
9107 clear_glyph_matrix (w->desired_matrix); | |
9108 move_it_by_lines (&it, 1, 0); | |
9109 try_window (window, it.current.pos); | |
9110 } | |
9111 else if (PT < IT_CHARPOS (it)) | |
9112 { | |
9113 clear_glyph_matrix (w->desired_matrix); | |
9114 move_it_by_lines (&it, -1, 0); | |
9115 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
|
9116 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9117 else |
25012 | 9118 { |
9119 /* Not much we can do about it. */ | |
9120 } | |
9121 } | |
9122 | |
9123 /* Consider the following case: Window starts at BEGV, there is | |
9124 invisible, intangible text at BEGV, so that display starts at | |
9125 some point START > BEGV. It can happen that we are called with | |
9126 PT somewhere between BEGV and START. Try to handle that case. */ | |
9127 if (w->cursor.vpos < 0) | |
9128 { | |
9129 struct glyph_row *row = w->current_matrix->rows; | |
9130 if (row->mode_line_p) | |
9131 ++row; | |
9132 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
9133 } | |
9134 | |
9135 make_cursor_line_fully_visible (w); | |
9136 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9137 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9138 |
25012 | 9139 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
9140 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
9141 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
9142 ? Qt : Qnil); | |
9143 | |
9144 /* 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
|
9145 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9146 /* If window not full width, must redo its mode line |
25012 | 9147 if (a) the window to its side is being redone and |
9148 (b) we do a frame-based redisplay. This is a consequence | |
9149 of how inverted lines are drawn in frame-based redisplay. */ | |
9150 || (!just_this_one_p | |
9151 && !FRAME_WINDOW_P (f) | |
9152 && !WINDOW_FULL_WIDTH_P (w)) | |
9153 /* 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
|
9154 || INTEGERP (w->base_line_pos) |
25012 | 9155 /* 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
|
9156 || (!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
|
9157 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 9158 /* This means that the window has a mode line. */ |
9159 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 9160 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 9161 { |
9162 display_mode_lines (w); | |
9163 | |
9164 /* If mode line height has changed, arrange for a thorough | |
9165 immediate redisplay using the correct mode line height. */ | |
9166 if (WINDOW_WANTS_MODELINE_P (w) | |
9167 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
9168 { | |
9169 fonts_changed_p = 1; | |
9170 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
9171 = DESIRED_MODE_LINE_HEIGHT (w); | |
9172 } | |
9173 | |
9174 /* If top line height has changed, arrange for a thorough | |
9175 immediate redisplay using the correct mode line height. */ | |
25546 | 9176 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9177 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 9178 { |
9179 fonts_changed_p = 1; | |
25546 | 9180 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
9181 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9182 } |
9183 | |
9184 if (fonts_changed_p) | |
9185 goto restore_buffers; | |
9186 } | |
9187 | |
9188 if (!line_number_displayed | |
9189 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9190 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9191 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9192 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9193 } |
277 | 9194 |
25012 | 9195 finish_menu_bars: |
9196 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9197 /* 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
|
9198 if (update_mode_line |
25012 | 9199 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9200 { | |
9201 int redisplay_menu_p = 0; | |
9202 | |
9203 if (FRAME_WINDOW_P (f)) | |
9204 { | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
9205 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
25012 | 9206 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
|
9207 #else |
25012 | 9208 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
|
9209 #endif |
25012 | 9210 } |
9211 else | |
9212 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9213 | |
9214 if (redisplay_menu_p) | |
9215 display_menu_bar (w); | |
9216 | |
9217 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9218 if (WINDOWP (f->tool_bar_window) |
9219 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9220 || auto_resize_tool_bars_p)) | |
9221 redisplay_tool_bar (f); | |
25012 | 9222 #endif |
9223 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9224 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9225 finish_scroll_bars: |
25012 | 9226 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9227 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
|
9228 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9229 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9230 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9231 /* 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
|
9232 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
|
9233 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
|
9234 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
|
9235 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9236 |
25012 | 9237 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
|
9238 if (!MINI_WINDOW_P (w) |
25012 | 9239 || (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
|
9240 && 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
|
9241 { |
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
|
9242 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
9243 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
|
9244 /* 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
|
9245 moment, we'll pretend it is. */ |
25012 | 9246 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
9247 | |
9248 if (end < start) | |
9249 end = start; | |
9250 if (whole < (end - start)) | |
9251 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9252 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9253 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9254 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9255 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9256 /* 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
|
9257 (*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
|
9258 |
25012 | 9259 /* Note that we actually used the scroll bar attached to this |
9260 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
|
9261 (*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
|
9262 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9263 |
25012 | 9264 restore_buffers: |
9265 | |
9266 /* Restore current_buffer and value of point in it. */ | |
9267 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
|
9268 if (really_switched_buffer) |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
9269 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
|
9270 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9271 set_buffer_temp (old); |
25012 | 9272 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
|
9273 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9274 unbind_to (count, Qnil); |
277 | 9275 } |
25012 | 9276 |
9277 | |
9278 /* Build the complete desired matrix of WINDOW with a window start | |
9279 buffer position POS. Value is non-zero if successful. It is zero | |
9280 if fonts were loaded during redisplay which makes re-adjusting | |
9281 glyph matrices necessary. */ | |
9282 | |
9283 int | |
277 | 9284 try_window (window, pos) |
9285 Lisp_Object window; | |
25012 | 9286 struct text_pos pos; |
9287 { | |
9288 struct window *w = XWINDOW (window); | |
9289 struct it it; | |
9290 struct glyph_row *last_text_row = NULL; | |
9291 | |
9292 /* Make POS the new window start. */ | |
9293 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
9294 | |
9295 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
9296 w->cursor.vpos = -1; | |
277 | 9297 overlay_arrow_seen = 0; |
25012 | 9298 |
9299 /* Initialize iterator and info to start at POS. */ | |
9300 start_display (&it, w, pos); | |
9301 | |
9302 /* Display all lines of W. */ | |
9303 while (it.current_y < it.last_visible_y) | |
9304 { | |
9305 if (display_line (&it)) | |
9306 last_text_row = it.glyph_row - 1; | |
9307 if (fonts_changed_p) | |
9308 return 0; | |
9309 } | |
9310 | |
9311 /* If bottom moved off end of frame, change mode line percentage. */ | |
9312 if (XFASTINT (w->window_end_pos) <= 0 | |
9313 && Z != IT_CHARPOS (it)) | |
277 | 9314 w->update_mode_line = Qt; |
9315 | |
25012 | 9316 /* Set window_end_pos to the offset of the last character displayed |
9317 on the window from the end of current_buffer. Set | |
9318 window_end_vpos to its row number. */ | |
9319 if (last_text_row) | |
9320 { | |
9321 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
9322 w->window_end_bytepos | |
9323 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9324 XSETFASTINT (w->window_end_pos, | |
9325 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9326 XSETFASTINT (w->window_end_vpos, | |
9327 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9328 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
9329 ->displays_text_p); | |
9330 } | |
9331 else | |
9332 { | |
9333 w->window_end_bytepos = 0; | |
9334 XSETFASTINT (w->window_end_pos, 0); | |
9335 XSETFASTINT (w->window_end_vpos, 0); | |
9336 } | |
9337 | |
277 | 9338 /* But that is not valid info until redisplay finishes. */ |
9339 w->window_end_valid = Qnil; | |
25012 | 9340 return 1; |
9341 } | |
9342 | |
9343 | |
277 | 9344 |
25012 | 9345 /************************************************************************ |
9346 Window redisplay reusing current matrix when buffer has not changed | |
9347 ************************************************************************/ | |
9348 | |
9349 /* Try redisplay of window W showing an unchanged buffer with a | |
9350 different window start than the last time it was displayed by | |
9351 reusing its current matrix. Value is non-zero if successful. | |
9352 W->start is the new window start. */ | |
9353 | |
9354 static int | |
9355 try_window_reusing_current_matrix (w) | |
9356 struct window *w; | |
9357 { | |
9358 struct frame *f = XFRAME (w->frame); | |
9359 struct glyph_row *row, *bottom_row; | |
9360 struct it it; | |
9361 struct run run; | |
9362 struct text_pos start, new_start; | |
9363 int nrows_scrolled, i; | |
9364 struct glyph_row *last_text_row; | |
9365 struct glyph_row *last_reused_text_row; | |
9366 struct glyph_row *start_row; | |
9367 int start_vpos, min_y, max_y; | |
9368 | |
9369 /* Right now this function doesn't handle terminal frames. */ | |
9370 if (!FRAME_WINDOW_P (f)) | |
9371 return 0; | |
9372 | |
9373 /* Can't do this if region may have changed. */ | |
9374 if ((!NILP (Vtransient_mark_mode) | |
9375 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9376 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9377 || !NILP (Vshow_trailing_whitespace)) |
25012 | 9378 return 0; |
9379 | |
9380 /* If top-line visibility has changed, give up. */ | |
25546 | 9381 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9382 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 9383 return 0; |
9384 | |
9385 /* Give up if old or new display is scrolled vertically. We could | |
9386 make this function handle this, but right now it doesn't. */ | |
9387 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9388 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
9389 return 0; | |
9390 | |
9391 /* The variable new_start now holds the new window start. The old | |
9392 start `start' can be determined from the current matrix. */ | |
9393 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
9394 start = start_row->start.pos; | |
9395 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
9396 | |
9397 /* Clear the desired matrix for the display below. */ | |
9398 clear_glyph_matrix (w->desired_matrix); | |
9399 | |
9400 if (CHARPOS (new_start) <= CHARPOS (start)) | |
9401 { | |
9402 int first_row_y; | |
9403 | |
9404 IF_DEBUG (debug_method_add (w, "twu1")); | |
9405 | |
9406 /* Display up to a row that can be reused. The variable | |
9407 last_text_row is set to the last row displayed that displays | |
9408 text. */ | |
9409 start_display (&it, w, new_start); | |
9410 first_row_y = it.current_y; | |
9411 w->cursor.vpos = -1; | |
9412 last_text_row = last_reused_text_row = NULL; | |
9413 while (it.current_y < it.last_visible_y | |
9414 && IT_CHARPOS (it) < CHARPOS (start) | |
9415 && !fonts_changed_p) | |
9416 if (display_line (&it)) | |
9417 last_text_row = it.glyph_row - 1; | |
9418 | |
9419 /* A value of current_y < last_visible_y means that we stopped | |
9420 at the previous window start, which in turn means that we | |
9421 have at least one reusable row. */ | |
9422 if (it.current_y < it.last_visible_y) | |
9423 { | |
9424 nrows_scrolled = it.vpos; | |
9425 | |
9426 /* Find PT if not already found in the lines displayed. */ | |
9427 if (w->cursor.vpos < 0) | |
9428 { | |
9429 int dy = it.current_y - first_row_y; | |
9430 | |
9431 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9432 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9433 { | |
9434 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
9435 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
9436 { | |
9437 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
9438 dy, nrows_scrolled); | |
9439 break; | |
9440 } | |
9441 | |
9442 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
9443 break; | |
9444 | |
9445 ++row; | |
9446 } | |
9447 | |
9448 /* Give up if point was not found. This shouldn't | |
9449 happen often; not more often than with try_window | |
9450 itself. */ | |
9451 if (w->cursor.vpos < 0) | |
9452 { | |
9453 clear_glyph_matrix (w->desired_matrix); | |
9454 return 0; | |
9455 } | |
9456 } | |
9457 | |
9458 /* Scroll the display. Do it before the current matrix is | |
9459 changed. The problem here is that update has not yet | |
9460 run, i.e. part of the current matrix is not up to date. | |
9461 scroll_run_hook will clear the cursor, and use the | |
9462 current matrix to get the height of the row the cursor is | |
9463 in. */ | |
9464 run.current_y = first_row_y; | |
9465 run.desired_y = it.current_y; | |
9466 run.height = it.last_visible_y - it.current_y; | |
9467 if (run.height > 0) | |
9468 { | |
9469 update_begin (f); | |
9470 rif->update_window_begin_hook (w); | |
9471 rif->scroll_run_hook (w, &run); | |
9472 rif->update_window_end_hook (w, 0); | |
9473 update_end (f); | |
9474 } | |
9475 | |
9476 /* Shift current matrix down by nrows_scrolled lines. */ | |
9477 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9478 rotate_matrix (w->current_matrix, | |
9479 start_vpos, | |
9480 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9481 nrows_scrolled); | |
9482 | |
9483 /* Disable lines not reused. */ | |
9484 for (i = 0; i < it.vpos; ++i) | |
9485 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
9486 | |
9487 /* Re-compute Y positions. */ | |
9488 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix) + nrows_scrolled; | |
25546 | 9489 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9490 max_y = it.last_visible_y; |
9491 while (row < bottom_row) | |
9492 { | |
9493 row->y = it.current_y; | |
9494 | |
9495 if (row->y < min_y) | |
9496 row->visible_height = row->height - (min_y - row->y); | |
9497 else if (row->y + row->height > max_y) | |
9498 row->visible_height | |
9499 = row->height - (row->y + row->height - max_y); | |
9500 else | |
9501 row->visible_height = row->height; | |
9502 | |
9503 it.current_y += row->height; | |
9504 ++it.vpos; | |
9505 | |
9506 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9507 last_reused_text_row = row; | |
9508 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
9509 break; | |
9510 ++row; | |
9511 } | |
9512 } | |
9513 | |
9514 /* Update window_end_pos etc.; last_reused_text_row is the last | |
9515 reused row from the current matrix containing text, if any. | |
9516 The value of last_text_row is the last displayed line | |
9517 containing text. */ | |
9518 if (last_reused_text_row) | |
9519 { | |
9520 w->window_end_bytepos | |
9521 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
9522 XSETFASTINT (w->window_end_pos, | |
9523 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
9524 XSETFASTINT (w->window_end_vpos, | |
9525 MATRIX_ROW_VPOS (last_reused_text_row, | |
9526 w->current_matrix)); | |
9527 } | |
9528 else if (last_text_row) | |
9529 { | |
9530 w->window_end_bytepos | |
9531 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9532 XSETFASTINT (w->window_end_pos, | |
9533 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9534 XSETFASTINT (w->window_end_vpos, | |
9535 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9536 } | |
9537 else | |
9538 { | |
9539 /* This window must be completely empty. */ | |
9540 w->window_end_bytepos = 0; | |
9541 XSETFASTINT (w->window_end_pos, 0); | |
9542 XSETFASTINT (w->window_end_vpos, 0); | |
9543 } | |
9544 w->window_end_valid = Qnil; | |
9545 | |
9546 /* Update hint: don't try scrolling again in update_window. */ | |
9547 w->desired_matrix->no_scrolling_p = 1; | |
9548 | |
9549 #if GLYPH_DEBUG | |
9550 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
9551 #endif | |
9552 return 1; | |
9553 } | |
9554 else if (CHARPOS (new_start) > CHARPOS (start)) | |
9555 { | |
9556 struct glyph_row *pt_row, *row; | |
9557 struct glyph_row *first_reusable_row; | |
9558 struct glyph_row *first_row_to_display; | |
9559 int dy; | |
9560 int yb = window_text_bottom_y (w); | |
9561 | |
9562 IF_DEBUG (debug_method_add (w, "twu2")); | |
9563 | |
9564 /* Find the row starting at new_start, if there is one. Don't | |
9565 reuse a partially visible line at the end. */ | |
9566 first_reusable_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9567 while (first_reusable_row->enabled_p | |
9568 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
9569 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
9570 < CHARPOS (new_start))) | |
9571 ++first_reusable_row; | |
9572 | |
9573 /* Give up if there is no row to reuse. */ | |
9574 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
|
9575 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9576 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9577 != CHARPOS (new_start))) |
25012 | 9578 return 0; |
9579 | |
9580 /* We can reuse fully visible rows beginning with | |
9581 first_reusable_row to the end of the window. Set | |
9582 first_row_to_display to the first row that cannot be reused. | |
9583 Set pt_row to the row containing point, if there is any. */ | |
9584 first_row_to_display = first_reusable_row; | |
9585 pt_row = NULL; | |
9586 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
9587 { | |
9588 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
9589 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
9590 pt_row = first_row_to_display; | |
9591 | |
9592 ++first_row_to_display; | |
9593 } | |
9594 | |
9595 /* Start displaying at the start of first_row_to_display. */ | |
9596 xassert (first_row_to_display->y < yb); | |
9597 init_to_row_start (&it, w, first_row_to_display); | |
9598 nrows_scrolled = MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix); | |
9599 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) | |
9600 - nrows_scrolled); | |
9601 it.current_y = first_row_to_display->y - first_reusable_row->y; | |
9602 | |
9603 /* Display lines beginning with first_row_to_display in the | |
9604 desired matrix. Set last_text_row to the last row displayed | |
9605 that displays text. */ | |
9606 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
9607 if (pt_row == NULL) | |
9608 w->cursor.vpos = -1; | |
9609 last_text_row = NULL; | |
9610 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
9611 if (display_line (&it)) | |
9612 last_text_row = it.glyph_row - 1; | |
9613 | |
9614 /* Give up If point isn't in a row displayed or reused. */ | |
9615 if (w->cursor.vpos < 0) | |
9616 { | |
9617 clear_glyph_matrix (w->desired_matrix); | |
9618 return 0; | |
9619 } | |
9620 | |
9621 /* If point is in a reused row, adjust y and vpos of the cursor | |
9622 position. */ | |
9623 if (pt_row) | |
9624 { | |
9625 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
9626 w->current_matrix); | |
9627 w->cursor.y -= first_reusable_row->y; | |
9628 } | |
9629 | |
9630 /* Scroll the display. */ | |
9631 run.current_y = first_reusable_row->y; | |
25546 | 9632 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9633 run.height = it.last_visible_y - run.current_y; |
9634 if (run.height) | |
9635 { | |
9636 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
9637 update_begin (f); | |
9638 rif->update_window_begin_hook (w); | |
9639 rif->scroll_run_hook (w, &run); | |
9640 rif->update_window_end_hook (w, 0); | |
9641 update_end (f); | |
9642 } | |
9643 | |
9644 /* Adjust Y positions of reused rows. */ | |
9645 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9646 row = first_reusable_row; | |
9647 dy = first_reusable_row->y; | |
25546 | 9648 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9649 max_y = it.last_visible_y; |
9650 while (row < first_row_to_display) | |
9651 { | |
9652 row->y -= dy; | |
9653 if (row->y < min_y) | |
9654 row->visible_height = row->height - (min_y - row->y); | |
9655 else if (row->y + row->height > max_y) | |
9656 row->visible_height | |
9657 = row->height - (row->y + row->height - max_y); | |
9658 else | |
9659 row->visible_height = row->height; | |
9660 ++row; | |
9661 } | |
9662 | |
9663 /* Disable rows not reused. */ | |
9664 while (row < bottom_row) | |
9665 { | |
9666 row->enabled_p = 0; | |
9667 ++row; | |
9668 } | |
9669 | |
9670 /* Scroll the current matrix. */ | |
9671 xassert (nrows_scrolled > 0); | |
9672 rotate_matrix (w->current_matrix, | |
9673 start_vpos, | |
9674 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9675 -nrows_scrolled); | |
9676 | |
9677 /* Adjust window end. A null value of last_text_row means that | |
9678 the window end is in reused rows which in turn means that | |
9679 only its vpos can have changed. */ | |
9680 if (last_text_row) | |
9681 { | |
9682 w->window_end_bytepos | |
9683 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9684 XSETFASTINT (w->window_end_pos, | |
9685 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9686 XSETFASTINT (w->window_end_vpos, | |
9687 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9688 } | |
9689 else | |
9690 { | |
9691 XSETFASTINT (w->window_end_vpos, | |
9692 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
9693 } | |
9694 | |
9695 w->window_end_valid = Qnil; | |
9696 w->desired_matrix->no_scrolling_p = 1; | |
9697 | |
9698 #if GLYPH_DEBUG | |
9699 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
9700 #endif | |
9701 return 1; | |
9702 } | |
9703 | |
9704 return 0; | |
9705 } | |
9706 | |
9707 | |
9708 | |
9709 /************************************************************************ | |
9710 Window redisplay reusing current matrix when buffer has changed | |
9711 ************************************************************************/ | |
9712 | |
9713 static struct glyph_row *get_last_unchanged_at_beg_row P_ ((struct window *)); | |
9714 static struct glyph_row *get_first_unchanged_at_end_row P_ ((struct window *, | |
9715 int *, int *)); | |
9716 static struct glyph_row * | |
9717 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
9718 struct glyph_row *)); | |
9719 | |
9720 | |
9721 /* Return the last row in MATRIX displaying text. If row START is | |
9722 non-null, start searching with that row. IT gives the dimensions | |
9723 of the display. Value is null if matrix is empty; otherwise it is | |
9724 a pointer to the row found. */ | |
9725 | |
9726 static struct glyph_row * | |
9727 find_last_row_displaying_text (matrix, it, start) | |
9728 struct glyph_matrix *matrix; | |
9729 struct it *it; | |
9730 struct glyph_row *start; | |
9731 { | |
9732 struct glyph_row *row, *row_found; | |
9733 | |
9734 /* Set row_found to the last row in IT->w's current matrix | |
9735 displaying text. The loop looks funny but think of partially | |
9736 visible lines. */ | |
9737 row_found = NULL; | |
9738 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
9739 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9740 { | |
9741 xassert (row->enabled_p); | |
9742 row_found = row; | |
9743 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
9744 break; | |
9745 ++row; | |
9746 } | |
9747 | |
9748 return row_found; | |
9749 } | |
9750 | |
9751 | |
9752 /* Return the last row in the current matrix of W that is not affected | |
9753 by changes at the start of current_buffer that occurred since the | |
9754 last time W was redisplayed. Value is null if no such row exists. | |
9755 | |
9756 The global variable beg_unchanged has to contain the number of | |
9757 bytes unchanged at the start of current_buffer. BEG + | |
9758 beg_unchanged is the buffer position of the first changed byte in | |
9759 current_buffer. Characters at positions < BEG + beg_unchanged are | |
9760 at the same buffer positions as they were when the current matrix | |
9761 was built. */ | |
9762 | |
9763 static struct glyph_row * | |
9764 get_last_unchanged_at_beg_row (w) | |
9765 struct window *w; | |
9766 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9767 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 9768 struct glyph_row *row; |
9769 struct glyph_row *row_found = NULL; | |
9770 int yb = window_text_bottom_y (w); | |
9771 | |
9772 /* Find the last row displaying unchanged text. */ | |
9773 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9774 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
9775 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
9776 { | |
9777 if (/* If row ends before first_changed_pos, it is unchanged, | |
9778 except in some case. */ | |
9779 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
9780 /* When row ends in ZV and we write at ZV it is not | |
9781 unchanged. */ | |
9782 && !row->ends_at_zv_p | |
9783 /* When first_changed_pos is the end of a continued line, | |
9784 row is not unchanged because it may be no longer | |
9785 continued. */ | |
9786 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
9787 && row->continued_p)) | |
9788 row_found = row; | |
9789 | |
9790 /* Stop if last visible row. */ | |
9791 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
9792 break; | |
9793 | |
9794 ++row; | |
9795 } | |
9796 | |
9797 return row_found; | |
9798 } | |
9799 | |
9800 | |
9801 /* Find the first glyph row in the current matrix of W that is not | |
9802 affected by changes at the end of current_buffer since the last | |
9803 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
|
9804 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
|
9805 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
|
9806 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
|
9807 exists, i.e. all rows are affected by changes. */ |
25012 | 9808 |
9809 static struct glyph_row * | |
9810 get_first_unchanged_at_end_row (w, delta, delta_bytes) | |
9811 struct window *w; | |
9812 int *delta, *delta_bytes; | |
9813 { | |
9814 struct glyph_row *row; | |
9815 struct glyph_row *row_found = NULL; | |
9816 | |
9817 *delta = *delta_bytes = 0; | |
9818 | |
9819 /* A value of window_end_pos >= end_unchanged means that the window | |
9820 end is in the range of changed text. If so, there is no | |
9821 unchanged row at the end of W's current matrix. */ | |
9822 xassert (!NILP (w->window_end_valid)); | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9823 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 9824 return NULL; |
9825 | |
9826 /* Set row to the last row in W's current matrix displaying text. */ | |
9827 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
9828 | |
9829 /* If matrix is entirely empty, no unchanged row exists. */ | |
9830 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9831 { | |
9832 /* The value of row is the last glyph row in the matrix having a | |
9833 meaningful buffer position in it. The end position of row | |
9834 corresponds to window_end_pos. This allows us to translate | |
9835 buffer positions in the current matrix to current buffer | |
9836 positions for characters not in changed text. */ | |
9837 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
9838 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
9839 int last_unchanged_pos, last_unchanged_pos_old; | |
9840 struct glyph_row *first_text_row | |
9841 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9842 | |
9843 *delta = Z - Z_old; | |
9844 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
9845 | |
9846 /* Set last_unchanged_pos to the buffer position of the last | |
9847 character in the buffer that has not been changed. Z is the | |
9848 index + 1 of the last byte in current_buffer, i.e. by | |
9849 subtracting end_unchanged we get the index of the last | |
9850 unchanged character, and we have to add BEG to get its buffer | |
9851 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9852 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 9853 last_unchanged_pos_old = last_unchanged_pos - *delta; |
9854 | |
9855 /* Search backward from ROW for a row displaying a line that | |
9856 starts at a minimum position >= last_unchanged_pos_old. */ | |
9857 while (row >= first_text_row) | |
9858 { | |
9859 xassert (row->enabled_p); | |
9860 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
9861 | |
9862 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
9863 row_found = row; | |
9864 --row; | |
9865 } | |
9866 } | |
9867 | |
9868 xassert (!row_found || MATRIX_ROW_DISPLAYS_TEXT_P (row_found)); | |
9869 return row_found; | |
9870 } | |
9871 | |
9872 | |
9873 /* Make sure that glyph rows in the current matrix of window W | |
9874 reference the same glyph memory as corresponding rows in the | |
9875 frame's frame matrix. This function is called after scrolling W's | |
9876 current matrix on a terminal frame in try_window_id and | |
9877 try_window_reusing_current_matrix. */ | |
9878 | |
9879 static void | |
9880 sync_frame_with_window_matrix_rows (w) | |
9881 struct window *w; | |
9882 { | |
9883 struct frame *f = XFRAME (w->frame); | |
9884 struct glyph_row *window_row, *window_row_end, *frame_row; | |
9885 | |
9886 /* Preconditions: W must be a leaf window and full-width. Its frame | |
9887 must have a frame matrix. */ | |
9888 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
9889 xassert (WINDOW_FULL_WIDTH_P (w)); | |
9890 xassert (!FRAME_WINDOW_P (f)); | |
9891 | |
9892 /* If W is a full-width window, glyph pointers in W's current matrix | |
9893 have, by definition, to be the same as glyph pointers in the | |
9894 corresponding frame matrix. */ | |
9895 window_row = w->current_matrix->rows; | |
9896 window_row_end = window_row + w->current_matrix->nrows; | |
9897 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
9898 while (window_row < window_row_end) | |
9899 { | |
9900 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9901 |
25012 | 9902 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
9903 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
|
9904 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9905 /* 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
|
9906 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
|
9907 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9908 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9909 |
25012 | 9910 ++window_row, ++frame_row; |
9911 } | |
9912 } | |
9913 | |
9914 | |
25543 | 9915 /* Find the glyph row in window W containing CHARPOS. Consider all |
9916 rows between START and END (not inclusive). END null means search | |
9917 all rows to the end of the display area of W. Value is the row | |
9918 containing CHARPOS or null. */ | |
9919 | |
9920 static struct glyph_row * | |
9921 row_containing_pos (w, charpos, start, end) | |
9922 struct window *w; | |
9923 int charpos; | |
9924 struct glyph_row *start, *end; | |
9925 { | |
9926 struct glyph_row *row = start; | |
9927 int last_y; | |
9928 | |
9929 /* If we happen to start on a header-line, skip that. */ | |
9930 if (row->mode_line_p) | |
9931 ++row; | |
9932 | |
9933 if ((end && row >= end) || !row->enabled_p) | |
9934 return NULL; | |
9935 | |
9936 last_y = window_text_bottom_y (w); | |
9937 | |
9938 while ((end == NULL || row < end) | |
9939 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
9940 /* The end position of a row equals the start | |
9941 position of the next row. If CHARPOS is there, we | |
9942 would rather display it in the next line, except | |
9943 when this line ends in ZV. */ | |
9944 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
9945 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
9946 || !row->ends_at_zv_p))) | |
9947 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
9948 ++row; | |
9949 | |
9950 /* Give up if CHARPOS not found. */ | |
9951 if ((end && row >= end) | |
9952 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
9953 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
9954 row = NULL; | |
9955 | |
9956 return row; | |
9957 } | |
9958 | |
9959 | |
25012 | 9960 /* Try to redisplay window W by reusing its existing display. W's |
9961 current matrix must be up to date when this function is called, | |
9962 i.e. window_end_valid must not be nil. | |
9963 | |
9964 Value is | |
9965 | |
9966 1 if display has been updated | |
9967 0 if otherwise unsuccessful | |
9968 -1 if redisplay with same window start is known not to succeed | |
9969 | |
9970 The following steps are performed: | |
9971 | |
9972 1. Find the last row in the current matrix of W that is not | |
9973 affected by changes at the start of current_buffer. If no such row | |
9974 is found, give up. | |
9975 | |
9976 2. Find the first row in W's current matrix that is not affected by | |
9977 changes at the end of current_buffer. Maybe there is no such row. | |
9978 | |
9979 3. Display lines beginning with the row + 1 found in step 1 to the | |
9980 row found in step 2 or, if step 2 didn't find a row, to the end of | |
9981 the window. | |
9982 | |
9983 4. If cursor is not known to appear on the window, give up. | |
9984 | |
9985 5. If display stopped at the row found in step 2, scroll the | |
9986 display and current matrix as needed. | |
9987 | |
9988 6. Maybe display some lines at the end of W, if we must. This can | |
9989 happen under various circumstances, like a partially visible line | |
9990 becoming fully visible, or because newly displayed lines are displayed | |
9991 in smaller font sizes. | |
9992 | |
9993 7. Update W's window end information. */ | |
9994 | |
9995 /* Check that window end is what we expect it to be. */ | |
277 | 9996 |
9997 static int | |
25012 | 9998 try_window_id (w) |
9999 struct window *w; | |
10000 { | |
10001 struct frame *f = XFRAME (w->frame); | |
10002 struct glyph_matrix *current_matrix = w->current_matrix; | |
10003 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10004 struct glyph_row *last_unchanged_at_beg_row; | |
10005 struct glyph_row *first_unchanged_at_end_row; | |
10006 struct glyph_row *row; | |
10007 struct glyph_row *bottom_row; | |
10008 int bottom_vpos; | |
10009 struct it it; | |
10010 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10011 struct text_pos start_pos; | |
10012 struct run run; | |
10013 int first_unchanged_at_end_vpos = 0; | |
10014 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10015 struct text_pos start; | |
10016 | |
10017 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10018 | |
10019 /* Check pre-conditions. Window end must be valid, otherwise | |
10020 the current matrix would not be up to date. */ | |
10021 xassert (!NILP (w->window_end_valid)); | |
10022 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10023 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10024 | |
10025 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10026 only if buffer has really changed. The reason is that the gap is | |
10027 initially at Z for freshly visited files. The code below would | |
10028 set end_unchanged to 0 in that case. */ | |
27011
fed3d128eeed
(try_window_id): Compute BEG_UNCHANGED and END_UNCHANGED
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
10029 if (MODIFF > 1) |
25012 | 10030 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10031 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10032 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10033 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10034 END_UNCHANGED = Z - GPT; |
25012 | 10035 } |
10036 | |
10037 /* If window starts after a line end, and the last change is in | |
10038 front of that newline, then changes don't affect the display. | |
10039 This case happens with stealth-fontification. */ | |
10040 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10041 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10042 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10043 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10044 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10045 { | |
10046 /* We have to update window end positions because the buffer's | |
10047 size has changed. */ | |
10048 w->window_end_pos | |
10049 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10050 w->window_end_bytepos | |
10051 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row)); | |
10052 return 1; | |
10053 } | |
10054 | |
10055 /* Return quickly if changes are all below what is displayed in the | |
10056 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
|
10057 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10058 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10059 { | |
10060 /* We have to update window end positions because the buffer's | |
10061 size has changed. */ | |
10062 w->window_end_pos | |
10063 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10064 w->window_end_bytepos | |
10065 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row)); | |
10066 return 1; | |
10067 } | |
10068 | |
10069 /* Check that window start agrees with the start of the first glyph | |
10070 row in its current matrix. Check this after we know the window | |
10071 start is not in changed text, otherwise positions would not be | |
10072 comparable. */ | |
10073 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10074 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10075 return 0; | |
10076 | |
10077 /* Compute the position at which we have to start displaying new | |
10078 lines. Some of the lines at the top of the window might be | |
10079 reusable because they are not displaying changed text. Find the | |
10080 last row in W's current matrix not affected by changes at the | |
10081 start of current_buffer. Value is null if changes start in the | |
10082 first line of window. */ | |
10083 last_unchanged_at_beg_row = get_last_unchanged_at_beg_row (w); | |
10084 if (last_unchanged_at_beg_row) | |
10085 { | |
10086 init_to_row_end (&it, w, last_unchanged_at_beg_row); | |
10087 start_pos = it.current.pos; | |
10088 | |
10089 /* Start displaying new lines in the desired matrix at the same | |
10090 vpos we would use in the current matrix, i.e. below | |
10091 last_unchanged_at_beg_row. */ | |
10092 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
10093 current_matrix); | |
10094 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10095 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
10096 | |
10097 xassert (it.hpos == 0 && it.current_x == 0); | |
10098 } | |
277 | 10099 else |
25012 | 10100 { |
10101 /* There are no reusable lines at the start of the window. | |
10102 Start displaying in the first line. */ | |
10103 start_display (&it, w, start); | |
10104 start_pos = it.current.pos; | |
10105 } | |
10106 | |
10107 /* Find the first row that is not affected by changes at the end of | |
10108 the buffer. Value will be null if there is no unchanged row, in | |
10109 which case we must redisplay to the end of the window. delta | |
10110 will be set to the value by which buffer positions beginning with | |
10111 first_unchanged_at_end_row have to be adjusted due to text | |
10112 changes. */ | |
10113 first_unchanged_at_end_row | |
10114 = get_first_unchanged_at_end_row (w, &delta, &delta_bytes); | |
10115 IF_DEBUG (debug_delta = delta); | |
10116 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
10117 | |
10118 /* Set stop_pos to the buffer position up to which we will have to | |
10119 display new lines. If first_unchanged_at_end_row != NULL, this | |
10120 is the buffer position of the start of the line displayed in that | |
10121 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
10122 that we don't stop at a buffer position. */ | |
10123 stop_pos = 0; | |
10124 if (first_unchanged_at_end_row) | |
10125 { | |
10126 xassert (last_unchanged_at_beg_row == NULL | |
10127 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
10128 | |
10129 /* If this is a continuation line, move forward to the next one | |
10130 that isn't. Changes in lines above affect this line. | |
10131 Caution: this may move first_unchanged_at_end_row to a row | |
10132 not displaying text. */ | |
10133 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
10134 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10135 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10136 < it.last_visible_y)) | |
10137 ++first_unchanged_at_end_row; | |
10138 | |
10139 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10140 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10141 >= it.last_visible_y)) | |
10142 first_unchanged_at_end_row = NULL; | |
10143 else | |
10144 { | |
10145 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
10146 + delta); | |
10147 first_unchanged_at_end_vpos | |
10148 = 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
|
10149 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 10150 } |
10151 } | |
10152 else if (last_unchanged_at_beg_row == NULL) | |
10153 return 0; | |
10154 | |
10155 | |
10156 #if GLYPH_DEBUG | |
10157 | |
10158 /* Either there is no unchanged row at the end, or the one we have | |
10159 now displays text. This is a necessary condition for the window | |
10160 end pos calculation at the end of this function. */ | |
10161 xassert (first_unchanged_at_end_row == NULL | |
10162 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
10163 | |
10164 debug_last_unchanged_at_beg_vpos | |
10165 = (last_unchanged_at_beg_row | |
10166 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
10167 : -1); | |
10168 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
10169 | |
10170 #endif /* GLYPH_DEBUG != 0 */ | |
10171 | |
10172 | |
10173 /* Display new lines. Set last_text_row to the last new line | |
10174 displayed which has text on it, i.e. might end up as being the | |
10175 line where the window_end_vpos is. */ | |
10176 w->cursor.vpos = -1; | |
10177 last_text_row = NULL; | |
277 | 10178 overlay_arrow_seen = 0; |
25012 | 10179 while (it.current_y < it.last_visible_y |
10180 && !fonts_changed_p | |
10181 && (first_unchanged_at_end_row == NULL | |
10182 || IT_CHARPOS (it) < stop_pos)) | |
10183 { | |
10184 if (display_line (&it)) | |
10185 last_text_row = it.glyph_row - 1; | |
10186 } | |
10187 | |
10188 if (fonts_changed_p) | |
10189 return -1; | |
10190 | |
10191 | |
10192 /* Compute differences in buffer positions, y-positions etc. for | |
10193 lines reused at the bottom of the window. Compute what we can | |
10194 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10195 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
|
10196 /* 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
|
10197 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10198 && it.current_y < it.last_visible_y) |
25012 | 10199 { |
10200 dvpos = (it.vpos | |
10201 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
10202 current_matrix)); | |
10203 dy = it.current_y - first_unchanged_at_end_row->y; | |
10204 run.current_y = first_unchanged_at_end_row->y; | |
10205 run.desired_y = run.current_y + dy; | |
10206 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
10207 } | |
10208 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10209 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10210 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
|
10211 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
|
10212 } |
25012 | 10213 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
10214 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
10215 |
25012 | 10216 /* Find the cursor if not already found. We have to decide whether |
10217 PT will appear on this window (it sometimes doesn't, but this is | |
10218 not a very frequent case.) This decision has to be made before | |
10219 the current matrix is altered. A value of cursor.vpos < 0 means | |
10220 that PT is either in one of the lines beginning at | |
10221 first_unchanged_at_end_row or below the window. Don't care for | |
10222 lines that might be displayed later at the window end; as | |
10223 mentioned, this is not a frequent case. */ | |
10224 if (w->cursor.vpos < 0) | |
10225 { | |
10226 /* Cursor in unchanged rows at the top? */ | |
10227 if (PT < CHARPOS (start_pos) | |
10228 && last_unchanged_at_beg_row) | |
10229 { | |
25543 | 10230 row = row_containing_pos (w, PT, |
10231 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
10232 last_unchanged_at_beg_row + 1); | |
10233 xassert (row && row <= last_unchanged_at_beg_row); | |
25012 | 10234 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
10235 } | |
10236 | |
10237 /* Start from first_unchanged_at_end_row looking for PT. */ | |
10238 else if (first_unchanged_at_end_row) | |
10239 { | |
25543 | 10240 row = row_containing_pos (w, PT - delta, |
10241 first_unchanged_at_end_row, NULL); | |
10242 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
10243 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
|
10244 delta_bytes, dy, dvpos); |
25012 | 10245 } |
10246 | |
10247 /* Give up if cursor was not found. */ | |
10248 if (w->cursor.vpos < 0) | |
10249 { | |
10250 clear_glyph_matrix (w->desired_matrix); | |
10251 return -1; | |
10252 } | |
10253 } | |
10254 | |
10255 /* Don't let the cursor end in the scroll margins. */ | |
10256 { | |
10257 int this_scroll_margin, cursor_height; | |
10258 | |
10259 this_scroll_margin = max (0, scroll_margin); | |
10260 this_scroll_margin = min (this_scroll_margin, | |
10261 XFASTINT (w->height) / 4); | |
10262 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
10263 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
10264 | |
10265 if ((w->cursor.y < this_scroll_margin | |
10266 && CHARPOS (start) > BEGV) | |
10267 /* Don't take scroll margin into account at the bottom because | |
10268 old redisplay didn't do it either. */ | |
10269 || w->cursor.y + cursor_height > it.last_visible_y) | |
10270 { | |
10271 w->cursor.vpos = -1; | |
10272 clear_glyph_matrix (w->desired_matrix); | |
10273 return -1; | |
10274 } | |
10275 } | |
10276 | |
10277 /* Scroll the display. Do it before changing the current matrix so | |
10278 that xterm.c doesn't get confused about where the cursor glyph is | |
10279 found. */ | |
10280 if (dy) | |
10281 { | |
10282 update_begin (f); | |
10283 | |
10284 if (FRAME_WINDOW_P (f)) | |
10285 { | |
10286 rif->update_window_begin_hook (w); | |
10287 rif->scroll_run_hook (w, &run); | |
10288 rif->update_window_end_hook (w, 0); | |
10289 } | |
10290 else | |
10291 { | |
10292 /* Terminal frame. In this case, dvpos gives the number of | |
10293 lines to scroll by; dvpos < 0 means scroll up. */ | |
10294 int first_unchanged_at_end_vpos | |
10295 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
10296 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
10297 int end = XFASTINT (w->top) + window_internal_height (w); | |
10298 | |
10299 /* Perform the operation on the screen. */ | |
10300 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
10301 { |
25012 | 10302 /* Scroll last_unchanged_at_beg_row to the end of the |
10303 window down dvpos lines. */ | |
10304 set_terminal_window (end); | |
10305 | |
10306 /* On dumb terminals delete dvpos lines at the end | |
10307 before inserting dvpos empty lines. */ | |
10308 if (!scroll_region_ok) | |
10309 ins_del_lines (end - dvpos, -dvpos); | |
10310 | |
10311 /* Insert dvpos empty lines in front of | |
10312 last_unchanged_at_beg_row. */ | |
10313 ins_del_lines (from, dvpos); | |
10314 } | |
10315 else if (dvpos < 0) | |
10316 { | |
10317 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
10318 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
10319 set_terminal_window (end); | |
10320 | |
10321 /* Delete dvpos lines in front of | |
10322 last_unchanged_at_beg_vpos. ins_del_lines will set | |
10323 the cursor to the given vpos and emit |dvpos| delete | |
10324 line sequences. */ | |
10325 ins_del_lines (from + dvpos, dvpos); | |
10326 | |
10327 /* On a dumb terminal insert dvpos empty lines at the | |
10328 end. */ | |
10329 if (!scroll_region_ok) | |
10330 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
|
10331 } |
25012 | 10332 |
10333 set_terminal_window (0); | |
10334 } | |
10335 | |
10336 update_end (f); | |
10337 } | |
10338 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10339 /* 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
|
10340 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
|
10341 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10342 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
|
10343 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 10344 if (dvpos < 0) |
10345 { | |
10346 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
10347 bottom_vpos, dvpos); | |
10348 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
10349 bottom_vpos, 0); | |
10350 } | |
10351 else if (dvpos > 0) | |
10352 { | |
10353 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
10354 bottom_vpos, dvpos); | |
10355 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
10356 first_unchanged_at_end_vpos + dvpos, 0); | |
10357 } | |
10358 | |
10359 /* For frame-based redisplay, make sure that current frame and window | |
10360 matrix are in sync with respect to glyph memory. */ | |
10361 if (!FRAME_WINDOW_P (f)) | |
10362 sync_frame_with_window_matrix_rows (w); | |
10363 | |
10364 /* Adjust buffer positions in reused rows. */ | |
10365 if (delta) | |
10366 increment_glyph_matrix_buffer_positions (current_matrix, | |
10367 first_unchanged_at_end_vpos + dvpos, | |
10368 bottom_vpos, delta, delta_bytes); | |
10369 | |
10370 /* Adjust Y positions. */ | |
10371 if (dy) | |
10372 shift_glyph_matrix (w, current_matrix, | |
10373 first_unchanged_at_end_vpos + dvpos, | |
10374 bottom_vpos, dy); | |
10375 | |
10376 if (first_unchanged_at_end_row) | |
10377 first_unchanged_at_end_row += dvpos; | |
10378 | |
10379 /* If scrolling up, there may be some lines to display at the end of | |
10380 the window. */ | |
10381 last_text_row_at_end = NULL; | |
10382 if (dy < 0) | |
10383 { | |
10384 /* Set last_row to the glyph row in the current matrix where the | |
10385 window end line is found. It has been moved up or down in | |
10386 the matrix by dvpos. */ | |
10387 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
10388 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
10389 | |
10390 /* If last_row is the window end line, it should display text. */ | |
10391 xassert (last_row->displays_text_p); | |
10392 | |
10393 /* If window end line was partially visible before, begin | |
10394 displaying at that line. Otherwise begin displaying with the | |
10395 line following it. */ | |
10396 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
10397 { | |
10398 init_to_row_start (&it, w, last_row); | |
10399 it.vpos = last_vpos; | |
10400 it.current_y = last_row->y; | |
10401 } | |
10402 else | |
10403 { | |
10404 init_to_row_end (&it, w, last_row); | |
10405 it.vpos = 1 + last_vpos; | |
10406 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
10407 ++last_row; | |
10408 } | |
10409 | |
10410 /* We may start in a continuation line. If so, we have to get | |
10411 the right continuation_lines_width and current_x. */ | |
10412 it.continuation_lines_width = last_row->continuation_lines_width; | |
10413 it.hpos = it.current_x = 0; | |
10414 | |
10415 /* Display the rest of the lines at the window end. */ | |
10416 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10417 while (it.current_y < it.last_visible_y | |
10418 && !fonts_changed_p) | |
10419 { | |
10420 /* Is it always sure that the display agrees with lines in | |
10421 the current matrix? I don't think so, so we mark rows | |
10422 displayed invalid in the current matrix by setting their | |
10423 enabled_p flag to zero. */ | |
10424 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
10425 if (display_line (&it)) | |
10426 last_text_row_at_end = it.glyph_row - 1; | |
10427 } | |
10428 } | |
10429 | |
10430 /* Update window_end_pos and window_end_vpos. */ | |
10431 if (first_unchanged_at_end_row | |
10432 && first_unchanged_at_end_row->y < it.last_visible_y | |
10433 && !last_text_row_at_end) | |
10434 { | |
10435 /* Window end line if one of the preserved rows from the current | |
10436 matrix. Set row to the last row displaying text in current | |
10437 matrix starting at first_unchanged_at_end_row, after | |
10438 scrolling. */ | |
10439 xassert (first_unchanged_at_end_row->displays_text_p); | |
10440 row = find_last_row_displaying_text (w->current_matrix, &it, | |
10441 first_unchanged_at_end_row); | |
10442 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
10443 | |
10444 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
10445 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
10446 XSETFASTINT (w->window_end_vpos, | |
10447 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
10448 } | |
10449 else if (last_text_row_at_end) | |
10450 { | |
10451 XSETFASTINT (w->window_end_pos, | |
10452 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
10453 w->window_end_bytepos | |
10454 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
10455 XSETFASTINT (w->window_end_vpos, | |
10456 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
10457 } | |
10458 else if (last_text_row) | |
10459 { | |
10460 /* We have displayed either to the end of the window or at the | |
10461 end of the window, i.e. the last row with text is to be found | |
10462 in the desired matrix. */ | |
10463 XSETFASTINT (w->window_end_pos, | |
10464 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10465 w->window_end_bytepos | |
10466 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10467 XSETFASTINT (w->window_end_vpos, | |
10468 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
10469 } | |
10470 else if (first_unchanged_at_end_row == NULL | |
10471 && last_text_row == NULL | |
10472 && last_text_row_at_end == NULL) | |
10473 { | |
10474 /* Displayed to end of window, but no line containing text was | |
10475 displayed. Lines were deleted at the end of the window. */ | |
10476 int vpos; | |
25546 | 10477 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 10478 |
10479 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 10480 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
10481 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
10482 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
10483 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 10484 break; |
10485 | |
10486 w->window_end_vpos = make_number (vpos); | |
10487 } | |
10488 else | |
10489 abort (); | |
10490 | |
10491 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
10492 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
10493 | |
10494 /* Record that display has not been completed. */ | |
277 | 10495 w->window_end_valid = Qnil; |
25012 | 10496 w->desired_matrix->no_scrolling_p = 1; |
277 | 10497 return 1; |
10498 } | |
25012 | 10499 |
10500 | |
10501 | |
10502 /*********************************************************************** | |
10503 More debugging support | |
10504 ***********************************************************************/ | |
10505 | |
10506 #if GLYPH_DEBUG | |
10507 | |
10508 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
10509 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
10510 | |
10511 | |
10512 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
10513 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
10514 | |
10515 void | |
10516 dump_glyph_matrix (matrix, with_glyphs_p) | |
10517 struct glyph_matrix *matrix; | |
10518 int with_glyphs_p; | |
10519 { | |
10520 int i; | |
10521 for (i = 0; i < matrix->nrows; ++i) | |
10522 dump_glyph_row (matrix, i, with_glyphs_p); | |
10523 } | |
10524 | |
10525 | |
10526 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
10527 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
10528 | |
10529 void | |
10530 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
10531 struct glyph_matrix *matrix; | |
10532 int vpos, with_glyphs_p; | |
10533 { | |
10534 struct glyph_row *row; | |
10535 | |
10536 if (vpos < 0 || vpos >= matrix->nrows) | |
10537 return; | |
10538 | |
10539 row = MATRIX_ROW (matrix, vpos); | |
10540 | |
10541 fprintf (stderr, "Row Start End Used oEI><O\\CTZF X Y W\n"); | |
10542 fprintf (stderr, "=============================================\n"); | |
10543 | |
10544 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", | |
10545 row - matrix->rows, | |
10546 MATRIX_ROW_START_CHARPOS (row), | |
10547 MATRIX_ROW_END_CHARPOS (row), | |
10548 row->used[TEXT_AREA], | |
10549 row->contains_overlapping_glyphs_p, | |
10550 row->enabled_p, | |
10551 row->inverse_p, | |
10552 row->truncated_on_left_p, | |
10553 row->truncated_on_right_p, | |
10554 row->overlay_arrow_p, | |
10555 row->continued_p, | |
10556 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
10557 row->displays_text_p, | |
10558 row->ends_at_zv_p, | |
10559 row->fill_line_p, | |
10560 row->x, | |
10561 row->y, | |
10562 row->pixel_width); | |
10563 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, | |
10564 row->end.overlay_string_index); | |
10565 fprintf (stderr, "%9d %5d\n", | |
10566 CHARPOS (row->start.string_pos), | |
10567 CHARPOS (row->end.string_pos)); | |
10568 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
10569 row->end.dpvec_index); | |
10570 | |
10571 if (with_glyphs_p) | |
10572 { | |
10573 struct glyph *glyph, *glyph_end; | |
10574 int prev_had_glyphs_p; | |
10575 | |
10576 glyph = row->glyphs[TEXT_AREA]; | |
10577 glyph_end = glyph + row->used[TEXT_AREA]; | |
10578 | |
10579 /* Glyph for a line end in text. */ | |
10580 if (glyph == glyph_end && glyph->charpos > 0) | |
10581 ++glyph_end; | |
10582 | |
10583 if (glyph < glyph_end) | |
10584 { | |
10585 fprintf (stderr, " Glyph Type Pos W Code C Face LR\n"); | |
10586 prev_had_glyphs_p = 1; | |
10587 } | |
10588 else | |
10589 prev_had_glyphs_p = 0; | |
10590 | |
10591 while (glyph < glyph_end) | |
10592 { | |
10593 if (glyph->type == CHAR_GLYPH) | |
10594 { | |
10595 fprintf (stderr, | |
10596 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10597 glyph - row->glyphs[TEXT_AREA], | |
10598 'C', | |
10599 glyph->charpos, | |
10600 glyph->pixel_width, | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10601 glyph->u.ch, |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10602 (glyph->u.ch < 0x80 && glyph->u.ch >= ' ' |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10603 ? glyph->u.ch |
25012 | 10604 : '.'), |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10605 glyph->face_id, |
25012 | 10606 glyph->left_box_line_p, |
10607 glyph->right_box_line_p); | |
10608 } | |
10609 else if (glyph->type == STRETCH_GLYPH) | |
10610 { | |
10611 fprintf (stderr, | |
10612 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10613 glyph - row->glyphs[TEXT_AREA], | |
10614 'S', | |
10615 glyph->charpos, | |
10616 glyph->pixel_width, | |
10617 0, | |
10618 '.', | |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
10619 glyph->face_id, |
25012 | 10620 glyph->left_box_line_p, |
10621 glyph->right_box_line_p); | |
10622 } | |
10623 else if (glyph->type == IMAGE_GLYPH) | |
10624 { | |
10625 fprintf (stderr, | |
10626 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10627 glyph - row->glyphs[TEXT_AREA], | |
10628 'I', | |
10629 glyph->charpos, | |
10630 glyph->pixel_width, | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10631 glyph->u.img_id, |
25012 | 10632 '.', |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
10633 glyph->face_id, |
25012 | 10634 glyph->left_box_line_p, |
10635 glyph->right_box_line_p); | |
10636 } | |
10637 ++glyph; | |
10638 } | |
10639 } | |
10640 } | |
10641 | |
10642 | |
10643 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
10644 Sdump_glyph_matrix, 0, 1, "p", | |
10645 "Dump the current matrix of the selected window to stderr.\n\ | |
10646 Shows contents of glyph row structures. With non-nil optional\n\ | |
10647 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
10648 (with_glyphs_p) | |
10649 { | |
10650 struct window *w = XWINDOW (selected_window); | |
10651 struct buffer *buffer = XBUFFER (w->buffer); | |
10652 | |
10653 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
10654 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
10655 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
10656 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
10657 fprintf (stderr, "=============================================\n"); | |
10658 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
10659 return Qnil; | |
10660 } | |
10661 | |
10662 | |
10663 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
10664 "Dump glyph row ROW to stderr.") | |
10665 (row) | |
10666 Lisp_Object row; | |
10667 { | |
10668 CHECK_NUMBER (row, 0); | |
10669 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
10670 return Qnil; | |
10671 } | |
10672 | |
10673 | |
25543 | 10674 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 10675 0, 0, "", "") |
10676 () | |
10677 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
10678 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
10679 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 10680 ->current_matrix); |
10681 dump_glyph_row (m, 0, 1); | |
10682 return Qnil; | |
10683 } | |
10684 | |
10685 | |
10686 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
10687 Strace_redisplay_toggle, 0, 0, "", | |
10688 "Toggle tracing of redisplay.") | |
10689 () | |
10690 { | |
10691 trace_redisplay_p = !trace_redisplay_p; | |
10692 return Qnil; | |
10693 } | |
10694 | |
10695 | |
10696 #endif /* GLYPH_DEBUG */ | |
10697 | |
10698 | |
277 | 10699 |
25012 | 10700 /*********************************************************************** |
10701 Building Desired Matrix Rows | |
10702 ***********************************************************************/ | |
10703 | |
10704 /* Return a temporary glyph row holding the glyphs of an overlay | |
10705 arrow. Only used for non-window-redisplay windows. */ | |
10706 | |
10707 static struct glyph_row * | |
10708 get_overlay_arrow_glyph_row (w) | |
10709 struct window *w; | |
10710 { | |
10711 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10712 struct buffer *buffer = XBUFFER (w->buffer); | |
10713 struct buffer *old = current_buffer; | |
10714 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
10715 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
10716 unsigned char *arrow_end = arrow_string + arrow_len; | |
10717 unsigned char *p; | |
10718 struct it it; | |
10719 int multibyte_p; | |
10720 int n_glyphs_before; | |
10721 | |
10722 set_buffer_temp (buffer); | |
10723 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
10724 it.glyph_row->used[TEXT_AREA] = 0; | |
10725 SET_TEXT_POS (it.position, 0, 0); | |
10726 | |
10727 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
10728 p = arrow_string; | |
10729 while (p < arrow_end) | |
10730 { | |
10731 Lisp_Object face, ilisp; | |
10732 | |
10733 /* Get the next character. */ | |
10734 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
10735 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 10736 else |
10737 it.c = *p, it.len = 1; | |
10738 p += it.len; | |
10739 | |
10740 /* Get its face. */ | |
10741 XSETFASTINT (ilisp, p - arrow_string); | |
10742 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
10743 it.face_id = compute_char_face (f, it.c, face); | |
10744 | |
10745 /* Compute its width, get its glyphs. */ | |
10746 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
|
10747 SET_TEXT_POS (it.position, -1, -1); |
25012 | 10748 PRODUCE_GLYPHS (&it); |
10749 | |
10750 /* If this character doesn't fit any more in the line, we have | |
10751 to remove some glyphs. */ | |
10752 if (it.current_x > it.last_visible_x) | |
10753 { | |
10754 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
10755 break; | |
10756 } | |
10757 } | |
10758 | |
10759 set_buffer_temp (old); | |
10760 return it.glyph_row; | |
10761 } | |
10762 | |
10763 | |
10764 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
10765 glyphs are only inserted for terminal frames since we can't really | |
10766 win with truncation glyphs when partially visible glyphs are | |
10767 involved. Which glyphs to insert is determined by | |
10768 produce_special_glyphs. */ | |
10769 | |
10770 static void | |
10771 insert_left_trunc_glyphs (it) | |
10772 struct it *it; | |
10773 { | |
10774 struct it truncate_it; | |
10775 struct glyph *from, *end, *to, *toend; | |
10776 | |
10777 xassert (!FRAME_WINDOW_P (it->f)); | |
10778 | |
10779 /* Get the truncation glyphs. */ | |
10780 truncate_it = *it; | |
10781 truncate_it.charset = -1; | |
10782 truncate_it.current_x = 0; | |
10783 truncate_it.face_id = DEFAULT_FACE_ID; | |
10784 truncate_it.glyph_row = &scratch_glyph_row; | |
10785 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
10786 CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1; | |
10787 truncate_it.object = 0; | |
10788 produce_special_glyphs (&truncate_it, IT_TRUNCATION); | |
10789 | |
10790 /* Overwrite glyphs from IT with truncation glyphs. */ | |
10791 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
10792 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
10793 to = it->glyph_row->glyphs[TEXT_AREA]; | |
10794 toend = to + it->glyph_row->used[TEXT_AREA]; | |
10795 | |
10796 while (from < end) | |
10797 *to++ = *from++; | |
10798 | |
10799 /* There may be padding glyphs left over. Remove them. */ | |
10800 from = to; | |
10801 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
10802 ++from; | |
10803 while (from < toend) | |
10804 *to++ = *from++; | |
10805 | |
10806 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
10807 } | |
10808 | |
10809 | |
10810 /* Compute the pixel height and width of IT->glyph_row. | |
10811 | |
10812 Most of the time, ascent and height of a display line will be equal | |
10813 to the max_ascent and max_height values of the display iterator | |
10814 structure. This is not the case if | |
10815 | |
10816 1. We hit ZV without displaying anything. In this case, max_ascent | |
10817 and max_height will be zero. | |
10818 | |
10819 2. We have some glyphs that don't contribute to the line height. | |
10820 (The glyph row flag contributes_to_line_height_p is for future | |
10821 pixmap extensions). | |
10822 | |
10823 The first case is easily covered by using default values because in | |
10824 these cases, the line height does not really matter, except that it | |
10825 must not be zero. */ | |
10826 | |
10827 static void | |
10828 compute_line_metrics (it) | |
10829 struct it *it; | |
10830 { | |
10831 struct glyph_row *row = it->glyph_row; | |
10832 int area, i; | |
10833 | |
10834 if (FRAME_WINDOW_P (it->f)) | |
10835 { | |
25546 | 10836 int i, header_line_height; |
25012 | 10837 |
10838 /* The line may consist of one space only, that was added to | |
10839 place the cursor on it. If so, the row's height hasn't been | |
10840 computed yet. */ | |
10841 if (row->height == 0) | |
10842 { | |
10843 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
|
10844 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 10845 row->ascent = it->max_ascent; |
10846 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
|
10847 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
|
10848 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 10849 } |
10850 | |
10851 /* Compute the width of this line. */ | |
10852 row->pixel_width = row->x; | |
10853 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
10854 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
10855 | |
10856 xassert (row->pixel_width >= 0); | |
10857 xassert (row->ascent >= 0 && row->height > 0); | |
10858 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10859 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
|
10860 || 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
|
10861 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10862 /* 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
|
10863 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
|
10864 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
|
10865 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
|
10866 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10867 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10868 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
|
10869 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10870 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10871 |
25012 | 10872 /* Compute how much of the line is visible. */ |
10873 row->visible_height = row->height; | |
10874 | |
25546 | 10875 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
10876 if (row->y < header_line_height) | |
10877 row->visible_height -= header_line_height - row->y; | |
25012 | 10878 else |
10879 { | |
10880 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
10881 if (row->y + row->height > max_y) | |
10882 row->visible_height -= row->y + row->height - max_y; | |
10883 } | |
10884 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
10885 else |
25012 | 10886 { |
10887 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
|
10888 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
|
10889 row->height = row->phys_height = row->visible_height = 1; |
25012 | 10890 } |
10891 | |
10892 /* Compute a hash code for this row. */ | |
10893 row->hash = 0; | |
10894 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
10895 for (i = 0; i < row->used[area]; ++i) | |
10896 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
10897 + row->glyphs[area][i].u.val | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10898 + row->glyphs[area][i].face_id |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
10899 + row->glyphs[area][i].padding_p |
25012 | 10900 + (row->glyphs[area][i].type << 2)); |
10901 | |
10902 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
|
10903 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 10904 } |
10905 | |
10906 | |
10907 /* Append one space to the glyph row of iterator IT if doing a | |
10908 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
10909 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
|
10910 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
|
10911 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10912 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
|
10913 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
|
10914 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
|
10915 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
|
10916 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10917 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
|
10918 end of the line if the row ends in italic text. */ |
25012 | 10919 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10920 static int |
25012 | 10921 append_space (it, default_face_p) |
10922 struct it *it; | |
10923 int default_face_p; | |
10924 { | |
10925 if (FRAME_WINDOW_P (it->f)) | |
10926 { | |
10927 int n = it->glyph_row->used[TEXT_AREA]; | |
10928 | |
10929 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
10930 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
10931 { | |
10932 /* Save some values that must not be changed. */ | |
10933 int saved_x = it->current_x; | |
10934 struct text_pos saved_pos; | |
10935 int saved_what = it->what; | |
10936 int saved_face_id = it->face_id; | |
10937 int saved_charset = it->charset; | |
10938 Lisp_Object saved_object; | |
10939 | |
10940 saved_object = it->object; | |
10941 saved_pos = it->position; | |
10942 | |
10943 it->what = IT_CHARACTER; | |
10944 bzero (&it->position, sizeof it->position); | |
10945 it->object = 0; | |
10946 it->c = ' '; | |
10947 it->len = 1; | |
10948 it->charset = CHARSET_ASCII; | |
10949 | |
10950 if (default_face_p) | |
10951 it->face_id = DEFAULT_FACE_ID; | |
10952 if (it->multibyte_p) | |
10953 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, CHARSET_ASCII); | |
10954 else | |
10955 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, -1); | |
10956 | |
10957 PRODUCE_GLYPHS (it); | |
10958 | |
10959 it->current_x = saved_x; | |
10960 it->object = saved_object; | |
10961 it->position = saved_pos; | |
10962 it->what = saved_what; | |
10963 it->face_id = saved_face_id; | |
10964 it->charset = saved_charset; | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10965 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10966 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10967 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10968 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10969 return 0; |
25012 | 10970 } |
10971 | |
10972 | |
10973 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
10974 to the end of the display line. Called from display_line. | |
10975 If the glyph row is empty, add a space glyph to it so that we | |
10976 know the face to draw. Set the glyph row flag fill_line_p. */ | |
10977 | |
10978 static void | |
10979 extend_face_to_end_of_line (it) | |
10980 struct it *it; | |
10981 { | |
10982 struct face *face; | |
10983 struct frame *f = it->f; | |
10984 | |
10985 /* If line is already filled, do nothing. */ | |
10986 if (it->current_x >= it->last_visible_x) | |
10987 return; | |
10988 | |
10989 /* Face extension extends the background and box of IT->face_id | |
10990 to the end of the line. If the background equals the background | |
10991 of the frame, we haven't to do anything. */ | |
10992 face = FACE_FROM_ID (f, it->face_id); | |
10993 if (FRAME_WINDOW_P (f) | |
10994 && face->box == FACE_NO_BOX | |
10995 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
10996 && !face->stipple) | |
10997 return; | |
10998 | |
10999 /* Set the glyph row flag indicating that the face of the last glyph | |
11000 in the text area has to be drawn to the end of the text area. */ | |
11001 it->glyph_row->fill_line_p = 1; | |
11002 | |
11003 /* If current charset of IT is not ASCII, make sure we have the | |
11004 ASCII face. This will be automatically undone the next time | |
11005 get_next_display_element returns a character from a different | |
11006 charset. Note that the charset will always be ASCII in unibyte | |
11007 text. */ | |
11008 if (it->charset != CHARSET_ASCII) | |
11009 { | |
11010 it->charset = CHARSET_ASCII; | |
11011 it->face_id = FACE_FOR_CHARSET (f, it->face_id, CHARSET_ASCII); | |
11012 } | |
11013 | |
11014 if (FRAME_WINDOW_P (f)) | |
11015 { | |
11016 /* If the row is empty, add a space with the current face of IT, | |
11017 so that we know which face to draw. */ | |
11018 if (it->glyph_row->used[TEXT_AREA] == 0) | |
11019 { | |
11020 it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph; | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11021 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 11022 it->glyph_row->used[TEXT_AREA] = 1; |
11023 } | |
11024 } | |
11025 else | |
11026 { | |
11027 /* Save some values that must not be changed. */ | |
11028 int saved_x = it->current_x; | |
11029 struct text_pos saved_pos; | |
11030 Lisp_Object saved_object; | |
11031 int saved_what = it->what; | |
11032 | |
11033 saved_object = it->object; | |
11034 saved_pos = it->position; | |
11035 | |
11036 it->what = IT_CHARACTER; | |
11037 bzero (&it->position, sizeof it->position); | |
11038 it->object = 0; | |
11039 it->c = ' '; | |
11040 it->len = 1; | |
11041 | |
11042 PRODUCE_GLYPHS (it); | |
11043 | |
11044 while (it->current_x <= it->last_visible_x) | |
11045 PRODUCE_GLYPHS (it); | |
11046 | |
11047 /* Don't count these blanks really. It would let us insert a left | |
11048 truncation glyph below and make us set the cursor on them, maybe. */ | |
11049 it->current_x = saved_x; | |
11050 it->object = saved_object; | |
11051 it->position = saved_pos; | |
11052 it->what = saved_what; | |
11053 } | |
11054 } | |
11055 | |
11056 | |
11057 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
11058 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11059 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11060 static int |
25012 | 11061 trailing_whitespace_p (charpos) |
11062 int charpos; | |
11063 { | |
11064 int bytepos = CHAR_TO_BYTE (charpos); | |
11065 int c = 0; | |
11066 | |
11067 while (bytepos < ZV_BYTE | |
11068 && (c = FETCH_CHAR (bytepos), | |
11069 c == ' ' || c == '\t')) | |
11070 ++bytepos; | |
11071 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11072 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11073 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11074 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11075 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11076 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11077 return 0; |
25012 | 11078 } |
11079 | |
11080 | |
11081 /* Highlight trailing whitespace, if any, in ROW. */ | |
11082 | |
11083 void | |
11084 highlight_trailing_whitespace (f, row) | |
11085 struct frame *f; | |
11086 struct glyph_row *row; | |
11087 { | |
11088 int used = row->used[TEXT_AREA]; | |
11089 | |
11090 if (used) | |
11091 { | |
11092 struct glyph *start = row->glyphs[TEXT_AREA]; | |
11093 struct glyph *glyph = start + used - 1; | |
11094 | |
11095 /* Skip over the space glyph inserted to display the | |
11096 cursor at the end of a line. */ | |
11097 if (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11098 && glyph->u.ch == ' ' |
25012 | 11099 && glyph->object == 0) |
11100 --glyph; | |
11101 | |
11102 /* If last glyph is a space or stretch, and it's trailing | |
11103 whitespace, set the face of all trailing whitespace glyphs in | |
11104 IT->glyph_row to `trailing-whitespace'. */ | |
11105 if (glyph >= start | |
11106 && BUFFERP (glyph->object) | |
11107 && (glyph->type == STRETCH_GLYPH | |
11108 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11109 && glyph->u.ch == ' ')) |
25012 | 11110 && trailing_whitespace_p (glyph->charpos)) |
11111 { | |
11112 int face_id = lookup_named_face (f, Qtrailing_whitespace, | |
11113 CHARSET_ASCII); | |
11114 | |
11115 while (glyph >= start | |
11116 && BUFFERP (glyph->object) | |
11117 && (glyph->type == STRETCH_GLYPH | |
11118 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11119 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11120 (glyph--)->face_id = face_id; |
25012 | 11121 } |
11122 } | |
11123 } | |
11124 | |
11125 | |
11126 /* Construct the glyph row IT->glyph_row in the desired matrix of | |
11127 IT->w from text at the current position of IT. See dispextern.h | |
11128 for an overview of struct it. Value is non-zero if | |
11129 IT->glyph_row displays text, as opposed to a line displaying ZV | |
11130 only. */ | |
11131 | |
11132 static int | |
11133 display_line (it) | |
11134 struct it *it; | |
11135 { | |
11136 struct glyph_row *row = it->glyph_row; | |
11137 | |
11138 /* We always start displaying at hpos zero even if hscrolled. */ | |
11139 xassert (it->hpos == 0 && it->current_x == 0); | |
11140 | |
11141 /* We must not display in a row that's not a text row. */ | |
11142 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
11143 < it->w->desired_matrix->nrows); | |
11144 | |
11145 /* Is IT->w showing the region? */ | |
11146 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
11147 | |
11148 /* Clear the result glyph row and enable it. */ | |
11149 prepare_desired_row (row); | |
11150 | |
11151 row->y = it->current_y; | |
11152 row->start = it->current; | |
11153 row->continuation_lines_width = it->continuation_lines_width; | |
11154 row->displays_text_p = 1; | |
277 | 11155 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
11156 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 11157 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
|
11158 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
|
11159 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
|
11160 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 11161 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
11162 | |
11163 /* Move over display elements that are not visible because we are | |
11164 hscrolled. This may stop at an x-position < IT->first_visible_x | |
11165 if the first glyph is partially visible or if we hit a line end. */ | |
11166 if (it->current_x < it->first_visible_x) | |
11167 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
11168 MOVE_TO_POS | MOVE_TO_X); | |
11169 | |
11170 /* Get the initial row height. This is either the height of the | |
11171 text hscrolled, if there is any, or zero. */ | |
11172 row->ascent = it->max_ascent; | |
11173 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
|
11174 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
|
11175 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11176 |
11177 /* Loop generating characters. The loop is left with IT on the next | |
11178 character to display. */ | |
11179 while (1) | |
11180 { | |
11181 int n_glyphs_before, hpos_before, x_before; | |
11182 int x, i, nglyphs; | |
11183 | |
11184 /* Retrieve the next thing to display. Value is zero if end of | |
11185 buffer reached. */ | |
11186 if (!get_next_display_element (it)) | |
11187 { | |
11188 /* Maybe add a space at the end of this line that is used to | |
26301
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11189 display the cursor there under X. Set the charpos of the |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11190 first glyph of blank lines not corresponding to any text |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11191 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11192 if ((append_space (it, 1) && row->used[TEXT_AREA] == 1) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11193 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11194 { |
25012 | 11195 row->glyphs[TEXT_AREA]->charpos = -1; |
11196 row->displays_text_p = 0; | |
11197 | |
11198 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
11199 row->indicate_empty_line_p = 1; | |
11200 } | |
11201 | |
11202 it->continuation_lines_width = 0; | |
11203 row->ends_at_zv_p = 1; | |
11204 break; | |
11205 } | |
11206 | |
11207 /* Now, get the metrics of what we want to display. This also | |
11208 generates glyphs in `row' (which is IT->glyph_row). */ | |
11209 n_glyphs_before = row->used[TEXT_AREA]; | |
11210 x = it->current_x; | |
11211 PRODUCE_GLYPHS (it); | |
11212 | |
11213 /* If this display element was in marginal areas, continue with | |
11214 the next one. */ | |
11215 if (it->area != TEXT_AREA) | |
11216 { | |
11217 row->ascent = max (row->ascent, it->max_ascent); | |
11218 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
|
11219 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
|
11220 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
|
11221 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11222 set_iterator_to_next (it); |
11223 continue; | |
11224 } | |
11225 | |
11226 /* Does the display element fit on the line? If we truncate | |
11227 lines, we should draw past the right edge of the window. If | |
11228 we don't truncate, we want to stop so that we can display the | |
11229 continuation glyph before the right margin. If lines are | |
11230 continued, there are two possible strategies for characters | |
11231 resulting in more than 1 glyph (e.g. tabs): Display as many | |
11232 glyphs as possible in this line and leave the rest for the | |
11233 continuation line, or display the whole element in the next | |
11234 line. Original redisplay did the former, so we do it also. */ | |
11235 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
11236 hpos_before = it->hpos; | |
11237 x_before = x; | |
11238 | |
11239 if (nglyphs == 1 | |
11240 && it->current_x < it->last_visible_x) | |
11241 { | |
11242 ++it->hpos; | |
11243 row->ascent = max (row->ascent, it->max_ascent); | |
11244 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
|
11245 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
|
11246 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
|
11247 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11248 if (it->current_x - it->pixel_width < it->first_visible_x) |
11249 row->x = x - it->first_visible_x; | |
11250 } | |
11251 else | |
11252 { | |
11253 int new_x; | |
11254 struct glyph *glyph; | |
11255 | |
11256 for (i = 0; i < nglyphs; ++i, x = new_x) | |
11257 { | |
11258 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
11259 new_x = x + glyph->pixel_width; | |
11260 | |
11261 if (/* Lines are continued. */ | |
11262 !it->truncate_lines_p | |
11263 && (/* Glyph doesn't fit on the line. */ | |
11264 new_x > it->last_visible_x | |
11265 /* Or it fits exactly on a window system frame. */ | |
11266 || (new_x == it->last_visible_x | |
11267 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11268 { |
25012 | 11269 /* End of a continued line. */ |
11270 | |
11271 if (it->hpos == 0 | |
11272 || (new_x == it->last_visible_x | |
11273 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11274 { |
25012 | 11275 /* Current glyph fits exactly on the line. We |
11276 must continue the line because we can't draw | |
11277 the cursor after the glyph. */ | |
11278 row->continued_p = 1; | |
11279 it->current_x = new_x; | |
11280 it->continuation_lines_width += new_x; | |
11281 ++it->hpos; | |
11282 if (i == nglyphs - 1) | |
11283 set_iterator_to_next (it); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11284 } |
25012 | 11285 else |
11286 { | |
11287 /* Display element draws past the right edge of | |
11288 the window. Restore positions to values | |
11289 before the element. The next line starts | |
11290 with current_x before the glyph that could | |
11291 not be displayed, so that TAB works right. */ | |
11292 row->used[TEXT_AREA] = n_glyphs_before + i; | |
11293 | |
11294 /* Display continuation glyphs. */ | |
11295 if (!FRAME_WINDOW_P (it->f)) | |
11296 produce_special_glyphs (it, IT_CONTINUATION); | |
11297 row->continued_p = 1; | |
11298 | |
11299 it->current_x = x; | |
11300 it->continuation_lines_width += x; | |
11301 } | |
11302 break; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11303 } |
25012 | 11304 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
|
11305 { |
25012 | 11306 /* Increment number of glyphs actually displayed. */ |
11307 ++it->hpos; | |
11308 | |
11309 if (x < it->first_visible_x) | |
11310 /* Glyph is partially visible, i.e. row starts at | |
11311 negative X position. */ | |
11312 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
|
11313 } |
25012 | 11314 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11315 { |
25012 | 11316 /* Glyph is completely off the left margin of the |
11317 window. This should not happen because of the | |
11318 move_it_in_display_line at the start of | |
11319 this function. */ | |
11320 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11321 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11322 } |
25012 | 11323 |
11324 row->ascent = max (row->ascent, it->max_ascent); | |
11325 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
|
11326 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
|
11327 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
|
11328 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11329 |
11330 /* End of this display line if row is continued. */ | |
11331 if (row->continued_p) | |
11332 break; | |
11333 } | |
11334 | |
11335 /* Is this a line end? If yes, we're also done, after making | |
11336 sure that a non-default face is extended up to the right | |
11337 margin of the window. */ | |
11338 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
11339 { | |
11340 int used_before = row->used[TEXT_AREA]; | |
11341 | |
11342 /* Add a space at the end of the line that is used to | |
11343 display the cursor there. */ | |
11344 append_space (it, 0); | |
11345 | |
11346 /* Extend the face to the end of the line. */ | |
11347 extend_face_to_end_of_line (it); | |
11348 | |
11349 /* Make sure we have the position. */ | |
11350 if (used_before == 0) | |
11351 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
11352 | |
11353 /* Consume the line end. This skips over invisible lines. */ | |
11354 set_iterator_to_next (it); | |
11355 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
|
11356 break; |
277 | 11357 } |
25012 | 11358 |
11359 /* Proceed with next display element. Note that this skips | |
11360 over lines invisible because of selective display. */ | |
11361 set_iterator_to_next (it); | |
11362 | |
11363 /* If we truncate lines, we are done when the last displayed | |
11364 glyphs reach past the right margin of the window. */ | |
11365 if (it->truncate_lines_p | |
11366 && (FRAME_WINDOW_P (it->f) | |
11367 ? (it->current_x >= it->last_visible_x) | |
11368 : (it->current_x > it->last_visible_x))) | |
11369 { | |
11370 /* Maybe add truncation glyphs. */ | |
11371 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11372 { |
25012 | 11373 --it->glyph_row->used[TEXT_AREA]; |
11374 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 11375 } |
25012 | 11376 |
11377 row->truncated_on_right_p = 1; | |
11378 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
|
11379 reseat_at_next_visible_line_start (it, 0); |
25012 | 11380 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
11381 it->hpos = hpos_before; | |
11382 it->current_x = x_before; | |
11383 break; | |
11384 } | |
11385 } | |
11386 | |
11387 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
11388 at the left window margin. */ | |
11389 if (it->first_visible_x | |
11390 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
11391 { | |
11392 if (!FRAME_WINDOW_P (it->f)) | |
11393 insert_left_trunc_glyphs (it); | |
11394 row->truncated_on_left_p = 1; | |
11395 } | |
11396 | |
11397 /* If the start of this line is the overlay arrow-position, then | |
11398 mark this glyph row as the one containing the overlay arrow. | |
11399 This is clearly a mess with variable size fonts. It would be | |
11400 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
|
11401 if (MARKERP (Voverlay_arrow_position) |
277 | 11402 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 11403 && (MATRIX_ROW_START_CHARPOS (row) |
11404 == 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
|
11405 && STRINGP (Voverlay_arrow_string) |
277 | 11406 && ! overlay_arrow_seen) |
11407 { | |
25012 | 11408 /* Overlay arrow in window redisplay is a bitmap. */ |
11409 if (!FRAME_WINDOW_P (it->f)) | |
11410 { | |
11411 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
11412 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
11413 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
11414 struct glyph *p = row->glyphs[TEXT_AREA]; | |
11415 struct glyph *p2, *end; | |
11416 | |
11417 /* Copy the arrow glyphs. */ | |
11418 while (glyph < arrow_end) | |
11419 *p++ = *glyph++; | |
11420 | |
11421 /* Throw away padding glyphs. */ | |
11422 p2 = p; | |
11423 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
11424 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
11425 ++p2; | |
11426 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
|
11427 { |
25012 | 11428 while (p2 < end) |
11429 *p++ = *p2++; | |
11430 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
|
11431 } |
25012 | 11432 } |
11433 | |
277 | 11434 overlay_arrow_seen = 1; |
25012 | 11435 row->overlay_arrow_p = 1; |
11436 } | |
11437 | |
11438 /* Compute pixel dimensions of this line. */ | |
11439 compute_line_metrics (it); | |
11440 | |
11441 /* Remember the position at which this line ends. */ | |
11442 row->end = it->current; | |
11443 | |
11444 /* Maybe set the cursor. If you change this, it's probably a good | |
11445 idea to also change the code in redisplay_window for cursor | |
11446 movement in an unchanged window. */ | |
11447 if (it->w->cursor.vpos < 0 | |
11448 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
11449 && MATRIX_ROW_END_CHARPOS (row) >= PT | |
11450 && !(MATRIX_ROW_END_CHARPOS (row) == PT | |
11451 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
11452 || !row->ends_at_zv_p))) | |
11453 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); | |
11454 | |
11455 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11456 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 11457 highlight_trailing_whitespace (it->f, it->glyph_row); |
11458 | |
11459 /* Prepare for the next line. This line starts horizontally at (X | |
11460 HPOS) = (0 0). Vertical positions are incremented. As a | |
11461 convenience for the caller, IT->glyph_row is set to the next | |
11462 row to be used. */ | |
11463 it->current_x = it->hpos = 0; | |
11464 it->current_y += row->height; | |
11465 ++it->vpos; | |
11466 ++it->glyph_row; | |
11467 return row->displays_text_p; | |
11468 } | |
11469 | |
11470 | |
277 | 11471 |
25012 | 11472 /*********************************************************************** |
11473 Menu Bar | |
11474 ***********************************************************************/ | |
11475 | |
11476 /* Redisplay the menu bar in the frame for window W. | |
11477 | |
11478 The menu bar of X frames that don't have X toolkit support is | |
11479 displayed in a special window W->frame->menu_bar_window. | |
11480 | |
11481 The menu bar of terminal frames is treated specially as far as | |
11482 glyph matrices are concerned. Menu bar lines are not part of | |
11483 windows, so the update is done directly on the frame matrix rows | |
11484 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11485 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11486 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11487 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11488 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11489 { |
25012 | 11490 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
11491 struct it it; | |
11492 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11493 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11494 |
25012 | 11495 /* 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
|
11496 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11497 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11498 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11499 #endif |
25012 | 11500 #ifdef USE_X_TOOLKIT |
11501 if (FRAME_X_P (f)) | |
11502 return; | |
11503 #endif | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11504 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11505 #ifdef USE_X_TOOLKIT |
25012 | 11506 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
|
11507 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 11508 it.first_visible_x = 0; |
11509 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
11510 #else /* not USE_X_TOOLKIT */ | |
11511 if (FRAME_WINDOW_P (f)) | |
11512 { | |
11513 /* Menu bar lines are displayed in the desired matrix of the | |
11514 dummy window menu_bar_window. */ | |
11515 struct window *menu_w; | |
11516 xassert (WINDOWP (f->menu_bar_window)); | |
11517 menu_w = XWINDOW (f->menu_bar_window); | |
11518 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
|
11519 MENU_FACE_ID); |
25012 | 11520 it.first_visible_x = 0; |
11521 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
11522 } | |
11523 else | |
11524 { | |
11525 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
11526 pixel x/y. */ | |
11527 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
|
11528 MENU_FACE_ID); |
25012 | 11529 it.first_visible_x = 0; |
11530 it.last_visible_x = FRAME_WIDTH (f); | |
11531 } | |
11532 #endif /* not USE_X_TOOLKIT */ | |
11533 | |
11534 /* Clear all rows of the menu bar. */ | |
11535 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
11536 { | |
11537 struct glyph_row *row = it.glyph_row + i; | |
11538 clear_glyph_row (row); | |
11539 row->enabled_p = 1; | |
11540 row->full_width_p = 1; | |
11541 } | |
11542 | |
11543 /* Make the first line of the menu bar appear in reverse video. */ | |
11544 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
11545 | |
11546 /* Display all items of the menu bar. */ | |
11547 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
|
11548 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
|
11549 { |
25012 | 11550 Lisp_Object string; |
11551 | |
11552 /* 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
|
11553 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
|
11554 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11555 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11556 |
25012 | 11557 /* Remember where item was displayed. */ |
11558 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
11559 | |
11560 /* Display the item, pad with one space. */ | |
11561 if (it.current_x < it.last_visible_x) | |
11562 display_string (NULL, string, Qnil, 0, 0, &it, | |
11563 XSTRING (string)->size + 1, 0, 0, -1); | |
11564 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
11565 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
11566 /* Fill out the line with spaces. */ |
25012 | 11567 if (it.current_x < it.last_visible_x) |
11568 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
11569 | |
11570 /* Compute the total height of the lines. */ | |
11571 compute_line_metrics (&it); | |
11572 } | |
11573 | |
11574 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11575 |
25012 | 11576 /*********************************************************************** |
11577 Mode Line | |
11578 ***********************************************************************/ | |
11579 | |
11580 /* Display the mode and/or top line of window W. */ | |
277 | 11581 |
11582 static void | |
25012 | 11583 display_mode_lines (w) |
277 | 11584 struct window *w; |
11585 { | |
25012 | 11586 /* 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
|
11587 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
|
11588 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11589 |
25012 | 11590 if (WINDOW_WANTS_MODELINE_P (w)) |
25546 | 11591 display_mode_line (w, MODE_LINE_FACE_ID, |
11592 current_buffer->mode_line_format); | |
11593 | |
11594 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
11595 display_mode_line (w, HEADER_LINE_FACE_ID, | |
11596 current_buffer->header_line_format); | |
25012 | 11597 } |
11598 | |
11599 | |
11600 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 11601 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
25012 | 11602 FORMAT is the mode line format to display. */ |
11603 | |
11604 static void | |
11605 display_mode_line (w, face_id, format) | |
11606 struct window *w; | |
11607 enum face_id face_id; | |
11608 Lisp_Object format; | |
11609 { | |
11610 struct it it; | |
11611 struct face *face; | |
11612 | |
11613 init_iterator (&it, w, -1, -1, NULL, face_id); | |
11614 prepare_desired_row (it.glyph_row); | |
11615 | |
11616 /* Temporarily make frame's keyboard the current kboard so that | |
11617 kboard-local variables in the mode_line_format will get the right | |
11618 values. */ | |
11619 push_frame_kboard (it.f); | |
11620 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
|
11621 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
11622 |
25012 | 11623 /* Fill up with spaces. */ |
11624 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
11625 | |
11626 compute_line_metrics (&it); | |
11627 it.glyph_row->full_width_p = 1; | |
11628 it.glyph_row->mode_line_p = 1; | |
11629 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
11630 it.glyph_row->continued_p = 0; | |
11631 it.glyph_row->truncated_on_left_p = 0; | |
11632 it.glyph_row->truncated_on_right_p = 0; | |
11633 | |
11634 /* Make a 3D mode-line have a shadow at its right end. */ | |
11635 face = FACE_FROM_ID (it.f, face_id); | |
11636 extend_face_to_end_of_line (&it); | |
11637 if (face->box != FACE_NO_BOX) | |
11638 { | |
11639 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
11640 + it.glyph_row->used[TEXT_AREA] - 1); | |
11641 last->right_box_line_p = 1; | |
11642 } | |
11643 } | |
11644 | |
11645 | |
11646 /* Contribute ELT to the mode line for window IT->w. How it | |
11647 translates into text depends on its data type. | |
11648 | |
11649 IT describes the display environment in which we display, as usual. | |
277 | 11650 |
11651 DEPTH is the depth in recursion. It is used to prevent | |
11652 infinite recursion here. | |
11653 | |
25012 | 11654 FIELD_WIDTH is the number of characters the display of ELT should |
11655 occupy in the mode line, and PRECISION is the maximum number of | |
11656 characters to display from ELT's representation. See | |
11657 display_string for details. * | |
11658 | |
11659 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 11660 |
11661 static int | |
25012 | 11662 display_mode_element (it, depth, field_width, precision, elt) |
11663 struct it *it; | |
277 | 11664 int depth; |
25012 | 11665 int field_width, precision; |
11666 Lisp_Object elt; | |
11667 { | |
11668 int n = 0, field, prec; | |
11669 | |
277 | 11670 tail_recurse: |
11671 if (depth > 10) | |
11672 goto invalid; | |
11673 | |
11674 depth++; | |
11675 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
11676 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 11677 { |
11678 case Lisp_String: | |
11679 { | |
11680 /* A string: output it and check for %-constructs within it. */ | |
25012 | 11681 unsigned char c; |
11682 unsigned char *this = XSTRING (elt)->data; | |
11683 unsigned char *lisp_string = this; | |
11684 | |
11685 while ((precision <= 0 || n < precision) | |
11686 && *this | |
11687 && (frame_title_ptr | |
11688 || it->current_x < it->last_visible_x)) | |
277 | 11689 { |
11690 unsigned char *last = this; | |
25012 | 11691 |
11692 /* Advance to end of string or next format specifier. */ | |
277 | 11693 while ((c = *this++) != '\0' && c != '%') |
11694 ; | |
25012 | 11695 |
277 | 11696 if (this - 1 != last) |
11697 { | |
25012 | 11698 /* Output to end of string or up to '%'. Field width |
11699 is length of string. Don't output more than | |
11700 PRECISION allows us. */ | |
11701 prec = --this - last; | |
11702 if (precision > 0 && prec > precision - n) | |
11703 prec = precision - n; | |
11704 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11705 if (frame_title_ptr) |
25012 | 11706 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
|
11707 else |
25012 | 11708 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
11709 it, 0, prec, 0, -1); | |
277 | 11710 } |
11711 else /* c == '%' */ | |
11712 { | |
25012 | 11713 unsigned char *percent_position = this; |
11714 | |
11715 /* Get the specified minimum width. Zero means | |
11716 don't pad. */ | |
11717 field = 0; | |
277 | 11718 while ((c = *this++) >= '0' && c <= '9') |
25012 | 11719 field = field * 10 + c - '0'; |
11720 | |
11721 /* Don't pad beyond the total padding allowed. */ | |
11722 if (field_width - n > 0 && field > field_width - n) | |
11723 field = field_width - n; | |
11724 | |
11725 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
11726 prec = precision - n; | |
11727 | |
277 | 11728 if (c == 'M') |
25012 | 11729 n += display_mode_element (it, depth, field, prec, |
11730 Vglobal_mode_string); | |
277 | 11731 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
|
11732 { |
25012 | 11733 unsigned char *spec |
11734 = decode_mode_spec (it->w, c, field, prec); | |
11735 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11736 if (frame_title_ptr) |
25012 | 11737 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
|
11738 else |
25012 | 11739 { |
11740 int nglyphs_before | |
11741 = it->glyph_row->used[TEXT_AREA]; | |
11742 int charpos | |
11743 = percent_position - XSTRING (elt)->data; | |
11744 int nwritten | |
11745 = display_string (spec, Qnil, elt, charpos, 0, it, | |
11746 field, prec, 0, -1); | |
11747 | |
11748 /* Assign to the glyphs written above the | |
11749 string where the `%x' came from, position | |
11750 of the `%'. */ | |
11751 if (nwritten > 0) | |
11752 { | |
11753 struct glyph *glyph | |
11754 = (it->glyph_row->glyphs[TEXT_AREA] | |
11755 + nglyphs_before); | |
11756 int i; | |
11757 | |
11758 for (i = 0; i < nwritten; ++i) | |
11759 { | |
11760 glyph[i].object = elt; | |
11761 glyph[i].charpos = charpos; | |
11762 } | |
11763 | |
11764 n += nwritten; | |
11765 } | |
11766 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11767 } |
277 | 11768 } |
11769 } | |
11770 } | |
11771 break; | |
11772 | |
11773 case Lisp_Symbol: | |
11774 /* A symbol: process the value of the symbol recursively | |
11775 as if it appeared here directly. Avoid error if symbol void. | |
11776 Special case: if value of symbol is a string, output the string | |
11777 literally. */ | |
11778 { | |
11779 register Lisp_Object tem; | |
11780 tem = Fboundp (elt); | |
485 | 11781 if (!NILP (tem)) |
277 | 11782 { |
11783 tem = Fsymbol_value (elt); | |
11784 /* If value is a string, output that string literally: | |
11785 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
|
11786 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11787 { |
25012 | 11788 prec = XSTRING (tem)->size; |
11789 if (precision > 0 && prec > precision - n) | |
11790 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11791 if (frame_title_ptr) |
25012 | 11792 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
|
11793 else |
25012 | 11794 n += display_string (NULL, tem, Qnil, 0, 0, it, |
11795 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
|
11796 } |
277 | 11797 else if (!EQ (tem, elt)) |
25012 | 11798 { |
11799 /* Give up right away for nil or t. */ | |
11800 elt = tem; | |
11801 goto tail_recurse; | |
11802 } | |
277 | 11803 } |
11804 } | |
11805 break; | |
11806 | |
11807 case Lisp_Cons: | |
11808 { | |
11809 register Lisp_Object car, tem; | |
11810 | |
11811 /* A cons cell: three distinct cases. | |
11812 If first element is a string or a cons, process all the elements | |
11813 and effectively concatenate them. | |
11814 If first element is a negative number, truncate displaying cdr to | |
11815 at most that many characters. If positive, pad (with spaces) | |
11816 to at least that many characters. | |
11817 If first element is a symbol, process the cadr or caddr recursively | |
11818 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
|
11819 car = XCAR (elt); |
25012 | 11820 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
11821 { | |
11822 /* An element of the form (:eval FORM) means evaluate FORM | |
11823 and use the result as mode line elements. */ | |
11824 struct gcpro gcpro1; | |
11825 Lisp_Object spec; | |
11826 | |
11827 spec = eval_form (XCAR (XCDR (elt))); | |
11828 GCPRO1 (spec); | |
11829 n += display_mode_element (it, depth, field_width - n, | |
11830 precision - n, spec); | |
11831 UNGCPRO; | |
11832 } | |
11833 else if (SYMBOLP (car)) | |
277 | 11834 { |
11835 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11836 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
|
11837 if (!CONSP (elt)) |
277 | 11838 goto invalid; |
11839 /* elt is now the cdr, and we know it is a cons cell. | |
11840 Use its car if CAR has a non-nil value. */ | |
485 | 11841 if (!NILP (tem)) |
277 | 11842 { |
11843 tem = Fsymbol_value (car); | |
485 | 11844 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11845 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11846 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11847 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11848 } |
277 | 11849 } |
11850 /* Symbol's value is nil (or symbol is unbound) | |
11851 Get the cddr of the original list | |
11852 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
|
11853 elt = XCDR (elt); |
485 | 11854 if (NILP (elt)) |
277 | 11855 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11856 else if (!CONSP (elt)) |
277 | 11857 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11858 elt = XCAR (elt); |
277 | 11859 goto tail_recurse; |
11860 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11861 else if (INTEGERP (car)) |
277 | 11862 { |
11863 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11864 elt = XCDR (elt); |
277 | 11865 if (lim < 0) |
25012 | 11866 { |
11867 /* Negative int means reduce maximum width. */ | |
11868 if (precision <= 0) | |
11869 precision = -lim; | |
11870 else | |
11871 precision = min (precision, -lim); | |
11872 } | |
277 | 11873 else if (lim > 0) |
11874 { | |
11875 /* Padding specified. Don't let it be more than | |
11876 current maximum. */ | |
25012 | 11877 if (precision > 0) |
11878 lim = min (precision, lim); | |
11879 | |
277 | 11880 /* If that's more padding than already wanted, queue it. |
11881 But don't reduce padding already specified even if | |
11882 that is beyond the current truncation point. */ | |
25012 | 11883 field_width = max (lim, field_width); |
277 | 11884 } |
11885 goto tail_recurse; | |
11886 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11887 else if (STRINGP (car) || CONSP (car)) |
277 | 11888 { |
11889 register int limit = 50; | |
25012 | 11890 /* Limit is to protect against circular lists. */ |
11891 while (CONSP (elt) | |
11892 && --limit > 0 | |
11893 && (precision <= 0 || n < precision)) | |
277 | 11894 { |
25012 | 11895 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
|
11896 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11897 elt = XCDR (elt); |
277 | 11898 } |
11899 } | |
11900 } | |
11901 break; | |
11902 | |
11903 default: | |
11904 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11905 if (frame_title_ptr) |
25012 | 11906 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
|
11907 else |
25012 | 11908 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
11909 precision - n, 0, 0); | |
11910 return n; | |
11911 } | |
11912 | |
11913 /* Pad to FIELD_WIDTH. */ | |
11914 if (field_width > 0 && n < field_width) | |
11915 { | |
11916 if (frame_title_ptr) | |
11917 n += store_frame_title ("", field_width - n, 0); | |
11918 else | |
11919 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
11920 0, 0, 0); | |
11921 } | |
11922 | |
11923 return n; | |
11924 } | |
11925 | |
11926 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11927 /* 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
|
11928 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
|
11929 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11930 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11931 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11932 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11933 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11934 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11935 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11936 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11937 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11938 if (d <= 0) |
25012 | 11939 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11940 else |
25012 | 11941 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11942 while (d > 0) |
25012 | 11943 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11944 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11945 d /= 10; |
25012 | 11946 } |
11947 } | |
11948 | |
11949 for (width -= (int) (p - buf); width > 0; --width) | |
11950 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11951 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11952 while (p > buf) |
25012 | 11953 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11954 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11955 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11956 *p-- = d; |
25012 | 11957 } |
11958 } | |
11959 | |
11960 /* 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
|
11961 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
|
11962 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
|
11963 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
11964 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
|
11965 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11966 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11967 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
|
11968 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11969 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11970 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11971 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11972 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11973 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
|
11974 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11975 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11976 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11977 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
|
11978 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11979 val = coding_system; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11980 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11981 if (NILP (val)) /* Not yet decided. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11982 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11983 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11984 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
11985 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11986 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
|
11987 /* 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
|
11988 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11989 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11990 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11991 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11992 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11993 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
|
11994 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11995 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
|
11996 { |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11997 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
|
11998 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
|
11999 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
|
12000 } |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12001 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12002 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12003 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12004 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12005 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12006 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12007 /* 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
|
12008 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12009 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
|
12010 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
|
12011 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
|
12012 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
|
12013 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
|
12014 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
|
12015 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12016 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12017 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12018 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12019 } |
25012 | 12020 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12021 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12022 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12023 /* 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
|
12024 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12025 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12026 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12027 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12028 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12029 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12030 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12031 { |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
12032 eol_str_len = CHAR_STRING (XINT (eoltype), eol_str); |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12033 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12034 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12035 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12036 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12037 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
|
12038 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12039 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
|
12040 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12041 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12042 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12043 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12044 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12045 |
277 | 12046 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 12047 generated by character C. PRECISION >= 0 means don't return a |
12048 string longer than that value. FIELD_WIDTH > 0 means pad the | |
12049 string returned with spaces to that value. */ | |
277 | 12050 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
12051 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
|
12052 |
277 | 12053 static char * |
25012 | 12054 decode_mode_spec (w, c, field_width, precision) |
277 | 12055 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
|
12056 register int c; |
25012 | 12057 int field_width, precision; |
277 | 12058 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12059 Lisp_Object obj; |
25012 | 12060 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12061 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
|
12062 struct buffer *b = XBUFFER (w->buffer); |
277 | 12063 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12064 obj = Qnil; |
277 | 12065 |
12066 switch (c) | |
12067 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12068 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12069 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
|
12070 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12071 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
|
12072 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12073 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12074 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12075 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12076 /* 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
|
12077 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
|
12078 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12079 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
|
12080 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12081 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12082 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12083 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12084 /* 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
|
12085 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
|
12086 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12087 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12088 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12089 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12090 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12091 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12092 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12093 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12094 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12095 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12096 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12097 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
|
12098 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12099 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
|
12100 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
|
12101 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12102 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12103 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
|
12104 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12105 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12106 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12107 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12108 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12109 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12110 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12111 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
|
12112 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12113 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
|
12114 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
|
12115 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12116 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12117 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
|
12118 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12119 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12120 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12121 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12122 register int i; |
25012 | 12123 |
12124 /* Let lots_of_dashes be a string of infinite length. */ | |
12125 if (field_width <= 0 | |
12126 || field_width > sizeof (lots_of_dashes)) | |
12127 { | |
12128 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
12129 decode_mode_spec_buf[i] = '-'; | |
12130 decode_mode_spec_buf[i] = '\0'; | |
12131 return decode_mode_spec_buf; | |
12132 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12133 else |
25012 | 12134 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
|
12135 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12136 |
277 | 12137 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12138 obj = b->name; |
277 | 12139 break; |
12140 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12141 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12142 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12143 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
|
12144 XSETFASTINT (w->column_number_displayed, col); |
25012 | 12145 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
|
12146 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
|
12147 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12148 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12149 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12150 /* %F displays the frame name. */ |
25012 | 12151 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
|
12152 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
12153 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
|
12154 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
|
12155 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
|
12156 |
277 | 12157 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12158 obj = b->filename; |
277 | 12159 break; |
12160 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12161 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12162 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12163 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12164 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12165 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12166 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12167 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12168 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12169 /* 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
|
12170 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12171 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
|
12172 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
12173 /* 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
|
12174 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
|
12175 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12176 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12177 /* 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
|
12178 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
|
12179 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12180 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12181 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12182 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12183 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12184 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12185 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12186 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12187 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12188 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12189 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12190 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12191 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
|
12192 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12193 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12194 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12195 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12196 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12197 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12198 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12199 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12200 /* 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
|
12201 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12202 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12203 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12204 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12205 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12206 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12207 /* 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
|
12208 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
|
12209 "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
|
12210 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
|
12211 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12212 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12213 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
|
12214 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
|
12215 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12216 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
|
12217 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12218 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12219 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12220 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12221 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12222 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
|
12223 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12224 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12225 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12226 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12227 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12228 } |
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 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12231 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12232 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12233 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12234 /* 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
|
12235 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
|
12236 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
|
12237 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12238 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12239 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12240 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12241 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12242 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12243 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12244 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12245 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
|
12246 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12247 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12248 /* 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
|
12249 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12250 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12251 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12252 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12253 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12254 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12255 /* Make the string to show. */ |
25012 | 12256 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
|
12257 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12258 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12259 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12260 char* p = decode_mode_spec_buf; |
25012 | 12261 int pad = field_width - 2; |
12262 while (pad-- > 0) | |
12263 *p++ = ' '; | |
12264 *p++ = '?'; | |
12265 *p = '?'; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12266 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12267 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12268 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12269 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12270 |
277 | 12271 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12272 obj = b->mode_name; |
277 | 12273 break; |
12274 | |
12275 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12276 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 12277 return " Narrow"; |
12278 break; | |
12279 | |
12280 case 'p': | |
12281 { | |
12282 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
|
12283 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
|
12284 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12285 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 12286 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12287 if (pos <= BUF_BEGV (b)) |
277 | 12288 return "All"; |
12289 else | |
12290 return "Bottom"; | |
12291 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12292 else if (pos <= BUF_BEGV (b)) |
277 | 12293 return "Top"; |
12294 else | |
12295 { | |
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
|
12296 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
|
12297 /* 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
|
12298 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
|
12299 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
|
12300 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 12301 /* We can't normally display a 3-digit number, |
12302 so get us a 2-digit number that is close. */ | |
12303 if (total == 100) | |
12304 total = 99; | |
12305 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
12306 return decode_mode_spec_buf; | |
12307 } | |
12308 } | |
12309 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12310 /* 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
|
12311 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12312 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12313 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
|
12314 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
|
12315 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
|
12316 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12317 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12318 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12319 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12320 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12321 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12322 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12323 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12324 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12325 { |
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
|
12326 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
|
12327 /* 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
|
12328 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
|
12329 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
|
12330 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
|
12331 /* 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
|
12332 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
|
12333 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12334 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12335 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12336 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12337 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12338 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12339 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12340 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12341 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12342 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12343 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12344 /* 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
|
12345 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
|
12346 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
|
12347 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
|
12348 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12349 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
|
12350 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12351 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12352 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12353 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
|
12354 #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
|
12355 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
|
12356 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12357 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12358 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12359 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12360 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12361 /* 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
|
12362 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12363 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12364 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12365 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
|
12366 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12367 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
12368 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12369 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12370 /* 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
|
12371 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12372 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
|
12373 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
|
12374 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12375 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
|
12376 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12377 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12378 #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
|
12379 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12380 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12381 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12382 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12383 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
|
12384 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12385 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
|
12386 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12387 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12388 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12389 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12390 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12391 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12392 } |
277 | 12393 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12394 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12395 if (STRINGP (obj)) |
277 | 12396 return (char *) XSTRING (obj)->data; |
12397 else | |
12398 return ""; | |
12399 } | |
25012 | 12400 |
12401 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12402 /* 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
|
12403 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12404 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
|
12405 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12406 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
|
12407 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12408 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12409 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
|
12410 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12411 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12412 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12413 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12414 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12415 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12416 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12417 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12418 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12419 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12420 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12421 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12422 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12423 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12424 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12425 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12426 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12427 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12428 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12429 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12430 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12431 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12432 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12433 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12434 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12435 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12436 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12437 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12438 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12439 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12440 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12441 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12442 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12443 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12444 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12445 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12446 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12447 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12448 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12449 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12450 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12451 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12452 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12453 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12454 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12455 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12456 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12457 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12458 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12459 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12460 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12461 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12462 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12463 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12464 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12465 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12466 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12467 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
|
12468 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12469 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12470 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12471 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12472 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12473 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12474 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12475 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12476 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12477 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12478 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12479 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12480 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12481 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12482 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12483 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12484 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12485 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
|
12486 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12487 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12488 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12489 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12490 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12491 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12492 /* 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
|
12493 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
|
12494 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12495 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12496 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12497 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12498 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12499 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12500 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12501 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12502 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12503 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12504 } |
25012 | 12505 |
12506 | |
277 | 12507 |
25012 | 12508 /*********************************************************************** |
12509 Displaying strings | |
12510 ***********************************************************************/ | |
12511 | |
12512 /* Display a NUL-terminated string, starting with index START. | |
12513 | |
12514 If STRING is non-null, display that C string. Otherwise, the Lisp | |
12515 string LISP_STRING is displayed. | |
12516 | |
12517 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
12518 FACE_STRING. Display STRING or LISP_STRING with the face at | |
12519 FACE_STRING_POS in FACE_STRING: | |
12520 | |
12521 Display the string in the environment given by IT, but use the | |
12522 standard display table, temporarily. | |
12523 | |
12524 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
12525 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
12526 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
12527 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
12528 | |
12529 PRECISION is the maximum number of characters to output from | |
12530 STRING. PRECISION < 0 means don't truncate the string. | |
12531 | |
12532 This is roughly equivalent to printf format specifiers: | |
12533 | |
12534 FIELD_WIDTH PRECISION PRINTF | |
12535 ---------------------------------------- | |
12536 -1 -1 %s | |
12537 -1 10 %.10s | |
12538 10 -1 %10s | |
12539 20 10 %20.10s | |
12540 | |
12541 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
12542 display them, and < 0 means obey the current buffer's value of | |
12543 enable_multibyte_characters. | |
12544 | |
12545 Value is the number of glyphs produced. */ | |
277 | 12546 |
12547 static int | |
25012 | 12548 display_string (string, lisp_string, face_string, face_string_pos, |
12549 start, it, field_width, precision, max_x, multibyte) | |
277 | 12550 unsigned char *string; |
25012 | 12551 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
|
12552 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
|
12553 int face_string_pos; |
25012 | 12554 int start; |
12555 struct it *it; | |
12556 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
|
12557 int multibyte; |
277 | 12558 { |
25012 | 12559 int hpos_at_start = it->hpos; |
12560 int saved_face_id = it->face_id; | |
12561 struct glyph_row *row = it->glyph_row; | |
12562 | |
12563 /* Initialize the iterator IT for iteration over STRING beginning | |
12564 with index START. We assume that IT may be modified here (which | |
12565 means that display_line has to do something when displaying a | |
12566 mini-buffer prompt, which it does). */ | |
12567 reseat_to_string (it, string, lisp_string, start, | |
12568 precision, field_width, multibyte); | |
12569 | |
12570 /* If displaying STRING, set up the face of the iterator | |
12571 from LISP_STRING, if that's given. */ | |
12572 if (STRINGP (face_string)) | |
12573 { | |
12574 int endptr; | |
12575 struct face *face; | |
12576 | |
12577 it->face_id | |
12578 = face_at_string_position (it->w, face_string, face_string_pos, | |
12579 0, it->region_beg_charpos, | |
12580 it->region_end_charpos, | |
12581 &endptr, it->base_face_id); | |
12582 face = FACE_FROM_ID (it->f, it->face_id); | |
12583 it->face_box_p = face->box != FACE_NO_BOX; | |
12584 } | |
12585 | |
12586 /* Set max_x to the maximum allowed X position. Don't let it go | |
12587 beyond the right edge of the window. */ | |
12588 if (max_x <= 0) | |
12589 max_x = it->last_visible_x; | |
12590 else | |
12591 max_x = min (max_x, it->last_visible_x); | |
12592 | |
12593 /* Skip over display elements that are not visible. because IT->w is | |
12594 hscrolled. */ | |
12595 if (it->current_x < it->first_visible_x) | |
12596 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
12597 MOVE_TO_POS | MOVE_TO_X); | |
12598 | |
12599 row->ascent = it->max_ascent; | |
12600 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
|
12601 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
|
12602 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 12603 |
12604 /* This condition is for the case that we are called with current_x | |
12605 past last_visible_x. */ | |
12606 while (it->current_x < max_x) | |
12607 { | |
12608 int x_before, x, n_glyphs_before, i, nglyphs; | |
12609 | |
12610 /* Get the next display element. */ | |
12611 if (!get_next_display_element (it)) | |
12612 break; | |
12613 | |
12614 /* Produce glyphs. */ | |
12615 x_before = it->current_x; | |
12616 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
12617 PRODUCE_GLYPHS (it); | |
12618 | |
12619 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
12620 i = 0; | |
12621 x = x_before; | |
12622 while (i < nglyphs) | |
12623 { | |
12624 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
12625 | |
12626 if (!it->truncate_lines_p | |
12627 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
12628 { |
25012 | 12629 /* End of continued line or max_x reached. */ |
12630 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
12631 it->current_x = x; | |
12632 break; | |
277 | 12633 } |
25012 | 12634 else if (x + glyph->pixel_width > it->first_visible_x) |
12635 { | |
12636 /* Glyph is at least partially visible. */ | |
12637 ++it->hpos; | |
12638 if (x < it->first_visible_x) | |
12639 it->glyph_row->x = x - it->first_visible_x; | |
12640 } | |
12641 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12642 { |
25012 | 12643 /* Glyph is off the left margin of the display area. |
12644 Should not happen. */ | |
12645 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12646 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
12647 |
25012 | 12648 row->ascent = max (row->ascent, it->max_ascent); |
12649 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
|
12650 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
|
12651 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
|
12652 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12653 x += glyph->pixel_width; |
12654 ++i; | |
12655 } | |
12656 | |
12657 /* Stop if max_x reached. */ | |
12658 if (i < nglyphs) | |
12659 break; | |
12660 | |
12661 /* Stop at line ends. */ | |
12662 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
12663 { | |
12664 it->continuation_lines_width = 0; | |
12665 break; | |
12666 } | |
12667 | |
12668 set_iterator_to_next (it); | |
12669 | |
12670 /* Stop if truncating at the right edge. */ | |
12671 if (it->truncate_lines_p | |
12672 && it->current_x >= it->last_visible_x) | |
12673 { | |
12674 /* Add truncation mark, but don't do it if the line is | |
12675 truncated at a padding space. */ | |
12676 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
|
12677 { |
25012 | 12678 if (!FRAME_WINDOW_P (it->f)) |
12679 produce_special_glyphs (it, IT_TRUNCATION); | |
12680 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
|
12681 } |
25012 | 12682 break; |
12683 } | |
12684 } | |
12685 | |
12686 /* Maybe insert a truncation at the left. */ | |
12687 if (it->first_visible_x | |
12688 && IT_CHARPOS (*it) > 0) | |
12689 { | |
12690 if (!FRAME_WINDOW_P (it->f)) | |
12691 insert_left_trunc_glyphs (it); | |
12692 it->glyph_row->truncated_on_left_p = 1; | |
12693 } | |
12694 | |
12695 it->face_id = saved_face_id; | |
12696 | |
12697 /* Value is number of columns displayed. */ | |
12698 return it->hpos - hpos_at_start; | |
12699 } | |
12700 | |
12701 | |
277 | 12702 |
25012 | 12703 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
12704 appears as an element of LIST or as the car of an element of LIST. | |
12705 If PROPVAL is a list, compare each element against LIST in that | |
12706 way, and return 1 if any element of PROPVAL is found in LIST. | |
12707 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
|
12708 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12709 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12710 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12711 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12712 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12713 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12714 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12715 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
|
12716 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12717 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12718 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12719 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12720 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12721 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
|
12722 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12723 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12724 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12725 for (proptail = propval; CONSP (proptail); |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12726 proptail = XCDR (proptail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12727 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12728 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12729 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12730 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
|
12731 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12732 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12733 tem = XCAR (tail); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12734 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12735 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12736 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
|
12737 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12738 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12739 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12740 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12741 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12742 |
25012 | 12743 |
12744 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
12745 the cdr of that element is non-nil. If PROPVAL is a list, check | |
12746 each element of PROPVAL in that way, and the first time some | |
12747 element is found, return 1 if the cdr of that element is non-nil. | |
12748 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
|
12749 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12750 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12751 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12752 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12753 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12754 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12755 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12756 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12757 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
|
12758 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12759 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12760 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12761 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12762 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12763 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12764 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12765 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12766 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
|
12767 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12768 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12769 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12770 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
|
12771 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12772 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12773 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12774 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12775 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12776 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12777 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12778 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12779 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12780 } |
25012 | 12781 |
12782 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12783 |
25012 | 12784 /*********************************************************************** |
12785 Initialization | |
12786 ***********************************************************************/ | |
12787 | |
277 | 12788 void |
12789 syms_of_xdisp () | |
12790 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12791 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
|
12792 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
|
12793 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12794 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12795 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12796 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12797 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12798 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12799 |
25012 | 12800 #if GLYPH_DEBUG |
12801 defsubr (&Sdump_glyph_matrix); | |
12802 defsubr (&Sdump_glyph_row); | |
25543 | 12803 defsubr (&Sdump_tool_bar_row); |
25012 | 12804 defsubr (&Strace_redisplay_toggle); |
12805 #endif | |
12806 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
12807 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
|
12808 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
|
12809 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
12810 staticpro (&Qoverriding_terminal_local_map); |
12267 | 12811 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
|
12812 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
12813 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
|
12814 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
|
12815 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12816 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12817 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
|
12818 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
12819 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
12820 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 12821 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
12822 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
12823 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
|
12824 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12825 Qdisplay = intern ("display"); |
25012 | 12826 staticpro (&Qdisplay); |
12827 Qspace_width = intern ("space-width"); | |
12828 staticpro (&Qspace_width); | |
12829 Qraise = intern ("raise"); | |
12830 staticpro (&Qraise); | |
12831 Qspace = intern ("space"); | |
12832 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12833 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12834 staticpro (&Qmargin); |
25012 | 12835 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12836 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12837 Qright_margin = intern ("right-margin"); |
25012 | 12838 staticpro (&Qright_margin); |
12839 Qalign_to = intern ("align-to"); | |
12840 staticpro (&Qalign_to); | |
12841 QCalign_to = intern (":align-to"); | |
12842 staticpro (&QCalign_to); | |
12843 Qrelative_width = intern ("relative-width"); | |
12844 staticpro (&Qrelative_width); | |
12845 QCrelative_width = intern (":relative-width"); | |
12846 staticpro (&QCrelative_width); | |
12847 QCrelative_height = intern (":relative-height"); | |
12848 staticpro (&QCrelative_height); | |
12849 QCeval = intern (":eval"); | |
12850 staticpro (&QCeval); | |
25614 | 12851 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12852 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
12853 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
12854 staticpro (&QCfile); |
25012 | 12855 Qfontified = intern ("fontified"); |
12856 staticpro (&Qfontified); | |
12857 Qfontification_functions = intern ("fontification-functions"); | |
12858 staticpro (&Qfontification_functions); | |
12859 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
12860 staticpro (&Qtrailing_whitespace); | |
12861 Qimage = intern ("image"); | |
12862 staticpro (&Qimage); | |
12863 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12864 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12865 last_arrow_string = Qnil; |
277 | 12866 staticpro (&last_arrow_position); |
12867 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
|
12868 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12869 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
|
12870 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12871 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12872 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12873 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
|
12874 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
|
12875 staticpro (&echo_area_buffer[1]); |
277 | 12876 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12877 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12878 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12879 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12880 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12881 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12882 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12883 "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
|
12884 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12885 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12886 |
277 | 12887 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
12888 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 12889 Vglobal_mode_string = Qnil; |
12890 | |
12891 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
12892 "Marker for where to display an arrow on top of the buffer text.\n\ | |
12893 This must be the beginning of a line in order to work.\n\ | |
12894 See also `overlay-arrow-string'."); | |
12895 Voverlay_arrow_position = Qnil; | |
12896 | |
12897 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
12898 "String to display as an arrow. See also `overlay-arrow-position'."); | |
12899 Voverlay_arrow_string = Qnil; | |
12900 | |
12901 DEFVAR_INT ("scroll-step", &scroll_step, | |
12902 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 12903 If that fails to bring point back on frame, point is centered instead.\n\ |
12904 If this is zero, point is always centered after it moves off frame."); | |
277 | 12905 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12906 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12907 "*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
|
12908 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12909 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12910 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12911 "*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
|
12912 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
|
12913 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12914 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12915 |
25012 | 12916 #if GLYPH_DEBUG |
277 | 12917 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 12918 #endif |
277 | 12919 |
12920 DEFVAR_BOOL ("truncate-partial-width-windows", | |
12921 &truncate_partial_width_windows, | |
769 | 12922 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 12923 truncate_partial_width_windows = 1; |
12924 | |
12925 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
12926 "*Non-nil means use inverse video for the mode line."); | |
12927 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12928 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12929 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
25012 | 12930 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 12931 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
|
12932 in the mode line."); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12933 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
|
12934 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12935 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
|
12936 "*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
|
12937 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
|
12938 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
|
12939 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12940 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
12941 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
|
12942 "*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
|
12943 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
|
12944 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12945 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
|
12946 "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
|
12947 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
|
12948 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
|
12949 `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
|
12950 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12951 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 12952 "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
|
12953 \(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
|
12954 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
|
12955 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
|
12956 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12957 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 12958 "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
|
12959 \(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
|
12960 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
|
12961 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
|
12962 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12963 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12964 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12965 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12966 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12967 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12968 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12969 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12970 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12971 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12972 Qnil))); |
10393 | 12973 |
12974 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
12975 "Maximum number of lines to keep in the message log buffer.\n\ | |
12976 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
12977 the buffer when it becomes large."); | |
12978 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12979 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12980 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
|
12981 "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
|
12982 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
|
12983 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
|
12984 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
|
12985 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
|
12986 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
|
12987 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12988 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 12989 "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
|
12990 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
|
12991 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
|
12992 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
|
12993 Vwindow_scroll_functions = Qnil; |
25012 | 12994 |
25543 | 12995 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
12996 "*Non-nil means automatically resize tool-bars.\n\ | |
12997 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
12998 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 12999 otherwise."); |
25543 | 13000 auto_resize_tool_bars_p = 1; |
13001 | |
13002 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
13003 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
13004 auto_raise_tool_bar_buttons_p = 1; | |
13005 | |
13006 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
13007 "*Margin around tool-bar buttons in pixels."); | |
13008 tool_bar_button_margin = 1; | |
13009 | |
13010 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
13011 "Relief thickness of tool-bar buttons."); | |
13012 tool_bar_button_relief = 3; | |
25012 | 13013 |
13014 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
13015 "List of functions to call to fontify regions of text.\n\ | |
13016 Each function is called with one argument POS. Functions must\n\ | |
13017 fontify a region starting at POS in the current buffer, and give\n\ | |
13018 fontified regions the property `fontified'.\n\ | |
13019 This variable automatically becomes buffer-local when set."); | |
13020 Vfontification_functions = Qnil; | |
13021 Fmake_local_variable (Qfontification_functions); | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13022 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13023 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 13024 &unibyte_display_via_language_environment, |
13025 "*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
|
13026 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
|
13027 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
|
13028 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
|
13029 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13030 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
|
13031 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13032 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
|
13033 "*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
|
13034 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
|
13035 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
|
13036 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
|
13037 Vmax_mini_window_height = make_float (0.25); |
277 | 13038 } |
13039 | |
25012 | 13040 |
13041 /* Initialize this module when Emacs starts. */ | |
13042 | |
21514 | 13043 void |
277 | 13044 init_xdisp () |
13045 { | |
13046 Lisp_Object root_window; | |
25012 | 13047 struct window *mini_w; |
13048 | |
13049 CHARPOS (this_line_start_pos) = 0; | |
277 | 13050 |
13051 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
|
13052 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 13053 |
13054 if (!noninteractive) | |
13055 { | |
25012 | 13056 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
13057 int i; | |
13058 | |
13059 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
|
13060 set_window_height (root_window, |
25012 | 13061 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
|
13062 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13063 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 13064 set_window_height (minibuf_window, 1, 0); |
13065 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13066 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
|
13067 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 13068 |
13069 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
13070 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
13071 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
13072 | |
13073 /* The default ellipsis glyphs `...'. */ | |
13074 for (i = 0; i < 3; ++i) | |
13075 XSETFASTINT (default_invis_vector[i], '.'); | |
13076 } | |
13077 | |
13078 #ifdef HAVE_WINDOW_SYSTEM | |
13079 { | |
13080 /* Allocate the buffer for frame titles. */ | |
13081 int size = 100; | |
13082 frame_title_buf = (char *) xmalloc (size); | |
13083 frame_title_buf_end = frame_title_buf + size; | |
13084 frame_title_ptr = NULL; | |
13085 } | |
13086 #endif /* HAVE_WINDOW_SYSTEM */ | |
13087 } | |
13088 | |
13089 |