Mercurial > emacs
annotate src/xdisp.c @ 34487:5cdf7acaeb2d
Add obsolete.
author | Dave Love <fx@gnu.org> |
---|---|
date | Tue, 12 Dec 2000 15:11:04 +0000 |
parents | aab24f62ad6b |
children | 41ad2cf8ccb8 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
30697
0b56d5da235e
(next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents:
30675
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000 |
25012 | 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" | |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
173 #include "keyboard.h" |
769 | 174 #include "frame.h" |
277 | 175 #include "window.h" |
176 #include "termchar.h" | |
177 #include "dispextern.h" | |
178 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
179 #include "charset.h" |
277 | 180 #include "indent.h" |
181 #include "commands.h" | |
182 #include "macros.h" | |
183 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
184 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
185 #include "intervals.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" |
29433 | 189 #include "fontset.h" |
21514 | 190 |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
191 #ifdef HAVE_X_WINDOWS |
21514 | 192 #include "xterm.h" |
193 #endif | |
27634
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
194 #ifdef WINDOWSNT |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
195 #include "w32term.h" |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
196 #endif |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
197 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
198 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
199 #endif |
277 | 200 |
25012 | 201 #define min(a, b) ((a) < (b) ? (a) : (b)) |
202 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
203 | |
204 #define INFINITY 10000000 | |
205 | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
206 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
207 extern void set_frame_menubar P_ ((struct frame *f, int, int)); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
208 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
|
209 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
210 |
277 | 211 extern int interrupt_input; |
212 extern int command_loop_level; | |
213 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
214 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
215 |
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
|
216 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
|
217 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
218 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
|
219 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 220 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
|
221 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
222 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
|
223 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
|
224 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
225 Lisp_Object Qinhibit_point_motion_hooks; |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
226 Lisp_Object QCeval, Qwhen, QCfile, QCdata; |
25012 | 227 Lisp_Object Qfontified; |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
228 Lisp_Object Qgrow_only; |
25012 | 229 |
230 /* Functions called to fontify regions of text. */ | |
231 | |
232 Lisp_Object Vfontification_functions; | |
233 Lisp_Object Qfontification_functions; | |
234 | |
25543 | 235 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 236 over them. */ |
237 | |
25543 | 238 int auto_raise_tool_bar_buttons_p; |
239 | |
240 /* Margin around tool bar buttons in pixels. */ | |
241 | |
242 int tool_bar_button_margin; | |
243 | |
244 /* Thickness of shadow to draw around tool bar buttons. */ | |
245 | |
246 int tool_bar_button_relief; | |
247 | |
248 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 249 items are visible, and no blank lines remain. */ |
250 | |
25543 | 251 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
|
252 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
253 /* 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
|
254 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
255 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
256 |
25012 | 257 /* Names of text properties relevant for redisplay. */ |
258 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
259 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
|
260 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 261 |
262 /* Symbols used in text property values. */ | |
263 | |
264 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
|
265 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
|
266 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
267 extern Lisp_Object Qheight; |
25012 | 268 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
269 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
270 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
271 Lisp_Object Vshow_trailing_whitespace; |
25012 | 272 |
273 /* Name of the face used to highlight trailing whitespace. */ | |
274 | |
275 Lisp_Object Qtrailing_whitespace; | |
276 | |
277 /* The symbol `image' which is the car of the lists used to represent | |
278 images in Lisp. */ | |
279 | |
280 Lisp_Object Qimage; | |
281 | |
282 /* Non-zero means print newline to stdout before next mini-buffer | |
283 message. */ | |
277 | 284 |
285 int noninteractive_need_newline; | |
286 | |
25012 | 287 /* 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
|
288 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
289 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
290 |
25012 | 291 |
292 /* The buffer position of the first character appearing entirely or | |
293 partially on the line of the selected window which contains the | |
294 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
295 redisplay optimization in redisplay_internal. */ | |
296 | |
297 static struct text_pos this_line_start_pos; | |
298 | |
299 /* Number of characters past the end of the line above, including the | |
300 terminating newline. */ | |
301 | |
302 static struct text_pos this_line_end_pos; | |
303 | |
304 /* The vertical positions and the height of this line. */ | |
305 | |
277 | 306 static int this_line_vpos; |
25012 | 307 static int this_line_y; |
308 static int this_line_pixel_height; | |
309 | |
310 /* X position at which this display line starts. Usually zero; | |
311 negative if first character is partially visible. */ | |
312 | |
313 static int this_line_start_x; | |
314 | |
315 /* Buffer that this_line_.* variables are referring to. */ | |
316 | |
277 | 317 static struct buffer *this_line_buffer; |
318 | |
25012 | 319 /* Nonzero means truncate lines in all windows less wide than the |
320 frame. */ | |
321 | |
277 | 322 int truncate_partial_width_windows; |
323 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
324 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 325 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
326 int unibyte_display_via_language_environment; |
25012 | 327 |
328 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
329 Not guaranteed to be accurate except while parsing | |
330 frame-title-format. */ | |
331 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
332 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
333 |
277 | 334 Lisp_Object Vglobal_mode_string; |
335 | |
336 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 337 |
277 | 338 Lisp_Object Voverlay_arrow_position; |
339 | |
25012 | 340 /* String to display for the arrow. Only used on terminal frames. */ |
341 | |
277 | 342 Lisp_Object Voverlay_arrow_string; |
343 | |
25012 | 344 /* Values of those variables at last redisplay. However, if |
345 Voverlay_arrow_position is a marker, last_arrow_position is its | |
346 numerical position. */ | |
347 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
348 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
349 |
25012 | 350 /* Like mode-line-format, but for the title bar on a visible frame. */ |
351 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
352 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
|
353 |
25012 | 354 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
355 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
356 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
|
357 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
358 /* 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
|
359 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
|
360 have changed. */ |
25012 | 361 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
362 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
363 |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
364 Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook; |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
365 |
277 | 366 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 367 |
277 | 368 static int overlay_arrow_seen; |
369 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
370 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 371 |
372 int highlight_nonselected_windows; | |
373 | |
374 /* If cursor motion alone moves point off frame, try scrolling this | |
375 many lines up or down if that will bring it back. */ | |
376 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
377 static int scroll_step; |
277 | 378 |
25012 | 379 /* Non-0 means scroll just far enough to bring point back on the |
380 screen, when appropriate. */ | |
381 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
382 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
383 |
25012 | 384 /* Recenter the window whenever point gets within this many lines of |
385 the top or bottom of the window. This value is translated into a | |
386 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
387 there is really a fixed pixel height scroll margin. */ | |
388 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
389 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
390 |
25012 | 391 /* Number of windows showing the buffer of the selected window (or |
392 another buffer with the same base buffer). keyboard.c refers to | |
393 this. */ | |
394 | |
277 | 395 int buffer_shared; |
396 | |
25012 | 397 /* Vector containing glyphs for an ellipsis `...'. */ |
398 | |
399 static Lisp_Object default_invis_vector[3]; | |
400 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
401 /* Zero means display the mode-line/header-line/menu-bar in the default face |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
402 (this slightly odd definition is for compatibility with previous versions |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
403 of emacs), non-zero means display them using their respective faces. |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
404 |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
405 This variable is deprecated. */ |
25012 | 406 |
277 | 407 int mode_line_inverse_video; |
408 | |
25012 | 409 /* Prompt to display in front of the mini-buffer contents. */ |
410 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
411 Lisp_Object minibuf_prompt; |
277 | 412 |
25012 | 413 /* Width of current mini-buffer prompt. Only set after display_line |
414 of the line that contains the prompt. */ | |
415 | |
277 | 416 int minibuf_prompt_width; |
25012 | 417 int minibuf_prompt_pixel_width; |
418 | |
419 /* This is the window where the echo area message was displayed. It | |
420 is always a mini-buffer window, but it may not be the same window | |
421 currently active as a mini-buffer. */ | |
422 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
423 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
|
424 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
425 /* 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
|
426 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
|
427 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
|
428 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
|
429 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
430 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
431 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
432 /* 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
|
433 message was specified. */ |
25012 | 434 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
435 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
436 |
25012 | 437 /* True if we should redraw the mode lines on the next redisplay. */ |
438 | |
277 | 439 int update_mode_lines; |
440 | |
25012 | 441 /* Nonzero if window sizes or contents have changed since last |
442 redisplay that finished */ | |
443 | |
277 | 444 int windows_or_buffers_changed; |
445 | |
25012 | 446 /* Nonzero after display_mode_line if %l was used and it displayed a |
447 line number. */ | |
448 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
449 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
450 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
451 /* Maximum buffer size for which to display line numbers. */ |
25012 | 452 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
453 Lisp_Object Vline_number_display_limit; |
10393 | 454 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
455 /* 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
|
456 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
457 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
458 |
25012 | 459 /* Number of lines to keep in the message log buffer. t means |
460 infinite. nil means don't log at all. */ | |
461 | |
10393 | 462 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
463 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
464 /* The name of the *Messages* buffer, a string. */ |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
465 |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
466 static Lisp_Object Vmessages_buffer_name; |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
467 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 /* 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
|
469 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
|
470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 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
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 /* 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
|
474 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
475 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
|
476 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
477 /* 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
|
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 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
|
480 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
481 /* 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
|
482 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
|
483 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
484 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
|
485 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
486 /* 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
|
487 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
488 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
489 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
490 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
491 /* 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
|
492 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
|
493 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
|
494 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
495 Lisp_Object Vmax_mini_window_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
496 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
497 /* Non-zero means messages should be displayed with truncated |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
498 lines instead of being continued. */ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
499 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
500 int message_truncate_lines; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
501 Lisp_Object Qmessage_truncate_lines; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
502 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
503 /* Non-zero means we want a hollow cursor in windows that are not |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
504 selected. Zero means there's no cursor in such windows. */ |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
505 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
506 int cursor_in_non_selected_windows; |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
507 |
25012 | 508 /* A scratch glyph row with contents used for generating truncation |
509 glyphs. Also used in direct_output_for_insert. */ | |
510 | |
511 #define MAX_SCRATCH_GLYPHS 100 | |
512 struct glyph_row scratch_glyph_row; | |
513 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
514 | |
515 /* Ascent and height of the last line processed by move_it_to. */ | |
516 | |
517 static int last_max_ascent, last_height; | |
518 | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
519 /* Non-zero if there's a help-echo in the echo area. */ |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
520 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
521 int help_echo_showing_p; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
522 |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
523 /* If >= 0, computed, exact values of mode-line and header-line height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
524 to use in the macros CURRENT_MODE_LINE_HEIGHT and |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
525 CURRENT_HEADER_LINE_HEIGHT. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
526 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
527 int current_mode_line_height, current_header_line_height; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
528 |
25012 | 529 /* The maximum distance to look ahead for text properties. Values |
530 that are too small let us call compute_char_face and similar | |
531 functions too often which is expensive. Values that are too large | |
532 let us call compute_char_face and alike too often because we | |
533 might not be interested in text properties that far away. */ | |
534 | |
535 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
536 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
537 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
538 |
25012 | 539 /* Non-zero means print traces of redisplay if compiled with |
540 GLYPH_DEBUG != 0. */ | |
541 | |
542 int trace_redisplay_p; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
543 |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
544 #endif /* GLYPH_DEBUG */ |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
545 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
546 #ifdef DEBUG_TRACE_MOVE |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
547 /* Non-zero means trace with TRACE_MOVE to stderr. */ |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
548 int trace_move; |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
549 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
550 #define TRACE_MOVE(x) if (trace_move) fprintf x; else (void) 0 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
551 #else |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
552 #define TRACE_MOVE(x) (void) 0 |
25012 | 553 #endif |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
554 |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
555 /* Non-zero means automatically scroll windows horizontally to make |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
556 point visible. */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
557 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
558 int automatic_hscrolling_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
559 |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
560 /* A list of symbols, one for each supported image type. */ |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
561 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
562 Lisp_Object Vimage_types; |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
563 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
564 /* The variable `resize-mini-windows'. If nil, don't resize |
33453 | 565 mini-windows. If t, always resize them to fit the text they |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
566 display. If `grow-only', let mini-windows grow only until they |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
567 become empty. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
568 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
569 Lisp_Object Vresize_mini_windows; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
570 |
25012 | 571 /* Value returned from text property handlers (see below). */ |
572 | |
573 enum prop_handled | |
574 { | |
575 HANDLED_NORMALLY, | |
576 HANDLED_RECOMPUTE_PROPS, | |
577 HANDLED_OVERLAY_STRING_CONSUMED, | |
578 HANDLED_RETURN | |
579 }; | |
580 | |
581 /* A description of text properties that redisplay is interested | |
582 in. */ | |
583 | |
584 struct props | |
585 { | |
586 /* The name of the property. */ | |
587 Lisp_Object *name; | |
588 | |
589 /* A unique index for the property. */ | |
590 enum prop_idx idx; | |
591 | |
592 /* A handler function called to set up iterator IT from the property | |
593 at IT's current position. Value is used to steer handle_stop. */ | |
594 enum prop_handled (*handler) P_ ((struct it *it)); | |
595 }; | |
596 | |
597 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
598 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
599 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
|
600 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 601 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
602 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
603 | |
604 /* Properties handled by iterators. */ | |
605 | |
606 static struct props it_props[] = | |
607 { | |
608 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
609 /* Handle `face' before `display' because some sub-properties of | |
610 `display' need to know the face. */ | |
611 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
612 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
613 {&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
|
614 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 615 {NULL, 0, NULL} |
616 }; | |
617 | |
618 /* Value is the position described by X. If X is a marker, value is | |
619 the marker_position of X. Otherwise, value is X. */ | |
620 | |
621 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
622 | |
623 /* Enumeration returned by some move_it_.* functions internally. */ | |
624 | |
625 enum move_it_result | |
626 { | |
627 /* Not used. Undefined value. */ | |
628 MOVE_UNDEFINED, | |
629 | |
630 /* Move ended at the requested buffer position or ZV. */ | |
631 MOVE_POS_MATCH_OR_ZV, | |
632 | |
633 /* Move ended at the requested X pixel position. */ | |
634 MOVE_X_REACHED, | |
635 | |
636 /* Move within a line ended at the end of a line that must be | |
637 continued. */ | |
638 MOVE_LINE_CONTINUED, | |
639 | |
640 /* Move within a line ended at the end of a line that would | |
641 be displayed truncated. */ | |
642 MOVE_LINE_TRUNCATED, | |
643 | |
644 /* Move within a line ended at a line end. */ | |
645 MOVE_NEWLINE_OR_CR | |
646 }; | |
647 | |
648 | |
649 | |
650 /* Function prototypes. */ | |
651 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
652 static int cursor_row_p P_ ((struct window *, struct glyph_row *)); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
653 static int redisplay_mode_lines P_ ((Lisp_Object, int)); |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
654 static char *decode_mode_spec_coding P_ ((Lisp_Object, char *, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
655 static int invisible_text_between_p P_ ((struct it *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
656 static int next_element_from_ellipsis P_ ((struct it *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
657 static void pint2str P_ ((char *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
658 static struct text_pos run_window_scroll_functions P_ ((Lisp_Object, |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
659 struct text_pos)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
660 static void reconsider_clip_changes P_ ((struct window *, struct buffer *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
661 static int text_outside_line_unchanged_p P_ ((struct window *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
662 static void store_frame_title_char P_ ((char)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
663 static int store_frame_title P_ ((unsigned char *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
664 static void x_consider_frame_title P_ ((Lisp_Object)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
665 static void handle_stop P_ ((struct it *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
666 static int tool_bar_lines_needed P_ ((struct frame *)); |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
667 static int single_display_prop_intangible_p P_ ((Lisp_Object)); |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
668 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 669 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
670 struct glyph_row *, | |
671 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
672 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
|
673 static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *)); |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
674 static int with_echo_area_buffer P_ ((struct window *, int, |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
675 int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT), |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
676 EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
677 static void clear_garbaged_frames P_ ((void)); |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
678 static int current_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
679 static int truncate_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
680 static int set_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
681 static int display_echo_area P_ ((struct window *)); |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
682 static int display_echo_area_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
683 static int resize_mini_window_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
684 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
|
685 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 686 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
687 struct text_pos)); | |
688 static int compute_window_start_on_continuation_line P_ ((struct window *)); | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
689 static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); |
25012 | 690 static void insert_left_trunc_glyphs P_ ((struct it *)); |
691 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
692 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
|
693 static int append_space P_ ((struct it *, int)); |
25012 | 694 static void make_cursor_line_fully_visible P_ ((struct window *)); |
695 static int try_scrolling P_ ((Lisp_Object, int, int, int, int)); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
696 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); |
25012 | 697 static int trailing_whitespace_p P_ ((int)); |
698 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
699 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
700 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
701 static void push_it P_ ((struct it *)); | |
702 static void pop_it P_ ((struct it *)); | |
703 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
704 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
|
705 static int echo_area_display P_ ((int)); |
25012 | 706 static void redisplay_windows P_ ((Lisp_Object)); |
707 static void redisplay_window P_ ((Lisp_Object, int)); | |
708 static void update_menu_bar P_ ((struct frame *, int)); | |
709 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
710 static int try_window_id P_ ((struct window *)); | |
711 static int display_line P_ ((struct it *)); | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
712 static int display_mode_lines P_ ((struct window *)); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
713 static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object)); |
25012 | 714 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
|
715 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 716 static void display_menu_bar P_ ((struct window *)); |
717 static int display_count_lines P_ ((int, int, int, int, int *)); | |
718 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
719 int, int, struct it *, int, int, int, int)); | |
720 static void compute_line_metrics P_ ((struct it *)); | |
721 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
722 static int get_overlay_strings P_ ((struct it *)); | |
723 static void next_overlay_string P_ ((struct it *)); | |
724 static void reseat P_ ((struct it *, struct text_pos, int)); | |
725 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
726 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
727 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
|
728 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 729 static int next_element_from_display_vector P_ ((struct it *)); |
730 static int next_element_from_string P_ ((struct it *)); | |
731 static int next_element_from_c_string P_ ((struct it *)); | |
732 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
|
733 static int next_element_from_composition P_ ((struct it *)); |
25012 | 734 static int next_element_from_image P_ ((struct it *)); |
735 static int next_element_from_stretch P_ ((struct it *)); | |
736 static void load_overlay_strings P_ ((struct it *)); | |
737 static void init_from_display_pos P_ ((struct it *, struct window *, | |
738 struct display_pos *)); | |
739 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
740 Lisp_Object, int, int, int, int)); | |
741 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
742 int, int, int)); | |
743 void move_it_vertically_backward P_ ((struct it *, int)); | |
744 static void init_to_row_start P_ ((struct it *, struct window *, | |
745 struct glyph_row *)); | |
746 static void init_to_row_end P_ ((struct it *, struct window *, | |
747 struct glyph_row *)); | |
748 static void back_to_previous_line_start P_ ((struct it *)); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
749 static int forward_to_next_line_start P_ ((struct it *, int *)); |
25012 | 750 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, |
751 Lisp_Object, int)); | |
752 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
753 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
754 static int number_of_chars P_ ((unsigned char *, int)); | |
755 static void compute_stop_pos P_ ((struct it *)); | |
756 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
757 Lisp_Object)); | |
758 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
759 static int next_overlay_change P_ ((int)); | |
760 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
761 Lisp_Object, struct text_pos *)); | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
762 static int underlying_face_id P_ ((struct it *)); |
25012 | 763 |
764 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
765 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
766 | |
767 #ifdef HAVE_WINDOW_SYSTEM | |
768 | |
25543 | 769 static void update_tool_bar P_ ((struct frame *, int)); |
770 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
771 static int redisplay_tool_bar P_ ((struct frame *)); | |
772 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 773 |
774 #endif /* HAVE_WINDOW_SYSTEM */ | |
775 | |
776 | |
777 /*********************************************************************** | |
778 Window display dimensions | |
779 ***********************************************************************/ | |
780 | |
781 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
782 text in window W. This is the height of W minus the height of a | |
783 mode line, if any. */ | |
784 | |
785 INLINE int | |
786 window_text_bottom_y (w) | |
787 struct window *w; | |
788 { | |
789 struct frame *f = XFRAME (w->frame); | |
790 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
791 |
25012 | 792 if (WINDOW_WANTS_MODELINE_P (w)) |
793 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
794 return height; | |
795 } | |
796 | |
797 | |
798 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
799 means return the total width of W, not including bitmap areas to | |
800 the left and right of the window. */ | |
801 | |
802 INLINE int | |
803 window_box_width (w, area) | |
804 struct window *w; | |
805 int area; | |
806 { | |
807 struct frame *f = XFRAME (w->frame); | |
808 int width = XFASTINT (w->width); | |
809 | |
810 if (!w->pseudo_window_p) | |
811 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
812 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 813 |
814 if (area == TEXT_AREA) | |
815 { | |
816 if (INTEGERP (w->left_margin_width)) | |
817 width -= XFASTINT (w->left_margin_width); | |
818 if (INTEGERP (w->right_margin_width)) | |
819 width -= XFASTINT (w->right_margin_width); | |
820 } | |
821 else if (area == LEFT_MARGIN_AREA) | |
822 width = (INTEGERP (w->left_margin_width) | |
823 ? XFASTINT (w->left_margin_width) : 0); | |
824 else if (area == RIGHT_MARGIN_AREA) | |
825 width = (INTEGERP (w->right_margin_width) | |
826 ? XFASTINT (w->right_margin_width) : 0); | |
827 } | |
828 | |
829 return width * CANON_X_UNIT (f); | |
830 } | |
831 | |
832 | |
833 /* Return the pixel height of the display area of window W, not | |
834 including mode lines of W, if any.. */ | |
835 | |
836 INLINE int | |
837 window_box_height (w) | |
838 struct window *w; | |
839 { | |
840 struct frame *f = XFRAME (w->frame); | |
841 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
31931
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
842 |
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
843 xassert (height >= 0); |
25012 | 844 |
845 if (WINDOW_WANTS_MODELINE_P (w)) | |
846 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
847 | |
25546 | 848 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
849 height -= CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 850 |
851 return height; | |
852 } | |
853 | |
854 | |
855 /* Return the frame-relative coordinate of the left edge of display | |
856 area AREA of window W. AREA < 0 means return the left edge of the | |
857 whole window, to the right of any bitmap area at the left side of | |
858 W. */ | |
859 | |
860 INLINE int | |
861 window_box_left (w, area) | |
862 struct window *w; | |
863 int area; | |
864 { | |
865 struct frame *f = XFRAME (w->frame); | |
866 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
867 | |
868 if (!w->pseudo_window_p) | |
869 { | |
870 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
|
871 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 872 |
873 if (area == TEXT_AREA) | |
874 x += window_box_width (w, LEFT_MARGIN_AREA); | |
875 else if (area == RIGHT_MARGIN_AREA) | |
876 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
877 + window_box_width (w, TEXT_AREA)); | |
878 } | |
879 | |
880 return x; | |
881 } | |
882 | |
883 | |
884 /* Return the frame-relative coordinate of the right edge of display | |
885 area AREA of window W. AREA < 0 means return the left edge of the | |
886 whole window, to the left of any bitmap area at the right side of | |
887 W. */ | |
888 | |
889 INLINE int | |
890 window_box_right (w, area) | |
891 struct window *w; | |
892 int area; | |
893 { | |
894 return window_box_left (w, area) + window_box_width (w, area); | |
895 } | |
896 | |
897 | |
898 /* Get the bounding box of the display area AREA of window W, without | |
899 mode lines, in frame-relative coordinates. AREA < 0 means the | |
900 whole window, not including bitmap areas to the left and right of | |
901 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
902 coordinates of the upper-left corner of the box. Return in | |
903 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
904 | |
905 INLINE void | |
906 window_box (w, area, box_x, box_y, box_width, box_height) | |
907 struct window *w; | |
908 int area; | |
909 int *box_x, *box_y, *box_width, *box_height; | |
910 { | |
911 struct frame *f = XFRAME (w->frame); | |
912 | |
913 *box_width = window_box_width (w, area); | |
914 *box_height = window_box_height (w); | |
915 *box_x = window_box_left (w, area); | |
916 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
917 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 918 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
919 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 920 } |
921 | |
922 | |
923 /* Get the bounding box of the display area AREA of window W, without | |
924 mode lines. AREA < 0 means the whole window, not including bitmap | |
925 areas to the left and right of the window. Return in *TOP_LEFT_X | |
926 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
927 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
928 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
929 box. */ | |
930 | |
931 INLINE void | |
932 window_box_edges (w, area, top_left_x, top_left_y, | |
933 bottom_right_x, bottom_right_y) | |
934 struct window *w; | |
935 int area; | |
936 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
937 { | |
938 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
939 bottom_right_y); | |
940 *bottom_right_x += *top_left_x; | |
941 *bottom_right_y += *top_left_y; | |
942 } | |
943 | |
944 | |
945 | |
946 /*********************************************************************** | |
947 Utilities | |
948 ***********************************************************************/ | |
949 | |
33510
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
950 /* Return 1 if position CHARPOS is visible in window W. Set *FULLY to |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
951 1 if POS is visible and the line containing POS is fully visible. |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
952 EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
953 and header-lines heights. */ |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
954 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
955 int |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
956 pos_visible_p (w, charpos, fully, exact_mode_line_heights_p) |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
957 struct window *w; |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
958 int charpos, *fully, exact_mode_line_heights_p; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
959 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
960 struct it it; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
961 struct text_pos top; |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
962 int visible_p; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
963 struct buffer *old_buffer = NULL; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
964 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
965 if (XBUFFER (w->buffer) != current_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
966 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
967 old_buffer = current_buffer; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
968 set_buffer_internal_1 (XBUFFER (w->buffer)); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
969 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
970 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
971 *fully = visible_p = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
972 SET_TEXT_POS_FROM_MARKER (top, w->start); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
973 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
974 /* Compute exact mode line heights, if requested. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
975 if (exact_mode_line_heights_p) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
976 { |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
977 if (WINDOW_WANTS_MODELINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
978 current_mode_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
979 = display_mode_line (w, MODE_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
980 current_buffer->mode_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
981 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
982 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
983 current_header_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
984 = display_mode_line (w, HEADER_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
985 current_buffer->header_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
986 } |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
987 |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
988 start_display (&it, w, top); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
989 move_it_to (&it, charpos, 0, it.last_visible_y, -1, |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
990 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
991 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
992 if (IT_CHARPOS (it) == charpos) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
993 { |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
994 int line_height, line_bottom_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
995 int line_top_y = it.current_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
996 int window_top_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
997 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
998 line_height = it.max_ascent + it.max_descent; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
999 if (line_height == 0) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1000 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1001 if (last_height) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1002 line_height = last_height; |
33531
de985bc39ea3
(pos_visible_p): Handle case that we reach ZV without
Gerd Moellmann <gerd@gnu.org>
parents:
33510
diff
changeset
|
1003 else if (charpos < ZV) |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1004 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1005 move_it_by_lines (&it, 1, 1); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1006 line_height = (it.max_ascent || it.max_descent |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1007 ? it.max_ascent + it.max_descent |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1008 : last_height); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1009 } |
33568
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1010 else |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1011 { |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1012 /* Use the default character height. */ |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1013 it.what = IT_CHARACTER; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1014 it.c = ' '; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1015 it.len = 1; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1016 PRODUCE_GLYPHS (&it); |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1017 line_height = it.ascent + it.descent; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1018 } |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1019 } |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1020 line_bottom_y = line_top_y + line_height; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1021 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1022 if (line_top_y < window_top_y) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1023 visible_p = line_bottom_y > window_top_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1024 else if (line_top_y < it.last_visible_y) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1025 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1026 visible_p = 1; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1027 *fully = line_bottom_y <= it.last_visible_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1028 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1029 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1030 else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1031 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1032 move_it_by_lines (&it, 1, 0); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1033 if (charpos < IT_CHARPOS (it)) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1034 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1035 visible_p = 1; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1036 *fully = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1037 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1038 } |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1039 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1040 if (old_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1041 set_buffer_internal_1 (old_buffer); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1042 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1043 current_header_line_height = current_mode_line_height = -1; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1044 return visible_p; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1045 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1046 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1047 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1048 /* 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
|
1049 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
|
1050 STRING_CHAR_AND_LENGTH but never returns an invalid character. If |
28932
f8b0ac62f238
Use the term `invalid' instead of `illegal'.
Gerd Moellmann <gerd@gnu.org>
parents:
28876
diff
changeset
|
1051 we find one, we return a `?', but with the length of the invalid |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1052 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1053 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1054 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1055 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
|
1056 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1057 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1058 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1059 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1060 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1061 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
|
1062 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1063 /* We may not change the length here because other places in Emacs |
28932
f8b0ac62f238
Use the term `invalid' instead of `illegal'.
Gerd Moellmann <gerd@gnu.org>
parents:
28876
diff
changeset
|
1064 don't use this function, i.e. they silently accept invalid |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1065 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1066 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1067 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1068 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1069 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1070 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1071 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1072 |
25012 | 1073 /* Given a position POS containing a valid character and byte position |
1074 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
1075 | |
1076 static struct text_pos | |
1077 string_pos_nchars_ahead (pos, string, nchars) | |
1078 struct text_pos pos; | |
1079 Lisp_Object string; | |
1080 int nchars; | |
1081 { | |
1082 xassert (STRINGP (string) && nchars >= 0); | |
1083 | |
1084 if (STRING_MULTIBYTE (string)) | |
1085 { | |
1086 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
1087 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
1088 int len; | |
1089 | |
1090 while (nchars--) | |
1091 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1092 string_char_and_length (p, rest, &len); |
25012 | 1093 p += len, rest -= len; |
1094 xassert (rest >= 0); | |
1095 CHARPOS (pos) += 1; | |
1096 BYTEPOS (pos) += len; | |
1097 } | |
1098 } | |
1099 else | |
1100 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
1101 | |
1102 return pos; | |
1103 } | |
1104 | |
1105 | |
1106 /* Value is the text position, i.e. character and byte position, | |
1107 for character position CHARPOS in STRING. */ | |
1108 | |
1109 static INLINE struct text_pos | |
1110 string_pos (charpos, string) | |
1111 int charpos; | |
1112 Lisp_Object string; | |
1113 { | |
1114 struct text_pos pos; | |
1115 xassert (STRINGP (string)); | |
1116 xassert (charpos >= 0); | |
1117 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
1118 return pos; | |
1119 } | |
1120 | |
1121 | |
1122 /* Value is a text position, i.e. character and byte position, for | |
1123 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
1124 means recognize multibyte characters. */ | |
1125 | |
1126 static struct text_pos | |
1127 c_string_pos (charpos, s, multibyte_p) | |
1128 int charpos; | |
1129 unsigned char *s; | |
1130 int multibyte_p; | |
1131 { | |
1132 struct text_pos pos; | |
1133 | |
1134 xassert (s != NULL); | |
1135 xassert (charpos >= 0); | |
1136 | |
1137 if (multibyte_p) | |
1138 { | |
1139 int rest = strlen (s), len; | |
1140 | |
1141 SET_TEXT_POS (pos, 0, 0); | |
1142 while (charpos--) | |
1143 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1144 string_char_and_length (s, rest, &len); |
25012 | 1145 s += len, rest -= len; |
1146 xassert (rest >= 0); | |
1147 CHARPOS (pos) += 1; | |
1148 BYTEPOS (pos) += len; | |
1149 } | |
1150 } | |
1151 else | |
1152 SET_TEXT_POS (pos, charpos, charpos); | |
1153 | |
1154 return pos; | |
1155 } | |
1156 | |
1157 | |
1158 /* Value is the number of characters in C string S. MULTIBYTE_P | |
1159 non-zero means recognize multibyte characters. */ | |
1160 | |
1161 static int | |
1162 number_of_chars (s, multibyte_p) | |
1163 unsigned char *s; | |
1164 int multibyte_p; | |
1165 { | |
1166 int nchars; | |
1167 | |
1168 if (multibyte_p) | |
1169 { | |
1170 int rest = strlen (s), len; | |
1171 unsigned char *p = (unsigned char *) s; | |
1172 | |
1173 for (nchars = 0; rest > 0; ++nchars) | |
1174 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1175 string_char_and_length (p, rest, &len); |
25012 | 1176 rest -= len, p += len; |
1177 } | |
1178 } | |
1179 else | |
1180 nchars = strlen (s); | |
1181 | |
1182 return nchars; | |
1183 } | |
1184 | |
1185 | |
1186 /* Compute byte position NEWPOS->bytepos corresponding to | |
1187 NEWPOS->charpos. POS is a known position in string STRING. | |
1188 NEWPOS->charpos must be >= POS.charpos. */ | |
1189 | |
1190 static void | |
1191 compute_string_pos (newpos, pos, string) | |
1192 struct text_pos *newpos, pos; | |
1193 Lisp_Object string; | |
1194 { | |
1195 xassert (STRINGP (string)); | |
1196 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1197 | |
1198 if (STRING_MULTIBYTE (string)) | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
1199 *newpos = string_pos_nchars_ahead (pos, string, |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
1200 CHARPOS (*newpos) - CHARPOS (pos)); |
25012 | 1201 else |
1202 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1203 } | |
1204 | |
1205 | |
1206 | |
1207 /*********************************************************************** | |
1208 Lisp form evaluation | |
1209 ***********************************************************************/ | |
1210 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1211 /* Error handler for safe_eval and safe_call. */ |
25012 | 1212 |
1213 static Lisp_Object | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1214 safe_eval_handler (arg) |
25012 | 1215 Lisp_Object arg; |
1216 { | |
33072
176f2eb7a645
(safe_eval_handler): Call add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents:
33068
diff
changeset
|
1217 add_to_log ("Error during redisplay: %s", arg, Qnil); |
25012 | 1218 return Qnil; |
1219 } | |
1220 | |
1221 | |
1222 /* Evaluate SEXPR and return the result, or nil if something went | |
1223 wrong. */ | |
1224 | |
30202
bade676e0950
(eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
30159
diff
changeset
|
1225 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1226 safe_eval (sexpr) |
25012 | 1227 Lisp_Object sexpr; |
1228 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1229 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1230 struct gcpro gcpro1; |
25012 | 1231 Lisp_Object val; |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1232 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1233 GCPRO1 (sexpr); |
25012 | 1234 specbind (Qinhibit_redisplay, Qt); |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1235 val = internal_condition_case_1 (Feval, sexpr, Qerror, safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1236 UNGCPRO; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1237 return unbind_to (count, val); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1238 } |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1239 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1240 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1241 /* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1]. |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1242 Return the result, or nil if something went wrong. */ |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1243 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1244 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1245 safe_call (nargs, args) |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1246 int nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1247 Lisp_Object *args; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1248 { |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1249 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1250 Lisp_Object val; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1251 struct gcpro gcpro1; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1252 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1253 GCPRO1 (args[0]); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1254 gcpro1.nvars = nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1255 specbind (Qinhibit_redisplay, Qt); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1256 val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror, |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1257 safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1258 UNGCPRO; |
25012 | 1259 return unbind_to (count, val); |
1260 } | |
1261 | |
1262 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1263 /* Call function FN with one argument ARG. |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1264 Return the result, or nil if something went wrong. */ |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1265 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1266 Lisp_Object |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1267 safe_call1 (fn, arg) |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1268 Lisp_Object fn, arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1269 { |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1270 Lisp_Object args[2]; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1271 args[0] = fn; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1272 args[1] = arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1273 return safe_call (2, args); |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1274 } |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1275 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1276 |
25012 | 1277 |
1278 /*********************************************************************** | |
1279 Debugging | |
1280 ***********************************************************************/ | |
1281 | |
1282 #if 0 | |
1283 | |
1284 /* Define CHECK_IT to perform sanity checks on iterators. | |
1285 This is for debugging. It is too slow to do unconditionally. */ | |
1286 | |
1287 static void | |
1288 check_it (it) | |
1289 struct it *it; | |
1290 { | |
1291 if (it->method == next_element_from_string) | |
1292 { | |
1293 xassert (STRINGP (it->string)); | |
1294 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1295 } | |
1296 else if (it->method == next_element_from_buffer) | |
1297 { | |
1298 /* Check that character and byte positions agree. */ | |
1299 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1300 } | |
1301 | |
1302 if (it->dpvec) | |
1303 xassert (it->current.dpvec_index >= 0); | |
1304 else | |
1305 xassert (it->current.dpvec_index < 0); | |
1306 } | |
1307 | |
1308 #define CHECK_IT(IT) check_it ((IT)) | |
1309 | |
1310 #else /* not 0 */ | |
1311 | |
1312 #define CHECK_IT(IT) (void) 0 | |
1313 | |
1314 #endif /* not 0 */ | |
1315 | |
1316 | |
1317 #if GLYPH_DEBUG | |
1318 | |
1319 /* Check that the window end of window W is what we expect it | |
1320 to be---the last row in the current matrix displaying text. */ | |
1321 | |
1322 static void | |
1323 check_window_end (w) | |
1324 struct window *w; | |
1325 { | |
1326 if (!MINI_WINDOW_P (w) | |
1327 && !NILP (w->window_end_valid)) | |
1328 { | |
1329 struct glyph_row *row; | |
1330 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1331 XFASTINT (w->window_end_vpos)), | |
1332 !row->enabled_p | |
1333 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1334 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1335 } | |
1336 } | |
1337 | |
1338 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1339 | |
1340 #else /* not GLYPH_DEBUG */ | |
1341 | |
1342 #define CHECK_WINDOW_END(W) (void) 0 | |
1343 | |
1344 #endif /* not GLYPH_DEBUG */ | |
1345 | |
1346 | |
1347 | |
1348 /*********************************************************************** | |
1349 Iterator initialization | |
1350 ***********************************************************************/ | |
1351 | |
1352 /* Initialize IT for displaying current_buffer in window W, starting | |
1353 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1354 position is specified which is useful when the iterator is assigned | |
1355 a position later. BYTEPOS is the byte position corresponding to | |
1356 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1357 | |
1358 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1359 will produce glyphs in that row. | |
1360 | |
1361 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1362 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1363 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1364 displaying the tool-bar. |
25012 | 1365 |
1366 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1367 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1368 corresponding mode line glyph row of the desired matrix of W. */ |
1369 | |
1370 void | |
1371 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1372 struct it *it; | |
1373 struct window *w; | |
1374 int charpos, bytepos; | |
1375 struct glyph_row *row; | |
1376 enum face_id base_face_id; | |
1377 { | |
1378 int highlight_region_p; | |
1379 | |
1380 /* Some precondition checks. */ | |
1381 xassert (w != NULL && it != NULL); | |
1382 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1383 | |
1384 /* If face attributes have been changed since the last redisplay, | |
1385 free realized faces now because they depend on face definitions | |
1386 that might have changed. */ | |
1387 if (face_change_count) | |
1388 { | |
1389 face_change_count = 0; | |
1390 free_all_realized_faces (Qnil); | |
1391 } | |
1392 | |
1393 /* Use one of the mode line rows of W's desired matrix if | |
1394 appropriate. */ | |
1395 if (row == NULL) | |
1396 { | |
1397 if (base_face_id == MODE_LINE_FACE_ID) | |
1398 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1399 else if (base_face_id == HEADER_LINE_FACE_ID) |
1400 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1401 } |
1402 | |
1403 /* Clear IT. */ | |
1404 bzero (it, sizeof *it); | |
1405 it->current.overlay_string_index = -1; | |
1406 it->current.dpvec_index = -1; | |
1407 it->base_face_id = base_face_id; | |
1408 | |
1409 /* The window in which we iterate over current_buffer: */ | |
1410 XSETWINDOW (it->window, w); | |
1411 it->w = w; | |
1412 it->f = XFRAME (w->frame); | |
1413 | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1414 /* Extra space between lines (on window systems only). */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1415 if (base_face_id == DEFAULT_FACE_ID |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1416 && FRAME_WINDOW_P (it->f)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1417 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1418 if (NATNUMP (current_buffer->extra_line_spacing)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1419 it->extra_line_spacing = XFASTINT (current_buffer->extra_line_spacing); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1420 else if (it->f->extra_line_spacing > 0) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1421 it->extra_line_spacing = it->f->extra_line_spacing; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1422 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1423 |
25012 | 1424 /* If realized faces have been removed, e.g. because of face |
1425 attribute changes of named faces, recompute them. */ | |
1426 if (FRAME_FACE_CACHE (it->f)->used == 0) | |
1427 recompute_basic_faces (it->f); | |
1428 | |
1429 /* Current value of the `space-width', and 'height' properties. */ | |
1430 it->space_width = Qnil; | |
1431 it->font_height = Qnil; | |
1432 | |
1433 /* Are control characters displayed as `^C'? */ | |
1434 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1435 | |
1436 /* -1 means everything between a CR and the following line end | |
1437 is invisible. >0 means lines indented more than this value are | |
1438 invisible. */ | |
1439 it->selective = (INTEGERP (current_buffer->selective_display) | |
1440 ? XFASTINT (current_buffer->selective_display) | |
1441 : (!NILP (current_buffer->selective_display) | |
1442 ? -1 : 0)); | |
1443 it->selective_display_ellipsis_p | |
1444 = !NILP (current_buffer->selective_display_ellipses); | |
1445 | |
1446 /* Display table to use. */ | |
1447 it->dp = window_display_table (w); | |
1448 | |
1449 /* Are multibyte characters enabled in current_buffer? */ | |
1450 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1451 | |
1452 /* Non-zero if we should highlight the region. */ | |
1453 highlight_region_p | |
1454 = (!NILP (Vtransient_mark_mode) | |
1455 && !NILP (current_buffer->mark_active) | |
1456 && XMARKER (current_buffer->mark)->buffer != 0); | |
1457 | |
1458 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1459 start and end of a visible region in window IT->w. Set both to | |
1460 -1 to indicate no region. */ | |
1461 if (highlight_region_p | |
1462 /* Maybe highlight only in selected window. */ | |
1463 && (/* Either show region everywhere. */ | |
1464 highlight_nonselected_windows | |
1465 /* Or show region in the selected window. */ | |
1466 || w == XWINDOW (selected_window) | |
1467 /* Or show the region if we are in the mini-buffer and W is | |
1468 the window the mini-buffer refers to. */ | |
1469 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1470 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1471 { | |
1472 int charpos = marker_position (current_buffer->mark); | |
1473 it->region_beg_charpos = min (PT, charpos); | |
1474 it->region_end_charpos = max (PT, charpos); | |
1475 } | |
1476 else | |
1477 it->region_beg_charpos = it->region_end_charpos = -1; | |
1478 | |
1479 /* Get the position at which the redisplay_end_trigger hook should | |
1480 be run, if it is to be run at all. */ | |
1481 if (MARKERP (w->redisplay_end_trigger) | |
1482 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1483 it->redisplay_end_trigger_charpos | |
1484 = marker_position (w->redisplay_end_trigger); | |
1485 else if (INTEGERP (w->redisplay_end_trigger)) | |
1486 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1487 | |
1488 /* Correct bogus values of tab_width. */ | |
1489 it->tab_width = XINT (current_buffer->tab_width); | |
1490 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1491 it->tab_width = 8; | |
1492 | |
1493 /* Are lines in the display truncated? */ | |
1494 it->truncate_lines_p | |
1495 = (base_face_id != DEFAULT_FACE_ID | |
1496 || XINT (it->w->hscroll) | |
1497 || (truncate_partial_width_windows | |
1498 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1499 || !NILP (current_buffer->truncate_lines)); | |
1500 | |
1501 /* Get dimensions of truncation and continuation glyphs. These are | |
1502 displayed as bitmaps under X, so we don't need them for such | |
1503 frames. */ | |
1504 if (!FRAME_WINDOW_P (it->f)) | |
1505 { | |
1506 if (it->truncate_lines_p) | |
1507 { | |
1508 /* We will need the truncation glyph. */ | |
1509 xassert (it->glyph_row == NULL); | |
1510 produce_special_glyphs (it, IT_TRUNCATION); | |
1511 it->truncation_pixel_width = it->pixel_width; | |
1512 } | |
1513 else | |
1514 { | |
1515 /* We will need the continuation glyph. */ | |
1516 xassert (it->glyph_row == NULL); | |
1517 produce_special_glyphs (it, IT_CONTINUATION); | |
1518 it->continuation_pixel_width = it->pixel_width; | |
1519 } | |
1520 | |
1521 /* Reset these values to zero becaue the produce_special_glyphs | |
1522 above has changed them. */ | |
1523 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
|
1524 it->phys_ascent = it->phys_descent = 0; |
25012 | 1525 } |
1526 | |
1527 /* Set this after getting the dimensions of truncation and | |
1528 continuation glyphs, so that we don't produce glyphs when calling | |
1529 produce_special_glyphs, above. */ | |
1530 it->glyph_row = row; | |
1531 it->area = TEXT_AREA; | |
1532 | |
1533 /* Get the dimensions of the display area. The display area | |
1534 consists of the visible window area plus a horizontally scrolled | |
1535 part to the left of the window. All x-values are relative to the | |
1536 start of this total display area. */ | |
1537 if (base_face_id != DEFAULT_FACE_ID) | |
1538 { | |
1539 /* Mode lines, menu bar in terminal frames. */ | |
1540 it->first_visible_x = 0; | |
1541 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1542 } | |
1543 else | |
1544 { | |
1545 it->first_visible_x | |
1546 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1547 it->last_visible_x = (it->first_visible_x | |
1548 + window_box_width (w, TEXT_AREA)); | |
1549 | |
1550 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1551 the right margin. Otherwise, leave room for the continuation | |
1552 glyph(s). Truncation and continuation glyphs are not inserted | |
1553 for window-based redisplay. */ | |
1554 if (!FRAME_WINDOW_P (it->f)) | |
1555 { | |
1556 if (it->truncate_lines_p) | |
1557 it->last_visible_x -= it->truncation_pixel_width; | |
1558 else | |
1559 it->last_visible_x -= it->continuation_pixel_width; | |
1560 } | |
1561 | |
25546 | 1562 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1563 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1564 } |
1565 | |
1566 /* Leave room for a border glyph. */ | |
1567 if (!FRAME_WINDOW_P (it->f) | |
1568 && !WINDOW_RIGHTMOST_P (it->w)) | |
1569 it->last_visible_x -= 1; | |
1570 | |
1571 it->last_visible_y = window_text_bottom_y (w); | |
1572 | |
1573 /* For mode lines and alike, arrange for the first glyph having a | |
1574 left box line if the face specifies a box. */ | |
1575 if (base_face_id != DEFAULT_FACE_ID) | |
1576 { | |
1577 struct face *face; | |
1578 | |
1579 it->face_id = base_face_id; | |
1580 | |
1581 /* If we have a boxed mode line, make the first character appear | |
1582 with a left box line. */ | |
1583 face = FACE_FROM_ID (it->f, base_face_id); | |
1584 if (face->box != FACE_NO_BOX) | |
1585 it->start_of_box_run_p = 1; | |
1586 } | |
1587 | |
1588 /* If a buffer position was specified, set the iterator there, | |
1589 getting overlays and face properties from that position. */ | |
1590 if (charpos > 0) | |
1591 { | |
1592 it->end_charpos = ZV; | |
1593 it->face_id = -1; | |
1594 IT_CHARPOS (*it) = charpos; | |
1595 | |
1596 /* Compute byte position if not specified. */ | |
1597 if (bytepos <= 0) | |
1598 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1599 else | |
1600 IT_BYTEPOS (*it) = bytepos; | |
1601 | |
1602 /* Compute faces etc. */ | |
1603 reseat (it, it->current.pos, 1); | |
1604 } | |
1605 | |
1606 CHECK_IT (it); | |
1607 } | |
1608 | |
1609 | |
1610 /* Initialize IT for the display of window W with window start POS. */ | |
1611 | |
1612 void | |
1613 start_display (it, w, pos) | |
1614 struct it *it; | |
1615 struct window *w; | |
1616 struct text_pos pos; | |
1617 { | |
1618 int start_at_line_beg_p; | |
1619 struct glyph_row *row; | |
25546 | 1620 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1621 int first_y; |
1622 | |
1623 row = w->desired_matrix->rows + first_vpos; | |
1624 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1625 first_y = it->current_y; | |
1626 | |
1627 /* If window start is not at a line start, move back to the line | |
1628 start. This makes sure that we take continuation lines into | |
1629 account. */ | |
1630 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1631 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1632 if (!start_at_line_beg_p) | |
1633 reseat_at_previous_visible_line_start (it); | |
1634 | |
1635 /* If window start is not at a line start, skip forward to POS to | |
1636 get the correct continuation_lines_width and current_x. */ | |
1637 if (!start_at_line_beg_p) | |
1638 { | |
1639 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1640 | |
1641 /* If lines are continued, this line may end in the middle of a | |
1642 multi-glyph character (e.g. a control character displayed as | |
1643 \003, or in the middle of an overlay string). In this case | |
1644 move_it_to above will not have taken us to the start of | |
1645 the continuation line but to the end of the continued line. */ | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1646 if (!it->truncate_lines_p) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1647 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1648 if (it->current_x > 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1649 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1650 if (it->current.dpvec_index >= 0 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1651 || it->current.overlay_string_index >= 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1652 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1653 set_iterator_to_next (it, 1); |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1654 move_it_in_display_line_to (it, -1, -1, 0); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1655 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1656 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1657 it->continuation_lines_width += it->current_x; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1658 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1659 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1660 /* We're starting a new display line, not affected by the |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1661 height of the continued line, so clear the appropriate |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1662 fields in the iterator structure. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1663 it->max_ascent = it->max_descent = 0; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1664 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 1665 } |
1666 | |
1667 it->current_y = first_y; | |
1668 it->vpos = 0; | |
1669 it->current_x = it->hpos = 0; | |
1670 } | |
1671 | |
1672 #if 0 /* Don't assert the following because start_display is sometimes | |
1673 called intentionally with a window start that is not at a | |
1674 line start. Please leave this code in as a comment. */ | |
1675 | |
1676 /* Window start should be on a line start, now. */ | |
1677 xassert (it->continuation_lines_width | |
1678 || IT_CHARPOS (it) == BEGV | |
1679 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1680 #endif /* 0 */ | |
1681 } | |
1682 | |
1683 | |
1684 /* Initialize IT for stepping through current_buffer in window W, | |
1685 starting at position POS that includes overlay string and display | |
1686 vector/ control character translation position information. */ | |
1687 | |
1688 static void | |
1689 init_from_display_pos (it, w, pos) | |
1690 struct it *it; | |
1691 struct window *w; | |
1692 struct display_pos *pos; | |
1693 { | |
1694 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1695 text, so we might end up at a position different from POS. This | |
1696 is only a problem when POS is a row start after a newline and an | |
1697 overlay starts there with an after-string, and the overlay has an | |
1698 invisible property. Since we don't skip invisible text in | |
1699 display_line and elsewhere immediately after consuming the | |
1700 newline before the row start, such a POS will not be in a string, | |
1701 but the call to init_iterator below will move us to the | |
1702 after-string. */ | |
1703 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1704 NULL, DEFAULT_FACE_ID); | |
1705 | |
1706 /* If position is within an overlay string, set up IT to | |
1707 the right overlay string. */ | |
1708 if (pos->overlay_string_index >= 0) | |
1709 { | |
1710 int relative_index; | |
1711 | |
1712 /* We already have the first chunk of overlay strings in | |
1713 IT->overlay_strings. Load more until the one for | |
1714 pos->overlay_string_index is in IT->overlay_strings. */ | |
1715 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1716 { | |
1717 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1718 it->current.overlay_string_index = 0; | |
1719 while (n--) | |
1720 { | |
1721 load_overlay_strings (it); | |
1722 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1723 } | |
1724 } | |
1725 | |
1726 it->current.overlay_string_index = pos->overlay_string_index; | |
1727 relative_index = (it->current.overlay_string_index | |
1728 % OVERLAY_STRING_CHUNK_SIZE); | |
1729 it->string = it->overlay_strings[relative_index]; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1730 xassert (STRINGP (it->string)); |
25012 | 1731 it->current.string_pos = pos->string_pos; |
1732 it->method = next_element_from_string; | |
1733 } | |
33863
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1734 else if (it->current.overlay_string_index >= 0) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1735 { |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1736 /* If POS says we're already after an overlay string ending at |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1737 POS, make sure to pop the iterator because it will be in |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1738 front of that overlay string. When POS is ZV, we've thereby |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1739 also ``processed'' overlay strings at ZV. */ |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1740 pop_it (it); |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1741 it->current.overlay_string_index = -1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1742 it->method = next_element_from_buffer; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1743 if (CHARPOS (pos->pos) == ZV) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1744 it->overlay_strings_at_end_processed_p = 1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1745 } |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1746 |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1747 if (CHARPOS (pos->string_pos) >= 0) |
25012 | 1748 { |
1749 /* Recorded position is not in an overlay string, but in another | |
1750 string. This can only be a string from a `display' property. | |
1751 IT should already be filled with that string. */ | |
1752 it->current.string_pos = pos->string_pos; | |
1753 xassert (STRINGP (it->string)); | |
1754 } | |
1755 | |
1756 /* Restore position in display vector translations or control | |
1757 character translations. */ | |
1758 if (pos->dpvec_index >= 0) | |
1759 { | |
1760 /* This fills IT->dpvec. */ | |
1761 get_next_display_element (it); | |
1762 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1763 it->current.dpvec_index = pos->dpvec_index; | |
1764 } | |
1765 | |
1766 CHECK_IT (it); | |
1767 } | |
1768 | |
1769 | |
1770 /* Initialize IT for stepping through current_buffer in window W | |
1771 starting at ROW->start. */ | |
1772 | |
1773 static void | |
1774 init_to_row_start (it, w, row) | |
1775 struct it *it; | |
1776 struct window *w; | |
1777 struct glyph_row *row; | |
1778 { | |
1779 init_from_display_pos (it, w, &row->start); | |
1780 it->continuation_lines_width = row->continuation_lines_width; | |
1781 CHECK_IT (it); | |
1782 } | |
1783 | |
1784 | |
1785 /* Initialize IT for stepping through current_buffer in window W | |
1786 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1787 | |
1788 static void | |
1789 init_to_row_end (it, w, row) | |
1790 struct it *it; | |
1791 struct window *w; | |
1792 struct glyph_row *row; | |
1793 { | |
1794 init_from_display_pos (it, w, &row->end); | |
1795 | |
1796 if (row->continued_p) | |
1797 it->continuation_lines_width = (row->continuation_lines_width | |
1798 + row->pixel_width); | |
1799 CHECK_IT (it); | |
1800 } | |
1801 | |
1802 | |
1803 | |
1804 | |
1805 /*********************************************************************** | |
1806 Text properties | |
1807 ***********************************************************************/ | |
1808 | |
1809 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1810 overlay changes. Set IT->stop_charpos to the next position where | |
1811 to stop. */ | |
1812 | |
1813 static void | |
1814 handle_stop (it) | |
1815 struct it *it; | |
1816 { | |
1817 enum prop_handled handled; | |
1818 int handle_overlay_change_p = 1; | |
1819 struct props *p; | |
1820 | |
1821 it->dpvec = NULL; | |
1822 it->current.dpvec_index = -1; | |
1823 | |
1824 do | |
1825 { | |
1826 handled = HANDLED_NORMALLY; | |
1827 | |
1828 /* Call text property handlers. */ | |
1829 for (p = it_props; p->handler; ++p) | |
1830 { | |
1831 handled = p->handler (it); | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1832 |
25012 | 1833 if (handled == HANDLED_RECOMPUTE_PROPS) |
1834 break; | |
1835 else if (handled == HANDLED_RETURN) | |
1836 return; | |
1837 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1838 handle_overlay_change_p = 0; | |
1839 } | |
1840 | |
1841 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1842 { | |
1843 /* Don't check for overlay strings below when set to deliver | |
1844 characters from a display vector. */ | |
1845 if (it->method == next_element_from_display_vector) | |
1846 handle_overlay_change_p = 0; | |
1847 | |
1848 /* Handle overlay changes. */ | |
1849 if (handle_overlay_change_p) | |
1850 handled = handle_overlay_change (it); | |
1851 | |
1852 /* Determine where to stop next. */ | |
1853 if (handled == HANDLED_NORMALLY) | |
1854 compute_stop_pos (it); | |
1855 } | |
1856 } | |
1857 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1858 } | |
1859 | |
1860 | |
1861 /* Compute IT->stop_charpos from text property and overlay change | |
1862 information for IT's current position. */ | |
1863 | |
1864 static void | |
1865 compute_stop_pos (it) | |
1866 struct it *it; | |
1867 { | |
1868 register INTERVAL iv, next_iv; | |
1869 Lisp_Object object, limit, position; | |
1870 | |
1871 /* If nowhere else, stop at the end. */ | |
1872 it->stop_charpos = it->end_charpos; | |
1873 | |
1874 if (STRINGP (it->string)) | |
1875 { | |
1876 /* Strings are usually short, so don't limit the search for | |
1877 properties. */ | |
1878 object = it->string; | |
1879 limit = Qnil; | |
1880 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1881 } | |
1882 else | |
1883 { | |
1884 int charpos; | |
1885 | |
1886 /* If next overlay change is in front of the current stop pos | |
1887 (which is IT->end_charpos), stop there. Note: value of | |
1888 next_overlay_change is point-max if no overlay change | |
1889 follows. */ | |
1890 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1891 if (charpos < it->stop_charpos) | |
1892 it->stop_charpos = charpos; | |
1893 | |
1894 /* If showing the region, we have to stop at the region | |
1895 start or end because the face might change there. */ | |
1896 if (it->region_beg_charpos > 0) | |
1897 { | |
1898 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1899 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1900 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1901 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1902 } | |
1903 | |
1904 /* Set up variables for computing the stop position from text | |
1905 property changes. */ | |
1906 XSETBUFFER (object, current_buffer); | |
1907 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1908 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1909 | |
1910 } | |
1911 | |
1912 /* Get the interval containing IT's position. Value is a null | |
1913 interval if there isn't such an interval. */ | |
1914 iv = validate_interval_range (object, &position, &position, 0); | |
1915 if (!NULL_INTERVAL_P (iv)) | |
1916 { | |
1917 Lisp_Object values_here[LAST_PROP_IDX]; | |
1918 struct props *p; | |
1919 | |
1920 /* Get properties here. */ | |
1921 for (p = it_props; p->handler; ++p) | |
1922 values_here[p->idx] = textget (iv->plist, *p->name); | |
1923 | |
1924 /* Look for an interval following iv that has different | |
1925 properties. */ | |
1926 for (next_iv = next_interval (iv); | |
1927 (!NULL_INTERVAL_P (next_iv) | |
1928 && (NILP (limit) | |
1929 || XFASTINT (limit) > next_iv->position)); | |
1930 next_iv = next_interval (next_iv)) | |
1931 { | |
1932 for (p = it_props; p->handler; ++p) | |
1933 { | |
1934 Lisp_Object new_value; | |
1935 | |
1936 new_value = textget (next_iv->plist, *p->name); | |
1937 if (!EQ (values_here[p->idx], new_value)) | |
1938 break; | |
1939 } | |
1940 | |
1941 if (p->handler) | |
1942 break; | |
1943 } | |
1944 | |
1945 if (!NULL_INTERVAL_P (next_iv)) | |
1946 { | |
1947 if (INTEGERP (limit) | |
1948 && next_iv->position >= XFASTINT (limit)) | |
1949 /* No text property change up to limit. */ | |
1950 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1951 else | |
1952 /* Text properties change in next_iv. */ | |
1953 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1954 } | |
1955 } | |
1956 | |
1957 xassert (STRINGP (it->string) | |
1958 || (it->stop_charpos >= BEGV | |
1959 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1960 } | |
1961 | |
1962 | |
1963 /* Return the position of the next overlay change after POS in | |
1964 current_buffer. Value is point-max if no overlay change | |
1965 follows. This is like `next-overlay-change' but doesn't use | |
1966 xmalloc. */ | |
1967 | |
1968 static int | |
1969 next_overlay_change (pos) | |
1970 int pos; | |
1971 { | |
1972 int noverlays; | |
1973 int endpos; | |
1974 Lisp_Object *overlays; | |
1975 int len; | |
1976 int i; | |
1977 | |
1978 /* Get all overlays at the given position. */ | |
1979 len = 10; | |
1980 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
30697
0b56d5da235e
(next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents:
30675
diff
changeset
|
1981 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1982 if (noverlays > len) |
1983 { | |
1984 len = noverlays; | |
1985 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
30697
0b56d5da235e
(next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents:
30675
diff
changeset
|
1986 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1987 } |
1988 | |
1989 /* If any of these overlays ends before endpos, | |
1990 use its ending point instead. */ | |
1991 for (i = 0; i < noverlays; ++i) | |
1992 { | |
1993 Lisp_Object oend; | |
1994 int oendpos; | |
1995 | |
1996 oend = OVERLAY_END (overlays[i]); | |
1997 oendpos = OVERLAY_POSITION (oend); | |
1998 endpos = min (endpos, oendpos); | |
1999 } | |
2000 | |
2001 return endpos; | |
2002 } | |
2003 | |
2004 | |
2005 | |
2006 /*********************************************************************** | |
2007 Fontification | |
2008 ***********************************************************************/ | |
2009 | |
2010 /* Handle changes in the `fontified' property of the current buffer by | |
2011 calling hook functions from Qfontification_functions to fontify | |
2012 regions of text. */ | |
2013 | |
2014 static enum prop_handled | |
2015 handle_fontified_prop (it) | |
2016 struct it *it; | |
2017 { | |
2018 Lisp_Object prop, pos; | |
2019 enum prop_handled handled = HANDLED_NORMALLY; | |
2020 | |
2021 /* Get the value of the `fontified' property at IT's current buffer | |
2022 position. (The `fontified' property doesn't have a special | |
2023 meaning in strings.) If the value is nil, call functions from | |
2024 Qfontification_functions. */ | |
2025 if (!STRINGP (it->string) | |
2026 && it->s == NULL | |
2027 && !NILP (Vfontification_functions) | |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2028 && !NILP (Vrun_hooks) |
25012 | 2029 && (pos = make_number (IT_CHARPOS (*it)), |
2030 prop = Fget_char_property (pos, Qfontified, Qnil), | |
2031 NILP (prop))) | |
2032 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2033 int count = BINDING_STACK_SIZE (); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2034 Lisp_Object val; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2035 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2036 val = Vfontification_functions; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2037 specbind (Qfontification_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2038 specbind (Qafter_change_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2039 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2040 if (!CONSP (val) || EQ (XCAR (val), Qlambda)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2041 safe_call1 (val, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2042 else |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2043 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2044 Lisp_Object globals, fn; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2045 struct gcpro gcpro1, gcpro2; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2046 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2047 globals = Qnil; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2048 GCPRO2 (val, globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2049 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2050 for (; CONSP (val); val = XCDR (val)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2051 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2052 fn = XCAR (val); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2053 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2054 if (EQ (fn, Qt)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2055 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2056 /* A value of t indicates this hook has a local |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2057 binding; it means to run the global binding too. |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2058 In a global value, t should not occur. If it |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2059 does, we must ignore it to avoid an endless |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2060 loop. */ |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2061 for (globals = Fdefault_value (Qfontification_functions); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2062 CONSP (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2063 globals = XCDR (globals)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2064 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2065 fn = XCAR (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2066 if (!EQ (fn, Qt)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2067 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2068 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2069 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2070 else |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2071 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2072 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2073 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2074 UNGCPRO; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2075 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2076 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2077 unbind_to (count, Qnil); |
25012 | 2078 |
2079 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
2080 something. This avoids an endless loop if they failed to | |
2081 fontify the text for which reason ever. */ | |
2082 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
2083 handled = HANDLED_RECOMPUTE_PROPS; | |
2084 } | |
2085 | |
2086 return handled; | |
2087 } | |
2088 | |
2089 | |
2090 | |
2091 /*********************************************************************** | |
2092 Faces | |
2093 ***********************************************************************/ | |
2094 | |
2095 /* Set up iterator IT from face properties at its current position. | |
2096 Called from handle_stop. */ | |
2097 | |
2098 static enum prop_handled | |
2099 handle_face_prop (it) | |
2100 struct it *it; | |
2101 { | |
2102 int new_face_id, next_stop; | |
2103 | |
2104 if (!STRINGP (it->string)) | |
2105 { | |
2106 new_face_id | |
2107 = face_at_buffer_position (it->w, | |
2108 IT_CHARPOS (*it), | |
2109 it->region_beg_charpos, | |
2110 it->region_end_charpos, | |
2111 &next_stop, | |
2112 (IT_CHARPOS (*it) | |
2113 + TEXT_PROP_DISTANCE_LIMIT), | |
2114 0); | |
2115 | |
2116 /* Is this a start of a run of characters with box face? | |
2117 Caveat: this can be called for a freshly initialized | |
2118 iterator; face_id is -1 is this case. We know that the new | |
2119 face will not change until limit, i.e. if the new face has a | |
2120 box, all characters up to limit will have one. But, as | |
2121 usual, we don't know whether limit is really the end. */ | |
2122 if (new_face_id != it->face_id) | |
2123 { | |
2124 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2125 | |
2126 /* If new face has a box but old face has not, this is | |
2127 the start of a run of characters with box, i.e. it has | |
2128 a shadow on the left side. The value of face_id of the | |
2129 iterator will be -1 if this is the initial call that gets | |
2130 the face. In this case, we have to look in front of IT's | |
2131 position and see whether there is a face != new_face_id. */ | |
2132 it->start_of_box_run_p | |
2133 = (new_face->box != FACE_NO_BOX | |
2134 && (it->face_id >= 0 | |
2135 || IT_CHARPOS (*it) == BEG | |
2136 || new_face_id != face_before_it_pos (it))); | |
2137 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2138 } | |
2139 } | |
2140 else | |
2141 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2142 int base_face_id, bufpos; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2143 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2144 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2145 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2146 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2147 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2148 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2149 /* For strings from a buffer, i.e. overlay strings or strings |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2150 from a `display' property, use the face at IT's current |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2151 buffer position as the base face to merge with, so that |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2152 overlay strings appear in the same face as surrounding |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2153 text, unless they specify their own faces. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2154 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2155 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2156 new_face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2157 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2158 IT_STRING_CHARPOS (*it), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2159 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2160 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2161 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2162 &next_stop, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2163 base_face_id); |
25012 | 2164 |
2165 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
2166 /* If IT is used to display a mode line we would really like to | |
2167 use the mode line face instead of the frame's default face. */ | |
2168 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
2169 && new_face_id == DEFAULT_FACE_ID) | |
2170 new_face_id = MODE_LINE_FACE_ID; | |
2171 #endif | |
2172 | |
2173 /* Is this a start of a run of characters with box? Caveat: | |
2174 this can be called for a freshly allocated iterator; face_id | |
2175 is -1 is this case. We know that the new face will not | |
2176 change until the next check pos, i.e. if the new face has a | |
2177 box, all characters up to that position will have a | |
2178 box. But, as usual, we don't know whether that position | |
2179 is really the end. */ | |
2180 if (new_face_id != it->face_id) | |
2181 { | |
2182 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2183 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
2184 | |
2185 /* If new face has a box but old face hasn't, this is the | |
2186 start of a run of characters with box, i.e. it has a | |
2187 shadow on the left side. */ | |
2188 it->start_of_box_run_p | |
2189 = new_face->box && (old_face == NULL || !old_face->box); | |
2190 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2191 } | |
2192 } | |
2193 | |
2194 it->face_id = new_face_id; | |
2195 return HANDLED_NORMALLY; | |
2196 } | |
2197 | |
2198 | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2199 /* Return the ID of the face ``underlying'' IT's current position, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2200 which is in a string. If the iterator is associated with a |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2201 buffer, return the face at IT's current buffer position. |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2202 Otherwise, use the iterator's base_face_id. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2203 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2204 static int |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2205 underlying_face_id (it) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2206 struct it *it; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2207 { |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2208 int face_id = it->base_face_id, i; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2209 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2210 xassert (STRINGP (it->string)); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2211 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2212 for (i = it->sp - 1; i >= 0; --i) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2213 if (NILP (it->stack[i].string)) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2214 face_id = it->stack[i].face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2215 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2216 return face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2217 } |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2218 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2219 |
25012 | 2220 /* Compute the face one character before or after the current position |
2221 of IT. BEFORE_P non-zero means get the face in front of IT's | |
2222 position. Value is the id of the face. */ | |
2223 | |
2224 static int | |
2225 face_before_or_after_it_pos (it, before_p) | |
2226 struct it *it; | |
2227 int before_p; | |
2228 { | |
2229 int face_id, limit; | |
2230 int next_check_charpos; | |
2231 struct text_pos pos; | |
2232 | |
2233 xassert (it->s == NULL); | |
2234 | |
2235 if (STRINGP (it->string)) | |
2236 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2237 int bufpos, base_face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2238 |
25012 | 2239 /* No face change past the end of the string (for the case |
2240 we are padding with spaces). No face change before the | |
2241 string start. */ | |
2242 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
2243 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
2244 return it->face_id; | |
2245 | |
2246 /* Set pos to the position before or after IT's current position. */ | |
2247 if (before_p) | |
2248 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
2249 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2250 /* 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
|
2251 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2252 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2253 ? 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
|
2254 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 2255 |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2256 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2257 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2258 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2259 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2260 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2261 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2262 |
25012 | 2263 /* Get the face for ASCII, or unibyte. */ |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2264 face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2265 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2266 CHARPOS (pos), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2267 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2268 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2269 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2270 &next_check_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2271 base_face_id); |
25012 | 2272 |
2273 /* Correct the face for charsets different from ASCII. Do it | |
2274 for the multibyte case only. The face returned above is | |
2275 suitable for unibyte text if IT->string is unibyte. */ | |
2276 if (STRING_MULTIBYTE (it->string)) | |
2277 { | |
2278 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
2279 int rest = STRING_BYTES (XSTRING (it->string)) - BYTEPOS (pos); | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2280 int c, len; |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2281 struct face *face = FACE_FROM_ID (it->f, face_id); |
25012 | 2282 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
2283 c = string_char_and_length (p, rest, &len); |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2284 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2285 } |
2286 } | |
2287 else | |
2288 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2289 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
|
2290 || (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
|
2291 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2292 |
25012 | 2293 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
2294 pos = it->current.pos; | |
2295 | |
2296 if (before_p) | |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2297 DEC_TEXT_POS (pos, it->multibyte_p); |
25012 | 2298 else |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2299 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2300 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2301 /* 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
|
2302 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2303 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
|
2304 else |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2305 INC_TEXT_POS (pos, it->multibyte_p); |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2306 } |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2307 |
25012 | 2308 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2309 face_id = face_at_buffer_position (it->w, | |
2310 CHARPOS (pos), | |
2311 it->region_beg_charpos, | |
2312 it->region_end_charpos, | |
2313 &next_check_charpos, | |
2314 limit, 0); | |
2315 | |
2316 /* Correct the face for charsets different from ASCII. Do it | |
2317 for the multibyte case only. The face returned above is | |
2318 suitable for unibyte text if current_buffer is unibyte. */ | |
2319 if (it->multibyte_p) | |
2320 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2321 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos)); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2322 struct face *face = FACE_FROM_ID (it->f, face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2323 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2324 } |
2325 } | |
2326 | |
2327 return face_id; | |
2328 } | |
2329 | |
2330 | |
2331 | |
2332 /*********************************************************************** | |
2333 Invisible text | |
2334 ***********************************************************************/ | |
2335 | |
2336 /* Set up iterator IT from invisible properties at its current | |
2337 position. Called from handle_stop. */ | |
2338 | |
2339 static enum prop_handled | |
2340 handle_invisible_prop (it) | |
2341 struct it *it; | |
2342 { | |
2343 enum prop_handled handled = HANDLED_NORMALLY; | |
2344 | |
2345 if (STRINGP (it->string)) | |
2346 { | |
2347 extern Lisp_Object Qinvisible; | |
2348 Lisp_Object prop, end_charpos, limit, charpos; | |
2349 | |
2350 /* Get the value of the invisible text property at the | |
2351 current position. Value will be nil if there is no such | |
2352 property. */ | |
2353 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2354 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2355 | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2356 if (!NILP (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2357 && IT_STRING_CHARPOS (*it) < it->end_charpos) |
25012 | 2358 { |
2359 handled = HANDLED_RECOMPUTE_PROPS; | |
2360 | |
2361 /* Get the position at which the next change of the | |
2362 invisible text property can be found in IT->string. | |
2363 Value will be nil if the property value is the same for | |
2364 all the rest of IT->string. */ | |
2365 XSETINT (limit, XSTRING (it->string)->size); | |
2366 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2367 it->string, limit); | |
2368 | |
2369 /* Text at current position is invisible. The next | |
2370 change in the property is at position end_charpos. | |
2371 Move IT's current position to that position. */ | |
2372 if (INTEGERP (end_charpos) | |
2373 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2374 { | |
2375 struct text_pos old; | |
2376 old = it->current.string_pos; | |
2377 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2378 compute_string_pos (&it->current.string_pos, old, it->string); | |
2379 } | |
2380 else | |
2381 { | |
2382 /* The rest of the string is invisible. If this is an | |
2383 overlay string, proceed with the next overlay string | |
2384 or whatever comes and return a character from there. */ | |
2385 if (it->current.overlay_string_index >= 0) | |
2386 { | |
2387 next_overlay_string (it); | |
2388 /* Don't check for overlay strings when we just | |
2389 finished processing them. */ | |
2390 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2391 } | |
2392 else | |
2393 { | |
2394 struct Lisp_String *s = XSTRING (it->string); | |
2395 IT_STRING_CHARPOS (*it) = s->size; | |
2396 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2397 } | |
2398 } | |
2399 } | |
2400 } | |
2401 else | |
2402 { | |
2403 int visible_p, newpos, next_stop; | |
2404 Lisp_Object pos, prop; | |
2405 | |
2406 /* First of all, is there invisible text at this position? */ | |
2407 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2408 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2409 | |
2410 /* If we are on invisible text, skip over it. */ | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2411 if (TEXT_PROP_MEANS_INVISIBLE (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2412 && IT_CHARPOS (*it) < it->end_charpos) |
25012 | 2413 { |
2414 /* Record whether we have to display an ellipsis for the | |
2415 invisible text. */ | |
2416 int display_ellipsis_p | |
2417 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2418 | |
2419 handled = HANDLED_RECOMPUTE_PROPS; | |
2420 | |
2421 /* Loop skipping over invisible text. The loop is left at | |
2422 ZV or with IT on the first char being visible again. */ | |
2423 do | |
2424 { | |
2425 /* Try to skip some invisible text. Return value is the | |
2426 position reached which can be equal to IT's position | |
2427 if there is nothing invisible here. This skips both | |
2428 over invisible text properties and overlays with | |
2429 invisible property. */ | |
2430 newpos = skip_invisible (IT_CHARPOS (*it), | |
2431 &next_stop, ZV, it->window); | |
2432 | |
2433 /* If we skipped nothing at all we weren't at invisible | |
2434 text in the first place. If everything to the end of | |
2435 the buffer was skipped, end the loop. */ | |
2436 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2437 visible_p = 1; | |
2438 else | |
2439 { | |
2440 /* We skipped some characters but not necessarily | |
2441 all there are. Check if we ended up on visible | |
2442 text. Fget_char_property returns the property of | |
2443 the char before the given position, i.e. if we | |
2444 get visible_p = 1, this means that the char at | |
2445 newpos is visible. */ | |
2446 XSETFASTINT (pos, newpos); | |
2447 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2448 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2449 } | |
2450 | |
2451 /* If we ended up on invisible text, proceed to | |
2452 skip starting with next_stop. */ | |
2453 if (!visible_p) | |
2454 IT_CHARPOS (*it) = next_stop; | |
2455 } | |
2456 while (!visible_p); | |
2457 | |
2458 /* The position newpos is now either ZV or on visible text. */ | |
2459 IT_CHARPOS (*it) = newpos; | |
2460 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2461 | |
2462 /* Maybe return `...' next for the end of the invisible text. */ | |
2463 if (display_ellipsis_p) | |
2464 { | |
2465 if (it->dp | |
2466 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2467 { | |
2468 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2469 it->dpvec = v->contents; | |
2470 it->dpend = v->contents + v->size; | |
2471 } | |
2472 else | |
2473 { | |
2474 /* Default `...'. */ | |
2475 it->dpvec = default_invis_vector; | |
2476 it->dpend = default_invis_vector + 3; | |
2477 } | |
2478 | |
2479 /* The ellipsis display does not replace the display of | |
2480 the character at the new position. Indicate this by | |
2481 setting IT->dpvec_char_len to zero. */ | |
2482 it->dpvec_char_len = 0; | |
2483 | |
2484 it->current.dpvec_index = 0; | |
2485 it->method = next_element_from_display_vector; | |
2486 } | |
2487 } | |
2488 } | |
2489 | |
2490 return handled; | |
2491 } | |
2492 | |
2493 | |
277 | 2494 |
25012 | 2495 /*********************************************************************** |
2496 'display' property | |
2497 ***********************************************************************/ | |
2498 | |
2499 /* Set up iterator IT from `display' property at its current position. | |
2500 Called from handle_stop. */ | |
2501 | |
2502 static enum prop_handled | |
2503 handle_display_prop (it) | |
2504 struct it *it; | |
2505 { | |
2506 Lisp_Object prop, object; | |
2507 struct text_pos *position; | |
2508 int space_or_image_found_p; | |
2509 | |
2510 if (STRINGP (it->string)) | |
2511 { | |
2512 object = it->string; | |
2513 position = &it->current.string_pos; | |
2514 } | |
2515 else | |
2516 { | |
2517 object = Qnil; | |
2518 position = &it->current.pos; | |
2519 } | |
2520 | |
2521 /* Reset those iterator values set from display property values. */ | |
2522 it->font_height = Qnil; | |
2523 it->space_width = Qnil; | |
2524 it->voffset = 0; | |
2525 | |
2526 /* We don't support recursive `display' properties, i.e. string | |
2527 values that have a string `display' property, that have a string | |
2528 `display' property etc. */ | |
2529 if (!it->string_from_display_prop_p) | |
2530 it->area = TEXT_AREA; | |
2531 | |
2532 prop = Fget_char_property (make_number (position->charpos), | |
2533 Qdisplay, object); | |
2534 if (NILP (prop)) | |
2535 return HANDLED_NORMALLY; | |
2536 | |
2537 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
|
2538 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2539 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2540 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2541 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2542 /* A list of sub-properties. */ |
25012 | 2543 while (CONSP (prop)) |
2544 { | |
2545 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2546 space_or_image_found_p = 1; | |
2547 prop = XCDR (prop); | |
2548 } | |
2549 } | |
2550 else if (VECTORP (prop)) | |
2551 { | |
2552 int i; | |
2553 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2554 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2555 object, position)) | |
2556 space_or_image_found_p = 1; | |
2557 } | |
2558 else | |
2559 { | |
2560 if (handle_single_display_prop (it, prop, object, position)) | |
2561 space_or_image_found_p = 1; | |
2562 } | |
2563 | |
2564 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2565 } | |
2566 | |
2567 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2568 /* Value is the position of the end of the `display' property starting |
25012 | 2569 at START_POS in OBJECT. */ |
2570 | |
2571 static struct text_pos | |
2572 display_prop_end (it, object, start_pos) | |
2573 struct it *it; | |
2574 Lisp_Object object; | |
2575 struct text_pos start_pos; | |
2576 { | |
2577 Lisp_Object end; | |
2578 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2579 |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2580 end = Fnext_single_char_property_change (make_number (CHARPOS (start_pos)), |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2581 Qdisplay, object, Qnil); |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2582 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2583 if (STRINGP (object)) |
25012 | 2584 compute_string_pos (&end_pos, start_pos, it->string); |
2585 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2586 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2587 |
2588 return end_pos; | |
2589 } | |
2590 | |
2591 | |
2592 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2593 is the object in which the `display' property was found. *POSITION | |
2594 is the position at which it was found. | |
2595 | |
2596 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2597 end position of the `display' property. | |
2598 | |
2599 Value is non-zero if a `space' or `image' property value was found. */ | |
2600 | |
2601 static int | |
2602 handle_single_display_prop (it, prop, object, position) | |
2603 struct it *it; | |
2604 Lisp_Object prop; | |
2605 Lisp_Object object; | |
2606 struct text_pos *position; | |
2607 { | |
2608 Lisp_Object value; | |
2609 int space_or_image_found_p = 0; | |
2610 Lisp_Object form; | |
2611 | |
25614 | 2612 /* 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
|
2613 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2614 form = Qt; |
25614 | 2615 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2616 { |
2617 prop = XCDR (prop); | |
2618 if (!CONSP (prop)) | |
2619 return 0; | |
2620 form = XCAR (prop); | |
2621 prop = XCDR (prop); | |
2622 } | |
2623 | |
2624 if (!NILP (form) && !EQ (form, Qt)) | |
2625 { | |
2626 struct gcpro gcpro1; | |
2627 struct text_pos end_pos, pt; | |
2628 | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2629 GCPRO1 (form); |
25012 | 2630 end_pos = display_prop_end (it, object, *position); |
2631 | |
2632 /* Temporarily set point to the end position, and then evaluate | |
2633 the form. This makes `(eolp)' work as FORM. */ | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2634 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2635 { |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2636 CHARPOS (pt) = PT; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2637 BYTEPOS (pt) = PT_BYTE; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2638 TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos)); |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2639 } |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2640 |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2641 form = safe_eval (form); |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2642 |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2643 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2644 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
25012 | 2645 UNGCPRO; |
2646 } | |
2647 | |
2648 if (NILP (form)) | |
2649 return 0; | |
2650 | |
2651 if (CONSP (prop) | |
2652 && EQ (XCAR (prop), Qheight) | |
2653 && CONSP (XCDR (prop))) | |
2654 { | |
2655 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2656 return 0; | |
2657 | |
2658 /* `(height HEIGHT)'. */ | |
2659 it->font_height = XCAR (XCDR (prop)); | |
2660 if (!NILP (it->font_height)) | |
2661 { | |
2662 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2663 int new_height = -1; | |
2664 | |
2665 if (CONSP (it->font_height) | |
2666 && (EQ (XCAR (it->font_height), Qplus) | |
2667 || EQ (XCAR (it->font_height), Qminus)) | |
2668 && CONSP (XCDR (it->font_height)) | |
2669 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2670 { | |
2671 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2672 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2673 if (EQ (XCAR (it->font_height), Qplus)) | |
2674 steps = - steps; | |
2675 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2676 } | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2677 else if (FUNCTIONP (it->font_height)) |
25012 | 2678 { |
2679 /* Call function with current height as argument. | |
2680 Value is the new height. */ | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2681 Lisp_Object height; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2682 height = safe_call1 (it->font_height, |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2683 face->lface[LFACE_HEIGHT_INDEX]); |
25012 | 2684 if (NUMBERP (height)) |
2685 new_height = XFLOATINT (height); | |
2686 } | |
2687 else if (NUMBERP (it->font_height)) | |
2688 { | |
2689 /* Value is a multiple of the canonical char height. */ | |
2690 struct face *face; | |
2691 | |
2692 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2693 new_height = (XFLOATINT (it->font_height) | |
2694 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2695 } | |
2696 else | |
2697 { | |
2698 /* Evaluate IT->font_height with `height' bound to the | |
2699 current specified height to get the new height. */ | |
2700 Lisp_Object value; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2701 int count = BINDING_STACK_SIZE (); |
25012 | 2702 |
2703 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2704 value = safe_eval (it->font_height); |
25012 | 2705 unbind_to (count, Qnil); |
2706 | |
2707 if (NUMBERP (value)) | |
2708 new_height = XFLOATINT (value); | |
2709 } | |
2710 | |
2711 if (new_height > 0) | |
2712 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2713 } | |
2714 } | |
2715 else if (CONSP (prop) | |
2716 && EQ (XCAR (prop), Qspace_width) | |
2717 && CONSP (XCDR (prop))) | |
2718 { | |
2719 /* `(space_width WIDTH)'. */ | |
2720 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2721 return 0; | |
2722 | |
2723 value = XCAR (XCDR (prop)); | |
2724 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2725 it->space_width = value; | |
2726 } | |
2727 else if (CONSP (prop) | |
2728 && EQ (XCAR (prop), Qraise) | |
2729 && CONSP (XCDR (prop))) | |
2730 { | |
2731 /* `(raise FACTOR)'. */ | |
2732 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2733 return 0; | |
2734 | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2735 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2736 value = XCAR (XCDR (prop)); |
2737 if (NUMBERP (value)) | |
2738 { | |
2739 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2740 it->voffset = - (XFLOATINT (value) | |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
2741 * (FONT_HEIGHT (face->font))); |
25012 | 2742 } |
2743 #endif /* HAVE_WINDOW_SYSTEM */ | |
2744 } | |
2745 else if (!it->string_from_display_prop_p) | |
2746 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2747 /* `((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
|
2748 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2749 Lisp_Object location, value; |
2750 struct text_pos start_pos; | |
2751 int valid_p; | |
2752 | |
2753 /* Characters having this form of property are not displayed, so | |
2754 we have to find the end of the property. */ | |
2755 start_pos = *position; | |
2756 *position = display_prop_end (it, object, start_pos); | |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
2757 value = Qnil; |
25012 | 2758 |
2759 /* Let's stop at the new position and assume that all | |
2760 text properties change there. */ | |
2761 it->stop_charpos = position->charpos; | |
2762 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2763 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2764 if (CONSP (prop) && CONSP (XCAR (prop))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2765 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2766 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2767 |
25012 | 2768 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2769 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2770 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2771 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2772 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2773 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2774 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2775 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2776 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2777 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2778 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2779 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2780 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2781 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2782 if (EQ (location, Qunbound)) |
25012 | 2783 { |
2784 location = Qnil; | |
2785 value = prop; | |
2786 } | |
2787 | |
2788 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2789 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2790 valid_p = STRINGP (value); |
2791 else | |
2792 valid_p = (STRINGP (value) | |
2793 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2794 || valid_image_p (value)); | |
2795 #else /* not HAVE_WINDOW_SYSTEM */ | |
2796 valid_p = STRINGP (value); | |
2797 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2798 | |
2799 if ((EQ (location, Qleft_margin) | |
2800 || EQ (location, Qright_margin) | |
2801 || NILP (location)) | |
2802 && valid_p) | |
2803 { | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2804 space_or_image_found_p = 1; |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2805 |
25012 | 2806 /* Save current settings of IT so that we can restore them |
2807 when we are finished with the glyph property value. */ | |
2808 push_it (it); | |
2809 | |
2810 if (NILP (location)) | |
2811 it->area = TEXT_AREA; | |
2812 else if (EQ (location, Qleft_margin)) | |
2813 it->area = LEFT_MARGIN_AREA; | |
2814 else | |
2815 it->area = RIGHT_MARGIN_AREA; | |
2816 | |
2817 if (STRINGP (value)) | |
2818 { | |
2819 it->string = value; | |
2820 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2821 it->current.overlay_string_index = -1; | |
2822 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2823 it->end_charpos = it->string_nchars | |
2824 = XSTRING (it->string)->size; | |
2825 it->method = next_element_from_string; | |
2826 it->stop_charpos = 0; | |
2827 it->string_from_display_prop_p = 1; | |
2828 } | |
2829 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2830 { | |
2831 it->method = next_element_from_stretch; | |
2832 it->object = value; | |
2833 it->current.pos = it->position = start_pos; | |
2834 } | |
2835 #ifdef HAVE_WINDOW_SYSTEM | |
2836 else | |
2837 { | |
2838 it->what = IT_IMAGE; | |
2839 it->image_id = lookup_image (it->f, value); | |
2840 it->position = start_pos; | |
2841 it->object = NILP (object) ? it->w->buffer : object; | |
2842 it->method = next_element_from_image; | |
2843 | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
2844 /* Say that we haven't consumed the characters with |
25012 | 2845 `display' property yet. The call to pop_it in |
2846 set_iterator_to_next will clean this up. */ | |
2847 *position = start_pos; | |
2848 } | |
2849 #endif /* HAVE_WINDOW_SYSTEM */ | |
2850 } | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2851 else |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2852 /* Invalid property or property not supported. Restore |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2853 the position to what it was before. */ |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2854 *position = start_pos; |
25012 | 2855 } |
2856 | |
2857 return space_or_image_found_p; | |
2858 } | |
2859 | |
2860 | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2861 /* Check if PROP is a display sub-property value whose text should be |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2862 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2863 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2864 static int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2865 single_display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2866 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2867 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2868 /* Skip over `when FORM'. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2869 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2870 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2871 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2872 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2873 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2874 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2875 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2876 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2877 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2878 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2879 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2880 /* Skip over `margin LOCATION'. If LOCATION is in the margins, |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2881 we don't need to treat text as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2882 if (EQ (XCAR (prop), Qmargin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2883 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2884 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2885 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2886 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2887 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2888 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2889 if (!CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2890 || EQ (XCAR (prop), Qleft_margin) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2891 || EQ (XCAR (prop), Qright_margin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2892 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2893 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2894 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2895 return CONSP (prop) && EQ (XCAR (prop), Qimage); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2896 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2897 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2898 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2899 /* Check if PROP is a display property value whose text should be |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2900 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2901 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2902 int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2903 display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2904 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2905 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2906 if (CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2907 && CONSP (XCAR (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2908 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2909 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2910 /* A list of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2911 while (CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2912 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2913 if (single_display_prop_intangible_p (XCAR (prop))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2914 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2915 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2916 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2917 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2918 else if (VECTORP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2919 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2920 /* A vector of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2921 int i; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2922 for (i = 0; i < XVECTOR (prop)->size; ++i) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2923 if (single_display_prop_intangible_p (XVECTOR (prop)->contents[i])) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2924 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2925 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2926 else |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2927 return single_display_prop_intangible_p (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2928 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2929 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2930 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2931 |
25012 | 2932 |
2933 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2934 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2935 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2936 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2937 /* 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
|
2938 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2939 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2940 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2941 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2942 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2943 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2944 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2945 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2946 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2947 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2948 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2949 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2950 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2951 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2952 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2953 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2954 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2955 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2956 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2957 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2958 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2959 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2960 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2961 /* 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
|
2962 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
|
2963 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
|
2964 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
|
2965 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2966 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2967 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2968 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
|
2969 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2970 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2971 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2972 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2973 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2974 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2975 /* 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
|
2976 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2977 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
|
2978 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2979 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2980 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2981 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2982 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2983 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2984 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2985 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2986 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2987 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2988 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2989 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2990 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2991 /*********************************************************************** |
25012 | 2992 Overlay strings |
2993 ***********************************************************************/ | |
2994 | |
2995 /* The following structure is used to record overlay strings for | |
2996 later sorting in load_overlay_strings. */ | |
2997 | |
2998 struct overlay_entry | |
2999 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3000 Lisp_Object overlay; |
25012 | 3001 Lisp_Object string; |
3002 int priority; | |
3003 int after_string_p; | |
3004 }; | |
3005 | |
3006 | |
3007 /* Set up iterator IT from overlay strings at its current position. | |
3008 Called from handle_stop. */ | |
3009 | |
3010 static enum prop_handled | |
3011 handle_overlay_change (it) | |
3012 struct it *it; | |
3013 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3014 if (!STRINGP (it->string) && get_overlay_strings (it)) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3015 return HANDLED_RECOMPUTE_PROPS; |
25012 | 3016 else |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3017 return HANDLED_NORMALLY; |
25012 | 3018 } |
3019 | |
3020 | |
3021 /* Set up the next overlay string for delivery by IT, if there is an | |
3022 overlay string to deliver. Called by set_iterator_to_next when the | |
3023 end of the current overlay string is reached. If there are more | |
3024 overlay strings to display, IT->string and | |
3025 IT->current.overlay_string_index are set appropriately here. | |
3026 Otherwise IT->string is set to nil. */ | |
3027 | |
3028 static void | |
3029 next_overlay_string (it) | |
3030 struct it *it; | |
3031 { | |
3032 ++it->current.overlay_string_index; | |
3033 if (it->current.overlay_string_index == it->n_overlay_strings) | |
3034 { | |
3035 /* No more overlay strings. Restore IT's settings to what | |
3036 they were before overlay strings were processed, and | |
3037 continue to deliver from current_buffer. */ | |
3038 pop_it (it); | |
3039 xassert (it->stop_charpos >= BEGV | |
3040 && it->stop_charpos <= it->end_charpos); | |
3041 it->string = Qnil; | |
3042 it->current.overlay_string_index = -1; | |
3043 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
3044 it->n_overlay_strings = 0; | |
3045 it->method = next_element_from_buffer; | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3046 |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3047 /* If we're at the end of the buffer, record that we have |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3048 processed the overlay strings there already, so that |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3049 next_element_from_buffer doesn't try it again. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3050 if (IT_CHARPOS (*it) >= it->end_charpos) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3051 it->overlay_strings_at_end_processed_p = 1; |
25012 | 3052 } |
3053 else | |
3054 { | |
3055 /* There are more overlay strings to process. If | |
3056 IT->current.overlay_string_index has advanced to a position | |
3057 where we must load IT->overlay_strings with more strings, do | |
3058 it. */ | |
3059 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
3060 | |
3061 if (it->current.overlay_string_index && i == 0) | |
3062 load_overlay_strings (it); | |
3063 | |
3064 /* Initialize IT to deliver display elements from the overlay | |
3065 string. */ | |
3066 it->string = it->overlay_strings[i]; | |
3067 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3068 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
3069 it->method = next_element_from_string; | |
3070 it->stop_charpos = 0; | |
3071 } | |
3072 | |
3073 CHECK_IT (it); | |
3074 } | |
3075 | |
3076 | |
3077 /* Compare two overlay_entry structures E1 and E2. Used as a | |
3078 comparison function for qsort in load_overlay_strings. Overlay | |
3079 strings for the same position are sorted so that | |
3080 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3081 1. All after-strings come in front of before-strings, except |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3082 when they come from the same overlay. |
25012 | 3083 |
3084 2. Within after-strings, strings are sorted so that overlay strings | |
3085 from overlays with higher priorities come first. | |
3086 | |
3087 2. Within before-strings, strings are sorted so that overlay | |
3088 strings from overlays with higher priorities come last. | |
3089 | |
3090 Value is analogous to strcmp. */ | |
3091 | |
3092 | |
3093 static int | |
3094 compare_overlay_entries (e1, e2) | |
3095 void *e1, *e2; | |
3096 { | |
3097 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
3098 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
3099 int result; | |
3100 | |
3101 if (entry1->after_string_p != entry2->after_string_p) | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3102 { |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3103 /* Let after-strings appear in front of before-strings if |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3104 they come from different overlays. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3105 if (EQ (entry1->overlay, entry2->overlay)) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3106 result = entry1->after_string_p ? 1 : -1; |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3107 else |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3108 result = entry1->after_string_p ? -1 : 1; |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3109 } |
25012 | 3110 else if (entry1->after_string_p) |
3111 /* After-strings sorted in order of decreasing priority. */ | |
3112 result = entry2->priority - entry1->priority; | |
3113 else | |
3114 /* Before-strings sorted in order of increasing priority. */ | |
3115 result = entry1->priority - entry2->priority; | |
3116 | |
3117 return result; | |
3118 } | |
3119 | |
3120 | |
3121 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
3122 current buffer position. Set IT->n_overlays to the total number of | |
3123 overlay strings found. | |
3124 | |
3125 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
3126 a time. On entry into load_overlay_strings, | |
3127 IT->current.overlay_string_index gives the number of overlay | |
3128 strings that have already been loaded by previous calls to this | |
3129 function. | |
3130 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3131 IT->add_overlay_start contains an additional overlay start |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3132 position to consider for taking overlay strings from, if non-zero. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3133 This position comes into play when the overlay has an `invisible' |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3134 property, and both before and after-strings. When we've skipped to |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3135 the end of the overlay, because of its `invisible' property, we |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3136 nevertheless want its before-string to appear. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3137 IT->add_overlay_start will contain the overlay start position |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3138 in this case. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3139 |
25012 | 3140 Overlay strings are sorted so that after-string strings come in |
3141 front of before-string strings. Within before and after-strings, | |
3142 strings are sorted by overlay priority. See also function | |
3143 compare_overlay_entries. */ | |
3144 | |
3145 static void | |
3146 load_overlay_strings (it) | |
3147 struct it *it; | |
3148 { | |
3149 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3150 Lisp_Object ov, overlay, window, str, invisible; |
25012 | 3151 int start, end; |
3152 int size = 20; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3153 int n = 0, i, j, invis_p; |
25012 | 3154 struct overlay_entry *entries |
3155 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3156 int charpos = IT_CHARPOS (*it); |
25012 | 3157 |
3158 /* Append the overlay string STRING of overlay OVERLAY to vector | |
3159 `entries' which has size `size' and currently contains `n' | |
3160 elements. AFTER_P non-zero means STRING is an after-string of | |
3161 OVERLAY. */ | |
3162 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
3163 do \ | |
3164 { \ | |
3165 Lisp_Object priority; \ | |
3166 \ | |
3167 if (n == size) \ | |
3168 { \ | |
3169 int new_size = 2 * size; \ | |
3170 struct overlay_entry *old = entries; \ | |
3171 entries = \ | |
3172 (struct overlay_entry *) alloca (new_size \ | |
3173 * sizeof *entries); \ | |
3174 bcopy (old, entries, size * sizeof *entries); \ | |
3175 size = new_size; \ | |
3176 } \ | |
3177 \ | |
3178 entries[n].string = (STRING); \ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3179 entries[n].overlay = (OVERLAY); \ |
25012 | 3180 priority = Foverlay_get ((OVERLAY), Qpriority); \ |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3181 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \ |
25012 | 3182 entries[n].after_string_p = (AFTER_P); \ |
3183 ++n; \ | |
3184 } \ | |
3185 while (0) | |
3186 | |
3187 /* Process overlay before the overlay center. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3188 for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCDR (ov)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3189 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3190 overlay = XCAR (ov); |
25012 | 3191 xassert (OVERLAYP (overlay)); |
3192 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3193 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3194 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3195 if (end < charpos) |
25012 | 3196 break; |
3197 | |
3198 /* Skip this overlay if it doesn't start or end at IT's current | |
3199 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3200 if (end != charpos && start != charpos) |
25012 | 3201 continue; |
3202 | |
3203 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3204 window = Foverlay_get (overlay, Qwindow); | |
3205 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3206 continue; | |
3207 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3208 /* If the text ``under'' the overlay is invisible, both before- |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3209 and after-strings from this overlay are visible; start and |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3210 end position are indistinguishable. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3211 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3212 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3213 |
25012 | 3214 /* If overlay has a non-empty before-string, record it. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3215 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3216 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3217 && XSTRING (str)->size) | |
3218 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3219 | |
3220 /* If overlay has a non-empty after-string, record it. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3221 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3222 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3223 && XSTRING (str)->size) | |
3224 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3225 } | |
3226 | |
3227 /* Process overlays after the overlay center. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3228 for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCDR (ov)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3229 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3230 overlay = XCAR (ov); |
25012 | 3231 xassert (OVERLAYP (overlay)); |
3232 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3233 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3234 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3235 if (start > charpos) |
25012 | 3236 break; |
3237 | |
3238 /* Skip this overlay if it doesn't start or end at IT's current | |
3239 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3240 if (end != charpos && start != charpos) |
25012 | 3241 continue; |
3242 | |
3243 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3244 window = Foverlay_get (overlay, Qwindow); | |
3245 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3246 continue; | |
3247 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3248 /* If the text ``under'' the overlay is invisible, it has a zero |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3249 dimension, and both before- and after-strings apply. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3250 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3251 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3252 |
25012 | 3253 /* If overlay has a non-empty before-string, record it. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3254 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3255 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3256 && XSTRING (str)->size) | |
3257 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3258 | |
3259 /* If overlay has a non-empty after-string, record it. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3260 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3261 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3262 && XSTRING (str)->size) | |
3263 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3264 } | |
3265 | |
3266 #undef RECORD_OVERLAY_STRING | |
3267 | |
3268 /* Sort entries. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3269 if (n > 1) |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3270 qsort (entries, n, sizeof *entries, compare_overlay_entries); |
25012 | 3271 |
3272 /* Record the total number of strings to process. */ | |
3273 it->n_overlay_strings = n; | |
3274 | |
3275 /* IT->current.overlay_string_index is the number of overlay strings | |
3276 that have already been consumed by IT. Copy some of the | |
3277 remaining overlay strings to IT->overlay_strings. */ | |
3278 i = 0; | |
3279 j = it->current.overlay_string_index; | |
3280 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
3281 it->overlay_strings[i++] = entries[j++].string; | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3282 |
25012 | 3283 CHECK_IT (it); |
3284 } | |
3285 | |
3286 | |
3287 /* Get the first chunk of overlay strings at IT's current buffer | |
3288 position. Value is non-zero if at least one overlay string was | |
3289 found. */ | |
3290 | |
3291 static int | |
3292 get_overlay_strings (it) | |
3293 struct it *it; | |
3294 { | |
3295 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
3296 process. This fills IT->overlay_strings with strings, and sets | |
3297 IT->n_overlay_strings to the total number of strings to process. | |
3298 IT->pos.overlay_string_index has to be set temporarily to zero | |
3299 because load_overlay_strings needs this; it must be set to -1 | |
3300 when no overlay strings are found because a zero value would | |
3301 indicate a position in the first overlay string. */ | |
3302 it->current.overlay_string_index = 0; | |
3303 load_overlay_strings (it); | |
3304 | |
3305 /* If we found overlay strings, set up IT to deliver display | |
3306 elements from the first one. Otherwise set up IT to deliver | |
3307 from current_buffer. */ | |
3308 if (it->n_overlay_strings) | |
3309 { | |
3310 /* Make sure we know settings in current_buffer, so that we can | |
3311 restore meaningful values when we're done with the overlay | |
3312 strings. */ | |
3313 compute_stop_pos (it); | |
3314 xassert (it->face_id >= 0); | |
3315 | |
3316 /* Save IT's settings. They are restored after all overlay | |
3317 strings have been processed. */ | |
3318 xassert (it->sp == 0); | |
3319 push_it (it); | |
3320 | |
3321 /* Set up IT to deliver display elements from the first overlay | |
3322 string. */ | |
3323 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
3324 it->stop_charpos = 0; | |
3325 it->string = it->overlay_strings[0]; | |
3326 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3327 xassert (STRINGP (it->string)); | |
3328 it->method = next_element_from_string; | |
3329 } | |
3330 else | |
3331 { | |
3332 it->string = Qnil; | |
3333 it->current.overlay_string_index = -1; | |
3334 it->method = next_element_from_buffer; | |
3335 } | |
3336 | |
3337 CHECK_IT (it); | |
3338 | |
3339 /* Value is non-zero if we found at least one overlay string. */ | |
3340 return STRINGP (it->string); | |
3341 } | |
3342 | |
3343 | |
3344 | |
3345 /*********************************************************************** | |
3346 Saving and restoring state | |
3347 ***********************************************************************/ | |
3348 | |
3349 /* Save current settings of IT on IT->stack. Called, for example, | |
3350 before setting up IT for an overlay string, to be able to restore | |
3351 IT's settings to what they were after the overlay string has been | |
3352 processed. */ | |
3353 | |
3354 static void | |
3355 push_it (it) | |
3356 struct it *it; | |
3357 { | |
3358 struct iterator_stack_entry *p; | |
3359 | |
3360 xassert (it->sp < 2); | |
3361 p = it->stack + it->sp; | |
3362 | |
3363 p->stop_charpos = it->stop_charpos; | |
3364 xassert (it->face_id >= 0); | |
3365 p->face_id = it->face_id; | |
3366 p->string = it->string; | |
3367 p->pos = it->current; | |
3368 p->end_charpos = it->end_charpos; | |
3369 p->string_nchars = it->string_nchars; | |
3370 p->area = it->area; | |
3371 p->multibyte_p = it->multibyte_p; | |
3372 p->space_width = it->space_width; | |
3373 p->font_height = it->font_height; | |
3374 p->voffset = it->voffset; | |
3375 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
3376 ++it->sp; | |
3377 } | |
3378 | |
3379 | |
3380 /* Restore IT's settings from IT->stack. Called, for example, when no | |
3381 more overlay strings must be processed, and we return to delivering | |
3382 display elements from a buffer, or when the end of a string from a | |
3383 `display' property is reached and we return to delivering display | |
3384 elements from an overlay string, or from a buffer. */ | |
3385 | |
3386 static void | |
3387 pop_it (it) | |
3388 struct it *it; | |
3389 { | |
3390 struct iterator_stack_entry *p; | |
3391 | |
3392 xassert (it->sp > 0); | |
3393 --it->sp; | |
3394 p = it->stack + it->sp; | |
3395 it->stop_charpos = p->stop_charpos; | |
3396 it->face_id = p->face_id; | |
3397 it->string = p->string; | |
3398 it->current = p->pos; | |
3399 it->end_charpos = p->end_charpos; | |
3400 it->string_nchars = p->string_nchars; | |
3401 it->area = p->area; | |
3402 it->multibyte_p = p->multibyte_p; | |
3403 it->space_width = p->space_width; | |
3404 it->font_height = p->font_height; | |
3405 it->voffset = p->voffset; | |
3406 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
3407 } | |
3408 | |
3409 | |
3410 | |
3411 /*********************************************************************** | |
3412 Moving over lines | |
3413 ***********************************************************************/ | |
3414 | |
3415 /* Set IT's current position to the previous line start. */ | |
3416 | |
3417 static void | |
3418 back_to_previous_line_start (it) | |
3419 struct it *it; | |
3420 { | |
3421 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3422 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3423 } | |
3424 | |
3425 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3426 /* Move IT to the next line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3427 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3428 Value is non-zero if a newline was found. Set *SKIPPED_P to 1 if |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3429 we skipped over part of the text (as opposed to moving the iterator |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3430 continuously over the text). Otherwise, don't change the value |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3431 of *SKIPPED_P. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3432 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3433 Newlines may come from buffer text, overlay strings, or strings |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3434 displayed via the `display' property. That's the reason we can't |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3435 simply use find_next_newline_no_quit. |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3436 |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3437 Note that this function may not skip over invisible text that is so |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3438 because of text properties and immediately follows a newline. If |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3439 it would, function reseat_at_next_visible_line_start, when called |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3440 from set_iterator_to_next, would effectively make invisible |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3441 characters following a newline part of the wrong glyph row, which |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3442 leads to wrong cursor motion. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3443 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3444 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3445 forward_to_next_line_start (it, skipped_p) |
25012 | 3446 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3447 int *skipped_p; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3448 { |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3449 int old_selective, newline_found_p, n; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3450 const int MAX_NEWLINE_DISTANCE = 500; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3451 |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3452 /* If already on a newline, just consume it to avoid unintended |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3453 skipping over invisible text below. */ |
33950
a036721cfe80
(forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents:
33916
diff
changeset
|
3454 if (it->what == IT_CHARACTER && it->c == '\n') |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3455 { |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3456 set_iterator_to_next (it, 0); |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3457 return 1; |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3458 } |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3459 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3460 /* Don't handle selective display in the following. It's (a) |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3461 unnecessary because it's done by the caller, and (b) leads to an |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3462 infinite recursion because next_element_from_ellipsis indirectly |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3463 calls this function. */ |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3464 old_selective = it->selective; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3465 it->selective = 0; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3466 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3467 /* Scan for a newline within MAX_NEWLINE_DISTANCE display elements |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3468 from buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3469 n = newline_found_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3470 while (n < MAX_NEWLINE_DISTANCE |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3471 && get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3472 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3473 { |
33950
a036721cfe80
(forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents:
33916
diff
changeset
|
3474 newline_found_p = it->what == IT_CHARACTER && it->c == '\n'; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3475 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3476 if (!STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3477 ++n; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3478 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3479 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3480 /* If we didn't find a newline near enough, see if we can use a |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3481 short-cut. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3482 if (!newline_found_p && n == MAX_NEWLINE_DISTANCE) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3483 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3484 int start = IT_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3485 int limit = find_next_newline_no_quit (start, 1); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3486 Lisp_Object pos; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3487 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3488 xassert (!STRINGP (it->string)); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3489 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3490 /* If there isn't any `display' property in sight, and no |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3491 overlays, we can just use the position of the newline in |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3492 buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3493 if (it->stop_charpos >= limit |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3494 || ((pos = Fnext_single_property_change (make_number (start), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3495 Qdisplay, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3496 Qnil, make_number (limit)), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3497 NILP (pos)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3498 && next_overlay_change (start) == ZV)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3499 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3500 IT_CHARPOS (*it) = limit; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3501 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3502 *skipped_p = newline_found_p = 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3503 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3504 else |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3505 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3506 while (get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3507 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3508 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3509 newline_found_p = ITERATOR_AT_END_OF_LINE_P (it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3510 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3511 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3512 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3513 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3514 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3515 it->selective = old_selective; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3516 return newline_found_p; |
25012 | 3517 } |
3518 | |
3519 | |
3520 /* Set IT's current position to the previous visible line start. Skip | |
3521 invisible text that is so either due to text properties or due to | |
3522 selective display. Caution: this does not change IT->current_x and | |
3523 IT->hpos. */ | |
3524 | |
3525 static void | |
3526 back_to_previous_visible_line_start (it) | |
3527 struct it *it; | |
3528 { | |
3529 int visible_p = 0; | |
3530 | |
3531 /* Go back one newline if not on BEGV already. */ | |
3532 if (IT_CHARPOS (*it) > BEGV) | |
3533 back_to_previous_line_start (it); | |
3534 | |
3535 /* Move over lines that are invisible because of selective display | |
3536 or text properties. */ | |
3537 while (IT_CHARPOS (*it) > BEGV | |
3538 && !visible_p) | |
3539 { | |
3540 visible_p = 1; | |
3541 | |
3542 /* If selective > 0, then lines indented more than that values | |
3543 are invisible. */ | |
3544 if (it->selective > 0 | |
3545 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3546 it->selective)) | |
3547 visible_p = 0; | |
3548 else | |
3549 { | |
3550 Lisp_Object prop; | |
3551 | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
3552 prop = Fget_char_property (make_number (IT_CHARPOS (*it)), |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
3553 Qinvisible, it->window); |
25012 | 3554 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
3555 visible_p = 0; | |
3556 } | |
3557 | |
3558 /* Back one more newline if the current one is invisible. */ | |
3559 if (!visible_p) | |
3560 back_to_previous_line_start (it); | |
3561 } | |
3562 | |
3563 xassert (IT_CHARPOS (*it) >= BEGV); | |
3564 xassert (IT_CHARPOS (*it) == BEGV | |
3565 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3566 CHECK_IT (it); | |
3567 } | |
3568 | |
3569 | |
3570 /* Reseat iterator IT at the previous visible line start. Skip | |
3571 invisible text that is so either due to text properties or due to | |
3572 selective display. At the end, update IT's overlay information, | |
3573 face information etc. */ | |
3574 | |
3575 static void | |
3576 reseat_at_previous_visible_line_start (it) | |
3577 struct it *it; | |
3578 { | |
3579 back_to_previous_visible_line_start (it); | |
3580 reseat (it, it->current.pos, 1); | |
3581 CHECK_IT (it); | |
3582 } | |
3583 | |
3584 | |
3585 /* 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
|
3586 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
|
3587 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
|
3588 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
|
3589 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
|
3590 is invisible because of text properties. */ |
25012 | 3591 |
3592 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3593 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3594 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3595 int on_newline_p; |
25012 | 3596 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3597 int newline_found_p, skipped_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3598 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3599 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3600 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3601 /* Skip over lines that are invisible because they are indented |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3602 more than the value of IT->selective. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3603 if (it->selective > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3604 while (IT_CHARPOS (*it) < ZV |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3605 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3606 it->selective)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3607 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3608 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3609 /* Position on the newline if that's what's requested. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3610 if (on_newline_p && newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3611 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3612 if (STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3613 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3614 if (IT_STRING_CHARPOS (*it) > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3615 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3616 --IT_STRING_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3617 --IT_STRING_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3618 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3619 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3620 else if (IT_CHARPOS (*it) > BEGV) |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3621 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3622 --IT_CHARPOS (*it); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3623 --IT_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3624 reseat (it, it->current.pos, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3625 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3626 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3627 else if (skipped_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3628 reseat (it, it->current.pos, 0); |
25012 | 3629 |
3630 CHECK_IT (it); | |
3631 } | |
3632 | |
3633 | |
3634 | |
3635 /*********************************************************************** | |
3636 Changing an iterator's position | |
3637 ***********************************************************************/ | |
3638 | |
3639 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3640 is non-zero, always check for text properties at the new position. | |
3641 Otherwise, text properties are only looked up if POS >= | |
3642 IT->check_charpos of a property. */ | |
3643 | |
3644 static void | |
3645 reseat (it, pos, force_p) | |
3646 struct it *it; | |
3647 struct text_pos pos; | |
3648 int force_p; | |
3649 { | |
3650 int original_pos = IT_CHARPOS (*it); | |
3651 | |
3652 reseat_1 (it, pos, 0); | |
3653 | |
3654 /* Determine where to check text properties. Avoid doing it | |
3655 where possible because text property lookup is very expensive. */ | |
3656 if (force_p | |
3657 || CHARPOS (pos) > it->stop_charpos | |
3658 || CHARPOS (pos) < original_pos) | |
3659 handle_stop (it); | |
3660 | |
3661 CHECK_IT (it); | |
3662 } | |
3663 | |
3664 | |
3665 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3666 IT->stop_pos to POS, also. */ | |
3667 | |
3668 static void | |
3669 reseat_1 (it, pos, set_stop_p) | |
3670 struct it *it; | |
3671 struct text_pos pos; | |
3672 int set_stop_p; | |
3673 { | |
3674 /* Don't call this function when scanning a C string. */ | |
3675 xassert (it->s == NULL); | |
3676 | |
3677 /* POS must be a reasonable value. */ | |
3678 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3679 | |
3680 it->current.pos = it->position = pos; | |
3681 XSETBUFFER (it->object, current_buffer); | |
3682 it->dpvec = NULL; | |
3683 it->current.dpvec_index = -1; | |
3684 it->current.overlay_string_index = -1; | |
3685 IT_STRING_CHARPOS (*it) = -1; | |
3686 IT_STRING_BYTEPOS (*it) = -1; | |
3687 it->string = Qnil; | |
3688 it->method = next_element_from_buffer; | |
3689 it->sp = 0; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
3690 it->face_before_selective_p = 0; |
25012 | 3691 |
3692 if (set_stop_p) | |
3693 it->stop_charpos = CHARPOS (pos); | |
3694 } | |
3695 | |
3696 | |
3697 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3698 If S is non-null, it is a C string to iterate over. Otherwise, | |
3699 STRING gives a Lisp string to iterate over. | |
3700 | |
3701 If PRECISION > 0, don't return more then PRECISION number of | |
3702 characters from the string. | |
3703 | |
3704 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3705 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3706 field width. | |
3707 | |
3708 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3709 MULTIBYTE > 0 means enable it, | |
3710 MULTIBYTE < 0 means use IT->multibyte_p. | |
3711 | |
3712 IT must be initialized via a prior call to init_iterator before | |
3713 calling this function. */ | |
3714 | |
3715 static void | |
3716 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3717 struct it *it; | |
3718 unsigned char *s; | |
3719 Lisp_Object string; | |
3720 int charpos; | |
3721 int precision, field_width, multibyte; | |
3722 { | |
3723 /* No region in strings. */ | |
3724 it->region_beg_charpos = it->region_end_charpos = -1; | |
3725 | |
3726 /* No text property checks performed by default, but see below. */ | |
3727 it->stop_charpos = -1; | |
3728 | |
3729 /* Set iterator position and end position. */ | |
3730 bzero (&it->current, sizeof it->current); | |
3731 it->current.overlay_string_index = -1; | |
3732 it->current.dpvec_index = -1; | |
3733 xassert (charpos >= 0); | |
3734 | |
3735 /* Use the setting of MULTIBYTE if specified. */ | |
3736 if (multibyte >= 0) | |
3737 it->multibyte_p = multibyte > 0; | |
3738 | |
3739 if (s == NULL) | |
3740 { | |
3741 xassert (STRINGP (string)); | |
3742 it->string = string; | |
3743 it->s = NULL; | |
3744 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3745 it->method = next_element_from_string; | |
3746 it->current.string_pos = string_pos (charpos, string); | |
3747 } | |
3748 else | |
3749 { | |
3750 it->s = s; | |
3751 it->string = Qnil; | |
3752 | |
3753 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3754 for displaying C strings. */ | |
3755 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3756 if (it->multibyte_p) | |
3757 { | |
3758 it->current.pos = c_string_pos (charpos, s, 1); | |
3759 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3760 } | |
3761 else | |
3762 { | |
3763 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3764 it->end_charpos = it->string_nchars = strlen (s); | |
3765 } | |
3766 | |
3767 it->method = next_element_from_c_string; | |
3768 } | |
3769 | |
3770 /* PRECISION > 0 means don't return more than PRECISION characters | |
3771 from the string. */ | |
3772 if (precision > 0 && it->end_charpos - charpos > precision) | |
3773 it->end_charpos = it->string_nchars = charpos + precision; | |
3774 | |
3775 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3776 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3777 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3778 padding with `-' at the end of a mode line. */ | |
3779 if (field_width < 0) | |
3780 field_width = INFINITY; | |
3781 if (field_width > it->end_charpos - charpos) | |
3782 it->end_charpos = charpos + field_width; | |
3783 | |
3784 /* Use the standard display table for displaying strings. */ | |
3785 if (DISP_TABLE_P (Vstandard_display_table)) | |
3786 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3787 | |
3788 it->stop_charpos = charpos; | |
3789 CHECK_IT (it); | |
3790 } | |
3791 | |
3792 | |
3793 | |
3794 /*********************************************************************** | |
3795 Iteration | |
3796 ***********************************************************************/ | |
3797 | |
3798 /* Load IT's display element fields with information about the next | |
3799 display element from the current position of IT. Value is zero if | |
3800 end of buffer (or C string) is reached. */ | |
3801 | |
3802 int | |
3803 get_next_display_element (it) | |
3804 struct it *it; | |
3805 { | |
3806 /* Non-zero means that we found an display element. Zero means that | |
3807 we hit the end of what we iterate over. Performance note: the | |
3808 function pointer `method' used here turns out to be faster than | |
3809 using a sequence of if-statements. */ | |
3810 int success_p = (*it->method) (it); | |
3811 | |
3812 if (it->what == IT_CHARACTER) | |
3813 { | |
3814 /* Map via display table or translate control characters. | |
3815 IT->c, IT->len etc. have been set to the next character by | |
3816 the function call above. If we have a display table, and it | |
3817 contains an entry for IT->c, translate it. Don't do this if | |
3818 IT->c itself comes from a display table, otherwise we could | |
3819 end up in an infinite recursion. (An alternative could be to | |
3820 count the recursion depth of this function and signal an | |
3821 error when a certain maximum depth is reached.) Is it worth | |
3822 it? */ | |
3823 if (success_p && it->dpvec == NULL) | |
3824 { | |
3825 Lisp_Object dv; | |
3826 | |
3827 if (it->dp | |
3828 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3829 VECTORP (dv))) | |
3830 { | |
3831 struct Lisp_Vector *v = XVECTOR (dv); | |
3832 | |
3833 /* Return the first character from the display table | |
3834 entry, if not empty. If empty, don't display the | |
3835 current character. */ | |
3836 if (v->size) | |
3837 { | |
3838 it->dpvec_char_len = it->len; | |
3839 it->dpvec = v->contents; | |
3840 it->dpend = v->contents + v->size; | |
3841 it->current.dpvec_index = 0; | |
3842 it->method = next_element_from_display_vector; | |
3843 } | |
3844 | |
3845 success_p = get_next_display_element (it); | |
3846 } | |
3847 | |
3848 /* Translate control characters into `\003' or `^C' form. | |
3849 Control characters coming from a display table entry are | |
3850 currently not translated because we use IT->dpvec to hold | |
3851 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
|
3852 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
|
3853 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3854 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3855 octal form. */ |
25012 | 3856 else if ((it->c < ' ' |
3857 && (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
|
3858 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3859 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3860 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3861 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3862 { |
3863 /* IT->c is a control character which must be displayed | |
3864 either as '\003' or as `^C' where the '\\' and '^' | |
3865 can be defined in the display table. Fill | |
3866 IT->ctl_chars with glyphs for what we have to | |
3867 display. Then, set IT->dpvec to these glyphs. */ | |
3868 GLYPH g; | |
3869 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3870 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3871 { |
3872 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3873 if (it->dp | |
3874 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3875 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3876 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3877 else | |
3878 g = FAST_MAKE_GLYPH ('^', 0); | |
3879 XSETINT (it->ctl_chars[0], g); | |
3880 | |
3881 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3882 XSETINT (it->ctl_chars[1], g); | |
3883 | |
3884 /* Set up IT->dpvec and return first character from it. */ | |
3885 it->dpvec_char_len = it->len; | |
3886 it->dpvec = it->ctl_chars; | |
3887 it->dpend = it->dpvec + 2; | |
3888 it->current.dpvec_index = 0; | |
3889 it->method = next_element_from_display_vector; | |
3890 get_next_display_element (it); | |
3891 } | |
3892 else | |
3893 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3894 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3895 int len; |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3896 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3897 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3898 |
25012 | 3899 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3900 if (it->dp | |
3901 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3902 && 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
|
3903 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3904 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3905 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3906 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3907 if (SINGLE_BYTE_CHAR_P (it->c)) |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3908 str[0] = it->c, len = 1; |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3909 else |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3910 len = CHAR_STRING (it->c, str); |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3911 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3912 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3913 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3914 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
|
3915 /* 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
|
3916 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3917 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
|
3918 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
|
3919 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
|
3920 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
|
3921 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
|
3922 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
|
3923 } |
25012 | 3924 |
3925 /* Set up IT->dpvec and return the first character | |
3926 from it. */ | |
3927 it->dpvec_char_len = it->len; | |
3928 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3929 it->dpend = it->dpvec + len * 4; |
25012 | 3930 it->current.dpvec_index = 0; |
3931 it->method = next_element_from_display_vector; | |
3932 get_next_display_element (it); | |
3933 } | |
3934 } | |
3935 } | |
3936 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3937 /* Adjust face id for a multibyte character. There are no |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3938 multibyte character in unibyte text. */ |
25012 | 3939 if (it->multibyte_p |
3940 && success_p | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3941 && FRAME_WINDOW_P (it->f)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3942 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3943 struct face *face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3944 it->face_id = FACE_FOR_CHAR (it->f, face, it->c); |
25012 | 3945 } |
3946 } | |
3947 | |
3948 /* Is this character the last one of a run of characters with | |
3949 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3950 if (it->face_box_p | |
3951 && it->s == NULL) | |
3952 { | |
3953 int face_id; | |
3954 struct face *face; | |
3955 | |
3956 it->end_of_box_run_p | |
3957 = ((face_id = face_after_it_pos (it), | |
3958 face_id != it->face_id) | |
3959 && (face = FACE_FROM_ID (it->f, face_id), | |
3960 face->box == FACE_NO_BOX)); | |
3961 } | |
3962 | |
3963 /* Value is 0 if end of buffer or string reached. */ | |
3964 return success_p; | |
3965 } | |
3966 | |
3967 | |
3968 /* Move IT to the next display element. | |
3969 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3970 RESEAT_P non-zero means if called on a newline in buffer text, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3971 skip to the next visible line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3972 |
25012 | 3973 Functions get_next_display_element and set_iterator_to_next are |
3974 separate because I find this arrangement easier to handle than a | |
3975 get_next_display_element function that also increments IT's | |
3976 position. The way it is we can first look at an iterator's current | |
3977 display element, decide whether it fits on a line, and if it does, | |
3978 increment the iterator position. The other way around we probably | |
3979 would either need a flag indicating whether the iterator has to be | |
3980 incremented the next time, or we would have to implement a | |
3981 decrement position function which would not be easy to write. */ | |
3982 | |
3983 void | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3984 set_iterator_to_next (it, reseat_p) |
25012 | 3985 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3986 int reseat_p; |
25012 | 3987 { |
32553
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
3988 /* Reset flags indicating start and end of a sequence of characters |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
3989 with box. Reset them at the start of this function because |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
3990 moving the iterator to a new position might set them. */ |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
3991 it->start_of_box_run_p = it->end_of_box_run_p = 0; |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
3992 |
25012 | 3993 if (it->method == next_element_from_buffer) |
3994 { | |
3995 /* The current display element of IT is a character from | |
3996 current_buffer. Advance in the buffer, and maybe skip over | |
3997 invisible lines that are so because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3998 if (ITERATOR_AT_END_OF_LINE_P (it) && reseat_p) |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3999 reseat_at_next_visible_line_start (it, 0); |
25012 | 4000 else |
4001 { | |
4002 xassert (it->len != 0); | |
4003 IT_BYTEPOS (*it) += it->len; | |
4004 IT_CHARPOS (*it) += 1; | |
4005 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
4006 } | |
4007 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4008 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
|
4009 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4010 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
|
4011 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4012 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4013 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4014 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4015 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4016 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4017 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4018 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4019 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4020 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4021 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4022 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4023 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4024 } |
25012 | 4025 else if (it->method == next_element_from_c_string) |
4026 { | |
4027 /* Current display element of IT is from a C string. */ | |
4028 IT_BYTEPOS (*it) += it->len; | |
4029 IT_CHARPOS (*it) += 1; | |
4030 } | |
4031 else if (it->method == next_element_from_display_vector) | |
4032 { | |
4033 /* Current display element of IT is from a display table entry. | |
4034 Advance in the display table definition. Reset it to null if | |
4035 end reached, and continue with characters from buffers/ | |
4036 strings. */ | |
4037 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
4038 |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4039 /* Restore face of the iterator to what they were before the |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4040 display vector entry (these entries may contain faces). */ |
25012 | 4041 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
|
4042 |
25012 | 4043 if (it->dpvec + it->current.dpvec_index == it->dpend) |
4044 { | |
4045 if (it->s) | |
4046 it->method = next_element_from_c_string; | |
4047 else if (STRINGP (it->string)) | |
4048 it->method = next_element_from_string; | |
4049 else | |
4050 it->method = next_element_from_buffer; | |
4051 | |
4052 it->dpvec = NULL; | |
4053 it->current.dpvec_index = -1; | |
4054 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4055 /* 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
|
4056 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
|
4057 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
|
4058 else if (it->dpvec_char_len > 0) |
25012 | 4059 { |
4060 it->len = it->dpvec_char_len; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4061 set_iterator_to_next (it, reseat_p); |
25012 | 4062 } |
4063 } | |
4064 } | |
4065 else if (it->method == next_element_from_string) | |
4066 { | |
4067 /* Current display element is a character from a Lisp string. */ | |
4068 xassert (it->s == NULL && STRINGP (it->string)); | |
4069 IT_STRING_BYTEPOS (*it) += it->len; | |
4070 IT_STRING_CHARPOS (*it) += 1; | |
4071 | |
4072 consider_string_end: | |
4073 | |
4074 if (it->current.overlay_string_index >= 0) | |
4075 { | |
4076 /* IT->string is an overlay string. Advance to the | |
4077 next, if there is one. */ | |
4078 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4079 next_overlay_string (it); | |
4080 } | |
4081 else | |
4082 { | |
4083 /* IT->string is not an overlay string. If we reached | |
4084 its end, and there is something on IT->stack, proceed | |
4085 with what is on the stack. This can be either another | |
4086 string, this time an overlay string, or a buffer. */ | |
4087 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
4088 && it->sp > 0) | |
4089 { | |
4090 pop_it (it); | |
4091 if (!STRINGP (it->string)) | |
4092 it->method = next_element_from_buffer; | |
4093 } | |
4094 } | |
4095 } | |
4096 else if (it->method == next_element_from_image | |
4097 || it->method == next_element_from_stretch) | |
4098 { | |
4099 /* The position etc with which we have to proceed are on | |
4100 the stack. The position may be at the end of a string, | |
4101 if the `display' property takes up the whole string. */ | |
4102 pop_it (it); | |
4103 it->image_id = 0; | |
4104 if (STRINGP (it->string)) | |
4105 { | |
4106 it->method = next_element_from_string; | |
4107 goto consider_string_end; | |
4108 } | |
4109 else | |
4110 it->method = next_element_from_buffer; | |
4111 } | |
4112 else | |
4113 /* There are no other methods defined, so this should be a bug. */ | |
4114 abort (); | |
4115 | |
4116 xassert (it->method != next_element_from_string | |
4117 || (STRINGP (it->string) | |
4118 && IT_STRING_CHARPOS (*it) >= 0)); | |
4119 } | |
4120 | |
4121 | |
4122 /* Load IT's display element fields with information about the next | |
4123 display element which comes from a display table entry or from the | |
4124 result of translating a control character to one of the forms `^C' | |
4125 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
4126 | |
4127 static int | |
4128 next_element_from_display_vector (it) | |
4129 struct it *it; | |
4130 { | |
4131 /* Precondition. */ | |
4132 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
4133 | |
4134 /* Remember the current face id in case glyphs specify faces. | |
4135 IT's face is restored in set_iterator_to_next. */ | |
4136 it->saved_face_id = it->face_id; | |
4137 | |
4138 if (INTEGERP (*it->dpvec) | |
4139 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
4140 { | |
4141 int lface_id; | |
4142 GLYPH g; | |
4143 | |
4144 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
4145 it->c = FAST_GLYPH_CHAR (g); | |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
4146 it->len = CHAR_BYTES (it->c); |
25012 | 4147 |
4148 /* The entry may contain a face id to use. Such a face id is | |
4149 the id of a Lisp face, not a realized face. A face id of | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4150 zero means no face is specified. */ |
25012 | 4151 lface_id = FAST_GLYPH_FACE (g); |
4152 if (lface_id) | |
4153 { | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4154 /* The function returns -1 if lface_id is invalid. */ |
25012 | 4155 int face_id = ascii_face_of_lisp_face (it->f, lface_id); |
4156 if (face_id >= 0) | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4157 it->face_id = face_id; |
25012 | 4158 } |
4159 } | |
4160 else | |
4161 /* Display table entry is invalid. Return a space. */ | |
4162 it->c = ' ', it->len = 1; | |
4163 | |
4164 /* Don't change position and object of the iterator here. They are | |
4165 still the values of the character that had this display table | |
4166 entry or was translated, and that's what we want. */ | |
4167 it->what = IT_CHARACTER; | |
4168 return 1; | |
4169 } | |
4170 | |
4171 | |
4172 /* Load IT with the next display element from Lisp string IT->string. | |
4173 IT->current.string_pos is the current position within the string. | |
4174 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
4175 overlay string. */ | |
4176 | |
4177 static int | |
4178 next_element_from_string (it) | |
4179 struct it *it; | |
4180 { | |
4181 struct text_pos position; | |
4182 | |
4183 xassert (STRINGP (it->string)); | |
4184 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
4185 position = it->current.string_pos; | |
4186 | |
4187 /* Time to check for invisible text? */ | |
4188 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
4189 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
4190 { | |
4191 handle_stop (it); | |
4192 | |
4193 /* Since a handler may have changed IT->method, we must | |
4194 recurse here. */ | |
4195 return get_next_display_element (it); | |
4196 } | |
4197 | |
4198 if (it->current.overlay_string_index >= 0) | |
4199 { | |
4200 /* Get the next character from an overlay string. In overlay | |
4201 strings, There is no field width or padding with spaces to | |
4202 do. */ | |
4203 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4204 { | |
4205 it->what = IT_EOB; | |
4206 return 0; | |
4207 } | |
4208 else if (STRING_MULTIBYTE (it->string)) | |
4209 { | |
4210 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
4211 - IT_STRING_BYTEPOS (*it)); | |
4212 unsigned char *s = (XSTRING (it->string)->data | |
4213 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4214 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 4215 } |
4216 else | |
4217 { | |
4218 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4219 it->len = 1; | |
4220 } | |
4221 } | |
4222 else | |
4223 { | |
4224 /* Get the next character from a Lisp string that is not an | |
4225 overlay string. Such strings come from the mode line, for | |
4226 example. We may have to pad with spaces, or truncate the | |
4227 string. See also next_element_from_c_string. */ | |
4228 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
4229 { | |
4230 it->what = IT_EOB; | |
4231 return 0; | |
4232 } | |
4233 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
4234 { | |
4235 /* Pad with spaces. */ | |
4236 it->c = ' ', it->len = 1; | |
4237 CHARPOS (position) = BYTEPOS (position) = -1; | |
4238 } | |
4239 else if (STRING_MULTIBYTE (it->string)) | |
4240 { | |
4241 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
4242 - IT_STRING_BYTEPOS (*it)); | |
4243 unsigned char *s = (XSTRING (it->string)->data | |
4244 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4245 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 4246 } |
4247 else | |
4248 { | |
4249 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4250 it->len = 1; | |
4251 } | |
4252 } | |
4253 | |
4254 /* Record what we have and where it came from. Note that we store a | |
4255 buffer position in IT->position although it could arguably be a | |
4256 string position. */ | |
4257 it->what = IT_CHARACTER; | |
4258 it->object = it->string; | |
4259 it->position = position; | |
4260 return 1; | |
4261 } | |
4262 | |
4263 | |
4264 /* Load IT with next display element from C string IT->s. | |
4265 IT->string_nchars is the maximum number of characters to return | |
4266 from the string. IT->end_charpos may be greater than | |
4267 IT->string_nchars when this function is called, in which case we | |
4268 may have to return padding spaces. Value is zero if end of string | |
4269 reached, including padding spaces. */ | |
4270 | |
4271 static int | |
4272 next_element_from_c_string (it) | |
4273 struct it *it; | |
4274 { | |
4275 int success_p = 1; | |
4276 | |
4277 xassert (it->s); | |
4278 it->what = IT_CHARACTER; | |
4279 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
4280 it->object = Qnil; | |
4281 | |
4282 /* IT's position can be greater IT->string_nchars in case a field | |
4283 width or precision has been specified when the iterator was | |
4284 initialized. */ | |
4285 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4286 { | |
4287 /* End of the game. */ | |
4288 it->what = IT_EOB; | |
4289 success_p = 0; | |
4290 } | |
4291 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
4292 { | |
4293 /* Pad with spaces. */ | |
4294 it->c = ' ', it->len = 1; | |
4295 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
4296 } | |
4297 else if (it->multibyte_p) | |
4298 { | |
4299 /* Implementation note: The calls to strlen apparently aren't a | |
4300 performance problem because there is no noticeable performance | |
4301 difference between Emacs running in unibyte or multibyte mode. */ | |
4302 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
|
4303 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
|
4304 maxlen, &it->len); |
25012 | 4305 } |
4306 else | |
4307 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
4308 | |
4309 return success_p; | |
4310 } | |
4311 | |
4312 | |
4313 /* Set up IT to return characters from an ellipsis, if appropriate. | |
4314 The definition of the ellipsis glyphs may come from a display table | |
4315 entry. This function Fills IT with the first glyph from the | |
4316 ellipsis if an ellipsis is to be displayed. */ | |
4317 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4318 static int |
25012 | 4319 next_element_from_ellipsis (it) |
4320 struct it *it; | |
4321 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4322 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4323 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4324 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
|
4325 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4326 /* 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
|
4327 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
|
4328 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
|
4329 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4330 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4331 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4332 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4333 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
|
4334 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4335 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4336 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4337 /* 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
|
4338 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4339 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4340 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4341 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4342 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
|
4343 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4344 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4345 else |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4346 { |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4347 /* The face at the current position may be different from the |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4348 face we find after the invisible text. Remember what it |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4349 was in IT->saved_face_id, and signal that it's there by |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4350 setting face_before_selective_p. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4351 it->saved_face_id = it->face_id; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4352 it->method = next_element_from_buffer; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4353 reseat_at_next_visible_line_start (it, 1); |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4354 it->face_before_selective_p = 1; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4355 } |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4356 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4357 return get_next_display_element (it); |
25012 | 4358 } |
4359 | |
4360 | |
4361 /* Deliver an image display element. The iterator IT is already | |
4362 filled with image information (done in handle_display_prop). Value | |
4363 is always 1. */ | |
4364 | |
4365 | |
4366 static int | |
4367 next_element_from_image (it) | |
4368 struct it *it; | |
4369 { | |
4370 it->what = IT_IMAGE; | |
4371 return 1; | |
4372 } | |
4373 | |
4374 | |
4375 /* Fill iterator IT with next display element from a stretch glyph | |
4376 property. IT->object is the value of the text property. Value is | |
4377 always 1. */ | |
4378 | |
4379 static int | |
4380 next_element_from_stretch (it) | |
4381 struct it *it; | |
4382 { | |
4383 it->what = IT_STRETCH; | |
4384 return 1; | |
4385 } | |
4386 | |
4387 | |
4388 /* Load IT with the next display element from current_buffer. Value | |
4389 is zero if end of buffer reached. IT->stop_charpos is the next | |
4390 position at which to stop and check for text properties or buffer | |
4391 end. */ | |
4392 | |
4393 static int | |
4394 next_element_from_buffer (it) | |
4395 struct it *it; | |
4396 { | |
4397 int success_p = 1; | |
4398 | |
4399 /* Check this assumption, otherwise, we would never enter the | |
4400 if-statement, below. */ | |
4401 xassert (IT_CHARPOS (*it) >= BEGV | |
4402 && IT_CHARPOS (*it) <= it->stop_charpos); | |
4403 | |
4404 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
4405 { | |
4406 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4407 { | |
4408 int overlay_strings_follow_p; | |
4409 | |
4410 /* End of the game, except when overlay strings follow that | |
4411 haven't been returned yet. */ | |
4412 if (it->overlay_strings_at_end_processed_p) | |
4413 overlay_strings_follow_p = 0; | |
4414 else | |
4415 { | |
4416 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
|
4417 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 4418 } |
4419 | |
4420 if (overlay_strings_follow_p) | |
4421 success_p = get_next_display_element (it); | |
4422 else | |
4423 { | |
4424 it->what = IT_EOB; | |
4425 it->position = it->current.pos; | |
4426 success_p = 0; | |
4427 } | |
4428 } | |
4429 else | |
4430 { | |
4431 handle_stop (it); | |
4432 return get_next_display_element (it); | |
4433 } | |
4434 } | |
4435 else | |
4436 { | |
4437 /* No face changes, overlays etc. in sight, so just return a | |
4438 character from current_buffer. */ | |
4439 unsigned char *p; | |
4440 | |
4441 /* Maybe run the redisplay end trigger hook. Performance note: | |
4442 This doesn't seem to cost measurable time. */ | |
4443 if (it->redisplay_end_trigger_charpos | |
4444 && it->glyph_row | |
4445 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
4446 run_redisplay_end_trigger_hook (it); | |
4447 | |
4448 /* Get the next character, maybe multibyte. */ | |
4449 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
|
4450 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 4451 { |
4452 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
4453 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4454 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 4455 } |
4456 else | |
4457 it->c = *p, it->len = 1; | |
4458 | |
4459 /* Record what we have and where it came from. */ | |
4460 it->what = IT_CHARACTER;; | |
4461 it->object = it->w->buffer; | |
4462 it->position = it->current.pos; | |
4463 | |
4464 /* Normally we return the character found above, except when we | |
4465 really want to return an ellipsis for selective display. */ | |
4466 if (it->selective) | |
4467 { | |
4468 if (it->c == '\n') | |
4469 { | |
4470 /* A value of selective > 0 means hide lines indented more | |
4471 than that number of columns. */ | |
4472 if (it->selective > 0 | |
4473 && IT_CHARPOS (*it) + 1 < ZV | |
4474 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
4475 IT_BYTEPOS (*it) + 1, | |
4476 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4477 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4478 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
|
4479 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4480 } |
25012 | 4481 } |
4482 else if (it->c == '\r' && it->selective == -1) | |
4483 { | |
4484 /* A value of selective == -1 means that everything from the | |
4485 CR to the end of the line is invisible, with maybe an | |
4486 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4487 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
|
4488 it->dpvec_char_len = -1; |
25012 | 4489 } |
4490 } | |
4491 } | |
4492 | |
4493 /* 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
|
4494 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4495 return success_p; |
4496 } | |
4497 | |
4498 | |
4499 /* Run the redisplay end trigger hook for IT. */ | |
4500 | |
4501 static void | |
4502 run_redisplay_end_trigger_hook (it) | |
4503 struct it *it; | |
4504 { | |
4505 Lisp_Object args[3]; | |
4506 | |
4507 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4508 displaying something, or otherwise we should not run the hook. */ | |
4509 xassert (it->glyph_row); | |
4510 | |
4511 /* Set up hook arguments. */ | |
4512 args[0] = Qredisplay_end_trigger_functions; | |
4513 args[1] = it->window; | |
4514 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4515 it->redisplay_end_trigger_charpos = 0; | |
4516 | |
4517 /* Since we are *trying* to run these functions, don't try to run | |
4518 them again, even if they get an error. */ | |
4519 it->w->redisplay_end_trigger = Qnil; | |
4520 Frun_hook_with_args (3, args); | |
4521 | |
4522 /* Notice if it changed the face of the character we are on. */ | |
4523 handle_face_prop (it); | |
4524 } | |
4525 | |
4526 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4527 /* 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
|
4528 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4529 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4530 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4531 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4532 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4533 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4534 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4535 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4536 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4537 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4538 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4539 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4540 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4541 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4542 |
25012 | 4543 |
4544 /*********************************************************************** | |
4545 Moving an iterator without producing glyphs | |
4546 ***********************************************************************/ | |
4547 | |
4548 /* Move iterator IT to a specified buffer or X position within one | |
4549 line on the display without producing glyphs. | |
4550 | |
4551 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4552 whichever is reached first. | |
4553 | |
4554 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4555 | |
4556 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4557 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4558 TO_X includes the amount by which a window is horizontally | |
4559 scrolled. | |
4560 | |
4561 Value is | |
4562 | |
4563 MOVE_POS_MATCH_OR_ZV | |
4564 - when TO_POS or ZV was reached. | |
4565 | |
4566 MOVE_X_REACHED | |
4567 -when TO_X was reached before TO_POS or ZV were reached. | |
4568 | |
4569 MOVE_LINE_CONTINUED | |
4570 - when we reached the end of the display area and the line must | |
4571 be continued. | |
4572 | |
4573 MOVE_LINE_TRUNCATED | |
4574 - when we reached the end of the display area and the line is | |
4575 truncated. | |
4576 | |
4577 MOVE_NEWLINE_OR_CR | |
4578 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4579 display is on. */ | |
4580 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4581 static enum move_it_result |
25012 | 4582 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4583 struct it *it; | |
4584 int to_charpos, to_x, op; | |
4585 { | |
4586 enum move_it_result result = MOVE_UNDEFINED; | |
4587 struct glyph_row *saved_glyph_row; | |
4588 | |
4589 /* Don't produce glyphs in produce_glyphs. */ | |
4590 saved_glyph_row = it->glyph_row; | |
4591 it->glyph_row = NULL; | |
4592 | |
4593 while (1) | |
4594 { | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
4595 int x, i, ascent = 0, descent = 0; |
25012 | 4596 |
4597 /* Stop when ZV or TO_CHARPOS reached. */ | |
4598 if (!get_next_display_element (it) | |
4599 || ((op & MOVE_TO_POS) != 0 | |
4600 && BUFFERP (it->object) | |
4601 && IT_CHARPOS (*it) >= to_charpos)) | |
4602 { | |
4603 result = MOVE_POS_MATCH_OR_ZV; | |
4604 break; | |
4605 } | |
4606 | |
4607 /* The call to produce_glyphs will get the metrics of the | |
4608 display element IT is loaded with. We record in x the | |
4609 x-position before this display element in case it does not | |
4610 fit on the line. */ | |
4611 x = it->current_x; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4612 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4613 /* Remember the line height so far in case the next element doesn't |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4614 fit on the line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4615 if (!it->truncate_lines_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4616 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4617 ascent = it->max_ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4618 descent = it->max_descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4619 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4620 |
25012 | 4621 PRODUCE_GLYPHS (it); |
4622 | |
4623 if (it->area != TEXT_AREA) | |
4624 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4625 set_iterator_to_next (it, 1); |
25012 | 4626 continue; |
4627 } | |
4628 | |
4629 /* The number of glyphs we get back in IT->nglyphs will normally | |
4630 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4631 character on a terminal frame, or (iii) a line end. For the | |
4632 second case, IT->nglyphs - 1 padding glyphs will be present | |
4633 (on X frames, there is only one glyph produced for a | |
4634 composite character. | |
4635 | |
4636 The behavior implemented below means, for continuation lines, | |
4637 that as many spaces of a TAB as fit on the current line are | |
4638 displayed there. For terminal frames, as many glyphs of a | |
4639 multi-glyph character are displayed in the current line, too. | |
4640 This is what the old redisplay code did, and we keep it that | |
4641 way. Under X, the whole shape of a complex character must | |
4642 fit on the line or it will be completely displayed in the | |
4643 next line. | |
4644 | |
4645 Note that both for tabs and padding glyphs, all glyphs have | |
4646 the same width. */ | |
4647 if (it->nglyphs) | |
4648 { | |
4649 /* More than one glyph or glyph doesn't fit on line. All | |
4650 glyphs have the same width. */ | |
4651 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4652 int new_x; | |
4653 | |
4654 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4655 { | |
4656 new_x = x + single_glyph_width; | |
4657 | |
4658 /* We want to leave anything reaching TO_X to the caller. */ | |
4659 if ((op & MOVE_TO_X) && new_x > to_x) | |
4660 { | |
4661 it->current_x = x; | |
4662 result = MOVE_X_REACHED; | |
4663 break; | |
4664 } | |
4665 else if (/* Lines are continued. */ | |
4666 !it->truncate_lines_p | |
4667 && (/* And glyph doesn't fit on the line. */ | |
4668 new_x > it->last_visible_x | |
4669 /* Or it fits exactly and we're on a window | |
4670 system frame. */ | |
4671 || (new_x == it->last_visible_x | |
4672 && FRAME_WINDOW_P (it->f)))) | |
4673 { | |
4674 if (/* IT->hpos == 0 means the very first glyph | |
4675 doesn't fit on the line, e.g. a wide image. */ | |
4676 it->hpos == 0 | |
4677 || (new_x == it->last_visible_x | |
4678 && FRAME_WINDOW_P (it->f))) | |
4679 { | |
4680 ++it->hpos; | |
4681 it->current_x = new_x; | |
4682 if (i == it->nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4683 set_iterator_to_next (it, 1); |
25012 | 4684 } |
4685 else | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4686 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4687 it->current_x = x; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4688 it->max_ascent = ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4689 it->max_descent = descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4690 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4691 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4692 TRACE_MOVE ((stderr, "move_it_in: continued at %d\n", |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4693 IT_CHARPOS (*it))); |
25012 | 4694 result = MOVE_LINE_CONTINUED; |
4695 break; | |
4696 } | |
4697 else if (new_x > it->first_visible_x) | |
4698 { | |
4699 /* Glyph is visible. Increment number of glyphs that | |
4700 would be displayed. */ | |
4701 ++it->hpos; | |
4702 } | |
4703 else | |
4704 { | |
4705 /* Glyph is completely off the left margin of the display | |
4706 area. Nothing to do. */ | |
4707 } | |
4708 } | |
4709 | |
4710 if (result != MOVE_UNDEFINED) | |
4711 break; | |
4712 } | |
4713 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4714 { | |
4715 /* Stop when TO_X specified and reached. This check is | |
4716 necessary here because of lines consisting of a line end, | |
4717 only. The line end will not produce any glyphs and we | |
4718 would never get MOVE_X_REACHED. */ | |
4719 xassert (it->nglyphs == 0); | |
4720 result = MOVE_X_REACHED; | |
4721 break; | |
4722 } | |
4723 | |
4724 /* Is this a line end? If yes, we're done. */ | |
4725 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4726 { | |
4727 result = MOVE_NEWLINE_OR_CR; | |
4728 break; | |
4729 } | |
4730 | |
4731 /* The current display element has been consumed. Advance | |
4732 to the next. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4733 set_iterator_to_next (it, 1); |
25012 | 4734 |
4735 /* Stop if lines are truncated and IT's current x-position is | |
4736 past the right edge of the window now. */ | |
4737 if (it->truncate_lines_p | |
4738 && it->current_x >= it->last_visible_x) | |
4739 { | |
4740 result = MOVE_LINE_TRUNCATED; | |
4741 break; | |
4742 } | |
4743 } | |
4744 | |
4745 /* Restore the iterator settings altered at the beginning of this | |
4746 function. */ | |
4747 it->glyph_row = saved_glyph_row; | |
4748 return result; | |
4749 } | |
4750 | |
4751 | |
4752 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4753 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4754 the description of enum move_operation_enum. | |
4755 | |
4756 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4757 screen line, this function will set IT to the next position > | |
4758 TO_CHARPOS. */ | |
4759 | |
4760 void | |
4761 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4762 struct it *it; | |
4763 int to_charpos, to_x, to_y, to_vpos; | |
4764 int op; | |
4765 { | |
4766 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4767 int line_height; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4768 int reached = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4769 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4770 for (;;) |
25012 | 4771 { |
4772 if (op & MOVE_TO_VPOS) | |
4773 { | |
4774 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4775 start of the line TO_VPOS. */ | |
4776 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4777 { | |
4778 if (it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4779 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4780 reached = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4781 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4782 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4783 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4784 skip = move_it_in_display_line_to (it, -1, -1, 0); |
25012 | 4785 } |
4786 else | |
4787 { | |
4788 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4789 TO_VPOS, or at TO_POS, whichever comes first. */ | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4790 if (it->vpos == to_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4791 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4792 reached = 2; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4793 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4794 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4795 |
25012 | 4796 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); |
4797 | |
4798 if (skip == MOVE_POS_MATCH_OR_ZV || it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4799 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4800 reached = 3; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4801 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4802 } |
25012 | 4803 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) |
4804 { | |
4805 /* We have reached TO_X but not in the line we want. */ | |
4806 skip = move_it_in_display_line_to (it, to_charpos, | |
4807 -1, MOVE_TO_POS); | |
4808 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4809 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4810 reached = 4; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4811 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4812 } |
25012 | 4813 } |
4814 } | |
4815 } | |
4816 else if (op & MOVE_TO_Y) | |
4817 { | |
4818 struct it it_backup; | |
4819 | |
4820 /* TO_Y specified means stop at TO_X in the line containing | |
4821 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4822 problem is that we can't really tell whether the line | |
4823 contains TO_Y before we have completely scanned it, and | |
4824 this may skip past TO_X. What we do is to first scan to | |
4825 TO_X. | |
4826 | |
4827 If TO_X is not specified, use a TO_X of zero. The reason | |
4828 is to make the outcome of this function more predictable. | |
4829 If we didn't use TO_X == 0, we would stop at the end of | |
4830 the line which is probably not what a caller would expect | |
4831 to happen. */ | |
4832 skip = move_it_in_display_line_to (it, to_charpos, | |
4833 ((op & MOVE_TO_X) | |
4834 ? to_x : 0), | |
4835 (MOVE_TO_X | |
4836 | (op & MOVE_TO_POS))); | |
4837 | |
4838 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4839 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4840 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4841 reached = 5; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4842 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4843 } |
25012 | 4844 |
4845 /* If TO_X was reached, we would like to know whether TO_Y | |
4846 is in the line. This can only be said if we know the | |
4847 total line height which requires us to scan the rest of | |
4848 the line. */ | |
4849 if (skip == MOVE_X_REACHED) | |
4850 { | |
4851 it_backup = *it; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4852 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it))); |
25012 | 4853 skip2 = move_it_in_display_line_to (it, to_charpos, -1, |
4854 op & MOVE_TO_POS); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4855 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it))); |
25012 | 4856 } |
4857 | |
4858 /* Now, decide whether TO_Y is in this line. */ | |
4859 line_height = it->max_ascent + it->max_descent; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4860 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height)); |
25012 | 4861 |
4862 if (to_y >= it->current_y | |
4863 && to_y < it->current_y + line_height) | |
4864 { | |
4865 if (skip == MOVE_X_REACHED) | |
4866 /* If TO_Y is in this line and TO_X was reached above, | |
4867 we scanned too far. We have to restore IT's settings | |
4868 to the ones before skipping. */ | |
4869 *it = it_backup; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4870 reached = 6; |
25012 | 4871 } |
4872 else if (skip == MOVE_X_REACHED) | |
4873 { | |
4874 skip = skip2; | |
4875 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4876 reached = 7; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4877 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4878 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4879 if (reached) |
25012 | 4880 break; |
4881 } | |
4882 else | |
4883 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4884 | |
4885 switch (skip) | |
4886 { | |
4887 case MOVE_POS_MATCH_OR_ZV: | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4888 reached = 8; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4889 goto out; |
25012 | 4890 |
4891 case MOVE_NEWLINE_OR_CR: | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4892 set_iterator_to_next (it, 1); |
25012 | 4893 it->continuation_lines_width = 0; |
4894 break; | |
4895 | |
4896 case MOVE_LINE_TRUNCATED: | |
4897 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
|
4898 reseat_at_next_visible_line_start (it, 0); |
25012 | 4899 if ((op & MOVE_TO_POS) != 0 |
4900 && IT_CHARPOS (*it) > to_charpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4901 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4902 reached = 9; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4903 goto out; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4904 } |
25012 | 4905 break; |
4906 | |
4907 case MOVE_LINE_CONTINUED: | |
4908 it->continuation_lines_width += it->current_x; | |
4909 break; | |
4910 | |
4911 default: | |
4912 abort (); | |
4913 } | |
4914 | |
4915 /* Reset/increment for the next run. */ | |
4916 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4917 it->current_x = it->hpos = 0; | |
4918 it->current_y += it->max_ascent + it->max_descent; | |
4919 ++it->vpos; | |
4920 last_height = it->max_ascent + it->max_descent; | |
4921 last_max_ascent = it->max_ascent; | |
4922 it->max_ascent = it->max_descent = 0; | |
4923 } | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4924 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4925 out: |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4926 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4927 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached)); |
25012 | 4928 } |
4929 | |
4930 | |
4931 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4932 | |
4933 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4934 means move IT backward to the preceding line start or BEGV. This | |
4935 function may move over more than DY pixels if IT->current_y - DY | |
4936 ends up in the middle of a line; in this case IT->current_y will be | |
4937 set to the top of the line moved to. */ | |
4938 | |
4939 void | |
4940 move_it_vertically_backward (it, dy) | |
4941 struct it *it; | |
4942 int dy; | |
4943 { | |
4944 int nlines, h, line_height; | |
4945 struct it it2; | |
4946 int start_pos = IT_CHARPOS (*it); | |
4947 | |
4948 xassert (dy >= 0); | |
4949 | |
4950 /* Estimate how many newlines we must move back. */ | |
4951 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4952 | |
4953 /* Set the iterator's position that many lines back. */ | |
4954 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4955 back_to_previous_visible_line_start (it); | |
4956 | |
4957 /* Reseat the iterator here. When moving backward, we don't want | |
4958 reseat to skip forward over invisible text, set up the iterator | |
4959 to deliver from overlay strings at the new position etc. So, | |
4960 use reseat_1 here. */ | |
4961 reseat_1 (it, it->current.pos, 1); | |
4962 | |
4963 /* We are now surely at a line start. */ | |
4964 it->current_x = it->hpos = 0; | |
4965 | |
4966 /* Move forward and see what y-distance we moved. First move to the | |
4967 start of the next line so that we get its height. We need this | |
4968 height to be able to tell whether we reached the specified | |
4969 y-distance. */ | |
4970 it2 = *it; | |
4971 it2.max_ascent = it2.max_descent = 0; | |
4972 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
4973 MOVE_TO_POS | MOVE_TO_VPOS); | |
4974 xassert (IT_CHARPOS (*it) >= BEGV); | |
4975 line_height = it2.max_ascent + it2.max_descent; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4976 |
25012 | 4977 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); |
4978 xassert (IT_CHARPOS (*it) >= BEGV); | |
4979 h = it2.current_y - it->current_y; | |
4980 nlines = it2.vpos - it->vpos; | |
4981 | |
4982 /* Correct IT's y and vpos position. */ | |
4983 it->vpos -= nlines; | |
4984 it->current_y -= h; | |
4985 | |
4986 if (dy == 0) | |
4987 { | |
4988 /* DY == 0 means move to the start of the screen line. The | |
4989 value of nlines is > 0 if continuation lines were involved. */ | |
4990 if (nlines > 0) | |
4991 move_it_by_lines (it, nlines, 1); | |
4992 xassert (IT_CHARPOS (*it) <= start_pos); | |
4993 } | |
4994 else if (nlines) | |
4995 { | |
4996 /* The y-position we try to reach. Note that h has been | |
4997 subtracted in front of the if-statement. */ | |
4998 int target_y = it->current_y + h - dy; | |
4999 | |
5000 /* If we did not reach target_y, try to move further backward if | |
5001 we can. If we moved too far backward, try to move forward. */ | |
5002 if (target_y < it->current_y | |
5003 && IT_CHARPOS (*it) > BEGV) | |
5004 { | |
5005 move_it_vertically (it, target_y - it->current_y); | |
5006 xassert (IT_CHARPOS (*it) >= BEGV); | |
5007 } | |
5008 else if (target_y >= it->current_y + line_height | |
5009 && IT_CHARPOS (*it) < ZV) | |
5010 { | |
5011 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
5012 xassert (IT_CHARPOS (*it) >= BEGV); | |
5013 } | |
5014 } | |
5015 } | |
5016 | |
5017 | |
5018 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
5019 move backwards. DY = 0 means move to start of screen line. At the | |
5020 end, IT will be on the start of a screen line. */ | |
5021 | |
5022 void | |
5023 move_it_vertically (it, dy) | |
5024 struct it *it; | |
5025 int dy; | |
5026 { | |
5027 if (dy <= 0) | |
5028 move_it_vertically_backward (it, -dy); | |
5029 else if (dy > 0) | |
5030 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5031 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy)); |
25012 | 5032 move_it_to (it, ZV, -1, it->current_y + dy, -1, |
5033 MOVE_TO_POS | MOVE_TO_Y); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5034 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it))); |
25012 | 5035 |
5036 /* If buffer ends in ZV without a newline, move to the start of | |
5037 the line to satisfy the post-condition. */ | |
5038 if (IT_CHARPOS (*it) == ZV | |
5039 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
5040 move_it_by_lines (it, 0, 0); | |
5041 } | |
5042 } | |
5043 | |
5044 | |
5045 /* Return non-zero if some text between buffer positions START_CHARPOS | |
5046 and END_CHARPOS is invisible. IT->window is the window for text | |
5047 property lookup. */ | |
5048 | |
5049 static int | |
5050 invisible_text_between_p (it, start_charpos, end_charpos) | |
5051 struct it *it; | |
5052 int start_charpos, end_charpos; | |
5053 { | |
5054 Lisp_Object prop, limit; | |
5055 int invisible_found_p; | |
5056 | |
5057 xassert (it != NULL && start_charpos <= end_charpos); | |
5058 | |
5059 /* Is text at START invisible? */ | |
5060 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
5061 it->window); | |
5062 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
5063 invisible_found_p = 1; | |
5064 else | |
5065 { | |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5066 limit = Fnext_single_char_property_change (make_number (start_charpos), |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5067 Qinvisible, Qnil, |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5068 make_number (end_charpos)); |
25012 | 5069 invisible_found_p = XFASTINT (limit) < end_charpos; |
5070 } | |
5071 | |
5072 return invisible_found_p; | |
5073 } | |
5074 | |
5075 | |
5076 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
5077 negative means move up. DVPOS == 0 means move to the start of the | |
5078 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
5079 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
5080 | |
5081 Further optimization ideas: If we would know that IT->f doesn't use | |
5082 a face with proportional font, we could be faster for | |
5083 truncate-lines nil. */ | |
5084 | |
5085 void | |
5086 move_it_by_lines (it, dvpos, need_y_p) | |
5087 struct it *it; | |
5088 int dvpos, need_y_p; | |
5089 { | |
5090 struct position pos; | |
5091 | |
5092 if (!FRAME_WINDOW_P (it->f)) | |
5093 { | |
5094 struct text_pos textpos; | |
5095 | |
5096 /* We can use vmotion on frames without proportional fonts. */ | |
5097 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
5098 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
5099 reseat (it, textpos, 1); | |
5100 it->vpos += pos.vpos; | |
5101 it->current_y += pos.vpos; | |
5102 } | |
5103 else if (dvpos == 0) | |
5104 { | |
5105 /* DVPOS == 0 means move to the start of the screen line. */ | |
5106 move_it_vertically_backward (it, 0); | |
5107 xassert (it->current_x == 0 && it->hpos == 0); | |
5108 } | |
5109 else if (dvpos > 0) | |
5110 { | |
5111 /* If there are no continuation lines, and if there is no | |
5112 selective display, try the simple method of moving forward | |
5113 DVPOS newlines, then see where we are. */ | |
5114 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
5115 { | |
5116 int shortage = 0, charpos; | |
5117 | |
34252
fb271e34071c
(move_it_by_lines): Fix paren typo.
Gerd Moellmann <gerd@gnu.org>
parents:
34225
diff
changeset
|
5118 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n') |
25012 | 5119 charpos = IT_CHARPOS (*it) + 1; |
5120 else | |
5121 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
5122 &shortage, 0); | |
5123 | |
5124 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
5125 { | |
5126 struct text_pos pos; | |
5127 CHARPOS (pos) = charpos; | |
5128 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
5129 reseat (it, pos, 1); | |
5130 it->vpos += dvpos - shortage; | |
5131 it->hpos = it->current_x = 0; | |
5132 return; | |
5133 } | |
5134 } | |
5135 | |
5136 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
5137 } | |
5138 else | |
5139 { | |
5140 struct it it2; | |
5141 int start_charpos, i; | |
5142 | |
5143 /* If there are no continuation lines, and if there is no | |
5144 selective display, try the simple method of moving backward | |
5145 -DVPOS newlines. */ | |
5146 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
5147 { | |
5148 int shortage; | |
5149 int charpos = IT_CHARPOS (*it); | |
5150 int bytepos = IT_BYTEPOS (*it); | |
5151 | |
5152 /* If in the middle of a line, go to its start. */ | |
5153 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
5154 { | |
5155 charpos = find_next_newline_no_quit (charpos, -1); | |
5156 bytepos = CHAR_TO_BYTE (charpos); | |
5157 } | |
5158 | |
5159 if (charpos == BEGV) | |
5160 { | |
5161 struct text_pos pos; | |
5162 CHARPOS (pos) = charpos; | |
5163 BYTEPOS (pos) = bytepos; | |
5164 reseat (it, pos, 1); | |
5165 it->hpos = it->current_x = 0; | |
5166 return; | |
5167 } | |
5168 else | |
5169 { | |
5170 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
5171 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
5172 { | |
5173 struct text_pos pos; | |
5174 CHARPOS (pos) = charpos; | |
5175 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
5176 reseat (it, pos, 1); | |
5177 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
5178 it->hpos = it->current_x = 0; | |
5179 return; | |
5180 } | |
5181 } | |
5182 } | |
5183 | |
5184 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
5185 start_charpos = IT_CHARPOS (*it); | |
5186 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
5187 back_to_previous_visible_line_start (it); | |
5188 reseat (it, it->current.pos, 1); | |
5189 it->current_x = it->hpos = 0; | |
5190 | |
5191 /* Above call may have moved too far if continuation lines | |
5192 are involved. Scan forward and see if it did. */ | |
5193 it2 = *it; | |
5194 it2.vpos = it2.current_y = 0; | |
5195 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
5196 it->vpos -= it2.vpos; | |
5197 it->current_y -= it2.current_y; | |
5198 it->current_x = it->hpos = 0; | |
5199 | |
5200 /* If we moved too far, move IT some lines forward. */ | |
5201 if (it2.vpos > -dvpos) | |
5202 { | |
5203 int delta = it2.vpos + dvpos; | |
5204 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
5205 } | |
5206 } | |
5207 } | |
5208 | |
5209 | |
5210 | |
5211 /*********************************************************************** | |
5212 Messages | |
5213 ***********************************************************************/ | |
5214 | |
5215 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5216 /* 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
|
5217 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5218 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5219 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5220 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
|
5221 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5222 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5223 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5224 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5225 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5226 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5227 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5228 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
|
5229 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5230 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5231 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5232 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5233 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
|
5234 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5235 args[2] = arg2; |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
5236 msg = Fformat (3, args); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5237 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5238 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
|
5239 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5240 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5241 |
28876
04cbb0510d7e
(add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents:
28869
diff
changeset
|
5242 message_dolog (buffer, len - 1, 1, 0); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5243 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5244 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5245 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5246 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5247 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5248 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5249 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5250 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5251 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5252 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5253 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
|
5254 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5255 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5256 |
25012 | 5257 /* Add a string M of length LEN to the message log, optionally |
5258 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
5259 nonzero, means interpret the contents of M as multibyte. This | |
5260 function calls low-level routines in order to bypass text property | |
5261 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
|
5262 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5263 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5264 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5265 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5266 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5267 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5268 if (!NILP (Vmessage_log_max)) |
10393 | 5269 { |
5270 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5271 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
|
5272 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
|
5273 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
|
5274 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
|
5275 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
|
5276 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
|
5277 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5278 old_deactivate_mark = Vdeactivate_mark; |
10393 | 5279 oldbuf = current_buffer; |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
5280 Fset_buffer (Fget_buffer_create (Vmessages_buffer_name)); |
11531
355c40d2b1d2
(message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents:
11499
diff
changeset
|
5281 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5282 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5283 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5284 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5285 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5286 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5287 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5288 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
|
5289 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5290 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
|
5291 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5292 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5293 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5294 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5295 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5296 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5297 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
|
5298 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5299 /* 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
|
5300 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
|
5301 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
|
5302 && 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
|
5303 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5304 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5305 unsigned char work[1]; |
25012 | 5306 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5307 /* 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
|
5308 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
|
5309 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
|
5310 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
5311 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
|
5312 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
|
5313 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5314 : 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
|
5315 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
|
5316 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5317 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5318 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
|
5319 && ! 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
|
5320 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5321 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
|
5322 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5323 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
|
5324 /* 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
|
5325 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
|
5326 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
|
5327 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5328 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
|
5329 nbytes = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5330 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
|
5331 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5332 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5333 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5334 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
|
5335 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5336 if (nlflag) |
10393 | 5337 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5338 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
|
5339 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5340 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5341 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
|
5342 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5343 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5344 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5345 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5346 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5347 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
|
5348 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5349 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5350 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
5351 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
|
5352 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5353 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5354 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5355 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5356 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5357 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5358 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5359 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5360 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5361 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5362 /* 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
|
5363 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5364 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5365 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5366 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
|
5367 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5368 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5369 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5370 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5371 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5372 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5373 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5374 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5375 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5376 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
|
5377 } |
10393 | 5378 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5379 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5380 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5381 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5382 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5383 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5384 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5385 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5386 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5387 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5388 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5389 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5390 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5391 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5392 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5393 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5394 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
|
5395 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5396 /* 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
|
5397 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5398 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
|
5399 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5400 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5401 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5402 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5403 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5404 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5405 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5406 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 5407 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5408 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5409 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
|
5410 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5411 Vdeactivate_mark = old_deactivate_mark; |
10393 | 5412 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5413 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5414 |
25012 | 5415 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5416 /* 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
|
5417 (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
|
5418 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
|
5419 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
|
5420 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
|
5421 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5422 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5423 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
|
5424 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5425 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5426 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5427 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
5428 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
|
5429 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5430 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
|
5431 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
|
5432 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5433 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5434 { |
33594
a4cd4c93196b
(message_log_check_duplicate): Let "..."-detection match
Miles Bader <miles@gnu.org>
parents:
33591
diff
changeset
|
5435 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.') |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5436 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5437 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5438 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5439 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5440 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5441 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5442 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5443 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5444 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5445 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5446 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5447 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5448 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5449 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5450 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5451 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5452 } |
25012 | 5453 |
5454 | |
5455 /* Display an echo area message M with a specified length of LEN | |
5456 chars. The string may include null characters. If M is 0, clear | |
5457 out any existing message, and let the mini-buffer text show through. | |
5458 | |
5459 The buffer M must continue to exist until after the echo area gets | |
5460 cleared or some other message gets displayed there. This means do | |
5461 not pass text that is stored in a Lisp string; do not pass text in | |
5462 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5463 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5464 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5465 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5466 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5467 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5468 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5469 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5470 /* 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
|
5471 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5472 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5473 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5474 message2_nolog (m, len, multibyte); |
10393 | 5475 } |
5476 | |
5477 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5478 /* The non-logging counterpart of message2. */ |
10393 | 5479 |
5480 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5481 message2_nolog (m, len, multibyte) |
10393 | 5482 char *m; |
5483 int len; | |
5484 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5485 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5486 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5487 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5488 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5489 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5490 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5491 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5492 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
|
5493 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
5494 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5495 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5496 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5497 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5498 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5499 /* 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
|
5500 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5501 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 5502 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5503 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5504 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5505 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5506 Lisp_Object mini_window; |
25012 | 5507 struct frame *f; |
5508 | |
5509 /* 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
|
5510 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5511 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
|
5512 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
|
5513 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5514 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5515 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
|
5516 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5517 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
|
5518 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5519 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5520 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5521 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5522 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5523 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5524 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5525 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5526 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5527 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5528 do_pending_window_change (0); |
25012 | 5529 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
|
5530 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
|
5531 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
|
5532 (*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
|
5533 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5534 } |
25012 | 5535 |
5536 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5537 /* 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
|
5538 bytes. The string may include null characters. If M is not a |
25012 | 5539 string, clear out any existing message, and let the mini-buffer |
5540 text show through. */ | |
5541 | |
5542 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5543 message3 (m, nbytes, multibyte) |
25012 | 5544 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5545 int nbytes; |
25012 | 5546 int multibyte; |
5547 { | |
5548 struct gcpro gcpro1; | |
5549 | |
5550 GCPRO1 (m); | |
5551 | |
5552 /* First flush out any partial line written with print. */ | |
5553 message_log_maybe_newline (); | |
5554 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5555 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
|
5556 message3_nolog (m, nbytes, multibyte); |
25012 | 5557 |
5558 UNGCPRO; | |
5559 } | |
5560 | |
5561 | |
5562 /* The non-logging version of message3. */ | |
5563 | |
5564 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5565 message3_nolog (m, nbytes, multibyte) |
25012 | 5566 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5567 int nbytes, multibyte; |
25012 | 5568 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5569 struct frame *sf = SELECTED_FRAME (); |
25012 | 5570 message_enable_multibyte = multibyte; |
5571 | |
5572 if (noninteractive) | |
5573 { | |
5574 if (noninteractive_need_newline) | |
5575 putc ('\n', stderr); | |
5576 noninteractive_need_newline = 0; | |
5577 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5578 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5579 if (cursor_in_echo_area == 0) |
5580 fprintf (stderr, "\n"); | |
5581 fflush (stderr); | |
5582 } | |
5583 /* A null message buffer means that the frame hasn't really been | |
5584 initialized yet. Error messages get reported properly by | |
5585 cmd_error, so this must be just an informative message; toss it. */ | |
5586 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5587 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5588 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5589 { |
5590 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
|
5591 Lisp_Object frame; |
25012 | 5592 struct frame *f; |
5593 | |
5594 /* Get the frame containing the mini-buffer | |
5595 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5596 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
|
5597 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
|
5598 f = XFRAME (frame); |
25012 | 5599 |
5600 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5601 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
|
5602 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5603 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5604 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5605 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
|
5606 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5607 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
|
5608 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5609 Fraise_frame (frame); |
25012 | 5610 } |
5611 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5612 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5613 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5614 do_pending_window_change (0); |
25012 | 5615 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
|
5616 do_pending_window_change (0); |
25012 | 5617 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5618 (*frame_up_to_date_hook) (f); | |
5619 } | |
5620 } | |
5621 | |
5622 | |
5623 /* Display a null-terminated echo area message M. If M is 0, clear | |
5624 out any existing message, and let the mini-buffer text show through. | |
5625 | |
5626 The buffer M must continue to exist until after the echo area gets | |
5627 cleared or some other message gets displayed there. Do not pass | |
5628 text that is stored in a Lisp string. Do not pass text in a buffer | |
5629 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
|
5630 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5631 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5632 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5633 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5634 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5635 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
|
5636 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5637 |
25012 | 5638 |
5639 /* The non-logging counterpart of message1. */ | |
5640 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5641 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5642 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5643 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5644 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5645 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
|
5646 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5647 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5648 /* 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
|
5649 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5650 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5651 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5652 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5653 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5654 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5655 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5656 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5657 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5658 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5659 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5660 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5661 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5662 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5663 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5664 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5665 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5666 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5667 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5668 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5669 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5670 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5671 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5672 /* 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
|
5673 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
|
5674 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
|
5675 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5676 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5677 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5678 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5679 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5680 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5681 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5682 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5683 /* 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
|
5684 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
|
5685 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
|
5686 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5687 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5688 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5689 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5690 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5691 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5692 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5693 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
|
5694 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5695 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5696 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5697 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5698 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5699 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5700 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5701 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5702 /* 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
|
5703 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5704 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5705 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5706 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5707 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5708 |
25012 | 5709 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5710 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5711 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
|
5712 |
277 | 5713 /* VARARGS 1 */ |
5714 void | |
5715 message (m, a1, a2, a3) | |
5716 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5717 EMACS_INT a1, a2, a3; |
277 | 5718 { |
5719 if (noninteractive) | |
5720 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5721 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5722 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5723 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
|
5724 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
|
5725 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
|
5726 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5727 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5728 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
|
5729 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5730 } |
277 | 5731 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5732 else if (INTERACTIVE) |
277 | 5733 { |
25012 | 5734 /* The frame whose mini-buffer we're going to display the message |
5735 on. It may be larger than the selected frame, so we need to | |
5736 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
|
5737 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5738 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5739 |
5740 /* 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
|
5741 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5742 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
|
5743 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5744 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5745 /* 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
|
5746 initialized yet. Error messages get reported properly by |
25012 | 5747 cmd_error, so this must be just an informative message; toss |
5748 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5749 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
|
5750 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5751 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5752 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5753 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
|
5754 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5755 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5756 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5757 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5758 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5759 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5760 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5761 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
|
5762 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5763 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5764 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
|
5765 (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
|
5766 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5767 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5768 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
|
5769 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5770 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5771 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5772 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5773 /* 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
|
5774 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
|
5775 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
|
5776 } |
277 | 5777 } |
5778 } | |
5779 | |
25012 | 5780 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5781 /* The non-logging version of message. */ |
25012 | 5782 |
11193 | 5783 void |
5784 message_nolog (m, a1, a2, a3) | |
5785 char *m; | |
5786 EMACS_INT a1, a2, a3; | |
5787 { | |
5788 Lisp_Object old_log_max; | |
5789 old_log_max = Vmessage_log_max; | |
5790 Vmessage_log_max = Qnil; | |
5791 message (m, a1, a2, a3); | |
5792 Vmessage_log_max = old_log_max; | |
5793 } | |
5794 | |
25012 | 5795 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5796 /* 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
|
5797 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
|
5798 critical. */ |
25012 | 5799 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5800 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5801 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5802 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5803 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
|
5804 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5805 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5806 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5807 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
|
5808 !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
|
5809 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5810 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5811 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5812 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5813 /* 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
|
5814 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5815 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5816 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5817 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5818 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5819 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5820 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5821 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5822 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5823 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5824 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5825 char name[30]; |
30631
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5826 Lisp_Object old_buffer; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5827 int j; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5828 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5829 old_buffer = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5830 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5831 echo_buffer[i] = Fget_buffer_create (build_string (name)); |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5832 XBUFFER (echo_buffer[i])->truncate_lines = Qnil; |
30631
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5833 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5834 for (j = 0; j < 2; ++j) |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5835 if (EQ (old_buffer, echo_area_buffer[j])) |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5836 echo_area_buffer[j] = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5837 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5838 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5839 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5840 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5841 /* Call FN with args A1..A4 with either the current or last displayed |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5842 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
|
5843 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5844 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
|
5845 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
|
5846 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
|
5847 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5848 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
|
5849 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
|
5850 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5851 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
|
5852 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
|
5853 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
|
5854 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5855 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
|
5856 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5857 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5858 with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5859 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5860 int which; |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
5861 int (*fn) P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
5862 EMACS_INT a1; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
5863 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
5864 EMACS_INT a3, a4; |
25358
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 Lisp_Object buffer; |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
5867 int this_one, the_other, clear_buffer_p, rc; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
5868 int count = BINDING_STACK_SIZE (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5869 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5870 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5871 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
|
5872 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5873 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5874 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5875 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5876 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
|
5877 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5878 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
|
5879 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5880 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5881 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
|
5882 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5883 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5884 /* 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
|
5885 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
|
5886 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
|
5887 && 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
|
5888 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
|
5889 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5890 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5891 /* 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
|
5892 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5893 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
|
5894 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5895 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
|
5896 = (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
|
5897 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5898 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5899 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5900 } |
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 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
|
5903 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5904 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
|
5905 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
|
5906 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5907 /* 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
|
5908 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
|
5909 == 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
|
5910 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
|
5911 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
|
5912 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
|
5913 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5914 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
|
5915 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5916 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5917 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5918 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
|
5919 } |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5920 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5921 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
|
5922 current_buffer->read_only = Qnil; |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5923 specbind (Qinhibit_read_only, Qt); |
25358
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 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
|
5926 del_range (BEG, Z); |
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 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5929 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
|
5930 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5931 rc = fn (a1, a2, a3, a4); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5932 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5933 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5934 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
|
5935 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5936 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5937 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5938 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5939 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5940 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5941 /* 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
|
5942 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
|
5943 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5944 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5945 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
|
5946 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5947 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5948 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5949 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5950 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5951 /* 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
|
5952 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
|
5953 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
|
5954 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
|
5955 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5956 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5957 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
|
5958 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5959 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
|
5960 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
|
5961 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
|
5962 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5963 if (w) |
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 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
|
5966 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
|
5967 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5968 = 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
|
5969 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5970 = 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
|
5971 } |
25012 | 5972 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5973 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5974 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5975 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5976 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
|
5977 } |
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 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
|
5980 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5981 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5982 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5983 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5984 /* 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
|
5985 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
|
5986 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5987 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5988 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
|
5989 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5990 { |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5991 set_buffer_internal_1 (XBUFFER (AREF (vector, 0))); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5992 Vdeactivate_mark = AREF (vector, 1); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5993 windows_or_buffers_changed = XFASTINT (AREF (vector, 2)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5994 |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5995 if (WINDOWP (AREF (vector, 3))) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5997 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5998 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
|
5999 |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6000 w = XWINDOW (AREF (vector, 3)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6001 buffer = AREF (vector, 4); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6002 charpos = AREF (vector, 5); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6003 bytepos = AREF (vector, 6); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6004 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6005 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6006 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
|
6007 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6008 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6009 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6010 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
|
6011 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6012 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6013 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6014 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6015 /* 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
|
6016 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
|
6017 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6018 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6019 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
|
6020 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6021 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6022 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6023 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6024 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6025 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6026 /* 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
|
6027 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
|
6028 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
|
6029 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
|
6030 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6031 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
|
6032 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6033 /* 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
|
6034 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6035 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6036 if (Z > BEG) |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6037 { |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6038 int count = BINDING_STACK_SIZE (); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6039 specbind (Qinhibit_read_only, Qt); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6040 del_range (BEG, Z); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6041 unbind_to (count, Qnil); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6042 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6043 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
|
6044 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6045 /* 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
|
6046 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6047 != !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
|
6048 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
|
6049 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6050 /* 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
|
6051 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6052 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6053 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
|
6054 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6055 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
|
6056 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
|
6057 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6058 |
29643
77f1e8db4147
(setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents:
29634
diff
changeset
|
6059 message_log_maybe_newline (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6060 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6061 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6062 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6063 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6064 if (NILP (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6065 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6066 if (EQ (echo_area_buffer[1], echo_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6067 echo_area_buffer[0] = echo_buffer[1]; |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6068 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6069 echo_area_buffer[0] = echo_buffer[0]; |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6070 } |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6071 |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6072 if (current_buffer != XBUFFER (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6073 /* Someone switched buffers between print requests. */ |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6074 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6075 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6076 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6077 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6078 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6079 /* 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
|
6080 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
|
6081 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
|
6082 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
|
6083 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6084 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6085 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6086 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6087 { |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6088 int i, no_message_p, window_height_changed_p, count; |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6089 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6090 /* Temporarily disable garbage collections while displaying the echo |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6091 area. This is done because a GC can print a message itself. |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6092 That message would modify the echo area buffer's contents while a |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6093 redisplay of the buffer is going on, and seriously confuse |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6094 redisplay. */ |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6095 count = inhibit_garbage_collection (); |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6096 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6097 /* 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
|
6098 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
|
6099 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
|
6100 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
|
6101 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
|
6102 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
|
6103 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6104 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6105 = with_echo_area_buffer (w, display_last_displayed_message_p, |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6106 display_echo_area_1, |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6107 (EMACS_INT) w, Qnil, 0, 0); |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6108 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6109 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6110 echo_area_buffer[i] = Qnil; |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6111 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6112 unbind_to (count, Qnil); |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6113 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
|
6114 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6115 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6116 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6117 /* Helper for display_echo_area. Display the current buffer which |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6118 contains the current echo area message in window W, a mini-window, |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6119 a pointer to which is passed in A1. A2..A4 are currently not used. |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6120 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
|
6121 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
|
6122 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6123 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6124 display_echo_area_1 (a1, a2, a3, a4) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6125 EMACS_INT a1; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6126 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6127 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6128 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6129 struct window *w = (struct window *) a1; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6130 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6131 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6132 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
|
6133 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6134 /* 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
|
6135 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6136 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
|
6137 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6138 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6139 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
|
6140 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6141 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
|
6142 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6143 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6144 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
|
6145 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6146 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6147 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6148 /* 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
|
6149 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
|
6150 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6151 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6152 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6153 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6154 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6155 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6156 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6157 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
|
6158 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6159 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6160 resized_p = with_echo_area_buffer (w, 0, resize_mini_window_1, |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6161 (EMACS_INT) w, Qnil, 0, 0); |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6162 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6163 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6164 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6165 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6166 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6167 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6168 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6169 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6170 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6171 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6172 /* Callback function for with_echo_area_buffer, when used from |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6173 resize_echo_area_axactly. A1 contains a pointer to the window to |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6174 resize, A2 to A4 are not used. Value is what resize_mini_window |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6175 returns. */ |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6176 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6177 static int |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6178 resize_mini_window_1 (a1, a2, a3, a4) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6179 EMACS_INT a1; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6180 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6181 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6182 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6183 return resize_mini_window ((struct window *) a1, 1); |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6184 } |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6185 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6186 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6187 /* 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
|
6188 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
|
6189 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
|
6190 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
|
6191 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6192 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6193 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
|
6194 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6195 int exact_p; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6196 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6197 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
|
6198 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
|
6199 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6200 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6201 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6202 /* Nil means don't try to resize. */ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6203 if (NILP (Vresize_mini_windows) |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
6204 || (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
|
6205 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6206 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6207 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
|
6208 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6209 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6210 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
|
6211 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
|
6212 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6213 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
|
6214 struct text_pos start; |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6215 struct buffer *old_current_buffer = NULL; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6216 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6217 if (current_buffer != XBUFFER (w->buffer)) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6218 { |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6219 old_current_buffer = current_buffer; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6220 set_buffer_internal (XBUFFER (w->buffer)); |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6221 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6222 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6223 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
|
6224 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6225 /* 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
|
6226 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
|
6227 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
|
6228 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
|
6229 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
|
6230 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6231 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
|
6232 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6233 /* 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
|
6234 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
|
6235 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
|
6236 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6237 /* Find out the height of the text in the window. */ |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6238 if (it.truncate_lines_p) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6239 height = 1; |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
6240 else |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6241 { |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6242 last_height = 0; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6243 move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6244 if (it.max_ascent == 0 && it.max_descent == 0) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6245 height = it.current_y + last_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6246 else |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6247 height = it.current_y + it.max_ascent + it.max_descent; |
29960
8aa954de8db9
(resize_mini_window): Subract the extra line spacing
Gerd Moellmann <gerd@gnu.org>
parents:
29858
diff
changeset
|
6248 height -= it.extra_line_spacing; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6249 height = (height + unit - 1) / unit; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6250 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6251 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6252 /* 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
|
6253 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6254 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6255 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6256 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
|
6257 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
|
6258 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6259 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6260 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6261 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
|
6262 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
|
6263 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6264 if (EQ (Vresize_mini_windows, Qgrow_only)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6265 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6266 /* Let it grow only, until we display an empty message, in which |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6267 case the window shrinks again. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6268 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6269 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6270 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6271 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6272 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6273 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6274 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6275 else if (height < XFASTINT (w->height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6276 && (exact_p || BEGV == ZV)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6277 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6278 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6279 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6280 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6281 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6282 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6283 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6284 else |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6285 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6286 /* Always resize to exact size needed. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6287 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6288 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6289 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6290 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6291 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6292 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6293 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6294 else if (height < XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6295 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6296 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6297 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6298 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6299 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6300 if (height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6301 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6302 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6303 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6304 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6305 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6306 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6307 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6308 } |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6309 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6310 if (old_current_buffer) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6311 set_buffer_internal (old_current_buffer); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6312 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6313 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6314 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
|
6315 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6316 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6317 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6318 /* 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
|
6319 current message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6320 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6321 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6322 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6323 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6324 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6325 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6326 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
|
6327 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6328 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6329 { |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6330 with_echo_area_buffer (0, 0, current_message_1, |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6331 (EMACS_INT) &msg, Qnil, 0, 0); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6332 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6333 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
|
6334 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6335 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6336 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6337 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6338 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6339 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6340 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6341 current_message_1 (a1, a2, a3, a4) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6342 EMACS_INT a1; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6343 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6344 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6345 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6346 Lisp_Object *msg = (Lisp_Object *) a1; |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6347 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6348 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6349 *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
|
6350 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6351 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6352 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6353 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6354 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6355 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6356 /* 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
|
6357 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
|
6358 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
|
6359 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6360 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6361 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6362 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6363 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6364 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6365 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6366 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
|
6367 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6368 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6369 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6370 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6371 /* 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
|
6372 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6373 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6374 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6375 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6376 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6377 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6378 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6379 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6380 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6381 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
|
6382 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6383 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
|
6384 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6385 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6386 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6387 /* 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
|
6388 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6389 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6390 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6391 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6392 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6393 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
|
6394 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6395 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6396 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6397 /* 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
|
6398 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
|
6399 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6400 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6401 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6402 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6403 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6404 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6405 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6406 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6407 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6408 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6409 /* 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
|
6410 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
|
6411 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6412 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6413 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6414 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6415 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6416 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6417 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
|
6418 /* 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
|
6419 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
|
6420 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
|
6421 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6422 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6423 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6424 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6425 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6426 if (FRAME_MESSAGE_BUF (sf)) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6427 with_echo_area_buffer (0, 0, truncate_message_1, nchars, Qnil, 0, 0); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6428 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6429 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6430 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6431 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6432 /* 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
|
6433 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
|
6434 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6435 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6436 truncate_message_1 (nchars, a2, a3, a4) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6437 EMACS_INT nchars; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6438 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6439 EMACS_INT a3, a4; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6440 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6441 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6442 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
|
6443 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6444 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
|
6445 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6446 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6447 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6448 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6449 /* 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
|
6450 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6451 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
|
6452 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
|
6453 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
|
6454 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6455 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
|
6456 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
|
6457 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
|
6458 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6459 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6460 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
|
6461 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6462 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6463 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6464 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6465 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6466 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6467 || (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
|
6468 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6469 with_echo_area_buffer (0, -1, set_message_1, |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6470 (EMACS_INT) s, string, nbytes, multibyte_p); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6471 message_buf_print = 0; |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
6472 help_echo_showing_p = 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6473 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6474 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6475 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6476 /* Helper function for set_message. Arguments have the same meaning |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6477 as there, with A1 corresponding to S and A2 corresponding to STRING |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6478 This function is called with the echo area buffer being |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6479 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6480 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6481 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6482 set_message_1 (a1, a2, nbytes, multibyte_p) |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6483 EMACS_INT a1; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6484 Lisp_Object a2; |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6485 EMACS_INT nbytes, multibyte_p; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6486 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6487 char *s = (char *) a1; |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
6488 Lisp_Object string = a2; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6489 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6490 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6491 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6492 /* 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
|
6493 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6494 != !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
|
6495 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
|
6496 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6497 current_buffer->truncate_lines = message_truncate_lines ? Qt : Qnil; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6498 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6499 /* 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
|
6500 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
|
6501 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6502 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6503 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6504 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6505 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6506 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6507 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
|
6508 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
|
6509 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6510 /* 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
|
6511 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
|
6512 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
|
6513 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
|
6514 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6515 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6516 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6517 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6518 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6519 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6520 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
|
6521 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6522 /* 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
|
6523 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6524 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6525 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6526 /* 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
|
6527 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
|
6528 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6529 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
|
6530 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
|
6531 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6532 : 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
|
6533 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
|
6534 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6535 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6536 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6537 && !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
|
6538 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6539 /* 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
|
6540 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6541 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6542 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
|
6543 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6544 /* 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
|
6545 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
|
6546 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6547 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
|
6548 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6549 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
|
6550 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6551 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6552 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6553 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
|
6554 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6555 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6556 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6557 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6558 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6559 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6560 /* 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
|
6561 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
|
6562 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6563 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6564 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6565 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
|
6566 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
|
6567 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6568 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6569 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
|
6570 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6571 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6572 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
|
6573 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6574 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6575 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6576 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6577 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6578 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6579 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
|
6580 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
|
6581 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
|
6582 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
|
6583 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
|
6584 and ensure a complete redisplay of all windows. */ |
25012 | 6585 |
277 | 6586 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6587 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6588 { |
769 | 6589 if (frame_garbaged) |
277 | 6590 { |
25012 | 6591 Lisp_Object tail, frame; |
6592 | |
6593 FOR_EACH_FRAME (tail, frame) | |
6594 { | |
6595 struct frame *f = XFRAME (frame); | |
6596 | |
6597 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
6598 { | |
6599 clear_current_matrices (f); | |
6600 f->garbaged = 0; | |
6601 } | |
6602 } | |
6603 | |
769 | 6604 frame_garbaged = 0; |
25012 | 6605 ++windows_or_buffers_changed; |
6606 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6607 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6608 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6609 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6610 /* 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
|
6611 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
|
6612 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
|
6613 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6614 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6615 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
|
6616 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6617 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6618 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6619 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6620 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6621 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6622 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6623 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6624 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
|
6625 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6626 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
|
6627 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6628 /* 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
|
6629 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
|
6630 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6631 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6632 /* The terminal frame is used as the first Emacs frame on the Mac OS. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6633 #ifndef macintosh |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6634 #ifdef HAVE_WINDOW_SYSTEM |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6635 /* 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
|
6636 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
|
6637 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
|
6638 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
|
6639 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6640 return 0; |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6641 #endif /* HAVE_WINDOW_SYSTEM */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6642 #endif |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6643 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6644 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6645 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6646 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6647 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6648 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
|
6649 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6650 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
|
6651 window_height_changed_p = display_echo_area (w); |
25012 | 6652 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
|
6653 |
33068
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6654 /* Update the display, unless called from redisplay_internal. |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6655 Also don't update the screen during redisplay itself. The |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6656 update will happen at the end of redisplay, and an update |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6657 here could cause confusion. */ |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6658 if (update_frame_p && !redisplaying_p) |
25012 | 6659 { |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6660 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6661 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6662 /* If the display update has been interrupted by pending |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6663 input, update mode lines in the frame. Due to the |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6664 pending input, it might have been that redisplay hasn't |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6665 been called, so that mode lines above the echo area are |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6666 garbaged. This looks odd, so we prevent it here. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6667 if (!display_completed) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6668 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6669 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6670 if (window_height_changed_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6671 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6672 /* Must update other windows. */ |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6673 windows_or_buffers_changed = 1; |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6674 redisplay_internal (0); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6675 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6676 else if (FRAME_WINDOW_P (f) && n == 0) |
25012 | 6677 { |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6678 /* Window configuration is the same as before. |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6679 Can do with a display update of the echo area, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6680 unless we displayed some mode lines. */ |
25012 | 6681 update_single_window (w, 1); |
6682 rif->flush_display (f); | |
6683 } | |
6684 else | |
6685 update_frame (f, 1, 1); | |
34068
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6686 |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6687 /* If cursor is in the echo area, make sure that the next |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6688 redisplay displays the minibuffer, so that the cursor will |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6689 be replaced with what the minibuffer wants. */ |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6690 if (cursor_in_echo_area) |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6691 ++windows_or_buffers_changed; |
25012 | 6692 } |
277 | 6693 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6694 else if (!EQ (mini_window, selected_window)) |
277 | 6695 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
|
6696 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6697 /* 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
|
6698 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
|
6699 |
25012 | 6700 /* Prevent redisplay optimization in redisplay_internal by resetting |
6701 this_line_start_pos. This is done because the mini-buffer now | |
6702 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
|
6703 if (EQ (mini_window, selected_window)) |
25012 | 6704 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
|
6705 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6706 return window_height_changed_p; |
25012 | 6707 } |
6708 | |
6709 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6710 |
25012 | 6711 /*********************************************************************** |
6712 Frame Titles | |
6713 ***********************************************************************/ | |
6714 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6715 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6716 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6717 |
6718 /* A buffer for constructing frame titles in it; allocated from the | |
6719 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6720 | |
6721 static char *frame_title_buf; | |
6722 | |
6723 /* The buffer's end, and a current output position in it. */ | |
6724 | |
6725 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
|
6726 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
|
6727 |
25012 | 6728 |
6729 /* Store a single character C for the frame title in frame_title_buf. | |
6730 Re-allocate frame_title_buf if necessary. */ | |
6731 | |
6732 static void | |
6733 store_frame_title_char (c) | |
6734 char c; | |
6735 { | |
6736 /* If output position has reached the end of the allocated buffer, | |
6737 double the buffer's size. */ | |
6738 if (frame_title_ptr == frame_title_buf_end) | |
6739 { | |
6740 int len = frame_title_ptr - frame_title_buf; | |
6741 int new_size = 2 * len * sizeof *frame_title_buf; | |
6742 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6743 frame_title_buf_end = frame_title_buf + new_size; | |
6744 frame_title_ptr = frame_title_buf + len; | |
6745 } | |
6746 | |
6747 *frame_title_ptr++ = c; | |
6748 } | |
6749 | |
6750 | |
6751 /* Store part of a frame title in frame_title_buf, beginning at | |
6752 frame_title_ptr. STR is the string to store. Do not copy more | |
6753 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
6754 the whole string. Pad with spaces until FIELD_WIDTH number of | |
6755 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
6756 Called from display_mode_element when it is used to build a frame | |
6757 title. */ | |
6758 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6759 static int |
25012 | 6760 store_frame_title (str, field_width, precision) |
6761 unsigned char *str; | |
6762 int field_width, precision; | |
6763 { | |
6764 int n = 0; | |
6765 | |
6766 /* Copy at most PRECISION chars from STR. */ | |
6767 while ((precision <= 0 || n < precision) | |
6768 && *str) | |
6769 { | |
6770 store_frame_title_char (*str++); | |
6771 ++n; | |
6772 } | |
6773 | |
6774 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6775 while (field_width > 0 | |
6776 && n < field_width) | |
6777 { | |
6778 store_frame_title_char (' '); | |
6779 ++n; | |
6780 } | |
6781 | |
6782 return n; | |
6783 } | |
6784 | |
6785 | |
6786 /* Set the title of FRAME, if it has changed. The title format is | |
6787 Vicon_title_format if FRAME is iconified, otherwise it is | |
6788 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6789 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6790 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6791 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
|
6792 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6793 { |
25012 | 6794 struct frame *f = XFRAME (frame); |
6795 | |
6796 if (FRAME_WINDOW_P (f) | |
6797 || FRAME_MINIBUF_ONLY_P (f) | |
6798 || f->explicit_name) | |
6799 { | |
6800 /* Do we have more than one visible frame on this X display? */ | |
6801 Lisp_Object tail; | |
6802 Lisp_Object fmt; | |
6803 struct buffer *obuf; | |
6804 int len; | |
6805 struct it it; | |
6806 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6807 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
|
6808 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6809 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6810 |
6811 if (tf != f | |
6812 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6813 && !FRAME_MINIBUF_ONLY_P (tf) | |
6814 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6815 break; | |
6816 } | |
6817 | |
6818 /* Set global variable indicating that multiple frames exist. */ | |
6819 multiple_frames = CONSP (tail); | |
6820 | |
6821 /* Switch to the buffer of selected window of the frame. Set up | |
6822 frame_title_ptr so that display_mode_element will output into it; | |
6823 then display the title. */ | |
6824 obuf = current_buffer; | |
6825 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6826 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6827 frame_title_ptr = frame_title_buf; | |
6828 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6829 NULL, DEFAULT_FACE_ID); | |
6830 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6831 frame_title_ptr = NULL; | |
6832 set_buffer_internal (obuf); | |
6833 | |
6834 /* Set the title only if it's changed. This avoids consing in | |
6835 the common case where it hasn't. (If it turns out that we've | |
6836 already wasted too much time by walking through the list with | |
6837 display_mode_element, then we might need to optimize at a | |
6838 higher level than this.) */ | |
6839 if (! STRINGP (f->name) | |
6840 || STRING_BYTES (XSTRING (f->name)) != len | |
6841 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6842 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6843 } | |
6844 } | |
6845 | |
6846 #else /* not HAVE_WINDOW_SYSTEM */ | |
6847 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6848 #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
|
6849 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6850 |
6851 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6852 | |
6853 | |
6854 | |
277 | 6855 |
25012 | 6856 /*********************************************************************** |
6857 Menu Bars | |
6858 ***********************************************************************/ | |
6859 | |
6860 | |
6861 /* Prepare for redisplay by updating menu-bar item lists when | |
6862 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6863 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6864 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6865 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6866 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6867 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6868 struct gcpro gcpro1, gcpro2; |
25012 | 6869 struct frame *f; |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6870 Lisp_Object tooltip_frame; |
25012 | 6871 |
6872 #ifdef HAVE_X_WINDOWS | |
6873 tooltip_frame = tip_frame; | |
6874 #else | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6875 tooltip_frame = Qnil; |
25012 | 6876 #endif |
6877 | |
6878 /* Update all frame titles based on their buffer names, etc. We do | |
6879 this before the menu bars so that the buffer-menu will show the | |
6880 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6881 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6882 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
|
6883 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6884 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6885 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6886 FOR_EACH_FRAME (tail, frame) |
25012 | 6887 { |
6888 f = XFRAME (frame); | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6889 if (!EQ (frame, tooltip_frame) |
25012 | 6890 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) |
6891 x_consider_frame_title (frame); | |
6892 } | |
6893 } | |
6894 #endif /* HAVE_WINDOW_SYSTEM */ | |
6895 | |
6896 /* Update the menu bar item lists, if appropriate. This has to be | |
6897 done before any actual redisplay or generation of display lines. */ | |
6898 all_windows = (update_mode_lines | |
6899 || buffer_shared > 1 | |
6900 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6901 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6902 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6903 Lisp_Object tail, frame; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
6904 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6905 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6906 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
|
6907 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6908 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6909 { |
25012 | 6910 f = XFRAME (frame); |
6911 | |
6912 /* Ignore tooltip frame. */ | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6913 if (EQ (frame, tooltip_frame)) |
25012 | 6914 continue; |
6915 | |
6916 /* If a window on this frame changed size, report that to | |
6917 the user and clear the size-change flag. */ | |
6918 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6919 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6920 Lisp_Object functions; |
25012 | 6921 |
6922 /* Clear flag first in case we get an error below. */ | |
6923 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6924 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6925 GCPRO2 (tail, functions); |
25012 | 6926 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6927 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6928 { |
25012 | 6929 call1 (XCAR (functions), frame); |
6930 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6931 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6932 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6933 } |
25012 | 6934 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6935 GCPRO1 (tail); |
25012 | 6936 update_menu_bar (f, 0); |
6937 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6938 update_tool_bar (f, 0); |
25012 | 6939 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6940 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6941 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6942 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6943 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6944 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6945 else |
25012 | 6946 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6947 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6948 update_menu_bar (sf, 1); |
25012 | 6949 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6950 update_tool_bar (sf, 1); |
25012 | 6951 #endif |
6952 } | |
6953 | |
6954 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6955 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6956 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6957 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6958 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6959 } |
25012 | 6960 |
6961 | |
6962 /* Update the menu bar item list for frame F. This has to be done | |
6963 before we start to fill in any display lines, because it can call | |
6964 eval. | |
6965 | |
6966 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
|
6967 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6968 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6969 update_menu_bar (f, save_match_data) |
25012 | 6970 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6971 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6972 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6973 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6974 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
|
6975 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6976 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6977 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6978 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6979 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6980 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6981 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6982 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
|
6983 ? |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6984 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6985 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
|
6986 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6987 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
|
6988 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6989 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6990 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6991 /* 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
|
6992 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
|
6993 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
|
6994 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
|
6995 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
|
6996 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
|
6997 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6998 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
|
6999 || !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
|
7000 || ((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
|
7001 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7002 != !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
|
7003 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
7004 && !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
|
7005 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7006 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7007 struct buffer *prev = current_buffer; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7008 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7009 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
7010 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
|
7011 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
7012 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
|
7013 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7014 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7015 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7016 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7017 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7018 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7019 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7020 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 7021 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7022 /* If it has changed current-menubar from previous value, |
25012 | 7023 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
|
7024 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7025 call0 (Qrecompute_lucid_menubar); |
25012 | 7026 |
14299 | 7027 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
|
7028 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 7029 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7030 /* Redisplay the menu bar in case we changed it. */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7031 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7032 if (FRAME_WINDOW_P (f) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7033 #if defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7034 /* All frames on Mac OS share the same menubar. So only the |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7035 selected frame should be allowed to set it. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7036 && f == SELECTED_FRAME () |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7037 #endif |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7038 ) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
7039 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
|
7040 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7041 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 7042 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
|
7043 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7044 #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
|
7045 /* 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
|
7046 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
|
7047 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7048 #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
|
7049 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7050 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
|
7051 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7052 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7053 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7054 } |
25012 | 7055 |
7056 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7057 |
25012 | 7058 /*********************************************************************** |
25543 | 7059 Tool-bars |
25012 | 7060 ***********************************************************************/ |
7061 | |
7062 #ifdef HAVE_WINDOW_SYSTEM | |
7063 | |
25543 | 7064 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 7065 before we start to fill in any display lines. Called from |
7066 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
7067 and restore it here. */ | |
7068 | |
7069 static void | |
25543 | 7070 update_tool_bar (f, save_match_data) |
25012 | 7071 struct frame *f; |
7072 int save_match_data; | |
7073 { | |
25543 | 7074 if (WINDOWP (f->tool_bar_window) |
7075 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 7076 { |
7077 Lisp_Object window; | |
7078 struct window *w; | |
7079 | |
7080 window = FRAME_SELECTED_WINDOW (f); | |
7081 w = XWINDOW (window); | |
7082 | |
7083 /* If the user has switched buffers or windows, we need to | |
7084 recompute to reflect the new bindings. But we'll | |
7085 recompute when update_mode_lines is set too; that means | |
7086 that people can use force-mode-line-update to request | |
7087 that the menu bar be recomputed. The adverse effect on | |
7088 the rest of the redisplay algorithm is about the same as | |
7089 windows_or_buffers_changed anyway. */ | |
7090 if (windows_or_buffers_changed | |
7091 || !NILP (w->update_mode_line) | |
7092 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
7093 < BUF_MODIFF (XBUFFER (w->buffer))) | |
7094 != !NILP (w->last_had_star)) | |
7095 || ((!NILP (Vtransient_mark_mode) | |
7096 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7097 != !NILP (w->region_showing))) | |
7098 { | |
7099 struct buffer *prev = current_buffer; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7100 int count = BINDING_STACK_SIZE (); |
25012 | 7101 |
7102 /* Set current_buffer to the buffer of the selected | |
7103 window of the frame, so that we get the right local | |
7104 keymaps. */ | |
7105 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
7106 | |
7107 /* Save match data, if we must. */ | |
7108 if (save_match_data) | |
7109 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
7110 | |
7111 /* Make sure that we don't accidentally use bogus keymaps. */ | |
7112 if (NILP (Voverriding_local_map_menu_flag)) | |
7113 { | |
7114 specbind (Qoverriding_terminal_local_map, Qnil); | |
7115 specbind (Qoverriding_local_map, Qnil); | |
7116 } | |
7117 | |
25543 | 7118 /* Build desired tool-bar items from keymaps. */ |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7119 f->tool_bar_items |
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7120 = tool_bar_items (f->tool_bar_items, &f->n_tool_bar_items); |
25012 | 7121 |
25543 | 7122 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 7123 w->update_mode_line = Qt; |
7124 | |
7125 unbind_to (count, Qnil); | |
7126 set_buffer_internal_1 (prev); | |
7127 } | |
7128 } | |
7129 } | |
7130 | |
7131 | |
25543 | 7132 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7133 F's desired tool-bar contents. F->tool_bar_items must have |
25012 | 7134 been set up previously by calling prepare_menu_bars. */ |
7135 | |
7136 static void | |
25543 | 7137 build_desired_tool_bar_string (f) |
25012 | 7138 struct frame *f; |
7139 { | |
7140 int i, size, size_needed, string_idx; | |
7141 struct gcpro gcpro1, gcpro2, gcpro3; | |
7142 Lisp_Object image, plist, props; | |
7143 | |
7144 image = plist = props = Qnil; | |
7145 GCPRO3 (image, plist, props); | |
7146 | |
25543 | 7147 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 7148 Otherwise, make a new string. */ |
7149 | |
7150 /* The size of the string we might be able to reuse. */ | |
25543 | 7151 size = (STRINGP (f->desired_tool_bar_string) |
7152 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 7153 : 0); |
7154 | |
7155 /* Each image in the string we build is preceded by a space, | |
7156 and there is a space at the end. */ | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7157 size_needed = f->n_tool_bar_items + 1; |
25543 | 7158 |
7159 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 7160 if (size < size_needed) |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
7161 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
7162 make_number (' ')); |
25012 | 7163 else |
7164 { | |
7165 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
7166 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 7167 props, f->desired_tool_bar_string); |
25012 | 7168 } |
7169 | |
7170 /* Put a `display' property on the string for the images to display, | |
25543 | 7171 put a `menu_item' property on tool-bar items with a value that |
7172 is the index of the item in F's tool-bar item vector. */ | |
25012 | 7173 for (i = 0, string_idx = 0; |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7174 i < f->n_tool_bar_items; |
25012 | 7175 ++i, string_idx += 1) |
7176 { | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7177 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) |
25543 | 7178 |
7179 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
7180 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7181 int margin, relief, idx; |
25012 | 7182 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; |
7183 extern Lisp_Object Qlaplace; | |
7184 | |
7185 /* If image is a vector, choose the image according to the | |
7186 button state. */ | |
25543 | 7187 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 7188 if (VECTORP (image)) |
7189 { | |
7190 if (enabled_p) | |
7191 idx = (selected_p | |
25543 | 7192 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
7193 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 7194 else |
7195 idx = (selected_p | |
25543 | 7196 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
7197 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 7198 |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7199 xassert (ASIZE (image) >= idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7200 image = AREF (image, idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7201 } |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7202 else |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7203 idx = -1; |
25012 | 7204 |
7205 /* Ignore invalid image specifications. */ | |
7206 if (!valid_image_p (image)) | |
7207 continue; | |
7208 | |
25543 | 7209 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 7210 plist = Fcopy_sequence (XCDR (image)); |
7211 | |
7212 /* Compute margin and relief to draw. */ | |
25543 | 7213 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
7214 margin = relief + max (0, tool_bar_button_margin); | |
7215 | |
7216 if (auto_raise_tool_bar_buttons_p) | |
25012 | 7217 { |
7218 /* Add a `:relief' property to the image spec if the item is | |
7219 selected. */ | |
7220 if (selected_p) | |
7221 { | |
7222 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
7223 margin -= relief; | |
7224 } | |
7225 } | |
7226 else | |
7227 { | |
7228 /* If image is selected, display it pressed, i.e. with a | |
7229 negative relief. If it's not selected, display it with a | |
7230 raised relief. */ | |
7231 plist = Fplist_put (plist, QCrelief, | |
7232 (selected_p | |
7233 ? make_number (-relief) | |
7234 : make_number (relief))); | |
7235 margin -= relief; | |
7236 } | |
7237 | |
7238 /* Put a margin around the image. */ | |
7239 if (margin) | |
7240 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
7241 | |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7242 /* If button is not enabled, and we don't have special images |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7243 for the disabled state, make the image appear disabled by |
25012 | 7244 applying an appropriate algorithm to it. */ |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7245 if (!enabled_p && idx < 0) |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7246 plist = Fplist_put (plist, QCalgorithm, Qdisabled); |
25012 | 7247 |
7248 /* Put a `display' text property on the string for the image to | |
7249 display. Put a `menu-item' property on the string that gives | |
25543 | 7250 the start of this item's properties in the tool-bar items |
25012 | 7251 vector. */ |
7252 image = Fcons (Qimage, plist); | |
7253 props = list4 (Qdisplay, image, | |
25543 | 7254 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 7255 Fadd_text_properties (make_number (string_idx), |
7256 make_number (string_idx + 1), | |
25543 | 7257 props, f->desired_tool_bar_string); |
25012 | 7258 #undef PROP |
7259 } | |
7260 | |
7261 UNGCPRO; | |
7262 } | |
7263 | |
7264 | |
25543 | 7265 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 7266 |
7267 static void | |
25543 | 7268 display_tool_bar_line (it) |
25012 | 7269 struct it *it; |
7270 { | |
7271 struct glyph_row *row = it->glyph_row; | |
7272 int max_x = it->last_visible_x; | |
7273 struct glyph *last; | |
7274 | |
7275 prepare_desired_row (row); | |
7276 row->y = it->current_y; | |
7277 | |
7278 while (it->current_x < max_x) | |
7279 { | |
7280 int x_before, x, n_glyphs_before, i, nglyphs; | |
7281 | |
7282 /* Get the next display element. */ | |
7283 if (!get_next_display_element (it)) | |
7284 break; | |
7285 | |
7286 /* Produce glyphs. */ | |
7287 x_before = it->current_x; | |
7288 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
7289 PRODUCE_GLYPHS (it); | |
7290 | |
7291 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
7292 i = 0; | |
7293 x = x_before; | |
7294 while (i < nglyphs) | |
7295 { | |
7296 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
7297 | |
7298 if (x + glyph->pixel_width > max_x) | |
7299 { | |
7300 /* Glyph doesn't fit on line. */ | |
7301 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
7302 it->current_x = x; | |
7303 goto out; | |
7304 } | |
7305 | |
7306 ++it->hpos; | |
7307 x += glyph->pixel_width; | |
7308 ++i; | |
7309 } | |
7310 | |
7311 /* Stop at line ends. */ | |
7312 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
7313 break; | |
7314 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
7315 set_iterator_to_next (it, 1); |
25012 | 7316 } |
7317 | |
7318 out:; | |
7319 | |
7320 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
7321 extend_face_to_end_of_line (it); | |
7322 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
7323 last->right_box_line_p = 1; | |
7324 compute_line_metrics (it); | |
7325 | |
25543 | 7326 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 7327 if (!row->displays_text_p) |
7328 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
7329 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
|
7330 row->ascent = row->phys_ascent = 0; |
25012 | 7331 } |
7332 | |
7333 row->full_width_p = 1; | |
7334 row->continued_p = 0; | |
7335 row->truncated_on_left_p = 0; | |
7336 row->truncated_on_right_p = 0; | |
7337 | |
7338 it->current_x = it->hpos = 0; | |
7339 it->current_y += row->height; | |
7340 ++it->vpos; | |
7341 ++it->glyph_row; | |
7342 } | |
7343 | |
7344 | |
25543 | 7345 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 7346 items of frame F visible. */ |
7347 | |
7348 static int | |
25543 | 7349 tool_bar_lines_needed (f) |
25012 | 7350 struct frame *f; |
7351 { | |
25543 | 7352 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 7353 struct it it; |
7354 | |
25543 | 7355 /* Initialize an iterator for iteration over |
7356 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
7357 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7358 it.first_visible_x = 0; |
7359 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 7360 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 7361 |
7362 while (!ITERATOR_AT_END_P (&it)) | |
7363 { | |
7364 it.glyph_row = w->desired_matrix->rows; | |
7365 clear_glyph_row (it.glyph_row); | |
25543 | 7366 display_tool_bar_line (&it); |
25012 | 7367 } |
7368 | |
7369 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
7370 } | |
7371 | |
7372 | |
25543 | 7373 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 7374 height should be changed. */ |
7375 | |
7376 static int | |
25543 | 7377 redisplay_tool_bar (f) |
25012 | 7378 struct frame *f; |
7379 { | |
7380 struct window *w; | |
7381 struct it it; | |
7382 struct glyph_row *row; | |
7383 int change_height_p = 0; | |
7384 | |
25543 | 7385 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
7386 do anything. This means you must start with tool-bar-lines | |
25012 | 7387 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 7388 can turn off tool-bars by specifying tool-bar-lines zero. */ |
7389 if (!WINDOWP (f->tool_bar_window) | |
7390 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 7391 XFASTINT (w->height) == 0)) |
7392 return 0; | |
7393 | |
25543 | 7394 /* Set up an iterator for the tool-bar window. */ |
7395 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7396 it.first_visible_x = 0; |
7397 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
7398 row = it.glyph_row; | |
7399 | |
25543 | 7400 /* Build a string that represents the contents of the tool-bar. */ |
7401 build_desired_tool_bar_string (f); | |
7402 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
7403 | |
7404 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 7405 while (it.current_y < it.last_visible_y) |
25543 | 7406 display_tool_bar_line (&it); |
7407 | |
7408 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 7409 window, so don't do it. */ |
7410 w->desired_matrix->no_scrolling_p = 1; | |
7411 w->must_be_updated_p = 1; | |
7412 | |
25543 | 7413 if (auto_resize_tool_bars_p) |
25012 | 7414 { |
7415 int nlines; | |
7416 | |
7417 /* If there are blank lines at the end, except for a partially | |
7418 visible blank line at the end that is smaller than | |
25543 | 7419 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 7420 row = it.glyph_row - 1; |
7421 if (!row->displays_text_p | |
7422 && row->height >= CANON_Y_UNIT (f)) | |
7423 change_height_p = 1; | |
7424 | |
25543 | 7425 /* If row displays tool-bar items, but is partially visible, |
7426 change the tool-bar's height. */ | |
25012 | 7427 if (row->displays_text_p |
7428 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
7429 change_height_p = 1; | |
7430 | |
25543 | 7431 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 7432 frame parameter. */ |
7433 if (change_height_p | |
25543 | 7434 && (nlines = tool_bar_lines_needed (f), |
25012 | 7435 nlines != XFASTINT (w->height))) |
7436 { | |
25543 | 7437 extern Lisp_Object Qtool_bar_lines; |
25012 | 7438 Lisp_Object frame; |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7439 int old_height = XFASTINT (w->height); |
25012 | 7440 |
7441 XSETFRAME (frame, f); | |
7442 clear_glyph_matrix (w->desired_matrix); | |
7443 Fmodify_frame_parameters (frame, | |
25543 | 7444 Fcons (Fcons (Qtool_bar_lines, |
25012 | 7445 make_number (nlines)), |
7446 Qnil)); | |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7447 if (XFASTINT (w->height) != old_height) |
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7448 fonts_changed_p = 1; |
25012 | 7449 } |
7450 } | |
7451 | |
7452 return change_height_p; | |
7453 } | |
7454 | |
7455 | |
25543 | 7456 /* Get information about the tool-bar item which is displayed in GLYPH |
7457 on frame F. Return in *PROP_IDX the index where tool-bar item | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7458 properties start in F->tool_bar_items. Value is zero if |
25543 | 7459 GLYPH doesn't display a tool-bar item. */ |
25012 | 7460 |
7461 int | |
25543 | 7462 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 7463 struct frame *f; |
7464 struct glyph *glyph; | |
7465 int *prop_idx; | |
7466 { | |
7467 Lisp_Object prop; | |
7468 int success_p; | |
7469 | |
7470 /* Get the text property `menu-item' at pos. The value of that | |
7471 property is the start index of this item's properties in | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7472 F->tool_bar_items. */ |
25012 | 7473 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 7474 Qmenu_item, f->current_tool_bar_string); |
25012 | 7475 if (INTEGERP (prop)) |
7476 { | |
7477 *prop_idx = XINT (prop); | |
7478 success_p = 1; | |
7479 } | |
7480 else | |
7481 success_p = 0; | |
7482 | |
7483 return success_p; | |
7484 } | |
7485 | |
7486 #endif /* HAVE_WINDOW_SYSTEM */ | |
7487 | |
7488 | |
7489 | |
7490 /************************************************************************ | |
7491 Horizontal scrolling | |
7492 ************************************************************************/ | |
7493 | |
7494 static int hscroll_window_tree P_ ((Lisp_Object)); | |
7495 static int hscroll_windows P_ ((Lisp_Object)); | |
7496 | |
7497 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
7498 hscroll value so that PT is (i) visible in the window, and (ii) so | |
7499 that it is not within a certain margin at the window's left and | |
7500 right border. Value is non-zero if any window's hscroll has been | |
7501 changed. */ | |
7502 | |
7503 static int | |
7504 hscroll_window_tree (window) | |
7505 Lisp_Object window; | |
7506 { | |
7507 int hscrolled_p = 0; | |
7508 | |
7509 while (WINDOWP (window)) | |
7510 { | |
7511 struct window *w = XWINDOW (window); | |
7512 | |
7513 if (WINDOWP (w->hchild)) | |
7514 hscrolled_p |= hscroll_window_tree (w->hchild); | |
7515 else if (WINDOWP (w->vchild)) | |
7516 hscrolled_p |= hscroll_window_tree (w->vchild); | |
7517 else if (w->cursor.vpos >= 0) | |
7518 { | |
7519 int hscroll_margin, text_area_x, text_area_y; | |
7520 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
|
7521 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7522 = 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
|
7523 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7524 = 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
|
7525 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7526 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7527 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7528 : current_cursor_row); |
25012 | 7529 |
7530 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
7531 &text_area_width, &text_area_height); | |
7532 | |
7533 /* Scroll when cursor is inside this scroll margin. */ | |
7534 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
7535 | |
7536 if ((XFASTINT (w->hscroll) | |
7537 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7538 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7539 && cursor_row->truncated_on_right_p |
25012 | 7540 && (w->cursor.x > text_area_width - hscroll_margin))) |
7541 { | |
7542 struct it it; | |
7543 int hscroll; | |
7544 struct buffer *saved_current_buffer; | |
7545 int pt; | |
7546 | |
7547 /* Find point in a display of infinite width. */ | |
7548 saved_current_buffer = current_buffer; | |
7549 current_buffer = XBUFFER (w->buffer); | |
7550 | |
7551 if (w == XWINDOW (selected_window)) | |
7552 pt = BUF_PT (current_buffer); | |
7553 else | |
7554 { | |
7555 pt = marker_position (w->pointm); | |
7556 pt = max (BEGV, pt); | |
7557 pt = min (ZV, pt); | |
7558 } | |
7559 | |
7560 /* Move iterator to pt starting at cursor_row->start in | |
7561 a line with infinite width. */ | |
7562 init_to_row_start (&it, w, cursor_row); | |
7563 it.last_visible_x = INFINITY; | |
7564 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
7565 current_buffer = saved_current_buffer; | |
7566 | |
7567 /* Center cursor in window. */ | |
7568 hscroll = (max (0, it.current_x - text_area_width / 2) | |
7569 / CANON_X_UNIT (it.f)); | |
7570 | |
7571 /* Don't call Fset_window_hscroll if value hasn't | |
7572 changed because it will prevent redisplay | |
7573 optimizations. */ | |
7574 if (XFASTINT (w->hscroll) != hscroll) | |
7575 { | |
7576 Fset_window_hscroll (window, make_number (hscroll)); | |
7577 hscrolled_p = 1; | |
7578 } | |
7579 } | |
7580 } | |
7581 | |
7582 window = w->next; | |
7583 } | |
7584 | |
7585 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
7586 return hscrolled_p; | |
7587 } | |
7588 | |
7589 | |
7590 /* Set hscroll so that cursor is visible and not inside horizontal | |
7591 scroll margins for all windows in the tree rooted at WINDOW. See | |
7592 also hscroll_window_tree above. Value is non-zero if any window's | |
7593 hscroll has been changed. If it has, desired matrices on the frame | |
7594 of WINDOW are cleared. */ | |
7595 | |
7596 static int | |
7597 hscroll_windows (window) | |
7598 Lisp_Object window; | |
7599 { | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7600 int hscrolled_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7601 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7602 if (automatic_hscrolling_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7603 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7604 hscrolled_p = hscroll_window_tree (window); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7605 if (hscrolled_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7606 clear_desired_matrices (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7607 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7608 else |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7609 hscrolled_p = 0; |
25012 | 7610 return hscrolled_p; |
7611 } | |
7612 | |
7613 | |
7614 | |
7615 /************************************************************************ | |
7616 Redisplay | |
7617 ************************************************************************/ | |
7618 | |
7619 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
7620 to a non-zero value. This is sometimes handy to have in a debugger | |
7621 session. */ | |
7622 | |
7623 #if GLYPH_DEBUG | |
7624 | |
7625 /* First and last unchanged row for try_window_id. */ | |
7626 | |
7627 int debug_first_unchanged_at_end_vpos; | |
7628 int debug_last_unchanged_at_beg_vpos; | |
7629 | |
7630 /* Delta vpos and y. */ | |
7631 | |
7632 int debug_dvpos, debug_dy; | |
7633 | |
7634 /* Delta in characters and bytes for try_window_id. */ | |
7635 | |
7636 int debug_delta, debug_delta_bytes; | |
7637 | |
7638 /* Values of window_end_pos and window_end_vpos at the end of | |
7639 try_window_id. */ | |
7640 | |
7641 int debug_end_pos, debug_end_vpos; | |
7642 | |
7643 /* Append a string to W->desired_matrix->method. FMT is a printf | |
7644 format string. A1...A9 are a supplement for a variable-length | |
7645 argument list. If trace_redisplay_p is non-zero also printf the | |
7646 resulting string to stderr. */ | |
7647 | |
7648 static void | |
7649 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
7650 struct window *w; | |
7651 char *fmt; | |
7652 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
7653 { | |
7654 char buffer[512]; | |
7655 char *method = w->desired_matrix->method; | |
7656 int len = strlen (method); | |
7657 int size = sizeof w->desired_matrix->method; | |
7658 int remaining = size - len - 1; | |
7659 | |
7660 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
7661 if (len && remaining) | |
7662 { | |
7663 method[len] = '|'; | |
7664 --remaining, ++len; | |
7665 } | |
7666 | |
7667 strncpy (method + len, buffer, remaining); | |
7668 | |
7669 if (trace_redisplay_p) | |
7670 fprintf (stderr, "%p (%s): %s\n", | |
7671 w, | |
7672 ((BUFFERP (w->buffer) | |
7673 && STRINGP (XBUFFER (w->buffer)->name)) | |
7674 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
7675 : "no buffer"), | |
7676 buffer); | |
7677 } | |
7678 | |
7679 #endif /* GLYPH_DEBUG */ | |
7680 | |
7681 | |
7682 /* This counter is used to clear the face cache every once in a while | |
7683 in redisplay_internal. It is incremented for each redisplay. | |
7684 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7685 cleared. */ | |
7686 | |
7687 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7688 static int clear_face_cache_count; | |
7689 | |
7690 /* Record the previous terminal frame we displayed. */ | |
7691 | |
7692 static struct frame *previous_terminal_frame; | |
7693 | |
7694 /* Non-zero while redisplay_internal is in progress. */ | |
7695 | |
7696 int redisplaying_p; | |
7697 | |
7698 | |
7699 /* Value is non-zero if all changes in window W, which displays | |
7700 current_buffer, are in the text between START and END. START is a | |
7701 buffer position, END is given as a distance from Z. Used in | |
7702 redisplay_internal for display optimization. */ | |
7703 | |
7704 static INLINE int | |
7705 text_outside_line_unchanged_p (w, start, end) | |
7706 struct window *w; | |
7707 int start, end; | |
7708 { | |
7709 int unchanged_p = 1; | |
7710 | |
7711 /* If text or overlays have changed, see where. */ | |
7712 if (XFASTINT (w->last_modified) < MODIFF | |
7713 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7714 { | |
7715 /* Gap in the line? */ | |
7716 if (GPT < start || Z - GPT < end) | |
7717 unchanged_p = 0; | |
7718 | |
7719 /* Changes start in front of the line, or end after it? */ | |
7720 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7721 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7722 || END_UNCHANGED < end)) |
25012 | 7723 unchanged_p = 0; |
7724 | |
7725 /* If selective display, can't optimize if changes start at the | |
7726 beginning of the line. */ | |
7727 if (unchanged_p | |
7728 && INTEGERP (current_buffer->selective_display) | |
7729 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7730 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7731 unchanged_p = 0; |
7732 } | |
7733 | |
7734 return unchanged_p; | |
7735 } | |
7736 | |
7737 | |
7738 /* Do a frame update, taking possible shortcuts into account. This is | |
7739 the main external entry point for redisplay. | |
7740 | |
7741 If the last redisplay displayed an echo area message and that message | |
7742 is no longer requested, we clear the echo area or bring back the | |
7743 mini-buffer if that is in use. */ | |
7744 | |
7745 void | |
7746 redisplay () | |
7747 { | |
7748 redisplay_internal (0); | |
7749 } | |
7750 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7751 /* 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
|
7752 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
|
7753 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
|
7754 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7755 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7756 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
|
7757 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7758 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7759 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7760 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7761 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7762 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7763 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7764 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7765 /* 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
|
7766 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7767 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7768 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7769 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7770 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7771 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7772 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7773 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
|
7774 && 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
|
7775 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7776 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7777 /* 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
|
7778 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7779 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7780 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7781 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7782 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7783 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
|
7784 && 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
|
7785 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7786 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7787 } |
25012 | 7788 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7789 /* 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
|
7790 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7791 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7792 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7793 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7794 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7795 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7796 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7797 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7798 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7799 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7800 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7801 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7802 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7803 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7804 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7805 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7806 /* 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
|
7807 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
|
7808 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
|
7809 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
|
7810 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7811 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7812 && 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
|
7813 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7814 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7815 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7816 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7817 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7818 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7819 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7820 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7821 if ((w->current_matrix->buffer != XBUFFER (w->buffer) |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
7822 || pt != XINT (w->last_point)) |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7823 && check_point_in_composition (w->current_matrix->buffer, |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
7824 XINT (w->last_point), |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7825 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7826 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7827 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7828 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7829 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7830 |
25012 | 7831 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7832 response to any user action; therefore, we should preserve the echo | |
7833 area. (Actually, our caller does that job.) Perhaps in the future | |
7834 avoid recentering windows if it is not necessary; currently that | |
7835 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7836 |
277 | 7837 static void |
25012 | 7838 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7839 int preserve_echo_area; |
277 | 7840 { |
25012 | 7841 struct window *w = XWINDOW (selected_window); |
7842 struct frame *f = XFRAME (w->frame); | |
7843 int pause; | |
7844 int must_finish = 0; | |
7845 struct text_pos tlbufpos, tlendpos; | |
7846 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7847 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7848 struct frame *sf = SELECTED_FRAME (); |
25012 | 7849 |
7850 /* Non-zero means redisplay has to consider all windows on all | |
7851 frames. Zero means, only selected_window is considered. */ | |
7852 int consider_all_windows_p; | |
7853 | |
7854 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7855 | |
7856 /* No redisplay if running in batch mode or frame is not yet fully | |
7857 initialized, or redisplay is explicitly turned off by setting | |
7858 Vinhibit_redisplay. */ | |
7859 if (noninteractive | |
7860 || !NILP (Vinhibit_redisplay) | |
7861 || !f->glyphs_initialized_p) | |
7862 return; | |
7863 | |
7864 /* The flag redisplay_performed_directly_p is set by | |
7865 direct_output_for_insert when it already did the whole screen | |
7866 update necessary. */ | |
7867 if (redisplay_performed_directly_p) | |
7868 { | |
7869 redisplay_performed_directly_p = 0; | |
7870 if (!hscroll_windows (selected_window)) | |
7871 return; | |
7872 } | |
7873 | |
7874 #ifdef USE_X_TOOLKIT | |
7875 if (popup_activated ()) | |
7876 return; | |
7877 #endif | |
7878 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7879 /* I don't think this happens but let's be paranoid. */ |
25012 | 7880 if (redisplaying_p) |
7881 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7882 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7883 /* 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
|
7884 when we leave this function. */ |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7885 count = BINDING_STACK_SIZE (); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7886 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7887 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7888 |
25012 | 7889 retry: |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
7890 pause = 0; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7891 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7892 |
25012 | 7893 /* If new fonts have been loaded that make a glyph matrix adjustment |
7894 necessary, do it. */ | |
7895 if (fonts_changed_p) | |
7896 { | |
7897 adjust_glyphs (NULL); | |
7898 ++windows_or_buffers_changed; | |
7899 fonts_changed_p = 0; | |
7900 } | |
7901 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7902 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7903 && previous_terminal_frame != sf) |
25012 | 7904 { |
7905 /* Since frames on an ASCII terminal share the same display | |
7906 area, displaying a different frame means redisplay the whole | |
7907 thing. */ | |
7908 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7909 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7910 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7911 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7912 previous_terminal_frame = sf; |
25012 | 7913 |
7914 /* Set the visible flags for all frames. Do this before checking | |
7915 for resized or garbaged frames; they want to know if their frames | |
7916 are visible. See the comment in frame.h for | |
7917 FRAME_SAMPLE_VISIBILITY. */ | |
7918 { | |
7919 Lisp_Object tail, frame; | |
7920 | |
7921 number_of_visible_frames = 0; | |
7922 | |
7923 FOR_EACH_FRAME (tail, frame) | |
7924 { | |
7925 struct frame *f = XFRAME (frame); | |
7926 | |
7927 FRAME_SAMPLE_VISIBILITY (f); | |
7928 if (FRAME_VISIBLE_P (f)) | |
7929 ++number_of_visible_frames; | |
7930 clear_desired_matrices (f); | |
7931 } | |
7932 } | |
7933 | |
7934 /* 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
|
7935 do_pending_window_change (1); |
25012 | 7936 |
7937 /* Clear frames marked as garbaged. */ | |
7938 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7939 clear_garbaged_frames (); |
25012 | 7940 |
25543 | 7941 /* Build menubar and tool-bar items. */ |
25012 | 7942 prepare_menu_bars (); |
7943 | |
7944 if (windows_or_buffers_changed) | |
7945 update_mode_lines++; | |
7946 | |
7947 /* Detect case that we need to write or remove a star in the mode line. */ | |
7948 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7949 { | |
7950 w->update_mode_line = Qt; | |
7951 if (buffer_shared > 1) | |
7952 update_mode_lines++; | |
7953 } | |
7954 | |
7955 /* If %c is in the mode line, update it if needed. */ | |
7956 if (!NILP (w->column_number_displayed) | |
7957 /* This alternative quickly identifies a common case | |
7958 where no change is needed. */ | |
7959 && !(PT == XFASTINT (w->last_point) | |
7960 && XFASTINT (w->last_modified) >= MODIFF | |
7961 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7962 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7963 w->update_mode_line = Qt; | |
7964 | |
7965 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
7966 | |
7967 /* The variable buffer_shared is set in redisplay_window and | |
7968 indicates that we redisplay a buffer in different windows. See | |
7969 there. */ | |
7970 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
7971 | |
7972 /* If specs for an arrow have changed, do thorough redisplay | |
7973 to ensure we remove any arrow that should no longer exist. */ | |
7974 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
7975 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
7976 consider_all_windows_p = windows_or_buffers_changed = 1; | |
7977 | |
7978 /* Normally the message* functions will have already displayed and | |
7979 updated the echo area, but the frame may have been trashed, or | |
7980 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
|
7981 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
|
7982 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
|
7983 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
|
7984 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7985 int window_height_changed_p = echo_area_display (0); |
25012 | 7986 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7987 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7988 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7989 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7990 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
|
7991 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7992 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
|
7993 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7994 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7995 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7996 /* 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
|
7997 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7998 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7999 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8000 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8001 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8002 } |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8003 else if (EQ (selected_window, minibuf_window) |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8004 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8005 || 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
|
8006 || 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
|
8007 && 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
|
8008 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8009 /* 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
|
8010 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
|
8011 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8012 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
|
8013 ++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
|
8014 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8015 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8016 /* 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
|
8017 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8018 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8019 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8020 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8021 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8022 |
25012 | 8023 |
8024 /* If showing the region, and mark has changed, we must redisplay | |
8025 the whole window. The assignment to this_line_start_pos prevents | |
8026 the optimization directly below this if-statement. */ | |
8027 if (((!NILP (Vtransient_mark_mode) | |
8028 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
8029 != !NILP (w->region_showing)) | |
8030 || (!NILP (w->region_showing) | |
8031 && !EQ (w->region_showing, | |
8032 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
8033 CHARPOS (this_line_start_pos) = 0; | |
8034 | |
8035 /* Optimize the case that only the line containing the cursor in the | |
8036 selected window has changed. Variables starting with this_ are | |
8037 set in display_line and record information about the line | |
8038 containing the cursor. */ | |
8039 tlbufpos = this_line_start_pos; | |
8040 tlendpos = this_line_end_pos; | |
8041 if (!consider_all_windows_p | |
8042 && CHARPOS (tlbufpos) > 0 | |
8043 && NILP (w->update_mode_line) | |
8044 && !current_buffer->clip_changed | |
8045 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
8046 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
8047 /* Make sure recorded data applies to current buffer, etc. */ | |
8048 && this_line_buffer == current_buffer | |
8049 && current_buffer == XBUFFER (w->buffer) | |
8050 && NILP (w->force_start) | |
8051 /* Point must be on the line that we have info recorded about. */ | |
8052 && PT >= CHARPOS (tlbufpos) | |
8053 && PT <= Z - CHARPOS (tlendpos) | |
8054 /* All text outside that line, including its final newline, | |
8055 must be unchanged */ | |
8056 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
8057 CHARPOS (tlendpos))) | |
8058 { | |
8059 if (CHARPOS (tlbufpos) > BEGV | |
8060 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
8061 && (CHARPOS (tlbufpos) == ZV | |
8062 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
8063 /* Former continuation line has disappeared by becoming empty */ | |
8064 goto cancel; | |
8065 else if (XFASTINT (w->last_modified) < MODIFF | |
8066 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
8067 || MINI_WINDOW_P (w)) | |
8068 { | |
8069 /* We have to handle the case of continuation around a | |
8070 wide-column character (See the comment in indent.c around | |
8071 line 885). | |
8072 | |
8073 For instance, in the following case: | |
8074 | |
8075 -------- Insert -------- | |
8076 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
8077 J_I_ ==> J_I_ `^^' are cursors. | |
8078 ^^ ^^ | |
8079 -------- -------- | |
8080 | |
8081 As we have to redraw the line above, we should goto cancel. */ | |
8082 | |
8083 struct it it; | |
8084 int line_height_before = this_line_pixel_height; | |
8085 | |
8086 /* Note that start_display will handle the case that the | |
8087 line starting at tlbufpos is a continuation lines. */ | |
8088 start_display (&it, w, tlbufpos); | |
8089 | |
8090 /* Implementation note: It this still necessary? */ | |
8091 if (it.current_x != this_line_start_x) | |
8092 goto cancel; | |
8093 | |
8094 TRACE ((stderr, "trying display optimization 1\n")); | |
8095 w->cursor.vpos = -1; | |
8096 overlay_arrow_seen = 0; | |
8097 it.vpos = this_line_vpos; | |
8098 it.current_y = this_line_y; | |
8099 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
8100 display_line (&it); | |
8101 | |
8102 /* If line contains point, is not continued, | |
8103 and ends at same distance from eob as before, we win */ | |
8104 if (w->cursor.vpos >= 0 | |
8105 /* Line is not continued, otherwise this_line_start_pos | |
8106 would have been set to 0 in display_line. */ | |
8107 && CHARPOS (this_line_start_pos) | |
8108 /* Line ends as before. */ | |
8109 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
8110 /* Line has same height as before. Otherwise other lines | |
8111 would have to be shifted up or down. */ | |
8112 && this_line_pixel_height == line_height_before) | |
8113 { | |
8114 /* If this is not the window's last line, we must adjust | |
8115 the charstarts of the lines below. */ | |
8116 if (it.current_y < it.last_visible_y) | |
8117 { | |
8118 struct glyph_row *row | |
8119 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
8120 int delta, delta_bytes; | |
8121 | |
8122 if (Z - CHARPOS (tlendpos) == ZV) | |
8123 { | |
8124 /* This line ends at end of (accessible part of) | |
8125 buffer. There is no newline to count. */ | |
8126 delta = (Z | |
8127 - CHARPOS (tlendpos) | |
8128 - MATRIX_ROW_START_CHARPOS (row)); | |
8129 delta_bytes = (Z_BYTE | |
8130 - BYTEPOS (tlendpos) | |
8131 - MATRIX_ROW_START_BYTEPOS (row)); | |
8132 } | |
8133 else | |
8134 { | |
8135 /* This line ends in a newline. Must take | |
8136 account of the newline and the rest of the | |
8137 text that follows. */ | |
8138 delta = (Z | |
8139 - CHARPOS (tlendpos) | |
8140 - MATRIX_ROW_START_CHARPOS (row)); | |
8141 delta_bytes = (Z_BYTE | |
8142 - BYTEPOS (tlendpos) | |
8143 - MATRIX_ROW_START_BYTEPOS (row)); | |
8144 } | |
8145 | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8146 increment_matrix_positions (w->current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8147 this_line_vpos + 1, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8148 w->current_matrix->nrows, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8149 delta, delta_bytes); |
25012 | 8150 } |
8151 | |
8152 /* If this row displays text now but previously didn't, | |
8153 or vice versa, w->window_end_vpos may have to be | |
8154 adjusted. */ | |
8155 if ((it.glyph_row - 1)->displays_text_p) | |
8156 { | |
8157 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
8158 XSETINT (w->window_end_vpos, this_line_vpos); | |
8159 } | |
8160 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
8161 && this_line_vpos > 0) | |
8162 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
8163 w->window_end_valid = Qnil; | |
8164 | |
8165 /* Update hint: No need to try to scroll in update_window. */ | |
8166 w->desired_matrix->no_scrolling_p = 1; | |
8167 | |
8168 #if GLYPH_DEBUG | |
8169 *w->desired_matrix->method = 0; | |
8170 debug_method_add (w, "optimization 1"); | |
8171 #endif | |
8172 goto update; | |
8173 } | |
8174 else | |
8175 goto cancel; | |
8176 } | |
8177 else if (/* Cursor position hasn't changed. */ | |
8178 PT == XFASTINT (w->last_point) | |
8179 /* Make sure the cursor was last displayed | |
8180 in this window. Otherwise we have to reposition it. */ | |
8181 && 0 <= w->cursor.vpos | |
8182 && XINT (w->height) > w->cursor.vpos) | |
8183 { | |
8184 if (!must_finish) | |
8185 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8186 do_pending_window_change (1); |
25012 | 8187 |
8188 /* We used to always goto end_of_redisplay here, but this | |
8189 isn't enough if we have a blinking cursor. */ | |
8190 if (w->cursor_off_p == w->last_cursor_off_p) | |
8191 goto end_of_redisplay; | |
8192 } | |
8193 goto update; | |
8194 } | |
8195 /* If highlighting the region, or if the cursor is in the echo area, | |
8196 then we can't just move the cursor. */ | |
8197 else if (! (!NILP (Vtransient_mark_mode) | |
8198 && !NILP (current_buffer->mark_active)) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8199 && (EQ (selected_window, current_buffer->last_selected_window) |
25012 | 8200 || highlight_nonselected_windows) |
8201 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8202 && NILP (Vshow_trailing_whitespace) |
25012 | 8203 && !cursor_in_echo_area) |
8204 { | |
8205 struct it it; | |
8206 struct glyph_row *row; | |
8207 | |
8208 /* Skip from tlbufpos to PT and see where it is. Note that | |
8209 PT may be in invisible text. If so, we will end at the | |
8210 next visible position. */ | |
8211 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
8212 NULL, DEFAULT_FACE_ID); | |
8213 it.current_x = this_line_start_x; | |
8214 it.current_y = this_line_y; | |
8215 it.vpos = this_line_vpos; | |
8216 | |
8217 /* The call to move_it_to stops in front of PT, but | |
8218 moves over before-strings. */ | |
8219 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
8220 | |
8221 if (it.vpos == this_line_vpos | |
8222 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
8223 row->enabled_p)) | |
8224 { | |
8225 xassert (this_line_vpos == it.vpos); | |
8226 xassert (this_line_y == it.current_y); | |
8227 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8228 goto update; | |
8229 } | |
8230 else | |
8231 goto cancel; | |
8232 } | |
8233 | |
8234 cancel: | |
8235 /* Text changed drastically or point moved off of line. */ | |
8236 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
8237 } | |
8238 | |
8239 CHARPOS (this_line_start_pos) = 0; | |
8240 consider_all_windows_p |= buffer_shared > 1; | |
8241 ++clear_face_cache_count; | |
8242 | |
8243 | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8244 /* Build desired matrices, and update the display. If |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8245 consider_all_windows_p is non-zero, do it for all windows on all |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8246 frames. Otherwise do it for selected_window, only. */ |
25012 | 8247 |
8248 if (consider_all_windows_p) | |
8249 { | |
8250 Lisp_Object tail, frame; | |
8251 | |
8252 /* Clear the face cache eventually. */ | |
8253 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
8254 { | |
8255 clear_face_cache (0); | |
8256 clear_face_cache_count = 0; | |
8257 } | |
8258 | |
8259 /* Recompute # windows showing selected buffer. This will be | |
8260 incremented each time such a window is displayed. */ | |
8261 buffer_shared = 0; | |
8262 | |
8263 FOR_EACH_FRAME (tail, frame) | |
8264 { | |
8265 struct frame *f = XFRAME (frame); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8266 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8267 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 8268 { |
8269 /* Mark all the scroll bars to be removed; we'll redeem | |
8270 the ones we want when we redisplay their windows. */ | |
8271 if (condemn_scroll_bars_hook) | |
8272 (*condemn_scroll_bars_hook) (f); | |
8273 | |
8274 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
8275 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
8276 | |
8277 /* Any scroll bars which redisplay_windows should have | |
8278 nuked should now go away. */ | |
8279 if (judge_scroll_bars_hook) | |
8280 (*judge_scroll_bars_hook) (f); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8281 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8282 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8283 if (fonts_changed_p) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8284 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8285 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8286 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8287 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8288 /* See if we have to hscroll. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8289 if (hscroll_windows (f->root_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8290 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8291 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8292 /* Prevent various kinds of signals during display |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8293 update. stdio is not robust about handling |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8294 signals, which can cause an apparent I/O |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8295 error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8296 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8297 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8298 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8299 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8300 /* Update the display. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8301 set_window_update_flags (XWINDOW (f->root_window), 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8302 pause |= update_frame (f, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8303 if (pause) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8304 break; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8305 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8306 mark_window_display_accurate (f->root_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8307 if (frame_up_to_date_hook) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8308 frame_up_to_date_hook (f); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8309 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8310 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8311 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8312 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8313 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8314 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8315 Lisp_Object mini_window; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8316 struct frame *mini_frame; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8317 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8318 redisplay_window (selected_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8319 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8320 /* Compare desired and current matrices, perform output. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8321 update: |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8322 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8323 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8324 if (fonts_changed_p) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8325 goto retry; |
25012 | 8326 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8327 /* Prevent various kinds of signals during display update. |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8328 stdio is not robust about handling signals, |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8329 which can cause an apparent I/O error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8330 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8331 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8332 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8333 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8334 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
25012 | 8335 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8336 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8337 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8338 |
25012 | 8339 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
|
8340 pause = update_frame (sf, 0, 0); |
25012 | 8341 } |
8342 | |
8343 /* We may have called echo_area_display at the top of this | |
8344 function. If the echo area is on another frame, that may | |
8345 have put text on a frame other than the selected one, so the | |
8346 above call to update_frame would not have caught it. Catch | |
8347 it here. */ | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8348 mini_window = FRAME_MINIBUF_WINDOW (sf); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8349 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
25012 | 8350 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8351 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8352 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8353 XWINDOW (mini_window)->must_be_updated_p = 1; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8354 pause |= update_frame (mini_frame, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8355 if (!pause && hscroll_windows (mini_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8356 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8357 } |
25012 | 8358 } |
8359 | |
8360 /* If display was paused because of pending input, make sure we do a | |
8361 thorough update the next time. */ | |
8362 if (pause) | |
8363 { | |
8364 /* Prevent the optimization at the beginning of | |
8365 redisplay_internal that tries a single-line update of the | |
8366 line containing the cursor in the selected window. */ | |
8367 CHARPOS (this_line_start_pos) = 0; | |
8368 | |
8369 /* Let the overlay arrow be updated the next time. */ | |
8370 if (!NILP (last_arrow_position)) | |
8371 { | |
8372 last_arrow_position = Qt; | |
8373 last_arrow_string = Qt; | |
8374 } | |
8375 | |
8376 /* If we pause after scrolling, some rows in the current | |
8377 matrices of some windows are not valid. */ | |
8378 if (!WINDOW_FULL_WIDTH_P (w) | |
8379 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
8380 update_mode_lines = 1; | |
8381 } | |
8382 | |
8383 /* Now text on frame agrees with windows, so put info into the | |
8384 windows for partial redisplay to follow. */ | |
8385 if (!pause) | |
8386 { | |
8387 register struct buffer *b = XBUFFER (w->buffer); | |
8388 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8389 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8390 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
|
8391 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
|
8392 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 8393 |
8394 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8395 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 8396 else |
8397 { | |
8398 XSETFASTINT (w->last_point, BUF_PT (b)); | |
8399 w->last_cursor = w->cursor; | |
8400 w->last_cursor_off_p = w->cursor_off_p; | |
8401 | |
8402 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8403 b->prevent_redisplay_optimizations_p = 0; |
25012 | 8404 w->update_mode_line = Qnil; |
8405 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
8406 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
8407 w->last_had_star | |
8408 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
8409 ? Qt : Qnil); | |
8410 | |
8411 /* Record if we are showing a region, so can make sure to | |
8412 update it fully at next redisplay. */ | |
8413 w->region_showing = (!NILP (Vtransient_mark_mode) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8414 && (EQ (selected_window, |
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8415 current_buffer->last_selected_window) |
25012 | 8416 || highlight_nonselected_windows) |
8417 && !NILP (XBUFFER (w->buffer)->mark_active) | |
8418 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
8419 : Qnil); | |
8420 | |
8421 w->window_end_valid = w->buffer; | |
8422 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8423 last_arrow_string = Voverlay_arrow_string; | |
8424 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8425 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8426 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8427 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8428 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8429 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8430 } |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
8431 |
25012 | 8432 update_mode_lines = 0; |
8433 windows_or_buffers_changed = 0; | |
8434 } | |
8435 | |
8436 /* Start SIGIO interrupts coming again. Having them off during the | |
8437 code above makes it less likely one will discard output, but not | |
8438 impossible, since there might be stuff in the system buffer here. | |
8439 But it is much hairier to try to do anything about that. */ | |
8440 if (interrupt_input) | |
8441 request_sigio (); | |
8442 start_polling (); | |
8443 | |
8444 /* If a frame has become visible which was not before, redisplay | |
8445 again, so that we display it. Expose events for such a frame | |
8446 (which it gets when becoming visible) don't call the parts of | |
8447 redisplay constructing glyphs, so simply exposing a frame won't | |
8448 display anything in this case. So, we have to display these | |
8449 frames here explicitly. */ | |
8450 if (!pause) | |
8451 { | |
8452 Lisp_Object tail, frame; | |
8453 int new_count = 0; | |
8454 | |
8455 FOR_EACH_FRAME (tail, frame) | |
8456 { | |
8457 int this_is_visible = 0; | |
8458 | |
8459 if (XFRAME (frame)->visible) | |
8460 this_is_visible = 1; | |
8461 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
8462 if (XFRAME (frame)->visible) | |
8463 this_is_visible = 1; | |
8464 | |
8465 if (this_is_visible) | |
8466 new_count++; | |
8467 } | |
8468 | |
8469 if (new_count != number_of_visible_frames) | |
8470 windows_or_buffers_changed++; | |
8471 } | |
8472 | |
8473 /* 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
|
8474 do_pending_window_change (1); |
25012 | 8475 |
8476 /* If we just did a pending size change, or have additional | |
8477 visible frames, redisplay again. */ | |
8478 if (windows_or_buffers_changed && !pause) | |
8479 goto retry; | |
8480 | |
8481 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8482 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8483 unbind_to (count, Qnil); |
25012 | 8484 } |
8485 | |
8486 | |
8487 /* Redisplay, but leave alone any recent echo area message unless | |
8488 another message has been requested in its place. | |
8489 | |
8490 This is useful in situations where you need to redisplay but no | |
8491 user action has occurred, making it inappropriate for the message | |
8492 area to be cleared. See tracking_off and | |
8493 wait_reading_process_input for examples of these situations. */ | |
8494 | |
8495 void | |
8496 redisplay_preserve_echo_area () | |
8497 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8498 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
|
8499 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8500 /* 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
|
8501 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
|
8502 display_last_displayed_message_p = 1; |
25012 | 8503 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8504 display_last_displayed_message_p = 0; |
25012 | 8505 } |
8506 else | |
8507 redisplay_internal (1); | |
8508 } | |
8509 | |
8510 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8511 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8512 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
|
8513 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8514 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8515 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8516 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8517 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8518 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8519 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
|
8520 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8521 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8522 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8523 |
25012 | 8524 /* Mark the display of windows in the window tree rooted at WINDOW as |
8525 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
8526 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
8527 the next time redisplay_internal is called. */ | |
8528 | |
8529 void | |
8530 mark_window_display_accurate (window, accurate_p) | |
8531 Lisp_Object window; | |
8532 int accurate_p; | |
8533 { | |
8534 struct window *w; | |
8535 | |
8536 for (; !NILP (window); window = w->next) | |
8537 { | |
8538 w = XWINDOW (window); | |
8539 | |
8540 if (BUFFERP (w->buffer)) | |
8541 { | |
8542 struct buffer *b = XBUFFER (w->buffer); | |
8543 | |
8544 XSETFASTINT (w->last_modified, | |
8545 accurate_p ? BUF_MODIFF (b) : 0); | |
8546 XSETFASTINT (w->last_overlay_modified, | |
8547 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
8548 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
8549 ? Qt : Qnil); | |
8550 | |
8551 #if 0 /* I don't think this is necessary because display_line does it. | |
8552 Let's check it. */ | |
8553 /* Record if we are showing a region, so can make sure to | |
8554 update it fully at next redisplay. */ | |
8555 w->region_showing | |
8556 = (!NILP (Vtransient_mark_mode) | |
8557 && (w == XWINDOW (current_buffer->last_selected_window) | |
8558 || highlight_nonselected_windows) | |
8559 && (!NILP (b->mark_active) | |
8560 ? Fmarker_position (b->mark) | |
8561 : Qnil)); | |
8562 #endif | |
8563 | |
8564 if (accurate_p) | |
8565 { | |
8566 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8567 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8568 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8569 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8570 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8571 w->last_cursor = w->cursor; |
8572 w->last_cursor_off_p = w->cursor_off_p; | |
8573 if (w == XWINDOW (selected_window)) | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
8574 w->last_point = make_number (BUF_PT (b)); |
25012 | 8575 else |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
8576 w->last_point = make_number (XMARKER (w->pointm)->charpos); |
25012 | 8577 } |
8578 } | |
8579 | |
8580 w->window_end_valid = w->buffer; | |
8581 w->update_mode_line = Qnil; | |
8582 | |
8583 if (!NILP (w->vchild)) | |
8584 mark_window_display_accurate (w->vchild, accurate_p); | |
8585 if (!NILP (w->hchild)) | |
8586 mark_window_display_accurate (w->hchild, accurate_p); | |
8587 } | |
8588 | |
8589 if (accurate_p) | |
8590 { | |
8591 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8592 last_arrow_string = Voverlay_arrow_string; | |
8593 } | |
8594 else | |
8595 { | |
8596 /* Force a thorough redisplay the next time by setting | |
8597 last_arrow_position and last_arrow_string to t, which is | |
8598 unequal to any useful value of Voverlay_arrow_... */ | |
8599 last_arrow_position = Qt; | |
8600 last_arrow_string = Qt; | |
8601 } | |
8602 } | |
8603 | |
277 | 8604 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8605 /* 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
|
8606 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
|
8607 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
|
8608 macro DISP_CHAR_VECTOR. */ |
25012 | 8609 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8610 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8611 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
|
8612 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
|
8613 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8614 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8615 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8616 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8617 |
25012 | 8618 if (SINGLE_BYTE_CHAR_P (c)) |
8619 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
|
8620 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
8621 SPLIT_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
|
8622 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8623 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8624 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8625 code[2] = -1; |
25012 | 8626 |
8627 /* Here, the possible range of code[0] (== charset ID) is | |
8628 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
|
8629 for multibyte characters after 256th element, we must increment |
25012 | 8630 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
|
8631 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8632 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8633 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8634 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
|
8635 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8636 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
|
8637 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
|
8638 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
|
8639 } |
25012 | 8640 |
8641 /* Here, val is a sub char table. We return the default value of | |
8642 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8643 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8644 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8645 |
25012 | 8646 |
8647 | |
8648 /*********************************************************************** | |
8649 Window Redisplay | |
8650 ***********************************************************************/ | |
8651 | |
8652 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
8653 | |
8654 static void | |
8655 redisplay_windows (window) | |
8656 Lisp_Object window; | |
8657 { | |
8658 while (!NILP (window)) | |
8659 { | |
8660 struct window *w = XWINDOW (window); | |
8661 | |
8662 if (!NILP (w->hchild)) | |
8663 redisplay_windows (w->hchild); | |
8664 else if (!NILP (w->vchild)) | |
8665 redisplay_windows (w->vchild); | |
8666 else | |
8667 redisplay_window (window, 0); | |
8668 | |
8669 window = w->next; | |
8670 } | |
8671 } | |
8672 | |
8673 | |
8674 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8675 DELTA is the number of bytes by which positions recorded in ROW | |
8676 differ from current buffer positions. */ | |
8677 | |
8678 void | |
8679 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8680 struct window *w; | |
8681 struct glyph_row *row; | |
8682 struct glyph_matrix *matrix; | |
8683 int delta, delta_bytes, dy, dvpos; | |
8684 { | |
8685 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8686 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8687 int x = row->x; | |
8688 int pt_old = PT - delta; | |
8689 | |
8690 /* Skip over glyphs not having an object at the start of the row. | |
8691 These are special glyphs like truncation marks on terminal | |
8692 frames. */ | |
8693 if (row->displays_text_p) | |
8694 while (glyph < end | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
8695 && INTEGERP (glyph->object) |
25012 | 8696 && glyph->charpos < 0) |
8697 { | |
8698 x += glyph->pixel_width; | |
8699 ++glyph; | |
8700 } | |
8701 | |
8702 while (glyph < end | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
8703 && !INTEGERP (glyph->object) |
25012 | 8704 && (!BUFFERP (glyph->object) |
8705 || glyph->charpos < pt_old)) | |
8706 { | |
8707 x += glyph->pixel_width; | |
8708 ++glyph; | |
8709 } | |
8710 | |
8711 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8712 w->cursor.x = x; | |
8713 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8714 w->cursor.y = row->y + dy; | |
8715 | |
8716 if (w == XWINDOW (selected_window)) | |
8717 { | |
8718 if (!row->continued_p | |
8719 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8720 && row->x == 0) | |
8721 { | |
8722 this_line_buffer = XBUFFER (w->buffer); | |
8723 | |
8724 CHARPOS (this_line_start_pos) | |
8725 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8726 BYTEPOS (this_line_start_pos) | |
8727 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8728 | |
8729 CHARPOS (this_line_end_pos) | |
8730 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8731 BYTEPOS (this_line_end_pos) | |
8732 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8733 | |
8734 this_line_y = w->cursor.y; | |
8735 this_line_pixel_height = row->height; | |
8736 this_line_vpos = w->cursor.vpos; | |
8737 this_line_start_x = row->x; | |
8738 } | |
8739 else | |
8740 CHARPOS (this_line_start_pos) = 0; | |
8741 } | |
8742 } | |
8743 | |
8744 | |
8745 /* 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
|
8746 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
|
8747 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8748 We assume that the window's buffer is really current. */ |
25012 | 8749 |
8750 static INLINE struct text_pos | |
8751 run_window_scroll_functions (window, startp) | |
8752 Lisp_Object window; | |
8753 struct text_pos startp; | |
8754 { | |
8755 struct window *w = XWINDOW (window); | |
8756 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
|
8757 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8758 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
|
8759 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8760 |
25012 | 8761 if (!NILP (Vwindow_scroll_functions)) |
8762 { | |
8763 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8764 make_number (CHARPOS (startp))); | |
8765 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
|
8766 /* 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
|
8767 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
|
8768 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8769 } |
8770 | |
8771 return startp; | |
8772 } | |
8773 | |
8774 | |
8775 /* Modify the desired matrix of window W and W->vscroll so that the | |
8776 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8777 |
277 | 8778 static void |
25012 | 8779 make_cursor_line_fully_visible (w) |
8780 struct window *w; | |
8781 { | |
8782 struct glyph_matrix *matrix; | |
8783 struct glyph_row *row; | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8784 int window_height, header_line_height; |
25012 | 8785 |
8786 /* It's not always possible to find the cursor, e.g, when a window | |
8787 is full of overlay strings. Don't do anything in that case. */ | |
8788 if (w->cursor.vpos < 0) | |
8789 return; | |
8790 | |
8791 matrix = w->desired_matrix; | |
8792 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8793 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8794 /* If the cursor row is not partially visible, there's nothing |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8795 to do. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8796 if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8797 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8798 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8799 /* If the row the cursor is in is taller than the window's height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8800 it's not clear what to do, so do nothing. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8801 window_height = window_box_height (w); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8802 if (row->height >= window_height) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8803 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8804 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8805 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) |
25012 | 8806 { |
8807 int dy = row->height - row->visible_height; | |
8808 w->vscroll = 0; | |
8809 w->cursor.y += dy; | |
8810 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8811 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8812 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */ |
25012 | 8813 { |
8814 int dy = - (row->height - row->visible_height); | |
8815 w->vscroll = dy; | |
8816 w->cursor.y += dy; | |
8817 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8818 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8819 |
25012 | 8820 /* When we change the cursor y-position of the selected window, |
8821 change this_line_y as well so that the display optimization for | |
8822 the cursor line of the selected window in redisplay_internal uses | |
8823 the correct y-position. */ | |
8824 if (w == XWINDOW (selected_window)) | |
8825 this_line_y = w->cursor.y; | |
8826 } | |
8827 | |
8828 | |
8829 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8830 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8831 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8832 in redisplay_window to bring a partially visible line into view in | |
8833 the case that only the cursor has moved. | |
8834 | |
8835 Value is | |
8836 | |
8837 1 if scrolling succeeded | |
8838 | |
8839 0 if scrolling didn't find point. | |
8840 | |
8841 -1 if new fonts have been loaded so that we must interrupt | |
8842 redisplay, adjust glyph matrices, and try again. */ | |
8843 | |
8844 static int | |
8845 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8846 scroll_step, temp_scroll_step) | |
277 | 8847 Lisp_Object window; |
25012 | 8848 int just_this_one_p; |
8849 int scroll_conservatively, scroll_step; | |
8850 int temp_scroll_step; | |
8851 { | |
8852 struct window *w = XWINDOW (window); | |
8853 struct frame *f = XFRAME (w->frame); | |
8854 struct text_pos scroll_margin_pos; | |
8855 struct text_pos pos; | |
8856 struct text_pos startp; | |
8857 struct it it; | |
8858 Lisp_Object window_end; | |
8859 int this_scroll_margin; | |
8860 int dy = 0; | |
8861 int scroll_max; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8862 int rc; |
25012 | 8863 int amount_to_scroll = 0; |
8864 Lisp_Object aggressive; | |
277 | 8865 int height; |
25012 | 8866 |
8867 #if GLYPH_DEBUG | |
8868 debug_method_add (w, "try_scrolling"); | |
8869 #endif | |
8870 | |
8871 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8872 | |
8873 /* Compute scroll margin height in pixels. We scroll when point is | |
8874 within this distance from the top or bottom of the window. */ | |
8875 if (scroll_margin > 0) | |
8876 { | |
8877 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8878 this_scroll_margin *= CANON_Y_UNIT (f); | |
8879 } | |
8880 else | |
8881 this_scroll_margin = 0; | |
8882 | |
8883 /* Compute how much we should try to scroll maximally to bring point | |
8884 into view. */ | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8885 if (scroll_step || scroll_conservatively || temp_scroll_step) |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8886 scroll_max = max (scroll_step, |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8887 max (scroll_conservatively, temp_scroll_step)); |
25012 | 8888 else if (NUMBERP (current_buffer->scroll_down_aggressively) |
8889 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8890 /* We're trying to scroll because of aggressive scrolling | |
8891 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8892 there should be a variable for this. */ | |
8893 scroll_max = 10; | |
8894 else | |
8895 scroll_max = 0; | |
8896 scroll_max *= CANON_Y_UNIT (f); | |
8897 | |
8898 /* Decide whether we have to scroll down. Start at the window end | |
8899 and move this_scroll_margin up to find the position of the scroll | |
8900 margin. */ | |
8901 window_end = Fwindow_end (window, Qt); | |
8902 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8903 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8904 if (this_scroll_margin) | |
8905 { | |
8906 start_display (&it, w, scroll_margin_pos); | |
8907 move_it_vertically (&it, - this_scroll_margin); | |
8908 scroll_margin_pos = it.current.pos; | |
8909 } | |
8910 | |
8911 if (PT >= CHARPOS (scroll_margin_pos)) | |
8912 { | |
8913 int y0; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8914 #if 0 |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8915 int line_height; |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8916 #endif |
25012 | 8917 |
8918 /* Point is in the scroll margin at the bottom of the window, or | |
8919 below. Compute a new window start that makes point visible. */ | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8920 |
25012 | 8921 /* Compute the distance from the scroll margin to PT. |
8922 Give up if the distance is greater than scroll_max. */ | |
8923 start_display (&it, w, scroll_margin_pos); | |
8924 y0 = it.current_y; | |
8925 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8926 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8927 #if 0 /* Taking the line's height into account here looks wrong. */ |
25012 | 8928 line_height = (it.max_ascent + it.max_descent |
8929 ? it.max_ascent + it.max_descent | |
8930 : last_height); | |
8931 dy = it.current_y + line_height - y0; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8932 #else |
33074
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8933 /* With a scroll_margin of 0, scroll_margin_pos is at the window |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8934 end, which is one line below the window. The iterator's |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8935 current_y will be same as y0 in that case, but we have to |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8936 scroll a line to make PT visible. That's the reason why 1 is |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8937 added below. */ |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8938 dy = 1 + it.current_y - y0; |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8939 #endif |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8940 |
25012 | 8941 if (dy > scroll_max) |
8942 return 0; | |
8943 | |
8944 /* Move the window start down. If scrolling conservatively, | |
8945 move it just enough down to make point visible. If | |
8946 scroll_step is set, move it down by scroll_step. */ | |
8947 start_display (&it, w, startp); | |
8948 | |
8949 if (scroll_conservatively) | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8950 amount_to_scroll = |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8951 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 8952 else if (scroll_step || temp_scroll_step) |
8953 amount_to_scroll = scroll_max; | |
8954 else | |
8955 { | |
8956 aggressive = current_buffer->scroll_down_aggressively; | |
8957 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8958 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8959 if (NUMBERP (aggressive)) |
8960 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8961 } | |
8962 | |
8963 if (amount_to_scroll <= 0) | |
8964 return 0; | |
8965 | |
8966 move_it_vertically (&it, amount_to_scroll); | |
8967 startp = it.current.pos; | |
8968 } | |
8969 else | |
8970 { | |
8971 /* See if point is inside the scroll margin at the top of the | |
8972 window. */ | |
8973 scroll_margin_pos = startp; | |
8974 if (this_scroll_margin) | |
8975 { | |
8976 start_display (&it, w, startp); | |
8977 move_it_vertically (&it, this_scroll_margin); | |
8978 scroll_margin_pos = it.current.pos; | |
8979 } | |
8980 | |
8981 if (PT < CHARPOS (scroll_margin_pos)) | |
8982 { | |
8983 /* Point is in the scroll margin at the top of the window or | |
8984 above what is displayed in the window. */ | |
8985 int y0; | |
8986 | |
8987 /* Compute the vertical distance from PT to the scroll | |
8988 margin position. Give up if distance is greater than | |
8989 scroll_max. */ | |
8990 SET_TEXT_POS (pos, PT, PT_BYTE); | |
8991 start_display (&it, w, pos); | |
8992 y0 = it.current_y; | |
8993 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
8994 it.last_visible_y, -1, | |
8995 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8996 dy = it.current_y - y0; | |
8997 if (dy > scroll_max) | |
8998 return 0; | |
8999 | |
9000 /* Compute new window start. */ | |
9001 start_display (&it, w, startp); | |
9002 | |
9003 if (scroll_conservatively) | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9004 amount_to_scroll = |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9005 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 9006 else if (scroll_step || temp_scroll_step) |
9007 amount_to_scroll = scroll_max; | |
9008 else | |
9009 { | |
9010 aggressive = current_buffer->scroll_up_aggressively; | |
9011 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 9012 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 9013 if (NUMBERP (aggressive)) |
9014 amount_to_scroll = XFLOATINT (aggressive) * height; | |
9015 } | |
9016 | |
9017 if (amount_to_scroll <= 0) | |
9018 return 0; | |
9019 | |
9020 move_it_vertically (&it, - amount_to_scroll); | |
9021 startp = it.current.pos; | |
9022 } | |
9023 } | |
9024 | |
9025 /* Run window scroll functions. */ | |
9026 startp = run_window_scroll_functions (window, startp); | |
9027 | |
9028 /* Display the window. Give up if new fonts are loaded, or if point | |
9029 doesn't appear. */ | |
9030 if (!try_window (window, startp)) | |
9031 rc = -1; | |
9032 else if (w->cursor.vpos < 0) | |
9033 { | |
9034 clear_glyph_matrix (w->desired_matrix); | |
9035 rc = 0; | |
9036 } | |
9037 else | |
9038 { | |
9039 /* Maybe forget recorded base line for line number display. */ | |
9040 if (!just_this_one_p | |
9041 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9042 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 9043 w->base_line_number = Qnil; |
9044 | |
9045 /* If cursor ends up on a partially visible line, shift display | |
9046 lines up or down. */ | |
9047 make_cursor_line_fully_visible (w); | |
9048 rc = 1; | |
9049 } | |
9050 | |
9051 return rc; | |
9052 } | |
9053 | |
9054 | |
9055 /* Compute a suitable window start for window W if display of W starts | |
9056 on a continuation line. Value is non-zero if a new window start | |
9057 was computed. | |
9058 | |
9059 The new window start will be computed, based on W's width, starting | |
9060 from the start of the continued line. It is the start of the | |
9061 screen line with the minimum distance from the old start W->start. */ | |
9062 | |
9063 static int | |
9064 compute_window_start_on_continuation_line (w) | |
9065 struct window *w; | |
9066 { | |
9067 struct text_pos pos, start_pos; | |
9068 int window_start_changed_p = 0; | |
9069 | |
9070 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
9071 | |
9072 /* If window start is on a continuation line... Window start may be | |
9073 < BEGV in case there's invisible text at the start of the | |
9074 buffer (M-x rmail, for example). */ | |
9075 if (CHARPOS (start_pos) > BEGV | |
9076 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
9077 { | |
9078 struct it it; | |
9079 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9080 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9081 /* 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
|
9082 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9083 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
|
9084 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9085 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 9086 |
9087 /* Find the start of the continued line. This should be fast | |
9088 because scan_buffer is fast (newline cache). */ | |
25546 | 9089 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 9090 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
9091 row, DEFAULT_FACE_ID); | |
9092 reseat_at_previous_visible_line_start (&it); | |
9093 | |
9094 /* If the line start is "too far" away from the window start, | |
9095 say it takes too much time to compute a new window start. */ | |
9096 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
9097 < XFASTINT (w->height) * XFASTINT (w->width)) | |
9098 { | |
9099 int min_distance, distance; | |
9100 | |
9101 /* Move forward by display lines to find the new window | |
9102 start. If window width was enlarged, the new start can | |
9103 be expected to be > the old start. If window width was | |
9104 decreased, the new window start will be < the old start. | |
9105 So, we're looking for the display line start with the | |
9106 minimum distance from the old window start. */ | |
9107 pos = it.current.pos; | |
9108 min_distance = INFINITY; | |
9109 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
9110 distance < min_distance) | |
9111 { | |
9112 min_distance = distance; | |
9113 pos = it.current.pos; | |
9114 move_it_by_lines (&it, 1, 0); | |
9115 } | |
9116 | |
9117 /* Set the window start there. */ | |
9118 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
9119 window_start_changed_p = 1; | |
9120 } | |
9121 } | |
9122 | |
9123 return window_start_changed_p; | |
9124 } | |
9125 | |
9126 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9127 /* Try cursor movement in case text has not changes in window WINDOW, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9128 with window start STARTP. Value is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9129 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9130 1 if successful |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9131 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9132 0 if this method cannot be used |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9133 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9134 -1 if we know we have to scroll the display. *SCROLL_STEP is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9135 set to 1, under certain circumstances, if we want to scroll as |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9136 if scroll-step were set to 1. See the code. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9137 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9138 static int |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9139 try_cursor_movement (window, startp, scroll_step) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9140 Lisp_Object window; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9141 struct text_pos startp; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9142 int *scroll_step; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9143 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9144 struct window *w = XWINDOW (window); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9145 struct frame *f = XFRAME (w->frame); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9146 int rc = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9147 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9148 /* Handle case where text has not changed, only point, and it has |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9149 not moved off the frame. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9150 if (/* Point may be in this window. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9151 PT >= CHARPOS (startp) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9152 /* Selective display hasn't changed. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9153 && !current_buffer->clip_changed |
34440
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9154 /* Function force-mode-line-update is used to force a thorough |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9155 redisplay. It sets either windows_or_buffers_changed or |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9156 update_mode_lines. So don't take a shortcut here for these |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9157 cases. */ |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9158 && !update_mode_lines |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9159 && !windows_or_buffers_changed |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9160 /* Can't use this case if highlighting a region. When a |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9161 region exists, cursor movement has to do more than just |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9162 set the cursor. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9163 && !(!NILP (Vtransient_mark_mode) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9164 && !NILP (current_buffer->mark_active)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9165 && NILP (w->region_showing) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9166 && NILP (Vshow_trailing_whitespace) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9167 /* Right after splitting windows, last_point may be nil. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9168 && INTEGERP (w->last_point) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9169 /* This code is not used for mini-buffer for the sake of the case |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9170 of redisplaying to replace an echo area message; since in |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9171 that case the mini-buffer contents per se are usually |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9172 unchanged. This code is of no real use in the mini-buffer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9173 since the handling of this_line_start_pos, etc., in redisplay |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9174 handles the same cases. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9175 && !EQ (window, minibuf_window) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9176 /* When splitting windows or for new windows, it happens that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9177 redisplay is called with a nil window_end_vpos or one being |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9178 larger than the window. This should really be fixed in |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9179 window.c. I don't have this on my list, now, so we do |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9180 approximately the same as the old redisplay code. --gerd. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9181 && INTEGERP (w->window_end_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9182 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9183 && (FRAME_WINDOW_P (f) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9184 || !MARKERP (Voverlay_arrow_position) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9185 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9186 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9187 int this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9188 struct glyph_row *row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9189 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9190 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9191 debug_method_add (w, "cursor movement"); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9192 #endif |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9193 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9194 /* Scroll if point within this distance from the top or bottom |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9195 of the window. This is a pixel value. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9196 this_scroll_margin = max (0, scroll_margin); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9197 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9198 this_scroll_margin *= CANON_Y_UNIT (f); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9199 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9200 /* Start with the row the cursor was displayed during the last |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9201 not paused redisplay. Give up if that row is not valid. */ |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
9202 if (w->last_cursor.vpos < 0 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
9203 || w->last_cursor.vpos >= w->current_matrix->nrows) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9204 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9205 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9206 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9207 row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9208 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9209 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9210 if (!row->enabled_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9211 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9212 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9213 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9214 if (rc == 0) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9215 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9216 int scroll_p = 0; |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9217 int last_y = window_text_bottom_y (w) - this_scroll_margin; |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9218 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9219 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9220 if (PT > XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9221 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9222 /* Point has moved forward. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9223 while (MATRIX_ROW_END_CHARPOS (row) < PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9224 && MATRIX_ROW_BOTTOM_Y (row) < last_y) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9225 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9226 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9227 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9228 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9229 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9230 /* The end position of a row equals the start position |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9231 of the next row. If PT is there, we would rather |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9232 display it in the next line. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9233 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9234 && MATRIX_ROW_END_CHARPOS (row) == PT |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9235 && !cursor_row_p (w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9236 ++row; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9237 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9238 /* If within the scroll margin, scroll. Note that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9239 MATRIX_ROW_BOTTOM_Y gives the pixel position at which |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9240 the next line would be drawn, and that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9241 this_scroll_margin can be zero. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9242 if (MATRIX_ROW_BOTTOM_Y (row) > last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9243 || PT > MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9244 /* Line is completely visible last line in window |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9245 and PT is to be set in the next line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9246 || (MATRIX_ROW_BOTTOM_Y (row) == last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9247 && PT == MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9248 && !row->ends_at_zv_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9249 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9250 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9251 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9252 else if (PT < XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9253 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9254 /* Cursor has to be moved backward. Note that PT >= |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9255 CHARPOS (startp) because of the outer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9256 if-statement. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9257 while (!row->mode_line_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9258 && (MATRIX_ROW_START_CHARPOS (row) > PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9259 || (MATRIX_ROW_START_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9260 && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row))) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9261 && (row->y > this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9262 || CHARPOS (startp) == BEGV)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9263 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9264 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9265 --row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9266 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9267 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9268 /* Consider the following case: Window starts at BEGV, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9269 there is invisible, intangible text at BEGV, so that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9270 display starts at some point START > BEGV. It can |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9271 happen that we are called with PT somewhere between |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9272 BEGV and START. Try to handle that case. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9273 if (row < w->current_matrix->rows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9274 || row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9275 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9276 row = w->current_matrix->rows; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9277 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9278 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9279 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9280 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9281 /* Due to newlines in overlay strings, we may have to |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9282 skip forward over overlay strings. */ |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9283 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9284 && MATRIX_ROW_END_CHARPOS (row) == PT |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9285 && !cursor_row_p (w, row)) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9286 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9287 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9288 /* If within the scroll margin, scroll. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9289 if (row->y < this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9290 && CHARPOS (startp) != BEGV) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9291 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9292 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9293 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9294 if (PT < MATRIX_ROW_START_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9295 || PT > MATRIX_ROW_END_CHARPOS (row)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9296 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9297 /* if PT is not in the glyph row, give up. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9298 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9299 } |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9300 else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9301 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9302 /* If we end up in a partially visible line, let's make it |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9303 fully visible, except when it's taller than the window, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9304 in which case we can't do much about it. */ |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9305 if (row->height > window_box_height (w)) |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9306 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9307 *scroll_step = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9308 rc = -1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9309 } |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9310 else |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9311 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9312 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9313 try_window (window, startp); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9314 make_cursor_line_fully_visible (w); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9315 rc = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9316 } |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9317 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9318 else if (scroll_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9319 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9320 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9321 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9322 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9323 rc = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9324 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9325 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9326 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9327 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9328 return rc; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9329 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9330 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9331 |
25012 | 9332 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only |
9333 selected_window is redisplayed. */ | |
9334 | |
9335 static void | |
9336 redisplay_window (window, just_this_one_p) | |
9337 Lisp_Object window; | |
9338 int just_this_one_p; | |
9339 { | |
9340 struct window *w = XWINDOW (window); | |
9341 struct frame *f = XFRAME (w->frame); | |
9342 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 9343 struct buffer *old = current_buffer; |
25012 | 9344 struct text_pos lpoint, opoint, startp; |
9345 int update_mode_line; | |
277 | 9346 int tem; |
25012 | 9347 struct it it; |
9348 /* Record it now because it's overwritten. */ | |
9349 int current_matrix_up_to_date_p = 0; | |
9350 int temp_scroll_step = 0; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
9351 int count = BINDING_STACK_SIZE (); |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9352 int rc; |
277 | 9353 |
25012 | 9354 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
9355 opoint = lpoint; | |
9356 | |
9357 /* W must be a leaf window here. */ | |
9358 xassert (!NILP (w->buffer)); | |
9359 #if GLYPH_DEBUG | |
9360 *w->desired_matrix->method = 0; | |
9361 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9362 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9363 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9364 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9365 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9366 |
25012 | 9367 /* Has the mode line to be updated? */ |
9368 update_mode_line = (!NILP (w->update_mode_line) | |
9369 || update_mode_lines | |
9370 || buffer->clip_changed); | |
433 | 9371 |
9372 if (MINI_WINDOW_P (w)) | |
9373 { | |
25012 | 9374 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
|
9375 && !NILP (echo_area_buffer[0])) |
25012 | 9376 { |
9377 if (update_mode_line) | |
9378 /* We may have to update a tty frame's menu bar or a | |
25543 | 9379 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 9380 goto finish_menu_bars; |
9381 else | |
9382 /* We've already displayed the echo area glyphs in this window. */ | |
9383 goto finish_scroll_bars; | |
9384 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
9385 else if (w != XWINDOW (minibuf_window)) |
433 | 9386 { |
25012 | 9387 /* W is a mini-buffer window, but it's not the currently |
9388 active one, so clear it. */ | |
9389 int yb = window_text_bottom_y (w); | |
9390 struct glyph_row *row; | |
9391 int y; | |
9392 | |
9393 for (y = 0, row = w->desired_matrix->rows; | |
9394 y < yb; | |
9395 y += row->height, ++row) | |
9396 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
|
9397 goto finish_scroll_bars; |
433 | 9398 } |
9399 } | |
277 | 9400 |
25012 | 9401 /* Otherwise set up data on this window; select its buffer and point |
9402 value. */ | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9403 /* Really select the buffer, for the sake of buffer-local |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9404 variables. */ |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9405 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9406 SET_TEXT_POS (opoint, PT, PT_BYTE); |
9407 | |
9408 current_matrix_up_to_date_p | |
9409 = (!NILP (w->window_end_valid) | |
9410 && !current_buffer->clip_changed | |
9411 && XFASTINT (w->last_modified) >= MODIFF | |
9412 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
9413 | |
9414 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
9415 the window end being valid, so set it to nil there. */ | |
9416 if (windows_or_buffers_changed) | |
9417 { | |
9418 /* If window starts on a continuation line, maybe adjust the | |
9419 window start in case the window's width changed. */ | |
9420 if (XMARKER (w->start)->buffer == current_buffer) | |
9421 compute_window_start_on_continuation_line (w); | |
9422 | |
9423 w->window_end_valid = Qnil; | |
9424 } | |
9425 | |
9426 /* Some sanity checks. */ | |
9427 CHECK_WINDOW_END (w); | |
9428 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
|
9429 abort (); |
25012 | 9430 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9431 abort (); |
277 | 9432 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9433 /* 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
|
9434 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9435 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9436 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9437 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9438 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9439 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9440 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9441 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9442 |
25012 | 9443 /* Count number of windows showing the selected buffer. An indirect |
9444 buffer counts as its base buffer. */ | |
9445 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9446 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9447 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9448 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9449 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
|
9450 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9451 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9452 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9453 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9454 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9455 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9456 } |
277 | 9457 |
25012 | 9458 /* Point refers normally to the selected window. For any other |
9459 window, set up appropriate value. */ | |
277 | 9460 if (!EQ (window, selected_window)) |
9461 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9462 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9463 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
|
9464 if (new_pt < BEGV) |
277 | 9465 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9466 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9467 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9468 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 9469 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9470 else if (new_pt > (ZV - 1)) |
277 | 9471 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9472 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9473 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9474 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 9475 } |
25012 | 9476 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9477 /* 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
|
9478 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 9479 } |
9480 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9481 /* If any of the character widths specified in the display table |
25012 | 9482 have changed, invalidate the width run cache. It's true that |
9483 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
|
9484 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
|
9485 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
|
9486 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
|
9487 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
9488 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
|
9489 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9490 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
|
9491 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
|
9492 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9493 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
|
9494 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
|
9495 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9496 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
|
9497 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9498 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9499 |
277 | 9500 /* If window-start is screwed up, choose a new one. */ |
9501 if (XMARKER (w->start)->buffer != current_buffer) | |
9502 goto recenter; | |
9503 | |
25012 | 9504 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 9505 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9506 /* 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
|
9507 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9508 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9509 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9510 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9511 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9512 w->optional_new_start = Qnil; |
25012 | 9513 start_display (&it, w, startp); |
9514 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9515 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9516 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9517 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9518 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9519 |
433 | 9520 /* 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
|
9521 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
|
9522 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9523 || w->frozen_window_start_p) |
277 | 9524 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9525 w->force_start = Qnil; |
25012 | 9526 w->vscroll = 0; |
9527 w->window_end_valid = Qnil; | |
9528 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9529 /* Forget any recorded base line for line number display. */ |
25012 | 9530 if (!current_matrix_up_to_date_p |
9531 || current_buffer->clip_changed) | |
9532 w->base_line_number = Qnil; | |
9533 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9534 /* 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
|
9535 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
|
9536 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9537 /* 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
|
9538 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
|
9539 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
|
9540 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
|
9541 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9542 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9543 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9544 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9545 w->update_mode_line = Qt; |
25012 | 9546 startp = run_window_scroll_functions (window, startp); |
9547 } | |
9548 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9549 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9550 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9551 if (CHARPOS (startp) < BEGV) |
9552 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
9553 else if (CHARPOS (startp) > ZV) | |
9554 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
9555 | |
9556 /* Redisplay, then check if cursor has been set during the | |
9557 redisplay. Give up if new fonts were loaded. */ | |
9558 if (!try_window (window, startp)) | |
9559 { | |
9560 w->force_start = Qt; | |
9561 clear_glyph_matrix (w->desired_matrix); | |
9562 goto restore_buffers; | |
9563 } | |
9564 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9565 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 9566 { |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9567 /* If point does not appear, try to move point so it does |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9568 appear. The desired matrix has been built above, so we |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9569 can use it here. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9570 int window_height; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9571 struct glyph_row *row; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9572 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9573 window_height = window_box_height (w) / 2; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9574 row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9575 while (MATRIX_ROW_BOTTOM_Y (row) < window_height) |
25012 | 9576 ++row; |
9577 | |
9578 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
9579 MATRIX_ROW_START_BYTEPOS (row)); | |
9580 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
9581 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9582 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 9583 else if (current_buffer == old) |
9584 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
9585 | |
9586 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
9587 | |
9588 /* If we are highlighting the region, then we just changed | |
9589 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
|
9590 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
|
9591 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9592 { |
25012 | 9593 clear_glyph_matrix (w->desired_matrix); |
9594 if (!try_window (window, startp)) | |
9595 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9596 } |
277 | 9597 } |
25012 | 9598 |
9599 make_cursor_line_fully_visible (w); | |
9600 #if GLYPH_DEBUG | |
9601 debug_method_add (w, "forced window start"); | |
9602 #endif | |
277 | 9603 goto done; |
9604 } | |
9605 | |
25012 | 9606 /* Handle case where text has not changed, only point, and it has |
9607 not moved off the frame. */ | |
9608 if (current_matrix_up_to_date_p | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9609 && (rc = try_cursor_movement (window, startp, &temp_scroll_step), |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9610 rc != 0)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9611 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9612 if (rc == -1) |
25012 | 9613 goto try_to_scroll; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9614 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9615 goto done; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9616 } |
277 | 9617 /* If current starting point was originally the beginning of a line |
9618 but no longer is, find a new starting point. */ | |
485 | 9619 else if (!NILP (w->start_at_line_beg) |
25012 | 9620 && !(CHARPOS (startp) <= BEGV |
9621 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
9622 { | |
9623 #if GLYPH_DEBUG | |
9624 debug_method_add (w, "recenter 1"); | |
9625 #endif | |
277 | 9626 goto recenter; |
9627 } | |
25012 | 9628 |
9629 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9630 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9631 !windows_or_buffers_changed |
25012 | 9632 /* Window must be either use window-based redisplay or |
9633 be full width. */ | |
9634 && (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
|
9635 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 9636 && !MINI_WINDOW_P (w) |
9637 /* Point is not known NOT to appear in window. */ | |
9638 && PT >= CHARPOS (startp) | |
277 | 9639 && XFASTINT (w->last_modified) |
25012 | 9640 /* Window is not hscrolled. */ |
9641 && XFASTINT (w->hscroll) == 0 | |
9642 /* Selective display has not changed. */ | |
9643 && !current_buffer->clip_changed | |
9644 /* Current matrix is up to date. */ | |
9645 && !NILP (w->window_end_valid) | |
9646 /* Can't use this case if highlighting a region because | |
9647 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
|
9648 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9649 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9650 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9651 && NILP (Vshow_trailing_whitespace) |
25012 | 9652 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
9653 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 9654 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 9655 /* Value is > 0 if update has been done, it is -1 if we |
9656 know that the same window start will not work. It is 0 | |
9657 if unsuccessful for some other reason. */ | |
9658 && (tem = try_window_id (w)) != 0) | |
9659 { | |
9660 #if GLYPH_DEBUG | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9661 debug_method_add (w, "try_window_id %d", tem); |
25012 | 9662 #endif |
9663 | |
9664 if (fonts_changed_p) | |
9665 goto restore_buffers; | |
277 | 9666 if (tem > 0) |
9667 goto done; | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9668 |
25012 | 9669 /* Otherwise try_window_id has returned -1 which means that we |
9670 don't want the alternative below this comment to execute. */ | |
9671 } | |
9672 else if (CHARPOS (startp) >= BEGV | |
9673 && CHARPOS (startp) <= ZV | |
9674 && PT >= CHARPOS (startp) | |
9675 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
9676 /* Avoid starting at end of buffer. */ |
25012 | 9677 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9678 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9679 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 9680 { |
25012 | 9681 #if GLYPH_DEBUG |
9682 debug_method_add (w, "same window start"); | |
9683 #endif | |
9684 | |
9685 /* Try to redisplay starting at same place as before. | |
9686 If point has not moved off frame, accept the results. */ | |
9687 if (!current_matrix_up_to_date_p | |
9688 /* Don't use try_window_reusing_current_matrix in this case | |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
9689 because a window scroll function can have changed the |
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
9690 buffer. */ |
25012 | 9691 || !NILP (Vwindow_scroll_functions) |
9692 || MINI_WINDOW_P (w) | |
9693 || !try_window_reusing_current_matrix (w)) | |
9694 { | |
9695 IF_DEBUG (debug_method_add (w, "1")); | |
9696 try_window (window, startp); | |
9697 } | |
9698 | |
9699 if (fonts_changed_p) | |
9700 goto restore_buffers; | |
9701 | |
9702 if (w->cursor.vpos >= 0) | |
9703 { | |
9704 if (!just_this_one_p | |
9705 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9706 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9707 /* 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
|
9708 w->base_line_number = Qnil; |
25012 | 9709 |
9710 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9711 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9712 } |
277 | 9713 else |
25012 | 9714 clear_glyph_matrix (w->desired_matrix); |
9715 } | |
9716 | |
9717 try_to_scroll: | |
277 | 9718 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9719 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9720 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9721 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9722 /* 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
|
9723 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9724 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9725 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9726 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9727 } |
277 | 9728 |
25012 | 9729 /* Try to scroll by specified few lines. */ |
9730 if ((scroll_conservatively | |
9731 || scroll_step | |
9732 || temp_scroll_step | |
9733 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9734 || 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
|
9735 && !current_buffer->clip_changed |
25012 | 9736 && CHARPOS (startp) >= BEGV |
9737 && CHARPOS (startp) <= ZV) | |
9738 { | |
9739 /* The function returns -1 if new fonts were loaded, 1 if | |
9740 successful, 0 if not successful. */ | |
9741 int rc = try_scrolling (window, just_this_one_p, | |
9742 scroll_conservatively, | |
9743 scroll_step, | |
9744 temp_scroll_step); | |
9745 if (rc > 0) | |
9746 goto done; | |
9747 else if (rc < 0) | |
9748 goto restore_buffers; | |
9749 } | |
9750 | |
9751 /* Finally, just choose place to start which centers point */ | |
9752 | |
9753 recenter: | |
9754 | |
9755 #if GLYPH_DEBUG | |
9756 debug_method_add (w, "recenter"); | |
9757 #endif | |
9758 | |
9759 /* w->vscroll = 0; */ | |
9760 | |
9761 /* Forget any previously recorded base line for line number display. */ | |
9762 if (!current_matrix_up_to_date_p | |
9763 || current_buffer->clip_changed) | |
9764 w->base_line_number = Qnil; | |
9765 | |
9766 /* Move backward half the height of the window. */ | |
9767 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9768 it.current_y = it.last_visible_y; | |
9769 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9770 xassert (IT_CHARPOS (it) >= BEGV); | |
9771 | |
9772 /* The function move_it_vertically_backward may move over more | |
9773 than the specified y-distance. If it->w is small, e.g. a | |
9774 mini-buffer window, we may end up in front of the window's | |
9775 display area. Start displaying at the start of the line | |
9776 containing PT in this case. */ | |
9777 if (it.current_y <= 0) | |
9778 { | |
9779 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9780 move_it_vertically (&it, 0); | |
9781 xassert (IT_CHARPOS (it) <= PT); | |
9782 it.current_y = 0; | |
9783 } | |
9784 | |
9785 it.current_x = it.hpos = 0; | |
9786 | |
9787 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9788 in case the window-scroll-functions functions get errors. */ | |
9789 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9790 | |
9791 /* Run scroll hooks. */ | |
9792 startp = run_window_scroll_functions (window, it.current.pos); | |
9793 | |
9794 /* Redisplay the window. */ | |
9795 if (!current_matrix_up_to_date_p | |
9796 || windows_or_buffers_changed | |
9797 /* Don't use try_window_reusing_current_matrix in this case | |
9798 because it can have changed the buffer. */ | |
9799 || !NILP (Vwindow_scroll_functions) | |
9800 || !just_this_one_p | |
9801 || MINI_WINDOW_P (w) | |
9802 || !try_window_reusing_current_matrix (w)) | |
9803 try_window (window, startp); | |
9804 | |
9805 /* If new fonts have been loaded (due to fontsets), give up. We | |
9806 have to start a new redisplay since we need to re-adjust glyph | |
9807 matrices. */ | |
9808 if (fonts_changed_p) | |
9809 goto restore_buffers; | |
9810 | |
9811 /* If cursor did not appear assume that the middle of the window is | |
9812 in the first line of the window. Do it again with the next line. | |
9813 (Imagine a window of height 100, displaying two lines of height | |
9814 60. Moving back 50 from it->last_visible_y will end in the first | |
9815 line.) */ | |
9816 if (w->cursor.vpos < 0) | |
9817 { | |
9818 if (!NILP (w->window_end_valid) | |
9819 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9820 { | |
9821 clear_glyph_matrix (w->desired_matrix); | |
9822 move_it_by_lines (&it, 1, 0); | |
9823 try_window (window, it.current.pos); | |
9824 } | |
9825 else if (PT < IT_CHARPOS (it)) | |
9826 { | |
9827 clear_glyph_matrix (w->desired_matrix); | |
9828 move_it_by_lines (&it, -1, 0); | |
9829 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
|
9830 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9831 else |
25012 | 9832 { |
9833 /* Not much we can do about it. */ | |
9834 } | |
9835 } | |
9836 | |
9837 /* Consider the following case: Window starts at BEGV, there is | |
9838 invisible, intangible text at BEGV, so that display starts at | |
9839 some point START > BEGV. It can happen that we are called with | |
9840 PT somewhere between BEGV and START. Try to handle that case. */ | |
9841 if (w->cursor.vpos < 0) | |
9842 { | |
9843 struct glyph_row *row = w->current_matrix->rows; | |
9844 if (row->mode_line_p) | |
9845 ++row; | |
9846 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
9847 } | |
9848 | |
9849 make_cursor_line_fully_visible (w); | |
9850 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9851 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9852 |
25012 | 9853 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
9854 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
9855 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
9856 ? Qt : Qnil); | |
9857 | |
9858 /* 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
|
9859 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9860 /* If window not full width, must redo its mode line |
25012 | 9861 if (a) the window to its side is being redone and |
9862 (b) we do a frame-based redisplay. This is a consequence | |
9863 of how inverted lines are drawn in frame-based redisplay. */ | |
9864 || (!just_this_one_p | |
9865 && !FRAME_WINDOW_P (f) | |
9866 && !WINDOW_FULL_WIDTH_P (w)) | |
9867 /* 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
|
9868 || INTEGERP (w->base_line_pos) |
25012 | 9869 /* 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
|
9870 || (!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
|
9871 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 9872 /* This means that the window has a mode line. */ |
9873 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 9874 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 9875 { |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9876 Lisp_Object old_selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9877 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9878 old_selected_frame = selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9879 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9880 XSETFRAME (selected_frame, f); |
25012 | 9881 display_mode_lines (w); |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9882 selected_frame = old_selected_frame; |
25012 | 9883 |
9884 /* If mode line height has changed, arrange for a thorough | |
9885 immediate redisplay using the correct mode line height. */ | |
9886 if (WINDOW_WANTS_MODELINE_P (w) | |
9887 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
9888 { | |
9889 fonts_changed_p = 1; | |
9890 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
9891 = DESIRED_MODE_LINE_HEIGHT (w); | |
9892 } | |
9893 | |
9894 /* If top line height has changed, arrange for a thorough | |
9895 immediate redisplay using the correct mode line height. */ | |
25546 | 9896 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9897 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 9898 { |
9899 fonts_changed_p = 1; | |
25546 | 9900 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
9901 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9902 } |
9903 | |
9904 if (fonts_changed_p) | |
9905 goto restore_buffers; | |
9906 } | |
9907 | |
9908 if (!line_number_displayed | |
9909 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9910 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9911 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9912 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9913 } |
277 | 9914 |
25012 | 9915 finish_menu_bars: |
9916 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9917 /* 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
|
9918 if (update_mode_line |
25012 | 9919 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9920 { | |
9921 int redisplay_menu_p = 0; | |
9922 | |
9923 if (FRAME_WINDOW_P (f)) | |
9924 { | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
9925 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
25012 | 9926 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
|
9927 #else |
25012 | 9928 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
|
9929 #endif |
25012 | 9930 } |
9931 else | |
9932 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9933 | |
9934 if (redisplay_menu_p) | |
9935 display_menu_bar (w); | |
9936 | |
9937 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9938 if (WINDOWP (f->tool_bar_window) |
9939 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9940 || auto_resize_tool_bars_p)) | |
9941 redisplay_tool_bar (f); | |
25012 | 9942 #endif |
9943 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9944 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9945 finish_scroll_bars: |
25012 | 9946 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9947 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
|
9948 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9949 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9950 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9951 /* 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
|
9952 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
|
9953 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
|
9954 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
|
9955 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9956 |
25012 | 9957 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
|
9958 if (!MINI_WINDOW_P (w) |
25012 | 9959 || (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
|
9960 && 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
|
9961 { |
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
|
9962 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
9963 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
|
9964 /* 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
|
9965 moment, we'll pretend it is. */ |
25012 | 9966 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
9967 | |
9968 if (end < start) | |
9969 end = start; | |
9970 if (whole < (end - start)) | |
9971 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9972 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9973 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9974 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9975 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9976 /* 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
|
9977 (*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
|
9978 |
25012 | 9979 /* Note that we actually used the scroll bar attached to this |
9980 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
|
9981 (*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
|
9982 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9983 |
25012 | 9984 restore_buffers: |
9985 | |
9986 /* Restore current_buffer and value of point in it. */ | |
9987 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint)); | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9988 set_buffer_internal_1 (old); |
25012 | 9989 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
|
9990 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9991 unbind_to (count, Qnil); |
277 | 9992 } |
25012 | 9993 |
9994 | |
9995 /* Build the complete desired matrix of WINDOW with a window start | |
9996 buffer position POS. Value is non-zero if successful. It is zero | |
9997 if fonts were loaded during redisplay which makes re-adjusting | |
9998 glyph matrices necessary. */ | |
9999 | |
10000 int | |
277 | 10001 try_window (window, pos) |
10002 Lisp_Object window; | |
25012 | 10003 struct text_pos pos; |
10004 { | |
10005 struct window *w = XWINDOW (window); | |
10006 struct it it; | |
10007 struct glyph_row *last_text_row = NULL; | |
10008 | |
10009 /* Make POS the new window start. */ | |
10010 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
10011 | |
10012 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
10013 w->cursor.vpos = -1; | |
277 | 10014 overlay_arrow_seen = 0; |
25012 | 10015 |
10016 /* Initialize iterator and info to start at POS. */ | |
10017 start_display (&it, w, pos); | |
10018 | |
10019 /* Display all lines of W. */ | |
10020 while (it.current_y < it.last_visible_y) | |
10021 { | |
10022 if (display_line (&it)) | |
10023 last_text_row = it.glyph_row - 1; | |
10024 if (fonts_changed_p) | |
10025 return 0; | |
10026 } | |
10027 | |
10028 /* If bottom moved off end of frame, change mode line percentage. */ | |
10029 if (XFASTINT (w->window_end_pos) <= 0 | |
10030 && Z != IT_CHARPOS (it)) | |
277 | 10031 w->update_mode_line = Qt; |
10032 | |
25012 | 10033 /* Set window_end_pos to the offset of the last character displayed |
10034 on the window from the end of current_buffer. Set | |
10035 window_end_vpos to its row number. */ | |
10036 if (last_text_row) | |
10037 { | |
10038 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
10039 w->window_end_bytepos | |
10040 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10041 XSETFASTINT (w->window_end_pos, | |
10042 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10043 XSETFASTINT (w->window_end_vpos, | |
10044 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10045 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
10046 ->displays_text_p); | |
10047 } | |
10048 else | |
10049 { | |
10050 w->window_end_bytepos = 0; | |
10051 XSETFASTINT (w->window_end_pos, 0); | |
10052 XSETFASTINT (w->window_end_vpos, 0); | |
10053 } | |
10054 | |
277 | 10055 /* But that is not valid info until redisplay finishes. */ |
10056 w->window_end_valid = Qnil; | |
25012 | 10057 return 1; |
10058 } | |
10059 | |
10060 | |
277 | 10061 |
25012 | 10062 /************************************************************************ |
10063 Window redisplay reusing current matrix when buffer has not changed | |
10064 ************************************************************************/ | |
10065 | |
10066 /* Try redisplay of window W showing an unchanged buffer with a | |
10067 different window start than the last time it was displayed by | |
10068 reusing its current matrix. Value is non-zero if successful. | |
10069 W->start is the new window start. */ | |
10070 | |
10071 static int | |
10072 try_window_reusing_current_matrix (w) | |
10073 struct window *w; | |
10074 { | |
10075 struct frame *f = XFRAME (w->frame); | |
10076 struct glyph_row *row, *bottom_row; | |
10077 struct it it; | |
10078 struct run run; | |
10079 struct text_pos start, new_start; | |
10080 int nrows_scrolled, i; | |
10081 struct glyph_row *last_text_row; | |
10082 struct glyph_row *last_reused_text_row; | |
10083 struct glyph_row *start_row; | |
10084 int start_vpos, min_y, max_y; | |
29981
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10085 |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10086 if (/* This function doesn't handle terminal frames. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10087 !FRAME_WINDOW_P (f) |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10088 /* Don't try to reuse the display if windows have been split |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10089 or such. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10090 || windows_or_buffers_changed) |
25012 | 10091 return 0; |
10092 | |
10093 /* Can't do this if region may have changed. */ | |
10094 if ((!NILP (Vtransient_mark_mode) | |
10095 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10096 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10097 || !NILP (Vshow_trailing_whitespace)) |
25012 | 10098 return 0; |
10099 | |
10100 /* If top-line visibility has changed, give up. */ | |
25546 | 10101 if (WINDOW_WANTS_HEADER_LINE_P (w) |
10102 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 10103 return 0; |
10104 | |
10105 /* Give up if old or new display is scrolled vertically. We could | |
10106 make this function handle this, but right now it doesn't. */ | |
10107 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10108 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
10109 return 0; | |
10110 | |
10111 /* The variable new_start now holds the new window start. The old | |
10112 start `start' can be determined from the current matrix. */ | |
10113 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
10114 start = start_row->start.pos; | |
10115 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
10116 | |
10117 /* Clear the desired matrix for the display below. */ | |
10118 clear_glyph_matrix (w->desired_matrix); | |
10119 | |
10120 if (CHARPOS (new_start) <= CHARPOS (start)) | |
10121 { | |
10122 int first_row_y; | |
10123 | |
10124 IF_DEBUG (debug_method_add (w, "twu1")); | |
10125 | |
10126 /* Display up to a row that can be reused. The variable | |
10127 last_text_row is set to the last row displayed that displays | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10128 text. Note that it.vpos == 0 if or if not there is a |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10129 header-line; it's not the same as the MATRIX_ROW_VPOS! */ |
25012 | 10130 start_display (&it, w, new_start); |
10131 first_row_y = it.current_y; | |
10132 w->cursor.vpos = -1; | |
10133 last_text_row = last_reused_text_row = NULL; | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10134 |
25012 | 10135 while (it.current_y < it.last_visible_y |
10136 && IT_CHARPOS (it) < CHARPOS (start) | |
10137 && !fonts_changed_p) | |
10138 if (display_line (&it)) | |
10139 last_text_row = it.glyph_row - 1; | |
10140 | |
10141 /* A value of current_y < last_visible_y means that we stopped | |
10142 at the previous window start, which in turn means that we | |
10143 have at least one reusable row. */ | |
10144 if (it.current_y < it.last_visible_y) | |
10145 { | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10146 /* IT.vpos always starts from 0; it counts text lines. */ |
25012 | 10147 nrows_scrolled = it.vpos; |
10148 | |
10149 /* Find PT if not already found in the lines displayed. */ | |
10150 if (w->cursor.vpos < 0) | |
10151 { | |
10152 int dy = it.current_y - first_row_y; | |
10153 | |
10154 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10155 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10156 { | |
10157 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
10158 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10159 { | |
10160 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
10161 dy, nrows_scrolled); | |
10162 break; | |
10163 } | |
10164 | |
10165 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
10166 break; | |
10167 | |
10168 ++row; | |
10169 } | |
10170 | |
10171 /* Give up if point was not found. This shouldn't | |
10172 happen often; not more often than with try_window | |
10173 itself. */ | |
10174 if (w->cursor.vpos < 0) | |
10175 { | |
10176 clear_glyph_matrix (w->desired_matrix); | |
10177 return 0; | |
10178 } | |
10179 } | |
10180 | |
10181 /* Scroll the display. Do it before the current matrix is | |
10182 changed. The problem here is that update has not yet | |
10183 run, i.e. part of the current matrix is not up to date. | |
10184 scroll_run_hook will clear the cursor, and use the | |
10185 current matrix to get the height of the row the cursor is | |
10186 in. */ | |
10187 run.current_y = first_row_y; | |
10188 run.desired_y = it.current_y; | |
10189 run.height = it.last_visible_y - it.current_y; | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10190 |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10191 if (run.height > 0 && run.current_y != run.desired_y) |
25012 | 10192 { |
10193 update_begin (f); | |
10194 rif->update_window_begin_hook (w); | |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
10195 rif->clear_mouse_face (w); |
25012 | 10196 rif->scroll_run_hook (w, &run); |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
10197 rif->update_window_end_hook (w, 0, 0); |
25012 | 10198 update_end (f); |
10199 } | |
10200 | |
10201 /* Shift current matrix down by nrows_scrolled lines. */ | |
10202 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
10203 rotate_matrix (w->current_matrix, | |
10204 start_vpos, | |
10205 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10206 nrows_scrolled); | |
10207 | |
10208 /* Disable lines not reused. */ | |
10209 for (i = 0; i < it.vpos; ++i) | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10210 (start_row + i)->enabled_p = 0; |
25012 | 10211 |
10212 /* Re-compute Y positions. */ | |
25546 | 10213 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10214 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10215 for (row = start_row + nrows_scrolled; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10216 row < bottom_row; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10217 ++row) |
25012 | 10218 { |
10219 row->y = it.current_y; | |
10220 | |
10221 if (row->y < min_y) | |
10222 row->visible_height = row->height - (min_y - row->y); | |
10223 else if (row->y + row->height > max_y) | |
10224 row->visible_height | |
10225 = row->height - (row->y + row->height - max_y); | |
10226 else | |
10227 row->visible_height = row->height; | |
10228 | |
10229 it.current_y += row->height; | |
10230 | |
10231 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10232 last_reused_text_row = row; | |
10233 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
10234 break; | |
10235 } | |
10236 } | |
10237 | |
10238 /* Update window_end_pos etc.; last_reused_text_row is the last | |
10239 reused row from the current matrix containing text, if any. | |
10240 The value of last_text_row is the last displayed line | |
10241 containing text. */ | |
10242 if (last_reused_text_row) | |
10243 { | |
10244 w->window_end_bytepos | |
10245 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
10246 XSETFASTINT (w->window_end_pos, | |
10247 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
10248 XSETFASTINT (w->window_end_vpos, | |
10249 MATRIX_ROW_VPOS (last_reused_text_row, | |
10250 w->current_matrix)); | |
10251 } | |
10252 else if (last_text_row) | |
10253 { | |
10254 w->window_end_bytepos | |
10255 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10256 XSETFASTINT (w->window_end_pos, | |
10257 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10258 XSETFASTINT (w->window_end_vpos, | |
10259 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10260 } | |
10261 else | |
10262 { | |
10263 /* This window must be completely empty. */ | |
10264 w->window_end_bytepos = 0; | |
10265 XSETFASTINT (w->window_end_pos, 0); | |
10266 XSETFASTINT (w->window_end_vpos, 0); | |
10267 } | |
10268 w->window_end_valid = Qnil; | |
10269 | |
10270 /* Update hint: don't try scrolling again in update_window. */ | |
10271 w->desired_matrix->no_scrolling_p = 1; | |
10272 | |
10273 #if GLYPH_DEBUG | |
10274 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
10275 #endif | |
10276 return 1; | |
10277 } | |
10278 else if (CHARPOS (new_start) > CHARPOS (start)) | |
10279 { | |
10280 struct glyph_row *pt_row, *row; | |
10281 struct glyph_row *first_reusable_row; | |
10282 struct glyph_row *first_row_to_display; | |
10283 int dy; | |
10284 int yb = window_text_bottom_y (w); | |
10285 | |
10286 IF_DEBUG (debug_method_add (w, "twu2")); | |
10287 | |
10288 /* Find the row starting at new_start, if there is one. Don't | |
10289 reuse a partially visible line at the end. */ | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10290 first_reusable_row = start_row; |
25012 | 10291 while (first_reusable_row->enabled_p |
10292 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
10293 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
10294 < CHARPOS (new_start))) | |
10295 ++first_reusable_row; | |
10296 | |
10297 /* Give up if there is no row to reuse. */ | |
10298 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
|
10299 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10300 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10301 != CHARPOS (new_start))) |
25012 | 10302 return 0; |
10303 | |
10304 /* We can reuse fully visible rows beginning with | |
10305 first_reusable_row to the end of the window. Set | |
10306 first_row_to_display to the first row that cannot be reused. | |
10307 Set pt_row to the row containing point, if there is any. */ | |
10308 first_row_to_display = first_reusable_row; | |
10309 pt_row = NULL; | |
10310 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
10311 { | |
10312 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
10313 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
10314 pt_row = first_row_to_display; | |
10315 | |
10316 ++first_row_to_display; | |
10317 } | |
10318 | |
10319 /* Start displaying at the start of first_row_to_display. */ | |
10320 xassert (first_row_to_display->y < yb); | |
10321 init_to_row_start (&it, w, first_row_to_display); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10322 nrows_scrolled = (MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix) |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10323 - start_vpos); |
25012 | 10324 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) |
10325 - nrows_scrolled); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10326 it.current_y = (first_row_to_display->y - first_reusable_row->y |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10327 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 10328 |
10329 /* Display lines beginning with first_row_to_display in the | |
10330 desired matrix. Set last_text_row to the last row displayed | |
10331 that displays text. */ | |
10332 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
10333 if (pt_row == NULL) | |
10334 w->cursor.vpos = -1; | |
10335 last_text_row = NULL; | |
10336 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
10337 if (display_line (&it)) | |
10338 last_text_row = it.glyph_row - 1; | |
10339 | |
10340 /* Give up If point isn't in a row displayed or reused. */ | |
10341 if (w->cursor.vpos < 0) | |
10342 { | |
10343 clear_glyph_matrix (w->desired_matrix); | |
10344 return 0; | |
10345 } | |
10346 | |
10347 /* If point is in a reused row, adjust y and vpos of the cursor | |
10348 position. */ | |
10349 if (pt_row) | |
10350 { | |
10351 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
10352 w->current_matrix); | |
10353 w->cursor.y -= first_reusable_row->y; | |
10354 } | |
10355 | |
10356 /* Scroll the display. */ | |
10357 run.current_y = first_reusable_row->y; | |
25546 | 10358 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10359 run.height = it.last_visible_y - run.current_y; |
31826
2c8c52a67b91
(try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents:
31650
diff
changeset
|
10360 dy = run.current_y - run.desired_y; |
2c8c52a67b91
(try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents:
31650
diff
changeset
|
10361 |
25012 | 10362 if (run.height) |
10363 { | |
10364 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10365 update_begin (f); | |
10366 rif->update_window_begin_hook (w); | |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
10367 rif->clear_mouse_face (w); |
25012 | 10368 rif->scroll_run_hook (w, &run); |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
10369 rif->update_window_end_hook (w, 0, 0); |
25012 | 10370 update_end (f); |
10371 } | |
10372 | |
10373 /* Adjust Y positions of reused rows. */ | |
10374 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
25546 | 10375 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10376 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10377 for (row = first_reusable_row; row < first_row_to_display; ++row) |
25012 | 10378 { |
10379 row->y -= dy; | |
10380 if (row->y < min_y) | |
10381 row->visible_height = row->height - (min_y - row->y); | |
10382 else if (row->y + row->height > max_y) | |
10383 row->visible_height | |
10384 = row->height - (row->y + row->height - max_y); | |
10385 else | |
10386 row->visible_height = row->height; | |
10387 } | |
10388 | |
10389 /* Disable rows not reused. */ | |
10390 while (row < bottom_row) | |
10391 { | |
10392 row->enabled_p = 0; | |
10393 ++row; | |
10394 } | |
10395 | |
10396 /* Scroll the current matrix. */ | |
10397 xassert (nrows_scrolled > 0); | |
10398 rotate_matrix (w->current_matrix, | |
10399 start_vpos, | |
10400 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10401 -nrows_scrolled); | |
10402 | |
10403 /* Adjust window end. A null value of last_text_row means that | |
10404 the window end is in reused rows which in turn means that | |
10405 only its vpos can have changed. */ | |
10406 if (last_text_row) | |
10407 { | |
10408 w->window_end_bytepos | |
10409 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10410 XSETFASTINT (w->window_end_pos, | |
10411 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10412 XSETFASTINT (w->window_end_vpos, | |
10413 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10414 } | |
10415 else | |
10416 { | |
10417 XSETFASTINT (w->window_end_vpos, | |
10418 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
10419 } | |
10420 | |
10421 w->window_end_valid = Qnil; | |
10422 w->desired_matrix->no_scrolling_p = 1; | |
10423 | |
10424 #if GLYPH_DEBUG | |
10425 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
10426 #endif | |
10427 return 1; | |
10428 } | |
10429 | |
10430 return 0; | |
10431 } | |
10432 | |
10433 | |
10434 | |
10435 /************************************************************************ | |
10436 Window redisplay reusing current matrix when buffer has changed | |
10437 ************************************************************************/ | |
10438 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10439 static struct glyph_row *find_last_unchanged_at_beg_row P_ ((struct window *)); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10440 static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, |
25012 | 10441 int *, int *)); |
10442 static struct glyph_row * | |
10443 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
10444 struct glyph_row *)); | |
10445 | |
10446 | |
10447 /* Return the last row in MATRIX displaying text. If row START is | |
10448 non-null, start searching with that row. IT gives the dimensions | |
10449 of the display. Value is null if matrix is empty; otherwise it is | |
10450 a pointer to the row found. */ | |
10451 | |
10452 static struct glyph_row * | |
10453 find_last_row_displaying_text (matrix, it, start) | |
10454 struct glyph_matrix *matrix; | |
10455 struct it *it; | |
10456 struct glyph_row *start; | |
10457 { | |
10458 struct glyph_row *row, *row_found; | |
10459 | |
10460 /* Set row_found to the last row in IT->w's current matrix | |
10461 displaying text. The loop looks funny but think of partially | |
10462 visible lines. */ | |
10463 row_found = NULL; | |
10464 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
10465 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10466 { | |
10467 xassert (row->enabled_p); | |
10468 row_found = row; | |
10469 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
10470 break; | |
10471 ++row; | |
10472 } | |
10473 | |
10474 return row_found; | |
10475 } | |
10476 | |
10477 | |
10478 /* Return the last row in the current matrix of W that is not affected | |
10479 by changes at the start of current_buffer that occurred since the | |
10480 last time W was redisplayed. Value is null if no such row exists. | |
10481 | |
10482 The global variable beg_unchanged has to contain the number of | |
10483 bytes unchanged at the start of current_buffer. BEG + | |
10484 beg_unchanged is the buffer position of the first changed byte in | |
10485 current_buffer. Characters at positions < BEG + beg_unchanged are | |
10486 at the same buffer positions as they were when the current matrix | |
10487 was built. */ | |
10488 | |
10489 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10490 find_last_unchanged_at_beg_row (w) |
25012 | 10491 struct window *w; |
10492 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10493 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 10494 struct glyph_row *row; |
10495 struct glyph_row *row_found = NULL; | |
10496 int yb = window_text_bottom_y (w); | |
10497 | |
10498 /* Find the last row displaying unchanged text. */ | |
10499 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10500 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
10501 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
10502 { | |
10503 if (/* If row ends before first_changed_pos, it is unchanged, | |
10504 except in some case. */ | |
10505 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
10506 /* When row ends in ZV and we write at ZV it is not | |
10507 unchanged. */ | |
10508 && !row->ends_at_zv_p | |
10509 /* When first_changed_pos is the end of a continued line, | |
10510 row is not unchanged because it may be no longer | |
10511 continued. */ | |
10512 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
10513 && row->continued_p)) | |
10514 row_found = row; | |
10515 | |
10516 /* Stop if last visible row. */ | |
10517 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
10518 break; | |
10519 | |
10520 ++row; | |
10521 } | |
10522 | |
10523 return row_found; | |
10524 } | |
10525 | |
10526 | |
10527 /* Find the first glyph row in the current matrix of W that is not | |
10528 affected by changes at the end of current_buffer since the last | |
10529 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
|
10530 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
|
10531 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
|
10532 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
|
10533 exists, i.e. all rows are affected by changes. */ |
25012 | 10534 |
10535 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10536 find_first_unchanged_at_end_row (w, delta, delta_bytes) |
25012 | 10537 struct window *w; |
10538 int *delta, *delta_bytes; | |
10539 { | |
10540 struct glyph_row *row; | |
10541 struct glyph_row *row_found = NULL; | |
10542 | |
10543 *delta = *delta_bytes = 0; | |
10544 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10545 /* Display must not have been paused, otherwise the current matrix |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10546 is not up to date. */ |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10547 if (NILP (w->window_end_valid)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10548 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10549 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10550 /* A value of window_end_pos >= END_UNCHANGED means that the window |
25012 | 10551 end is in the range of changed text. If so, there is no |
10552 unchanged row at the end of W's current matrix. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10553 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 10554 return NULL; |
10555 | |
10556 /* Set row to the last row in W's current matrix displaying text. */ | |
10557 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10558 | |
10559 /* If matrix is entirely empty, no unchanged row exists. */ | |
10560 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10561 { | |
10562 /* The value of row is the last glyph row in the matrix having a | |
10563 meaningful buffer position in it. The end position of row | |
10564 corresponds to window_end_pos. This allows us to translate | |
10565 buffer positions in the current matrix to current buffer | |
10566 positions for characters not in changed text. */ | |
10567 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
10568 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
10569 int last_unchanged_pos, last_unchanged_pos_old; | |
10570 struct glyph_row *first_text_row | |
10571 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10572 | |
10573 *delta = Z - Z_old; | |
10574 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
10575 | |
10576 /* Set last_unchanged_pos to the buffer position of the last | |
10577 character in the buffer that has not been changed. Z is the | |
10578 index + 1 of the last byte in current_buffer, i.e. by | |
10579 subtracting end_unchanged we get the index of the last | |
10580 unchanged character, and we have to add BEG to get its buffer | |
10581 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10582 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 10583 last_unchanged_pos_old = last_unchanged_pos - *delta; |
10584 | |
10585 /* Search backward from ROW for a row displaying a line that | |
10586 starts at a minimum position >= last_unchanged_pos_old. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10587 for (; row > first_text_row; --row) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10588 { |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10589 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10590 abort (); |
25012 | 10591 |
10592 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
10593 row_found = row; | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10594 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10595 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10596 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10597 if (row_found && !MATRIX_ROW_DISPLAYS_TEXT_P (row_found)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10598 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10599 |
25012 | 10600 return row_found; |
10601 } | |
10602 | |
10603 | |
10604 /* Make sure that glyph rows in the current matrix of window W | |
10605 reference the same glyph memory as corresponding rows in the | |
10606 frame's frame matrix. This function is called after scrolling W's | |
10607 current matrix on a terminal frame in try_window_id and | |
10608 try_window_reusing_current_matrix. */ | |
10609 | |
10610 static void | |
10611 sync_frame_with_window_matrix_rows (w) | |
10612 struct window *w; | |
10613 { | |
10614 struct frame *f = XFRAME (w->frame); | |
10615 struct glyph_row *window_row, *window_row_end, *frame_row; | |
10616 | |
10617 /* Preconditions: W must be a leaf window and full-width. Its frame | |
10618 must have a frame matrix. */ | |
10619 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
10620 xassert (WINDOW_FULL_WIDTH_P (w)); | |
10621 xassert (!FRAME_WINDOW_P (f)); | |
10622 | |
10623 /* If W is a full-width window, glyph pointers in W's current matrix | |
10624 have, by definition, to be the same as glyph pointers in the | |
10625 corresponding frame matrix. */ | |
10626 window_row = w->current_matrix->rows; | |
10627 window_row_end = window_row + w->current_matrix->nrows; | |
10628 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
10629 while (window_row < window_row_end) | |
10630 { | |
10631 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10632 |
25012 | 10633 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
10634 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
|
10635 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10636 /* 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
|
10637 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
|
10638 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10639 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10640 |
25012 | 10641 ++window_row, ++frame_row; |
10642 } | |
10643 } | |
10644 | |
10645 | |
25543 | 10646 /* Find the glyph row in window W containing CHARPOS. Consider all |
10647 rows between START and END (not inclusive). END null means search | |
10648 all rows to the end of the display area of W. Value is the row | |
10649 containing CHARPOS or null. */ | |
10650 | |
10651 static struct glyph_row * | |
10652 row_containing_pos (w, charpos, start, end) | |
10653 struct window *w; | |
10654 int charpos; | |
10655 struct glyph_row *start, *end; | |
10656 { | |
10657 struct glyph_row *row = start; | |
10658 int last_y; | |
10659 | |
10660 /* If we happen to start on a header-line, skip that. */ | |
10661 if (row->mode_line_p) | |
10662 ++row; | |
10663 | |
10664 if ((end && row >= end) || !row->enabled_p) | |
10665 return NULL; | |
10666 | |
10667 last_y = window_text_bottom_y (w); | |
10668 | |
10669 while ((end == NULL || row < end) | |
10670 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
10671 /* The end position of a row equals the start | |
10672 position of the next row. If CHARPOS is there, we | |
10673 would rather display it in the next line, except | |
10674 when this line ends in ZV. */ | |
10675 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
10676 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
10677 || !row->ends_at_zv_p))) | |
10678 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
10679 ++row; | |
10680 | |
10681 /* Give up if CHARPOS not found. */ | |
10682 if ((end && row >= end) | |
10683 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
10684 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
10685 row = NULL; | |
10686 | |
10687 return row; | |
10688 } | |
10689 | |
10690 | |
25012 | 10691 /* Try to redisplay window W by reusing its existing display. W's |
10692 current matrix must be up to date when this function is called, | |
10693 i.e. window_end_valid must not be nil. | |
10694 | |
10695 Value is | |
10696 | |
10697 1 if display has been updated | |
10698 0 if otherwise unsuccessful | |
10699 -1 if redisplay with same window start is known not to succeed | |
10700 | |
10701 The following steps are performed: | |
10702 | |
10703 1. Find the last row in the current matrix of W that is not | |
10704 affected by changes at the start of current_buffer. If no such row | |
10705 is found, give up. | |
10706 | |
10707 2. Find the first row in W's current matrix that is not affected by | |
10708 changes at the end of current_buffer. Maybe there is no such row. | |
10709 | |
10710 3. Display lines beginning with the row + 1 found in step 1 to the | |
10711 row found in step 2 or, if step 2 didn't find a row, to the end of | |
10712 the window. | |
10713 | |
10714 4. If cursor is not known to appear on the window, give up. | |
10715 | |
10716 5. If display stopped at the row found in step 2, scroll the | |
10717 display and current matrix as needed. | |
10718 | |
10719 6. Maybe display some lines at the end of W, if we must. This can | |
10720 happen under various circumstances, like a partially visible line | |
10721 becoming fully visible, or because newly displayed lines are displayed | |
10722 in smaller font sizes. | |
10723 | |
10724 7. Update W's window end information. */ | |
10725 | |
10726 /* Check that window end is what we expect it to be. */ | |
277 | 10727 |
10728 static int | |
25012 | 10729 try_window_id (w) |
10730 struct window *w; | |
10731 { | |
10732 struct frame *f = XFRAME (w->frame); | |
10733 struct glyph_matrix *current_matrix = w->current_matrix; | |
10734 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10735 struct glyph_row *last_unchanged_at_beg_row; | |
10736 struct glyph_row *first_unchanged_at_end_row; | |
10737 struct glyph_row *row; | |
10738 struct glyph_row *bottom_row; | |
10739 int bottom_vpos; | |
10740 struct it it; | |
10741 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10742 struct text_pos start_pos; | |
10743 struct run run; | |
10744 int first_unchanged_at_end_vpos = 0; | |
10745 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10746 struct text_pos start; | |
10747 | |
10748 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10749 | |
10750 /* Check pre-conditions. Window end must be valid, otherwise | |
10751 the current matrix would not be up to date. */ | |
10752 xassert (!NILP (w->window_end_valid)); | |
10753 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10754 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10755 | |
10756 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10757 only if buffer has really changed. The reason is that the gap is | |
10758 initially at Z for freshly visited files. The code below would | |
10759 set end_unchanged to 0 in that case. */ | |
27990
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10760 if (MODIFF > SAVE_MODIFF |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10761 /* This seems to happen sometimes after saving a buffer. */ |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10762 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) |
25012 | 10763 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10764 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10765 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10766 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10767 END_UNCHANGED = Z - GPT; |
25012 | 10768 } |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
10769 |
25012 | 10770 /* If window starts after a line end, and the last change is in |
10771 front of that newline, then changes don't affect the display. | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10772 This case happens with stealth-fontification. Note that although |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10773 the display is unchanged, glyph positions in the matrix have to |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10774 be adjusted, of course. */ |
25012 | 10775 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); |
10776 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10777 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10778 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10779 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10780 { | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10781 struct glyph_row *r0 = MATRIX_FIRST_TEXT_ROW (current_matrix); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10782 int delta = CHARPOS (start) - MATRIX_ROW_START_CHARPOS (r0); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10783 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10784 if (delta) |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10785 { |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10786 struct glyph_row *r1 = MATRIX_BOTTOM_TEXT_ROW (current_matrix, w); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10787 int delta_bytes = BYTEPOS (start) - MATRIX_ROW_START_BYTEPOS (r0); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10788 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10789 increment_matrix_positions (w->current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10790 MATRIX_ROW_VPOS (r0, current_matrix), |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10791 MATRIX_ROW_VPOS (r1, current_matrix), |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10792 delta, delta_bytes); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10793 } |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10794 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10795 #if 0 /* If changes are all in front of the window start, the |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10796 distance of the last displayed glyph from Z hasn't |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10797 changed. */ |
25012 | 10798 w->window_end_pos |
10799 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10800 w->window_end_bytepos | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
10801 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10802 #endif |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10803 |
34438
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10804 row = row_containing_pos (w, PT, r0, NULL); |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10805 if (row == NULL) |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10806 return 0; |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10807 |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10808 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 10809 return 1; |
10810 } | |
10811 | |
10812 /* Return quickly if changes are all below what is displayed in the | |
10813 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
|
10814 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10815 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10816 { | |
10817 /* We have to update window end positions because the buffer's | |
10818 size has changed. */ | |
10819 w->window_end_pos | |
10820 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10821 w->window_end_bytepos | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
10822 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10823 |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10824 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10825 row = row_containing_pos (w, PT, row, NULL); |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10826 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10827 return 2; |
25012 | 10828 } |
10829 | |
10830 /* Check that window start agrees with the start of the first glyph | |
10831 row in its current matrix. Check this after we know the window | |
10832 start is not in changed text, otherwise positions would not be | |
10833 comparable. */ | |
10834 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10835 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10836 return 0; | |
10837 | |
10838 /* Compute the position at which we have to start displaying new | |
10839 lines. Some of the lines at the top of the window might be | |
10840 reusable because they are not displaying changed text. Find the | |
10841 last row in W's current matrix not affected by changes at the | |
10842 start of current_buffer. Value is null if changes start in the | |
10843 first line of window. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10844 last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); |
25012 | 10845 if (last_unchanged_at_beg_row) |
10846 { | |
33898
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10847 /* Avoid starting to display in the moddle of a character, a TAB |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10848 for instance. This is easier than to set up the iterator |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10849 exactly, and it's not a frequent case, so the additional |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10850 effort wouldn't really pay off. */ |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10851 while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10852 && last_unchanged_at_beg_row > w->current_matrix->rows) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10853 --last_unchanged_at_beg_row; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10854 |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10855 if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10856 return 0; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10857 |
25012 | 10858 init_to_row_end (&it, w, last_unchanged_at_beg_row); |
10859 start_pos = it.current.pos; | |
10860 | |
10861 /* Start displaying new lines in the desired matrix at the same | |
10862 vpos we would use in the current matrix, i.e. below | |
10863 last_unchanged_at_beg_row. */ | |
10864 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
10865 current_matrix); | |
10866 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10867 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
10868 | |
10869 xassert (it.hpos == 0 && it.current_x == 0); | |
10870 } | |
277 | 10871 else |
25012 | 10872 { |
10873 /* There are no reusable lines at the start of the window. | |
10874 Start displaying in the first line. */ | |
10875 start_display (&it, w, start); | |
10876 start_pos = it.current.pos; | |
10877 } | |
10878 | |
10879 /* Find the first row that is not affected by changes at the end of | |
10880 the buffer. Value will be null if there is no unchanged row, in | |
10881 which case we must redisplay to the end of the window. delta | |
10882 will be set to the value by which buffer positions beginning with | |
10883 first_unchanged_at_end_row have to be adjusted due to text | |
10884 changes. */ | |
10885 first_unchanged_at_end_row | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10886 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes); |
25012 | 10887 IF_DEBUG (debug_delta = delta); |
10888 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
10889 | |
10890 /* Set stop_pos to the buffer position up to which we will have to | |
10891 display new lines. If first_unchanged_at_end_row != NULL, this | |
10892 is the buffer position of the start of the line displayed in that | |
10893 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
10894 that we don't stop at a buffer position. */ | |
10895 stop_pos = 0; | |
10896 if (first_unchanged_at_end_row) | |
10897 { | |
10898 xassert (last_unchanged_at_beg_row == NULL | |
10899 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
10900 | |
10901 /* If this is a continuation line, move forward to the next one | |
10902 that isn't. Changes in lines above affect this line. | |
10903 Caution: this may move first_unchanged_at_end_row to a row | |
10904 not displaying text. */ | |
10905 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
10906 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10907 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10908 < it.last_visible_y)) | |
10909 ++first_unchanged_at_end_row; | |
10910 | |
10911 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10912 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10913 >= it.last_visible_y)) | |
10914 first_unchanged_at_end_row = NULL; | |
10915 else | |
10916 { | |
10917 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
10918 + delta); | |
10919 first_unchanged_at_end_vpos | |
10920 = 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
|
10921 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 10922 } |
10923 } | |
10924 else if (last_unchanged_at_beg_row == NULL) | |
10925 return 0; | |
10926 | |
10927 | |
10928 #if GLYPH_DEBUG | |
10929 | |
10930 /* Either there is no unchanged row at the end, or the one we have | |
10931 now displays text. This is a necessary condition for the window | |
10932 end pos calculation at the end of this function. */ | |
10933 xassert (first_unchanged_at_end_row == NULL | |
10934 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
10935 | |
10936 debug_last_unchanged_at_beg_vpos | |
10937 = (last_unchanged_at_beg_row | |
10938 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
10939 : -1); | |
10940 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
10941 | |
10942 #endif /* GLYPH_DEBUG != 0 */ | |
10943 | |
10944 | |
10945 /* Display new lines. Set last_text_row to the last new line | |
10946 displayed which has text on it, i.e. might end up as being the | |
10947 line where the window_end_vpos is. */ | |
10948 w->cursor.vpos = -1; | |
10949 last_text_row = NULL; | |
277 | 10950 overlay_arrow_seen = 0; |
25012 | 10951 while (it.current_y < it.last_visible_y |
10952 && !fonts_changed_p | |
10953 && (first_unchanged_at_end_row == NULL | |
10954 || IT_CHARPOS (it) < stop_pos)) | |
10955 { | |
10956 if (display_line (&it)) | |
10957 last_text_row = it.glyph_row - 1; | |
10958 } | |
10959 | |
10960 if (fonts_changed_p) | |
10961 return -1; | |
10962 | |
10963 | |
10964 /* Compute differences in buffer positions, y-positions etc. for | |
10965 lines reused at the bottom of the window. Compute what we can | |
10966 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10967 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
|
10968 /* 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
|
10969 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10970 && it.current_y < it.last_visible_y) |
25012 | 10971 { |
10972 dvpos = (it.vpos | |
10973 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
10974 current_matrix)); | |
10975 dy = it.current_y - first_unchanged_at_end_row->y; | |
10976 run.current_y = first_unchanged_at_end_row->y; | |
10977 run.desired_y = run.current_y + dy; | |
10978 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
10979 } | |
10980 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10981 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10982 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
|
10983 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
|
10984 } |
25012 | 10985 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
10986 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
10987 |
25012 | 10988 /* Find the cursor if not already found. We have to decide whether |
10989 PT will appear on this window (it sometimes doesn't, but this is | |
10990 not a very frequent case.) This decision has to be made before | |
10991 the current matrix is altered. A value of cursor.vpos < 0 means | |
10992 that PT is either in one of the lines beginning at | |
10993 first_unchanged_at_end_row or below the window. Don't care for | |
10994 lines that might be displayed later at the window end; as | |
10995 mentioned, this is not a frequent case. */ | |
10996 if (w->cursor.vpos < 0) | |
10997 { | |
10998 /* Cursor in unchanged rows at the top? */ | |
10999 if (PT < CHARPOS (start_pos) | |
11000 && last_unchanged_at_beg_row) | |
11001 { | |
25543 | 11002 row = row_containing_pos (w, PT, |
11003 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
11004 last_unchanged_at_beg_row + 1); | |
31493
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
11005 if (row) |
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
11006 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 11007 } |
11008 | |
11009 /* Start from first_unchanged_at_end_row looking for PT. */ | |
11010 else if (first_unchanged_at_end_row) | |
11011 { | |
25543 | 11012 row = row_containing_pos (w, PT - delta, |
11013 first_unchanged_at_end_row, NULL); | |
11014 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
11015 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
|
11016 delta_bytes, dy, dvpos); |
25012 | 11017 } |
11018 | |
11019 /* Give up if cursor was not found. */ | |
11020 if (w->cursor.vpos < 0) | |
11021 { | |
11022 clear_glyph_matrix (w->desired_matrix); | |
11023 return -1; | |
11024 } | |
11025 } | |
11026 | |
11027 /* Don't let the cursor end in the scroll margins. */ | |
11028 { | |
11029 int this_scroll_margin, cursor_height; | |
11030 | |
11031 this_scroll_margin = max (0, scroll_margin); | |
11032 this_scroll_margin = min (this_scroll_margin, | |
11033 XFASTINT (w->height) / 4); | |
11034 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
11035 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
11036 | |
11037 if ((w->cursor.y < this_scroll_margin | |
11038 && CHARPOS (start) > BEGV) | |
11039 /* Don't take scroll margin into account at the bottom because | |
11040 old redisplay didn't do it either. */ | |
11041 || w->cursor.y + cursor_height > it.last_visible_y) | |
11042 { | |
11043 w->cursor.vpos = -1; | |
11044 clear_glyph_matrix (w->desired_matrix); | |
11045 return -1; | |
11046 } | |
11047 } | |
11048 | |
11049 /* Scroll the display. Do it before changing the current matrix so | |
11050 that xterm.c doesn't get confused about where the cursor glyph is | |
11051 found. */ | |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
11052 if (dy && run.height) |
25012 | 11053 { |
11054 update_begin (f); | |
11055 | |
11056 if (FRAME_WINDOW_P (f)) | |
11057 { | |
11058 rif->update_window_begin_hook (w); | |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
11059 rif->clear_mouse_face (w); |
25012 | 11060 rif->scroll_run_hook (w, &run); |
30159
1b0331a7c724
(try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents:
30136
diff
changeset
|
11061 rif->update_window_end_hook (w, 0, 0); |
25012 | 11062 } |
11063 else | |
11064 { | |
11065 /* Terminal frame. In this case, dvpos gives the number of | |
11066 lines to scroll by; dvpos < 0 means scroll up. */ | |
11067 int first_unchanged_at_end_vpos | |
11068 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
11069 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
11070 int end = XFASTINT (w->top) + window_internal_height (w); | |
11071 | |
11072 /* Perform the operation on the screen. */ | |
11073 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
11074 { |
25012 | 11075 /* Scroll last_unchanged_at_beg_row to the end of the |
11076 window down dvpos lines. */ | |
11077 set_terminal_window (end); | |
11078 | |
11079 /* On dumb terminals delete dvpos lines at the end | |
11080 before inserting dvpos empty lines. */ | |
11081 if (!scroll_region_ok) | |
11082 ins_del_lines (end - dvpos, -dvpos); | |
11083 | |
11084 /* Insert dvpos empty lines in front of | |
11085 last_unchanged_at_beg_row. */ | |
11086 ins_del_lines (from, dvpos); | |
11087 } | |
11088 else if (dvpos < 0) | |
11089 { | |
11090 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
11091 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
11092 set_terminal_window (end); | |
11093 | |
11094 /* Delete dvpos lines in front of | |
11095 last_unchanged_at_beg_vpos. ins_del_lines will set | |
11096 the cursor to the given vpos and emit |dvpos| delete | |
11097 line sequences. */ | |
11098 ins_del_lines (from + dvpos, dvpos); | |
11099 | |
11100 /* On a dumb terminal insert dvpos empty lines at the | |
11101 end. */ | |
11102 if (!scroll_region_ok) | |
11103 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
|
11104 } |
25012 | 11105 |
11106 set_terminal_window (0); | |
11107 } | |
11108 | |
11109 update_end (f); | |
11110 } | |
11111 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11112 /* 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
|
11113 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
|
11114 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11115 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
|
11116 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 11117 if (dvpos < 0) |
11118 { | |
11119 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
11120 bottom_vpos, dvpos); | |
11121 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
11122 bottom_vpos, 0); | |
11123 } | |
11124 else if (dvpos > 0) | |
11125 { | |
11126 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
11127 bottom_vpos, dvpos); | |
11128 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
11129 first_unchanged_at_end_vpos + dvpos, 0); | |
11130 } | |
11131 | |
11132 /* For frame-based redisplay, make sure that current frame and window | |
11133 matrix are in sync with respect to glyph memory. */ | |
11134 if (!FRAME_WINDOW_P (f)) | |
11135 sync_frame_with_window_matrix_rows (w); | |
11136 | |
11137 /* Adjust buffer positions in reused rows. */ | |
11138 if (delta) | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11139 increment_matrix_positions (current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11140 first_unchanged_at_end_vpos + dvpos, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11141 bottom_vpos, delta, delta_bytes); |
25012 | 11142 |
11143 /* Adjust Y positions. */ | |
11144 if (dy) | |
11145 shift_glyph_matrix (w, current_matrix, | |
11146 first_unchanged_at_end_vpos + dvpos, | |
11147 bottom_vpos, dy); | |
11148 | |
11149 if (first_unchanged_at_end_row) | |
11150 first_unchanged_at_end_row += dvpos; | |
11151 | |
11152 /* If scrolling up, there may be some lines to display at the end of | |
11153 the window. */ | |
11154 last_text_row_at_end = NULL; | |
11155 if (dy < 0) | |
11156 { | |
11157 /* Set last_row to the glyph row in the current matrix where the | |
11158 window end line is found. It has been moved up or down in | |
11159 the matrix by dvpos. */ | |
11160 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
11161 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
11162 | |
11163 /* If last_row is the window end line, it should display text. */ | |
11164 xassert (last_row->displays_text_p); | |
11165 | |
11166 /* If window end line was partially visible before, begin | |
11167 displaying at that line. Otherwise begin displaying with the | |
11168 line following it. */ | |
11169 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
11170 { | |
11171 init_to_row_start (&it, w, last_row); | |
11172 it.vpos = last_vpos; | |
11173 it.current_y = last_row->y; | |
11174 } | |
11175 else | |
11176 { | |
11177 init_to_row_end (&it, w, last_row); | |
11178 it.vpos = 1 + last_vpos; | |
11179 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
11180 ++last_row; | |
11181 } | |
11182 | |
11183 /* We may start in a continuation line. If so, we have to get | |
11184 the right continuation_lines_width and current_x. */ | |
11185 it.continuation_lines_width = last_row->continuation_lines_width; | |
11186 it.hpos = it.current_x = 0; | |
11187 | |
11188 /* Display the rest of the lines at the window end. */ | |
11189 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
11190 while (it.current_y < it.last_visible_y | |
11191 && !fonts_changed_p) | |
11192 { | |
11193 /* Is it always sure that the display agrees with lines in | |
11194 the current matrix? I don't think so, so we mark rows | |
11195 displayed invalid in the current matrix by setting their | |
11196 enabled_p flag to zero. */ | |
11197 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
11198 if (display_line (&it)) | |
11199 last_text_row_at_end = it.glyph_row - 1; | |
11200 } | |
11201 } | |
11202 | |
11203 /* Update window_end_pos and window_end_vpos. */ | |
11204 if (first_unchanged_at_end_row | |
11205 && first_unchanged_at_end_row->y < it.last_visible_y | |
11206 && !last_text_row_at_end) | |
11207 { | |
11208 /* Window end line if one of the preserved rows from the current | |
11209 matrix. Set row to the last row displaying text in current | |
11210 matrix starting at first_unchanged_at_end_row, after | |
11211 scrolling. */ | |
11212 xassert (first_unchanged_at_end_row->displays_text_p); | |
11213 row = find_last_row_displaying_text (w->current_matrix, &it, | |
11214 first_unchanged_at_end_row); | |
11215 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
11216 | |
11217 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
11218 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
11219 XSETFASTINT (w->window_end_vpos, | |
11220 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
11221 } | |
11222 else if (last_text_row_at_end) | |
11223 { | |
11224 XSETFASTINT (w->window_end_pos, | |
11225 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
11226 w->window_end_bytepos | |
11227 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
11228 XSETFASTINT (w->window_end_vpos, | |
11229 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
11230 } | |
11231 else if (last_text_row) | |
11232 { | |
11233 /* We have displayed either to the end of the window or at the | |
11234 end of the window, i.e. the last row with text is to be found | |
11235 in the desired matrix. */ | |
11236 XSETFASTINT (w->window_end_pos, | |
11237 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
11238 w->window_end_bytepos | |
11239 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
11240 XSETFASTINT (w->window_end_vpos, | |
11241 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
11242 } | |
11243 else if (first_unchanged_at_end_row == NULL | |
11244 && last_text_row == NULL | |
11245 && last_text_row_at_end == NULL) | |
11246 { | |
11247 /* Displayed to end of window, but no line containing text was | |
11248 displayed. Lines were deleted at the end of the window. */ | |
11249 int vpos; | |
25546 | 11250 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 11251 |
11252 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 11253 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
11254 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
11255 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
11256 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 11257 break; |
11258 | |
11259 w->window_end_vpos = make_number (vpos); | |
11260 } | |
11261 else | |
11262 abort (); | |
11263 | |
11264 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
11265 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
11266 | |
11267 /* Record that display has not been completed. */ | |
277 | 11268 w->window_end_valid = Qnil; |
25012 | 11269 w->desired_matrix->no_scrolling_p = 1; |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
11270 return 3; |
277 | 11271 } |
25012 | 11272 |
11273 | |
11274 | |
11275 /*********************************************************************** | |
11276 More debugging support | |
11277 ***********************************************************************/ | |
11278 | |
11279 #if GLYPH_DEBUG | |
11280 | |
11281 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
11282 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
11283 | |
11284 | |
11285 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
11286 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
11287 | |
29748
1cd9b7a33ad1
(dump_glyph_matrix): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents:
29698
diff
changeset
|
11288 static void |
25012 | 11289 dump_glyph_matrix (matrix, with_glyphs_p) |
11290 struct glyph_matrix *matrix; | |
11291 int with_glyphs_p; | |
11292 { | |
11293 int i; | |
11294 for (i = 0; i < matrix->nrows; ++i) | |
11295 dump_glyph_row (matrix, i, with_glyphs_p); | |
11296 } | |
11297 | |
11298 | |
11299 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
11300 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
11301 | |
11302 void | |
11303 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
11304 struct glyph_matrix *matrix; | |
11305 int vpos, with_glyphs_p; | |
11306 { | |
11307 struct glyph_row *row; | |
11308 | |
11309 if (vpos < 0 || vpos >= matrix->nrows) | |
11310 return; | |
11311 | |
11312 row = MATRIX_ROW (matrix, vpos); | |
11313 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11314 fprintf (stderr, "Row Start End Used oEI><O\\CTZFes X Y W H V A P\n"); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11315 fprintf (stderr, "=======================================================================\n"); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11316 |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11317 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\ |
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11318 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
25012 | 11319 row - matrix->rows, |
11320 MATRIX_ROW_START_CHARPOS (row), | |
11321 MATRIX_ROW_END_CHARPOS (row), | |
11322 row->used[TEXT_AREA], | |
11323 row->contains_overlapping_glyphs_p, | |
11324 row->enabled_p, | |
11325 row->inverse_p, | |
11326 row->truncated_on_left_p, | |
11327 row->truncated_on_right_p, | |
11328 row->overlay_arrow_p, | |
11329 row->continued_p, | |
11330 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
11331 row->displays_text_p, | |
11332 row->ends_at_zv_p, | |
11333 row->fill_line_p, | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11334 row->ends_in_middle_of_char_p, |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11335 row->starts_in_middle_of_char_p, |
25012 | 11336 row->x, |
11337 row->y, | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11338 row->pixel_width, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11339 row->height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11340 row->visible_height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11341 row->ascent, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11342 row->phys_ascent); |
25012 | 11343 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, |
11344 row->end.overlay_string_index); | |
11345 fprintf (stderr, "%9d %5d\n", | |
11346 CHARPOS (row->start.string_pos), | |
11347 CHARPOS (row->end.string_pos)); | |
11348 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
11349 row->end.dpvec_index); | |
11350 | |
11351 if (with_glyphs_p) | |
11352 { | |
11353 struct glyph *glyph, *glyph_end; | |
11354 int prev_had_glyphs_p; | |
11355 | |
11356 glyph = row->glyphs[TEXT_AREA]; | |
11357 glyph_end = glyph + row->used[TEXT_AREA]; | |
11358 | |
11359 /* Glyph for a line end in text. */ | |
11360 if (glyph == glyph_end && glyph->charpos > 0) | |
11361 ++glyph_end; | |
11362 | |
11363 if (glyph < glyph_end) | |
11364 { | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11365 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n"); |
25012 | 11366 prev_had_glyphs_p = 1; |
11367 } | |
11368 else | |
11369 prev_had_glyphs_p = 0; | |
11370 | |
11371 while (glyph < glyph_end) | |
11372 { | |
11373 if (glyph->type == CHAR_GLYPH) | |
11374 { | |
11375 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11376 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11377 glyph - row->glyphs[TEXT_AREA], |
11378 'C', | |
11379 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11380 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11381 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11382 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11383 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11384 : '-')), |
25012 | 11385 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11386 glyph->u.ch, |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11387 (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
|
11388 ? glyph->u.ch |
25012 | 11389 : '.'), |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11390 glyph->face_id, |
25012 | 11391 glyph->left_box_line_p, |
11392 glyph->right_box_line_p); | |
11393 } | |
11394 else if (glyph->type == STRETCH_GLYPH) | |
11395 { | |
11396 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11397 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11398 glyph - row->glyphs[TEXT_AREA], |
11399 'S', | |
11400 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11401 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11402 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11403 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11404 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11405 : '-')), |
25012 | 11406 glyph->pixel_width, |
11407 0, | |
11408 '.', | |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11409 glyph->face_id, |
25012 | 11410 glyph->left_box_line_p, |
11411 glyph->right_box_line_p); | |
11412 } | |
11413 else if (glyph->type == IMAGE_GLYPH) | |
11414 { | |
11415 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11416 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11417 glyph - row->glyphs[TEXT_AREA], |
11418 'I', | |
11419 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11420 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11421 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11422 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11423 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11424 : '-')), |
25012 | 11425 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11426 glyph->u.img_id, |
25012 | 11427 '.', |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11428 glyph->face_id, |
25012 | 11429 glyph->left_box_line_p, |
11430 glyph->right_box_line_p); | |
11431 } | |
11432 ++glyph; | |
11433 } | |
11434 } | |
11435 } | |
11436 | |
11437 | |
11438 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
11439 Sdump_glyph_matrix, 0, 1, "p", | |
11440 "Dump the current matrix of the selected window to stderr.\n\ | |
11441 Shows contents of glyph row structures. With non-nil optional\n\ | |
11442 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
11443 (with_glyphs_p) | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
11444 Lisp_Object with_glyphs_p; |
25012 | 11445 { |
11446 struct window *w = XWINDOW (selected_window); | |
11447 struct buffer *buffer = XBUFFER (w->buffer); | |
11448 | |
11449 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
11450 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
11451 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
11452 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
11453 fprintf (stderr, "=============================================\n"); | |
11454 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
11455 return Qnil; | |
11456 } | |
11457 | |
11458 | |
11459 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
11460 "Dump glyph row ROW to stderr.") | |
11461 (row) | |
11462 Lisp_Object row; | |
11463 { | |
11464 CHECK_NUMBER (row, 0); | |
11465 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
11466 return Qnil; | |
11467 } | |
11468 | |
11469 | |
25543 | 11470 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 11471 0, 0, "", "") |
11472 () | |
11473 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11474 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11475 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 11476 ->current_matrix); |
11477 dump_glyph_row (m, 0, 1); | |
11478 return Qnil; | |
11479 } | |
11480 | |
11481 | |
11482 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
11483 Strace_redisplay_toggle, 0, 0, "", | |
11484 "Toggle tracing of redisplay.") | |
11485 () | |
11486 { | |
11487 trace_redisplay_p = !trace_redisplay_p; | |
11488 return Qnil; | |
11489 } | |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11490 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11491 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11492 DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, 1, "", |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11493 "Print STRING to stderr.") |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11494 (string) |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11495 Lisp_Object string; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11496 { |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11497 CHECK_STRING (string, 0); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11498 fprintf (stderr, "%s", XSTRING (string)->data); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11499 return Qnil; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11500 } |
25012 | 11501 |
11502 #endif /* GLYPH_DEBUG */ | |
11503 | |
11504 | |
277 | 11505 |
25012 | 11506 /*********************************************************************** |
11507 Building Desired Matrix Rows | |
11508 ***********************************************************************/ | |
11509 | |
11510 /* Return a temporary glyph row holding the glyphs of an overlay | |
11511 arrow. Only used for non-window-redisplay windows. */ | |
11512 | |
11513 static struct glyph_row * | |
11514 get_overlay_arrow_glyph_row (w) | |
11515 struct window *w; | |
11516 { | |
11517 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
11518 struct buffer *buffer = XBUFFER (w->buffer); | |
11519 struct buffer *old = current_buffer; | |
11520 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
11521 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
11522 unsigned char *arrow_end = arrow_string + arrow_len; | |
11523 unsigned char *p; | |
11524 struct it it; | |
11525 int multibyte_p; | |
11526 int n_glyphs_before; | |
11527 | |
11528 set_buffer_temp (buffer); | |
11529 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
11530 it.glyph_row->used[TEXT_AREA] = 0; | |
11531 SET_TEXT_POS (it.position, 0, 0); | |
11532 | |
11533 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
11534 p = arrow_string; | |
11535 while (p < arrow_end) | |
11536 { | |
11537 Lisp_Object face, ilisp; | |
11538 | |
11539 /* Get the next character. */ | |
11540 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
11541 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 11542 else |
11543 it.c = *p, it.len = 1; | |
11544 p += it.len; | |
11545 | |
11546 /* Get its face. */ | |
11547 XSETFASTINT (ilisp, p - arrow_string); | |
11548 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
11549 it.face_id = compute_char_face (f, it.c, face); | |
11550 | |
11551 /* Compute its width, get its glyphs. */ | |
11552 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
|
11553 SET_TEXT_POS (it.position, -1, -1); |
25012 | 11554 PRODUCE_GLYPHS (&it); |
11555 | |
11556 /* If this character doesn't fit any more in the line, we have | |
11557 to remove some glyphs. */ | |
11558 if (it.current_x > it.last_visible_x) | |
11559 { | |
11560 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
11561 break; | |
11562 } | |
11563 } | |
11564 | |
11565 set_buffer_temp (old); | |
11566 return it.glyph_row; | |
11567 } | |
11568 | |
11569 | |
11570 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
11571 glyphs are only inserted for terminal frames since we can't really | |
11572 win with truncation glyphs when partially visible glyphs are | |
11573 involved. Which glyphs to insert is determined by | |
11574 produce_special_glyphs. */ | |
11575 | |
11576 static void | |
11577 insert_left_trunc_glyphs (it) | |
11578 struct it *it; | |
11579 { | |
11580 struct it truncate_it; | |
11581 struct glyph *from, *end, *to, *toend; | |
11582 | |
11583 xassert (!FRAME_WINDOW_P (it->f)); | |
11584 | |
11585 /* Get the truncation glyphs. */ | |
11586 truncate_it = *it; | |
11587 truncate_it.current_x = 0; | |
11588 truncate_it.face_id = DEFAULT_FACE_ID; | |
11589 truncate_it.glyph_row = &scratch_glyph_row; | |
11590 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
11591 CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1; | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
11592 truncate_it.object = make_number (0); |
25012 | 11593 produce_special_glyphs (&truncate_it, IT_TRUNCATION); |
11594 | |
11595 /* Overwrite glyphs from IT with truncation glyphs. */ | |
11596 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
11597 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
11598 to = it->glyph_row->glyphs[TEXT_AREA]; | |
11599 toend = to + it->glyph_row->used[TEXT_AREA]; | |
11600 | |
11601 while (from < end) | |
11602 *to++ = *from++; | |
11603 | |
11604 /* There may be padding glyphs left over. Remove them. */ | |
11605 from = to; | |
11606 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
11607 ++from; | |
11608 while (from < toend) | |
11609 *to++ = *from++; | |
11610 | |
11611 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
11612 } | |
11613 | |
11614 | |
11615 /* Compute the pixel height and width of IT->glyph_row. | |
11616 | |
11617 Most of the time, ascent and height of a display line will be equal | |
11618 to the max_ascent and max_height values of the display iterator | |
11619 structure. This is not the case if | |
11620 | |
11621 1. We hit ZV without displaying anything. In this case, max_ascent | |
11622 and max_height will be zero. | |
11623 | |
11624 2. We have some glyphs that don't contribute to the line height. | |
11625 (The glyph row flag contributes_to_line_height_p is for future | |
11626 pixmap extensions). | |
11627 | |
11628 The first case is easily covered by using default values because in | |
11629 these cases, the line height does not really matter, except that it | |
11630 must not be zero. */ | |
11631 | |
11632 static void | |
11633 compute_line_metrics (it) | |
11634 struct it *it; | |
11635 { | |
11636 struct glyph_row *row = it->glyph_row; | |
11637 int area, i; | |
11638 | |
11639 if (FRAME_WINDOW_P (it->f)) | |
11640 { | |
25546 | 11641 int i, header_line_height; |
25012 | 11642 |
11643 /* The line may consist of one space only, that was added to | |
11644 place the cursor on it. If so, the row's height hasn't been | |
11645 computed yet. */ | |
11646 if (row->height == 0) | |
11647 { | |
11648 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
|
11649 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 11650 row->ascent = it->max_ascent; |
11651 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
|
11652 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
|
11653 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11654 } |
11655 | |
11656 /* Compute the width of this line. */ | |
11657 row->pixel_width = row->x; | |
11658 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
11659 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
11660 | |
11661 xassert (row->pixel_width >= 0); | |
11662 xassert (row->ascent >= 0 && row->height > 0); | |
11663 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11664 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
|
11665 || 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
|
11666 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11667 /* 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
|
11668 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
|
11669 This makes accented characters fully visible. */ |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11670 if (row == MATRIX_FIRST_TEXT_ROW (it->w->desired_matrix) |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11671 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11672 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11673 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
|
11674 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11675 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11676 |
25012 | 11677 /* Compute how much of the line is visible. */ |
11678 row->visible_height = row->height; | |
11679 | |
25546 | 11680 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
11681 if (row->y < header_line_height) | |
11682 row->visible_height -= header_line_height - row->y; | |
25012 | 11683 else |
11684 { | |
11685 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
11686 if (row->y + row->height > max_y) | |
11687 row->visible_height -= row->y + row->height - max_y; | |
11688 } | |
11689 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
11690 else |
25012 | 11691 { |
11692 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
|
11693 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
|
11694 row->height = row->phys_height = row->visible_height = 1; |
25012 | 11695 } |
11696 | |
11697 /* Compute a hash code for this row. */ | |
11698 row->hash = 0; | |
11699 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
11700 for (i = 0; i < row->used[area]; ++i) | |
11701 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
11702 + 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
|
11703 + 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
|
11704 + row->glyphs[area][i].padding_p |
25012 | 11705 + (row->glyphs[area][i].type << 2)); |
11706 | |
11707 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
|
11708 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 11709 } |
11710 | |
11711 | |
11712 /* Append one space to the glyph row of iterator IT if doing a | |
11713 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
11714 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
|
11715 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
|
11716 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11717 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
|
11718 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
|
11719 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
|
11720 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
|
11721 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11722 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
|
11723 end of the line if the row ends in italic text. */ |
25012 | 11724 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11725 static int |
25012 | 11726 append_space (it, default_face_p) |
11727 struct it *it; | |
11728 int default_face_p; | |
11729 { | |
11730 if (FRAME_WINDOW_P (it->f)) | |
11731 { | |
11732 int n = it->glyph_row->used[TEXT_AREA]; | |
11733 | |
11734 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
11735 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
11736 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11737 /* Save some values that must not be changed. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11738 Must save IT->c and IT->len because otherwise |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11739 ITERATOR_AT_END_P wouldn't work anymore after |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11740 append_space has been called. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11741 int saved_what = it->what; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11742 int saved_c = it->c, saved_len = it->len; |
25012 | 11743 int saved_x = it->current_x; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11744 int saved_face_id = it->face_id; |
25012 | 11745 struct text_pos saved_pos; |
11746 Lisp_Object saved_object; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11747 struct face *face; |
25012 | 11748 |
11749 saved_object = it->object; | |
11750 saved_pos = it->position; | |
11751 | |
11752 it->what = IT_CHARACTER; | |
11753 bzero (&it->position, sizeof it->position); | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
11754 it->object = make_number (0); |
25012 | 11755 it->c = ' '; |
11756 it->len = 1; | |
11757 | |
11758 if (default_face_p) | |
11759 it->face_id = DEFAULT_FACE_ID; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11760 else if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11761 it->face_id = it->saved_face_id; |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11762 face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11763 it->face_id = FACE_FOR_CHAR (it->f, face, 0); |
25012 | 11764 |
11765 PRODUCE_GLYPHS (it); | |
11766 | |
11767 it->current_x = saved_x; | |
11768 it->object = saved_object; | |
11769 it->position = saved_pos; | |
11770 it->what = saved_what; | |
11771 it->face_id = saved_face_id; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11772 it->len = saved_len; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11773 it->c = saved_c; |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11774 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11775 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11776 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11777 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11778 return 0; |
25012 | 11779 } |
11780 | |
11781 | |
11782 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
11783 to the end of the display line. Called from display_line. | |
11784 If the glyph row is empty, add a space glyph to it so that we | |
11785 know the face to draw. Set the glyph row flag fill_line_p. */ | |
11786 | |
11787 static void | |
11788 extend_face_to_end_of_line (it) | |
11789 struct it *it; | |
11790 { | |
11791 struct face *face; | |
11792 struct frame *f = it->f; | |
11793 | |
11794 /* If line is already filled, do nothing. */ | |
11795 if (it->current_x >= it->last_visible_x) | |
11796 return; | |
11797 | |
11798 /* Face extension extends the background and box of IT->face_id | |
11799 to the end of the line. If the background equals the background | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11800 of the frame, we don't have to do anything. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11801 if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11802 face = FACE_FROM_ID (it->f, it->saved_face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11803 else |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11804 face = FACE_FROM_ID (f, it->face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11805 |
25012 | 11806 if (FRAME_WINDOW_P (f) |
11807 && face->box == FACE_NO_BOX | |
11808 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
11809 && !face->stipple) | |
11810 return; | |
11811 | |
11812 /* Set the glyph row flag indicating that the face of the last glyph | |
11813 in the text area has to be drawn to the end of the text area. */ | |
11814 it->glyph_row->fill_line_p = 1; | |
11815 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11816 /* If current character of IT is not ASCII, make sure we have the |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11817 ASCII face. This will be automatically undone the next time |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11818 get_next_display_element returns a multibyte character. Note |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11819 that the character will always be single byte in unibyte text. */ |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11820 if (!SINGLE_BYTE_CHAR_P (it->c)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11821 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11822 it->face_id = FACE_FOR_CHAR (f, face, 0); |
25012 | 11823 } |
11824 | |
11825 if (FRAME_WINDOW_P (f)) | |
11826 { | |
11827 /* If the row is empty, add a space with the current face of IT, | |
11828 so that we know which face to draw. */ | |
11829 if (it->glyph_row->used[TEXT_AREA] == 0) | |
11830 { | |
11831 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
|
11832 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 11833 it->glyph_row->used[TEXT_AREA] = 1; |
11834 } | |
11835 } | |
11836 else | |
11837 { | |
11838 /* Save some values that must not be changed. */ | |
11839 int saved_x = it->current_x; | |
11840 struct text_pos saved_pos; | |
11841 Lisp_Object saved_object; | |
11842 int saved_what = it->what; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11843 int saved_face_id = it->face_id; |
25012 | 11844 |
11845 saved_object = it->object; | |
11846 saved_pos = it->position; | |
11847 | |
11848 it->what = IT_CHARACTER; | |
11849 bzero (&it->position, sizeof it->position); | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
11850 it->object = make_number (0); |
25012 | 11851 it->c = ' '; |
11852 it->len = 1; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11853 it->face_id = face->id; |
25012 | 11854 |
11855 PRODUCE_GLYPHS (it); | |
11856 | |
11857 while (it->current_x <= it->last_visible_x) | |
11858 PRODUCE_GLYPHS (it); | |
11859 | |
11860 /* Don't count these blanks really. It would let us insert a left | |
11861 truncation glyph below and make us set the cursor on them, maybe. */ | |
11862 it->current_x = saved_x; | |
11863 it->object = saved_object; | |
11864 it->position = saved_pos; | |
11865 it->what = saved_what; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11866 it->face_id = saved_face_id; |
25012 | 11867 } |
11868 } | |
11869 | |
11870 | |
11871 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
11872 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11873 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11874 static int |
25012 | 11875 trailing_whitespace_p (charpos) |
11876 int charpos; | |
11877 { | |
11878 int bytepos = CHAR_TO_BYTE (charpos); | |
11879 int c = 0; | |
11880 | |
11881 while (bytepos < ZV_BYTE | |
11882 && (c = FETCH_CHAR (bytepos), | |
11883 c == ' ' || c == '\t')) | |
11884 ++bytepos; | |
11885 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11886 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11887 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11888 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11889 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11890 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11891 return 0; |
25012 | 11892 } |
11893 | |
11894 | |
11895 /* Highlight trailing whitespace, if any, in ROW. */ | |
11896 | |
11897 void | |
11898 highlight_trailing_whitespace (f, row) | |
11899 struct frame *f; | |
11900 struct glyph_row *row; | |
11901 { | |
11902 int used = row->used[TEXT_AREA]; | |
11903 | |
11904 if (used) | |
11905 { | |
11906 struct glyph *start = row->glyphs[TEXT_AREA]; | |
11907 struct glyph *glyph = start + used - 1; | |
11908 | |
11909 /* Skip over the space glyph inserted to display the | |
11910 cursor at the end of a line. */ | |
11911 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
|
11912 && glyph->u.ch == ' ' |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28362
diff
changeset
|
11913 && INTEGERP (glyph->object)) |
25012 | 11914 --glyph; |
11915 | |
11916 /* If last glyph is a space or stretch, and it's trailing | |
11917 whitespace, set the face of all trailing whitespace glyphs in | |
11918 IT->glyph_row to `trailing-whitespace'. */ | |
11919 if (glyph >= start | |
11920 && BUFFERP (glyph->object) | |
11921 && (glyph->type == STRETCH_GLYPH | |
11922 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11923 && glyph->u.ch == ' ')) |
25012 | 11924 && trailing_whitespace_p (glyph->charpos)) |
11925 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11926 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0); |
25012 | 11927 |
11928 while (glyph >= start | |
11929 && BUFFERP (glyph->object) | |
11930 && (glyph->type == STRETCH_GLYPH | |
11931 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11932 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11933 (glyph--)->face_id = face_id; |
25012 | 11934 } |
11935 } | |
11936 } | |
11937 | |
11938 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11939 /* Value is non-zero if glyph row ROW in window W should be |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
11940 used to hold the cursor. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11941 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11942 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11943 cursor_row_p (w, row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11944 struct window *w; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11945 struct glyph_row *row; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11946 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11947 int cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11948 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11949 if (PT == MATRIX_ROW_END_CHARPOS (row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11950 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11951 /* If the row ends with a newline from a string, we don't want |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11952 the cursor there (if the row is continued it doesn't end in a |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11953 newline). */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11954 if (CHARPOS (row->end.string_pos) >= 0 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11955 || MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11956 cursor_row_p = row->continued_p; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11957 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11958 /* If the row ends at ZV, display the cursor at the end of that |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11959 row instead of at the start of the row below. */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11960 else if (row->ends_at_zv_p) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11961 cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11962 else |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11963 cursor_row_p = 0; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11964 } |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11965 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11966 return cursor_row_p; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11967 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11968 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11969 |
25012 | 11970 /* Construct the glyph row IT->glyph_row in the desired matrix of |
11971 IT->w from text at the current position of IT. See dispextern.h | |
11972 for an overview of struct it. Value is non-zero if | |
11973 IT->glyph_row displays text, as opposed to a line displaying ZV | |
11974 only. */ | |
11975 | |
11976 static int | |
11977 display_line (it) | |
11978 struct it *it; | |
11979 { | |
11980 struct glyph_row *row = it->glyph_row; | |
11981 | |
11982 /* We always start displaying at hpos zero even if hscrolled. */ | |
11983 xassert (it->hpos == 0 && it->current_x == 0); | |
11984 | |
11985 /* We must not display in a row that's not a text row. */ | |
11986 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
11987 < it->w->desired_matrix->nrows); | |
11988 | |
11989 /* Is IT->w showing the region? */ | |
11990 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
11991 | |
11992 /* Clear the result glyph row and enable it. */ | |
11993 prepare_desired_row (row); | |
11994 | |
11995 row->y = it->current_y; | |
11996 row->start = it->current; | |
11997 row->continuation_lines_width = it->continuation_lines_width; | |
11998 row->displays_text_p = 1; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11999 row->starts_in_middle_of_char_p = it->starts_in_middle_of_char_p; |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12000 it->starts_in_middle_of_char_p = 0; |
277 | 12001 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
12002 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 12003 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
|
12004 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
|
12005 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
|
12006 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 12007 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
12008 | |
12009 /* Move over display elements that are not visible because we are | |
12010 hscrolled. This may stop at an x-position < IT->first_visible_x | |
12011 if the first glyph is partially visible or if we hit a line end. */ | |
12012 if (it->current_x < it->first_visible_x) | |
12013 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
12014 MOVE_TO_POS | MOVE_TO_X); | |
12015 | |
12016 /* Get the initial row height. This is either the height of the | |
12017 text hscrolled, if there is any, or zero. */ | |
12018 row->ascent = it->max_ascent; | |
12019 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
|
12020 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
|
12021 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 12022 |
12023 /* Loop generating characters. The loop is left with IT on the next | |
12024 character to display. */ | |
12025 while (1) | |
12026 { | |
12027 int n_glyphs_before, hpos_before, x_before; | |
12028 int x, i, nglyphs; | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
12029 int ascent = 0, descent = 0, phys_ascent = 0, phys_descent = 0; |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
12030 |
25012 | 12031 /* Retrieve the next thing to display. Value is zero if end of |
12032 buffer reached. */ | |
12033 if (!get_next_display_element (it)) | |
12034 { | |
12035 /* 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
|
12036 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
|
12037 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
|
12038 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12039 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
|
12040 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12041 { |
25012 | 12042 row->glyphs[TEXT_AREA]->charpos = -1; |
12043 row->displays_text_p = 0; | |
12044 | |
12045 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
12046 row->indicate_empty_line_p = 1; | |
12047 } | |
12048 | |
12049 it->continuation_lines_width = 0; | |
12050 row->ends_at_zv_p = 1; | |
12051 break; | |
12052 } | |
12053 | |
12054 /* Now, get the metrics of what we want to display. This also | |
12055 generates glyphs in `row' (which is IT->glyph_row). */ | |
12056 n_glyphs_before = row->used[TEXT_AREA]; | |
12057 x = it->current_x; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12058 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12059 /* Remember the line height so far in case the next element doesn't |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12060 fit on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12061 if (!it->truncate_lines_p) |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12062 { |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12063 ascent = it->max_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12064 descent = it->max_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12065 phys_ascent = it->max_phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12066 phys_descent = it->max_phys_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12067 } |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12068 |
25012 | 12069 PRODUCE_GLYPHS (it); |
12070 | |
12071 /* If this display element was in marginal areas, continue with | |
12072 the next one. */ | |
12073 if (it->area != TEXT_AREA) | |
12074 { | |
12075 row->ascent = max (row->ascent, it->max_ascent); | |
12076 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
|
12077 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
|
12078 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
|
12079 it->max_phys_ascent + it->max_phys_descent); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12080 set_iterator_to_next (it, 1); |
25012 | 12081 continue; |
12082 } | |
12083 | |
12084 /* Does the display element fit on the line? If we truncate | |
12085 lines, we should draw past the right edge of the window. If | |
12086 we don't truncate, we want to stop so that we can display the | |
12087 continuation glyph before the right margin. If lines are | |
12088 continued, there are two possible strategies for characters | |
12089 resulting in more than 1 glyph (e.g. tabs): Display as many | |
12090 glyphs as possible in this line and leave the rest for the | |
12091 continuation line, or display the whole element in the next | |
12092 line. Original redisplay did the former, so we do it also. */ | |
12093 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
12094 hpos_before = it->hpos; | |
12095 x_before = x; | |
12096 | |
12097 if (nglyphs == 1 | |
12098 && it->current_x < it->last_visible_x) | |
12099 { | |
12100 ++it->hpos; | |
12101 row->ascent = max (row->ascent, it->max_ascent); | |
12102 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
|
12103 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
|
12104 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
|
12105 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12106 if (it->current_x - it->pixel_width < it->first_visible_x) |
12107 row->x = x - it->first_visible_x; | |
12108 } | |
12109 else | |
12110 { | |
12111 int new_x; | |
12112 struct glyph *glyph; | |
12113 | |
12114 for (i = 0; i < nglyphs; ++i, x = new_x) | |
12115 { | |
12116 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
12117 new_x = x + glyph->pixel_width; | |
12118 | |
12119 if (/* Lines are continued. */ | |
12120 !it->truncate_lines_p | |
12121 && (/* Glyph doesn't fit on the line. */ | |
12122 new_x > it->last_visible_x | |
12123 /* Or it fits exactly on a window system frame. */ | |
12124 || (new_x == it->last_visible_x | |
12125 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12126 { |
25012 | 12127 /* End of a continued line. */ |
12128 | |
12129 if (it->hpos == 0 | |
12130 || (new_x == it->last_visible_x | |
12131 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12132 { |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12133 /* Current glyph is the only one on the line or |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12134 fits exactly on the line. We must continue |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12135 the line because we can't draw the cursor |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12136 after the glyph. */ |
25012 | 12137 row->continued_p = 1; |
12138 it->current_x = new_x; | |
12139 it->continuation_lines_width += new_x; | |
12140 ++it->hpos; | |
12141 if (i == nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12142 set_iterator_to_next (it, 1); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12143 } |
29461
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12144 else if (CHAR_GLYPH_PADDING_P (*glyph) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12145 && !FRAME_WINDOW_P (it->f)) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12146 { |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12147 /* A padding glyph that doesn't fit on this line. |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12148 This means the whole character doesn't fit |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12149 on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12150 row->used[TEXT_AREA] = n_glyphs_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12151 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12152 /* Fill the rest of the row with continuation |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12153 glyphs like in 20.x. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12154 while (row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12155 < row->glyphs[1 + TEXT_AREA]) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12156 produce_special_glyphs (it, IT_CONTINUATION); |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12157 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12158 row->continued_p = 1; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12159 it->current_x = x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12160 it->continuation_lines_width += x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12161 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12162 /* Restore the height to what it was before the |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12163 element not fitting on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12164 it->max_ascent = ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12165 it->max_descent = descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12166 it->max_phys_ascent = phys_ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12167 it->max_phys_descent = phys_descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12168 } |
25012 | 12169 else |
12170 { | |
12171 /* Display element draws past the right edge of | |
12172 the window. Restore positions to values | |
12173 before the element. The next line starts | |
12174 with current_x before the glyph that could | |
12175 not be displayed, so that TAB works right. */ | |
12176 row->used[TEXT_AREA] = n_glyphs_before + i; | |
12177 | |
12178 /* Display continuation glyphs. */ | |
12179 if (!FRAME_WINDOW_P (it->f)) | |
12180 produce_special_glyphs (it, IT_CONTINUATION); | |
12181 row->continued_p = 1; | |
12182 | |
12183 it->current_x = x; | |
12184 it->continuation_lines_width += x; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12185 if (nglyphs > 1 && i > 0) |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12186 { |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12187 row->ends_in_middle_of_char_p = 1; |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12188 it->starts_in_middle_of_char_p = 1; |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12189 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12190 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12191 /* Restore the height to what it was before the |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12192 element not fitting on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12193 it->max_ascent = ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12194 it->max_descent = descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12195 it->max_phys_ascent = phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12196 it->max_phys_descent = phys_descent; |
25012 | 12197 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12198 |
25012 | 12199 break; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12200 } |
25012 | 12201 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
|
12202 { |
25012 | 12203 /* Increment number of glyphs actually displayed. */ |
12204 ++it->hpos; | |
12205 | |
12206 if (x < it->first_visible_x) | |
12207 /* Glyph is partially visible, i.e. row starts at | |
12208 negative X position. */ | |
12209 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
|
12210 } |
25012 | 12211 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12212 { |
25012 | 12213 /* Glyph is completely off the left margin of the |
12214 window. This should not happen because of the | |
12215 move_it_in_display_line at the start of | |
12216 this function. */ | |
12217 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12218 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12219 } |
25012 | 12220 |
12221 row->ascent = max (row->ascent, it->max_ascent); | |
12222 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
|
12223 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
|
12224 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
|
12225 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12226 |
12227 /* End of this display line if row is continued. */ | |
12228 if (row->continued_p) | |
12229 break; | |
12230 } | |
12231 | |
12232 /* Is this a line end? If yes, we're also done, after making | |
12233 sure that a non-default face is extended up to the right | |
12234 margin of the window. */ | |
12235 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
12236 { | |
12237 int used_before = row->used[TEXT_AREA]; | |
12238 | |
12239 /* Add a space at the end of the line that is used to | |
12240 display the cursor there. */ | |
12241 append_space (it, 0); | |
12242 | |
12243 /* Extend the face to the end of the line. */ | |
12244 extend_face_to_end_of_line (it); | |
12245 | |
12246 /* Make sure we have the position. */ | |
12247 if (used_before == 0) | |
12248 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
12249 | |
12250 /* Consume the line end. This skips over invisible lines. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12251 set_iterator_to_next (it, 1); |
25012 | 12252 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
|
12253 break; |
277 | 12254 } |
25012 | 12255 |
12256 /* Proceed with next display element. Note that this skips | |
12257 over lines invisible because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12258 set_iterator_to_next (it, 1); |
25012 | 12259 |
12260 /* If we truncate lines, we are done when the last displayed | |
12261 glyphs reach past the right margin of the window. */ | |
12262 if (it->truncate_lines_p | |
12263 && (FRAME_WINDOW_P (it->f) | |
12264 ? (it->current_x >= it->last_visible_x) | |
12265 : (it->current_x > it->last_visible_x))) | |
12266 { | |
12267 /* Maybe add truncation glyphs. */ | |
12268 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12269 { |
25012 | 12270 --it->glyph_row->used[TEXT_AREA]; |
12271 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 12272 } |
25012 | 12273 |
12274 row->truncated_on_right_p = 1; | |
12275 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
|
12276 reseat_at_next_visible_line_start (it, 0); |
25012 | 12277 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
12278 it->hpos = hpos_before; | |
12279 it->current_x = x_before; | |
12280 break; | |
12281 } | |
12282 } | |
12283 | |
12284 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
12285 at the left window margin. */ | |
12286 if (it->first_visible_x | |
12287 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
12288 { | |
12289 if (!FRAME_WINDOW_P (it->f)) | |
12290 insert_left_trunc_glyphs (it); | |
12291 row->truncated_on_left_p = 1; | |
12292 } | |
12293 | |
12294 /* If the start of this line is the overlay arrow-position, then | |
12295 mark this glyph row as the one containing the overlay arrow. | |
12296 This is clearly a mess with variable size fonts. It would be | |
12297 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
|
12298 if (MARKERP (Voverlay_arrow_position) |
277 | 12299 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 12300 && (MATRIX_ROW_START_CHARPOS (row) |
12301 == 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
|
12302 && STRINGP (Voverlay_arrow_string) |
277 | 12303 && ! overlay_arrow_seen) |
12304 { | |
25012 | 12305 /* Overlay arrow in window redisplay is a bitmap. */ |
12306 if (!FRAME_WINDOW_P (it->f)) | |
12307 { | |
12308 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
12309 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
12310 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
12311 struct glyph *p = row->glyphs[TEXT_AREA]; | |
12312 struct glyph *p2, *end; | |
12313 | |
12314 /* Copy the arrow glyphs. */ | |
12315 while (glyph < arrow_end) | |
12316 *p++ = *glyph++; | |
12317 | |
12318 /* Throw away padding glyphs. */ | |
12319 p2 = p; | |
12320 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
12321 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
12322 ++p2; | |
12323 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
|
12324 { |
25012 | 12325 while (p2 < end) |
12326 *p++ = *p2++; | |
12327 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
|
12328 } |
25012 | 12329 } |
12330 | |
277 | 12331 overlay_arrow_seen = 1; |
25012 | 12332 row->overlay_arrow_p = 1; |
12333 } | |
12334 | |
12335 /* Compute pixel dimensions of this line. */ | |
12336 compute_line_metrics (it); | |
12337 | |
12338 /* Remember the position at which this line ends. */ | |
12339 row->end = it->current; | |
12340 | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
12341 /* Maybe set the cursor. */ |
25012 | 12342 if (it->w->cursor.vpos < 0 |
12343 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12344 && PT <= MATRIX_ROW_END_CHARPOS (row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12345 && cursor_row_p (it->w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12346 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); |
25012 | 12347 |
12348 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12349 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 12350 highlight_trailing_whitespace (it->f, it->glyph_row); |
12351 | |
12352 /* Prepare for the next line. This line starts horizontally at (X | |
12353 HPOS) = (0 0). Vertical positions are incremented. As a | |
12354 convenience for the caller, IT->glyph_row is set to the next | |
12355 row to be used. */ | |
12356 it->current_x = it->hpos = 0; | |
12357 it->current_y += row->height; | |
12358 ++it->vpos; | |
12359 ++it->glyph_row; | |
12360 return row->displays_text_p; | |
12361 } | |
12362 | |
12363 | |
277 | 12364 |
25012 | 12365 /*********************************************************************** |
12366 Menu Bar | |
12367 ***********************************************************************/ | |
12368 | |
12369 /* Redisplay the menu bar in the frame for window W. | |
12370 | |
12371 The menu bar of X frames that don't have X toolkit support is | |
12372 displayed in a special window W->frame->menu_bar_window. | |
12373 | |
12374 The menu bar of terminal frames is treated specially as far as | |
12375 glyph matrices are concerned. Menu bar lines are not part of | |
12376 windows, so the update is done directly on the frame matrix rows | |
12377 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12378 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12379 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12380 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12381 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12382 { |
25012 | 12383 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12384 struct it it; | |
12385 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12386 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12387 |
25012 | 12388 /* 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
|
12389 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12390 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12391 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12392 #endif |
25012 | 12393 #ifdef USE_X_TOOLKIT |
12394 if (FRAME_X_P (f)) | |
12395 return; | |
12396 #endif | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12397 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12398 if (FRAME_MAC_P (f)) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12399 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12400 #endif |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12401 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12402 #ifdef USE_X_TOOLKIT |
25012 | 12403 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
|
12404 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 12405 it.first_visible_x = 0; |
12406 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12407 #else /* not USE_X_TOOLKIT */ | |
12408 if (FRAME_WINDOW_P (f)) | |
12409 { | |
12410 /* Menu bar lines are displayed in the desired matrix of the | |
12411 dummy window menu_bar_window. */ | |
12412 struct window *menu_w; | |
12413 xassert (WINDOWP (f->menu_bar_window)); | |
12414 menu_w = XWINDOW (f->menu_bar_window); | |
12415 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
|
12416 MENU_FACE_ID); |
25012 | 12417 it.first_visible_x = 0; |
12418 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12419 } | |
12420 else | |
12421 { | |
12422 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
12423 pixel x/y. */ | |
12424 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
|
12425 MENU_FACE_ID); |
25012 | 12426 it.first_visible_x = 0; |
12427 it.last_visible_x = FRAME_WIDTH (f); | |
12428 } | |
12429 #endif /* not USE_X_TOOLKIT */ | |
12430 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12431 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12432 /* Force the menu-bar to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12433 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12434 |
25012 | 12435 /* Clear all rows of the menu bar. */ |
12436 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
12437 { | |
12438 struct glyph_row *row = it.glyph_row + i; | |
12439 clear_glyph_row (row); | |
12440 row->enabled_p = 1; | |
12441 row->full_width_p = 1; | |
12442 } | |
12443 | |
12444 /* Display all items of the menu bar. */ | |
12445 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
|
12446 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
|
12447 { |
25012 | 12448 Lisp_Object string; |
12449 | |
12450 /* 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
|
12451 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
|
12452 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12453 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12454 |
25012 | 12455 /* Remember where item was displayed. */ |
12456 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
12457 | |
12458 /* Display the item, pad with one space. */ | |
12459 if (it.current_x < it.last_visible_x) | |
12460 display_string (NULL, string, Qnil, 0, 0, &it, | |
12461 XSTRING (string)->size + 1, 0, 0, -1); | |
12462 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12463 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12464 /* Fill out the line with spaces. */ |
25012 | 12465 if (it.current_x < it.last_visible_x) |
12466 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
12467 | |
12468 /* Compute the total height of the lines. */ | |
12469 compute_line_metrics (&it); | |
12470 } | |
12471 | |
12472 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12473 |
25012 | 12474 /*********************************************************************** |
12475 Mode Line | |
12476 ***********************************************************************/ | |
12477 | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12478 /* Redisplay mode lines in the window tree whose root is WINDOW. If |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12479 FORCE is non-zero, redisplay mode lines unconditionally. |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12480 Otherwise, redisplay only mode lines that are garbaged. Value is |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12481 the number of windows whose mode lines were redisplayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12482 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12483 static int |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12484 redisplay_mode_lines (window, force) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12485 Lisp_Object window; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12486 int force; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12487 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12488 int nwindows = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12489 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12490 while (!NILP (window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12491 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12492 struct window *w = XWINDOW (window); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12493 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12494 if (WINDOWP (w->hchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12495 nwindows += redisplay_mode_lines (w->hchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12496 else if (WINDOWP (w->vchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12497 nwindows += redisplay_mode_lines (w->vchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12498 else if (force |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12499 || FRAME_GARBAGED_P (XFRAME (w->frame)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12500 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12501 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12502 Lisp_Object old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12503 struct text_pos lpoint; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12504 struct buffer *old = current_buffer; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12505 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12506 /* Set the window's buffer for the mode line display. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12507 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12508 set_buffer_internal_1 (XBUFFER (w->buffer)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12509 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12510 /* Point refers normally to the selected window. For any |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12511 other window, set up appropriate value. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12512 if (!EQ (window, selected_window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12513 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12514 struct text_pos pt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12515 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12516 SET_TEXT_POS_FROM_MARKER (pt, w->pointm); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12517 if (CHARPOS (pt) < BEGV) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12518 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12519 else if (CHARPOS (pt) > (ZV - 1)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12520 TEMP_SET_PT_BOTH (ZV, ZV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12521 else |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12522 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12523 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12524 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12525 /* Temporarily set up the selected frame. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12526 old_selected_frame = selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12527 selected_frame = w->frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12528 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12529 /* Display mode lines. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12530 clear_glyph_matrix (w->desired_matrix); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12531 if (display_mode_lines (w)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12532 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12533 ++nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12534 w->must_be_updated_p = 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12535 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12536 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12537 /* Restore old settings. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12538 selected_frame = old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12539 set_buffer_internal_1 (old); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12540 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12541 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12542 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12543 window = w->next; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12544 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12545 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12546 return nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12547 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12548 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12549 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12550 /* Display the mode and/or top line of window W. Value is the number |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12551 of mode lines displayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12552 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12553 static int |
25012 | 12554 display_mode_lines (w) |
277 | 12555 struct window *w; |
12556 { | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12557 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12558 |
25012 | 12559 /* 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
|
12560 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
|
12561 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12562 |
25012 | 12563 if (WINDOW_WANTS_MODELINE_P (w)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12564 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12565 display_mode_line (w, MODE_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12566 current_buffer->mode_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12567 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12568 } |
25546 | 12569 |
12570 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12571 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12572 display_mode_line (w, HEADER_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12573 current_buffer->header_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12574 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12575 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12576 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12577 return n; |
25012 | 12578 } |
12579 | |
12580 | |
12581 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 12582 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12583 FORMAT is the mode line format to display. Value is the pixel |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12584 height of the mode line displayed. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12585 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12586 static int |
25012 | 12587 display_mode_line (w, face_id, format) |
12588 struct window *w; | |
12589 enum face_id face_id; | |
12590 Lisp_Object format; | |
12591 { | |
12592 struct it it; | |
12593 struct face *face; | |
12594 | |
12595 init_iterator (&it, w, -1, -1, NULL, face_id); | |
12596 prepare_desired_row (it.glyph_row); | |
12597 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12598 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12599 /* Force the mode-line to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12600 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12601 |
25012 | 12602 /* Temporarily make frame's keyboard the current kboard so that |
12603 kboard-local variables in the mode_line_format will get the right | |
12604 values. */ | |
12605 push_frame_kboard (it.f); | |
12606 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
|
12607 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
12608 |
25012 | 12609 /* Fill up with spaces. */ |
12610 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
12611 | |
12612 compute_line_metrics (&it); | |
12613 it.glyph_row->full_width_p = 1; | |
12614 it.glyph_row->mode_line_p = 1; | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12615 it.glyph_row->inverse_p = 0; |
25012 | 12616 it.glyph_row->continued_p = 0; |
12617 it.glyph_row->truncated_on_left_p = 0; | |
12618 it.glyph_row->truncated_on_right_p = 0; | |
12619 | |
12620 /* Make a 3D mode-line have a shadow at its right end. */ | |
12621 face = FACE_FROM_ID (it.f, face_id); | |
12622 extend_face_to_end_of_line (&it); | |
12623 if (face->box != FACE_NO_BOX) | |
12624 { | |
12625 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
12626 + it.glyph_row->used[TEXT_AREA] - 1); | |
12627 last->right_box_line_p = 1; | |
12628 } | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12629 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12630 return it.glyph_row->height; |
25012 | 12631 } |
12632 | |
12633 | |
12634 /* Contribute ELT to the mode line for window IT->w. How it | |
12635 translates into text depends on its data type. | |
12636 | |
12637 IT describes the display environment in which we display, as usual. | |
277 | 12638 |
12639 DEPTH is the depth in recursion. It is used to prevent | |
12640 infinite recursion here. | |
12641 | |
25012 | 12642 FIELD_WIDTH is the number of characters the display of ELT should |
12643 occupy in the mode line, and PRECISION is the maximum number of | |
12644 characters to display from ELT's representation. See | |
12645 display_string for details. * | |
12646 | |
12647 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 12648 |
12649 static int | |
25012 | 12650 display_mode_element (it, depth, field_width, precision, elt) |
12651 struct it *it; | |
277 | 12652 int depth; |
25012 | 12653 int field_width, precision; |
12654 Lisp_Object elt; | |
12655 { | |
12656 int n = 0, field, prec; | |
12657 | |
277 | 12658 tail_recurse: |
12659 if (depth > 10) | |
12660 goto invalid; | |
12661 | |
12662 depth++; | |
12663 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
12664 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 12665 { |
12666 case Lisp_String: | |
12667 { | |
12668 /* A string: output it and check for %-constructs within it. */ | |
25012 | 12669 unsigned char c; |
12670 unsigned char *this = XSTRING (elt)->data; | |
12671 unsigned char *lisp_string = this; | |
12672 | |
12673 while ((precision <= 0 || n < precision) | |
12674 && *this | |
12675 && (frame_title_ptr | |
12676 || it->current_x < it->last_visible_x)) | |
277 | 12677 { |
12678 unsigned char *last = this; | |
25012 | 12679 |
12680 /* Advance to end of string or next format specifier. */ | |
277 | 12681 while ((c = *this++) != '\0' && c != '%') |
12682 ; | |
25012 | 12683 |
277 | 12684 if (this - 1 != last) |
12685 { | |
25012 | 12686 /* Output to end of string or up to '%'. Field width |
12687 is length of string. Don't output more than | |
12688 PRECISION allows us. */ | |
12689 prec = --this - last; | |
12690 if (precision > 0 && prec > precision - n) | |
12691 prec = precision - n; | |
12692 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12693 if (frame_title_ptr) |
25012 | 12694 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
|
12695 else |
25012 | 12696 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
12697 it, 0, prec, 0, -1); | |
277 | 12698 } |
12699 else /* c == '%' */ | |
12700 { | |
25012 | 12701 unsigned char *percent_position = this; |
12702 | |
12703 /* Get the specified minimum width. Zero means | |
12704 don't pad. */ | |
12705 field = 0; | |
277 | 12706 while ((c = *this++) >= '0' && c <= '9') |
25012 | 12707 field = field * 10 + c - '0'; |
12708 | |
12709 /* Don't pad beyond the total padding allowed. */ | |
12710 if (field_width - n > 0 && field > field_width - n) | |
12711 field = field_width - n; | |
12712 | |
12713 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
12714 prec = precision - n; | |
12715 | |
277 | 12716 if (c == 'M') |
25012 | 12717 n += display_mode_element (it, depth, field, prec, |
12718 Vglobal_mode_string); | |
277 | 12719 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
|
12720 { |
25012 | 12721 unsigned char *spec |
12722 = decode_mode_spec (it->w, c, field, prec); | |
12723 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12724 if (frame_title_ptr) |
25012 | 12725 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
|
12726 else |
25012 | 12727 { |
12728 int nglyphs_before | |
12729 = it->glyph_row->used[TEXT_AREA]; | |
12730 int charpos | |
12731 = percent_position - XSTRING (elt)->data; | |
12732 int nwritten | |
12733 = display_string (spec, Qnil, elt, charpos, 0, it, | |
12734 field, prec, 0, -1); | |
12735 | |
12736 /* Assign to the glyphs written above the | |
12737 string where the `%x' came from, position | |
12738 of the `%'. */ | |
12739 if (nwritten > 0) | |
12740 { | |
12741 struct glyph *glyph | |
12742 = (it->glyph_row->glyphs[TEXT_AREA] | |
12743 + nglyphs_before); | |
12744 int i; | |
12745 | |
12746 for (i = 0; i < nwritten; ++i) | |
12747 { | |
12748 glyph[i].object = elt; | |
12749 glyph[i].charpos = charpos; | |
12750 } | |
12751 | |
12752 n += nwritten; | |
12753 } | |
12754 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12755 } |
277 | 12756 } |
12757 } | |
12758 } | |
12759 break; | |
12760 | |
12761 case Lisp_Symbol: | |
12762 /* A symbol: process the value of the symbol recursively | |
12763 as if it appeared here directly. Avoid error if symbol void. | |
12764 Special case: if value of symbol is a string, output the string | |
12765 literally. */ | |
12766 { | |
12767 register Lisp_Object tem; | |
12768 tem = Fboundp (elt); | |
485 | 12769 if (!NILP (tem)) |
277 | 12770 { |
12771 tem = Fsymbol_value (elt); | |
12772 /* If value is a string, output that string literally: | |
12773 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
|
12774 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12775 { |
25012 | 12776 prec = XSTRING (tem)->size; |
12777 if (precision > 0 && prec > precision - n) | |
12778 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12779 if (frame_title_ptr) |
25012 | 12780 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
|
12781 else |
25012 | 12782 n += display_string (NULL, tem, Qnil, 0, 0, it, |
12783 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
|
12784 } |
277 | 12785 else if (!EQ (tem, elt)) |
25012 | 12786 { |
12787 /* Give up right away for nil or t. */ | |
12788 elt = tem; | |
12789 goto tail_recurse; | |
12790 } | |
277 | 12791 } |
12792 } | |
12793 break; | |
12794 | |
12795 case Lisp_Cons: | |
12796 { | |
12797 register Lisp_Object car, tem; | |
12798 | |
12799 /* A cons cell: three distinct cases. | |
12800 If first element is a string or a cons, process all the elements | |
12801 and effectively concatenate them. | |
12802 If first element is a negative number, truncate displaying cdr to | |
12803 at most that many characters. If positive, pad (with spaces) | |
12804 to at least that many characters. | |
12805 If first element is a symbol, process the cadr or caddr recursively | |
12806 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
|
12807 car = XCAR (elt); |
25012 | 12808 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
12809 { | |
12810 /* An element of the form (:eval FORM) means evaluate FORM | |
12811 and use the result as mode line elements. */ | |
12812 struct gcpro gcpro1; | |
12813 Lisp_Object spec; | |
12814 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
12815 spec = safe_eval (XCAR (XCDR (elt))); |
25012 | 12816 GCPRO1 (spec); |
12817 n += display_mode_element (it, depth, field_width - n, | |
12818 precision - n, spec); | |
12819 UNGCPRO; | |
12820 } | |
12821 else if (SYMBOLP (car)) | |
277 | 12822 { |
12823 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12824 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
|
12825 if (!CONSP (elt)) |
277 | 12826 goto invalid; |
12827 /* elt is now the cdr, and we know it is a cons cell. | |
12828 Use its car if CAR has a non-nil value. */ | |
485 | 12829 if (!NILP (tem)) |
277 | 12830 { |
12831 tem = Fsymbol_value (car); | |
485 | 12832 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12833 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12834 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12835 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12836 } |
277 | 12837 } |
12838 /* Symbol's value is nil (or symbol is unbound) | |
12839 Get the cddr of the original list | |
12840 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
|
12841 elt = XCDR (elt); |
485 | 12842 if (NILP (elt)) |
277 | 12843 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12844 else if (!CONSP (elt)) |
277 | 12845 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12846 elt = XCAR (elt); |
277 | 12847 goto tail_recurse; |
12848 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12849 else if (INTEGERP (car)) |
277 | 12850 { |
12851 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12852 elt = XCDR (elt); |
277 | 12853 if (lim < 0) |
25012 | 12854 { |
12855 /* Negative int means reduce maximum width. */ | |
12856 if (precision <= 0) | |
12857 precision = -lim; | |
12858 else | |
12859 precision = min (precision, -lim); | |
12860 } | |
277 | 12861 else if (lim > 0) |
12862 { | |
12863 /* Padding specified. Don't let it be more than | |
12864 current maximum. */ | |
25012 | 12865 if (precision > 0) |
12866 lim = min (precision, lim); | |
12867 | |
277 | 12868 /* If that's more padding than already wanted, queue it. |
12869 But don't reduce padding already specified even if | |
12870 that is beyond the current truncation point. */ | |
25012 | 12871 field_width = max (lim, field_width); |
277 | 12872 } |
12873 goto tail_recurse; | |
12874 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12875 else if (STRINGP (car) || CONSP (car)) |
277 | 12876 { |
12877 register int limit = 50; | |
25012 | 12878 /* Limit is to protect against circular lists. */ |
12879 while (CONSP (elt) | |
12880 && --limit > 0 | |
12881 && (precision <= 0 || n < precision)) | |
277 | 12882 { |
25012 | 12883 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
|
12884 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12885 elt = XCDR (elt); |
277 | 12886 } |
12887 } | |
12888 } | |
12889 break; | |
12890 | |
12891 default: | |
12892 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12893 if (frame_title_ptr) |
25012 | 12894 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
|
12895 else |
25012 | 12896 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
12897 precision - n, 0, 0); | |
12898 return n; | |
12899 } | |
12900 | |
12901 /* Pad to FIELD_WIDTH. */ | |
12902 if (field_width > 0 && n < field_width) | |
12903 { | |
12904 if (frame_title_ptr) | |
12905 n += store_frame_title ("", field_width - n, 0); | |
12906 else | |
12907 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
12908 0, 0, 0); | |
12909 } | |
12910 | |
12911 return n; | |
12912 } | |
12913 | |
12914 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12915 /* 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
|
12916 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
|
12917 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12918 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12919 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12920 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12921 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12922 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12923 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12924 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12925 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12926 if (d <= 0) |
25012 | 12927 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12928 else |
25012 | 12929 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12930 while (d > 0) |
25012 | 12931 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12932 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12933 d /= 10; |
25012 | 12934 } |
12935 } | |
12936 | |
12937 for (width -= (int) (p - buf); width > 0; --width) | |
12938 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12939 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12940 while (p > buf) |
25012 | 12941 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12942 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12943 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12944 *p-- = d; |
25012 | 12945 } |
12946 } | |
12947 | |
12948 /* 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
|
12949 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
|
12950 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
|
12951 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
12952 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
|
12953 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12954 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12955 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
|
12956 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12957 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12958 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12959 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12960 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12961 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
|
12962 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12963 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12964 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12965 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
|
12966 |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12967 val = Fget (coding_system, Qcoding_system); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
12968 eoltype = Qnil; |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12969 |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12970 if (!VECTORP (val)) /* Not yet decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12971 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12972 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12973 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
12974 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12975 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
|
12976 /* 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
|
12977 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12978 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12979 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12980 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12981 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12982 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
|
12983 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12984 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12985 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12986 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12987 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12988 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12989 /* 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
|
12990 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12991 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
|
12992 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
|
12993 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
|
12994 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
|
12995 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
|
12996 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
|
12997 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12998 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12999 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13000 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13001 } |
25012 | 13002 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13003 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13004 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13005 /* 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
|
13006 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13007 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13008 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13009 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13010 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13011 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13012 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13013 { |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13014 eol_str = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH); |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
13015 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
|
13016 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13017 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13018 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13019 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13020 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
|
13021 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13022 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
|
13023 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13024 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13025 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13026 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13027 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13028 |
277 | 13029 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 13030 generated by character C. PRECISION >= 0 means don't return a |
13031 string longer than that value. FIELD_WIDTH > 0 means pad the | |
13032 string returned with spaces to that value. */ | |
277 | 13033 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
13034 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
|
13035 |
277 | 13036 static char * |
25012 | 13037 decode_mode_spec (w, c, field_width, precision) |
277 | 13038 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
|
13039 register int c; |
25012 | 13040 int field_width, precision; |
277 | 13041 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13042 Lisp_Object obj; |
25012 | 13043 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
13044 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
|
13045 struct buffer *b = XBUFFER (w->buffer); |
277 | 13046 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13047 obj = Qnil; |
277 | 13048 |
13049 switch (c) | |
13050 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13051 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13052 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
|
13053 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13054 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
|
13055 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13056 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13057 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13058 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13059 /* 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
|
13060 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
|
13061 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13062 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
|
13063 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13064 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13065 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13066 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13067 /* 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
|
13068 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
|
13069 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13070 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13071 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13072 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13073 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13074 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13075 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13076 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13077 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13078 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13079 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13080 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
|
13081 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13082 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
|
13083 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
|
13084 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13085 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13086 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
|
13087 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13088 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13089 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13090 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13091 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13092 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13093 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13094 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
|
13095 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13096 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
|
13097 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
|
13098 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13099 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13100 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
|
13101 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13102 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13103 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13104 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13105 register int i; |
25012 | 13106 |
13107 /* Let lots_of_dashes be a string of infinite length. */ | |
13108 if (field_width <= 0 | |
13109 || field_width > sizeof (lots_of_dashes)) | |
13110 { | |
13111 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
13112 decode_mode_spec_buf[i] = '-'; | |
13113 decode_mode_spec_buf[i] = '\0'; | |
13114 return decode_mode_spec_buf; | |
13115 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13116 else |
25012 | 13117 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
|
13118 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13119 |
277 | 13120 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13121 obj = b->name; |
277 | 13122 break; |
13123 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13124 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13125 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13126 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
|
13127 XSETFASTINT (w->column_number_displayed, col); |
25012 | 13128 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
|
13129 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
|
13130 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13131 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13132 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13133 /* %F displays the frame name. */ |
25012 | 13134 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
|
13135 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
13136 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
|
13137 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
|
13138 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
|
13139 |
277 | 13140 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13141 obj = b->filename; |
277 | 13142 break; |
13143 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13144 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13145 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13146 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13147 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13148 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13149 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13150 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13151 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13152 /* 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
|
13153 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13154 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
|
13155 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
13156 /* 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
|
13157 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
|
13158 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13159 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13160 /* If the buffer is very big, don't waste time. */ |
29698
9ad6e18de5f7
* xdisp.c (decode_mode_spec): Fix sense of test whether Vline_number_display_limit is an integer.
Ken Raeburn <raeburn@raeburn.org>
parents:
29697
diff
changeset
|
13161 if (INTEGERP (Vline_number_display_limit) |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13162 && BUF_ZV (b) - BUF_BEGV (b) > XINT (Vline_number_display_limit)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13163 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13164 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13165 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13166 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13167 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13168 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13169 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13170 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13171 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13172 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13173 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13174 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13175 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
|
13176 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13177 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13178 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13179 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13180 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13181 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13182 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13183 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13184 /* 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
|
13185 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13186 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13187 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13188 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13189 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13190 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13191 /* 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
|
13192 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
|
13193 "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
|
13194 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
|
13195 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13196 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13197 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
|
13198 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
|
13199 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13200 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
|
13201 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13202 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13203 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13204 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13205 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13206 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
|
13207 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13208 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13209 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13210 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13211 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13212 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13213 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13214 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13215 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13216 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13217 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13218 /* 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
|
13219 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
|
13220 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
|
13221 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13222 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13223 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13224 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13225 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13226 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13227 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13228 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13229 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
|
13230 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13231 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13232 /* 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
|
13233 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13234 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13235 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13236 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13237 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13238 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13239 /* Make the string to show. */ |
25012 | 13240 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
|
13241 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13242 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13243 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13244 char* p = decode_mode_spec_buf; |
25012 | 13245 int pad = field_width - 2; |
13246 while (pad-- > 0) | |
13247 *p++ = ' '; | |
13248 *p++ = '?'; | |
29697
f24d81dfa064
* xdisp.c (decode_mode_spec): In "no_value" case, do NUL termination of string.
Ken Raeburn <raeburn@raeburn.org>
parents:
29643
diff
changeset
|
13249 *p++ = '?'; |
f24d81dfa064
* xdisp.c (decode_mode_spec): In "no_value" case, do NUL termination of string.
Ken Raeburn <raeburn@raeburn.org>
parents:
29643
diff
changeset
|
13250 *p = '\0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13251 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13252 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13253 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13254 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13255 |
277 | 13256 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13257 obj = b->mode_name; |
277 | 13258 break; |
13259 | |
13260 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13261 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 13262 return " Narrow"; |
13263 break; | |
13264 | |
13265 case 'p': | |
13266 { | |
13267 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
|
13268 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
|
13269 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13270 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 13271 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13272 if (pos <= BUF_BEGV (b)) |
277 | 13273 return "All"; |
13274 else | |
13275 return "Bottom"; | |
13276 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13277 else if (pos <= BUF_BEGV (b)) |
277 | 13278 return "Top"; |
13279 else | |
13280 { | |
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
|
13281 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
|
13282 /* 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
|
13283 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
|
13284 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
|
13285 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 13286 /* We can't normally display a 3-digit number, |
13287 so get us a 2-digit number that is close. */ | |
13288 if (total == 100) | |
13289 total = 99; | |
13290 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
13291 return decode_mode_spec_buf; | |
13292 } | |
13293 } | |
13294 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13295 /* 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
|
13296 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13297 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13298 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
|
13299 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
|
13300 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
|
13301 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13302 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13303 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13304 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13305 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13306 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13307 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13308 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13309 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13310 { |
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
|
13311 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
|
13312 /* 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
|
13313 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
|
13314 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
|
13315 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
|
13316 /* 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
|
13317 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
|
13318 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13319 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13320 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13321 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13322 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13323 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13324 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13325 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13326 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13327 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13328 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13329 /* 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
|
13330 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
|
13331 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
|
13332 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
|
13333 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13334 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
|
13335 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13336 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13337 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13338 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
|
13339 #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
|
13340 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
|
13341 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13342 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13343 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13344 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13345 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13346 /* 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
|
13347 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13348 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13349 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13350 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
|
13351 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13352 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
13353 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13354 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13355 /* 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
|
13356 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13357 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
|
13358 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
|
13359 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13360 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
|
13361 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13362 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13363 #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
|
13364 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13365 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13366 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13367 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13368 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
|
13369 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13370 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
|
13371 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13372 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13373 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13374 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13375 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13376 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13377 } |
277 | 13378 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13379 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13380 if (STRINGP (obj)) |
277 | 13381 return (char *) XSTRING (obj)->data; |
13382 else | |
13383 return ""; | |
13384 } | |
25012 | 13385 |
13386 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13387 /* 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
|
13388 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13389 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
|
13390 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13391 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
|
13392 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13393 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13394 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
|
13395 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13396 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13397 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13398 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13399 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13400 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13401 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13402 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13403 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13404 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13405 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13406 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13407 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13408 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13409 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13410 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13411 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13412 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13413 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13414 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13415 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13416 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13417 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13418 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13419 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13420 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13421 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13422 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13423 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13424 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13425 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13426 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13427 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13428 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13429 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13430 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13431 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13432 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13433 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13434 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13435 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13436 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13437 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13438 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13439 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13440 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13441 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13442 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13443 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13444 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13445 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13446 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13447 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13448 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13449 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13450 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13451 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13452 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
|
13453 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13454 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13455 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13456 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13457 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13458 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13459 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13460 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13461 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13462 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13463 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13464 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13465 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13466 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13467 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13468 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13469 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13470 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
|
13471 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13472 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13473 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13474 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13475 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13476 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13477 /* 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
|
13478 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
|
13479 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13480 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13481 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13482 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13483 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13484 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13485 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13486 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13487 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13488 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13489 } |
25012 | 13490 |
13491 | |
277 | 13492 |
25012 | 13493 /*********************************************************************** |
13494 Displaying strings | |
13495 ***********************************************************************/ | |
13496 | |
13497 /* Display a NUL-terminated string, starting with index START. | |
13498 | |
13499 If STRING is non-null, display that C string. Otherwise, the Lisp | |
13500 string LISP_STRING is displayed. | |
13501 | |
13502 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
13503 FACE_STRING. Display STRING or LISP_STRING with the face at | |
13504 FACE_STRING_POS in FACE_STRING: | |
13505 | |
13506 Display the string in the environment given by IT, but use the | |
13507 standard display table, temporarily. | |
13508 | |
13509 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
13510 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
13511 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
13512 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
13513 | |
13514 PRECISION is the maximum number of characters to output from | |
13515 STRING. PRECISION < 0 means don't truncate the string. | |
13516 | |
13517 This is roughly equivalent to printf format specifiers: | |
13518 | |
13519 FIELD_WIDTH PRECISION PRINTF | |
13520 ---------------------------------------- | |
13521 -1 -1 %s | |
13522 -1 10 %.10s | |
13523 10 -1 %10s | |
13524 20 10 %20.10s | |
13525 | |
13526 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
13527 display them, and < 0 means obey the current buffer's value of | |
13528 enable_multibyte_characters. | |
13529 | |
13530 Value is the number of glyphs produced. */ | |
277 | 13531 |
13532 static int | |
25012 | 13533 display_string (string, lisp_string, face_string, face_string_pos, |
13534 start, it, field_width, precision, max_x, multibyte) | |
277 | 13535 unsigned char *string; |
25012 | 13536 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
|
13537 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
|
13538 int face_string_pos; |
25012 | 13539 int start; |
13540 struct it *it; | |
13541 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
|
13542 int multibyte; |
277 | 13543 { |
25012 | 13544 int hpos_at_start = it->hpos; |
13545 int saved_face_id = it->face_id; | |
13546 struct glyph_row *row = it->glyph_row; | |
13547 | |
13548 /* Initialize the iterator IT for iteration over STRING beginning | |
13549 with index START. We assume that IT may be modified here (which | |
13550 means that display_line has to do something when displaying a | |
13551 mini-buffer prompt, which it does). */ | |
13552 reseat_to_string (it, string, lisp_string, start, | |
13553 precision, field_width, multibyte); | |
13554 | |
13555 /* If displaying STRING, set up the face of the iterator | |
13556 from LISP_STRING, if that's given. */ | |
13557 if (STRINGP (face_string)) | |
13558 { | |
13559 int endptr; | |
13560 struct face *face; | |
13561 | |
13562 it->face_id | |
13563 = face_at_string_position (it->w, face_string, face_string_pos, | |
13564 0, it->region_beg_charpos, | |
13565 it->region_end_charpos, | |
13566 &endptr, it->base_face_id); | |
13567 face = FACE_FROM_ID (it->f, it->face_id); | |
13568 it->face_box_p = face->box != FACE_NO_BOX; | |
13569 } | |
13570 | |
13571 /* Set max_x to the maximum allowed X position. Don't let it go | |
13572 beyond the right edge of the window. */ | |
13573 if (max_x <= 0) | |
13574 max_x = it->last_visible_x; | |
13575 else | |
13576 max_x = min (max_x, it->last_visible_x); | |
13577 | |
13578 /* Skip over display elements that are not visible. because IT->w is | |
13579 hscrolled. */ | |
13580 if (it->current_x < it->first_visible_x) | |
13581 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
13582 MOVE_TO_POS | MOVE_TO_X); | |
13583 | |
13584 row->ascent = it->max_ascent; | |
13585 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
|
13586 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
|
13587 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 13588 |
13589 /* This condition is for the case that we are called with current_x | |
13590 past last_visible_x. */ | |
13591 while (it->current_x < max_x) | |
13592 { | |
13593 int x_before, x, n_glyphs_before, i, nglyphs; | |
13594 | |
13595 /* Get the next display element. */ | |
13596 if (!get_next_display_element (it)) | |
13597 break; | |
13598 | |
13599 /* Produce glyphs. */ | |
13600 x_before = it->current_x; | |
13601 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
13602 PRODUCE_GLYPHS (it); | |
13603 | |
13604 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
13605 i = 0; | |
13606 x = x_before; | |
13607 while (i < nglyphs) | |
13608 { | |
13609 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
13610 | |
13611 if (!it->truncate_lines_p | |
13612 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
13613 { |
25012 | 13614 /* End of continued line or max_x reached. */ |
13615 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
13616 it->current_x = x; | |
13617 break; | |
277 | 13618 } |
25012 | 13619 else if (x + glyph->pixel_width > it->first_visible_x) |
13620 { | |
13621 /* Glyph is at least partially visible. */ | |
13622 ++it->hpos; | |
13623 if (x < it->first_visible_x) | |
13624 it->glyph_row->x = x - it->first_visible_x; | |
13625 } | |
13626 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13627 { |
25012 | 13628 /* Glyph is off the left margin of the display area. |
13629 Should not happen. */ | |
13630 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13631 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
13632 |
25012 | 13633 row->ascent = max (row->ascent, it->max_ascent); |
13634 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
|
13635 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
|
13636 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
|
13637 it->max_phys_ascent + it->max_phys_descent); |
25012 | 13638 x += glyph->pixel_width; |
13639 ++i; | |
13640 } | |
13641 | |
13642 /* Stop if max_x reached. */ | |
13643 if (i < nglyphs) | |
13644 break; | |
13645 | |
13646 /* Stop at line ends. */ | |
13647 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
13648 { | |
13649 it->continuation_lines_width = 0; | |
13650 break; | |
13651 } | |
13652 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
13653 set_iterator_to_next (it, 1); |
25012 | 13654 |
13655 /* Stop if truncating at the right edge. */ | |
13656 if (it->truncate_lines_p | |
13657 && it->current_x >= it->last_visible_x) | |
13658 { | |
13659 /* Add truncation mark, but don't do it if the line is | |
13660 truncated at a padding space. */ | |
13661 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
|
13662 { |
25012 | 13663 if (!FRAME_WINDOW_P (it->f)) |
13664 produce_special_glyphs (it, IT_TRUNCATION); | |
13665 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
|
13666 } |
25012 | 13667 break; |
13668 } | |
13669 } | |
13670 | |
13671 /* Maybe insert a truncation at the left. */ | |
13672 if (it->first_visible_x | |
13673 && IT_CHARPOS (*it) > 0) | |
13674 { | |
13675 if (!FRAME_WINDOW_P (it->f)) | |
13676 insert_left_trunc_glyphs (it); | |
13677 it->glyph_row->truncated_on_left_p = 1; | |
13678 } | |
13679 | |
13680 it->face_id = saved_face_id; | |
13681 | |
13682 /* Value is number of columns displayed. */ | |
13683 return it->hpos - hpos_at_start; | |
13684 } | |
13685 | |
13686 | |
277 | 13687 |
25012 | 13688 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
13689 appears as an element of LIST or as the car of an element of LIST. | |
13690 If PROPVAL is a list, compare each element against LIST in that | |
13691 way, and return 1 if any element of PROPVAL is found in LIST. | |
13692 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
|
13693 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13694 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13695 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13696 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13697 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13698 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13699 register Lisp_Object tail, proptail; |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13700 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13701 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
|
13702 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13703 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13704 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13705 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13706 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13707 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
|
13708 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13709 } |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13710 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13711 if (CONSP (propval)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13712 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13713 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13714 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13715 Lisp_Object propelt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13716 propelt = XCAR (proptail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13717 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13718 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13719 register Lisp_Object tem; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13720 tem = XCAR (tail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13721 if (EQ (propelt, tem)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13722 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13723 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13724 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13725 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13726 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13727 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13728 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13729 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13730 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13731 |
25012 | 13732 |
13733 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
13734 the cdr of that element is non-nil. If PROPVAL is a list, check | |
13735 each element of PROPVAL in that way, and the first time some | |
13736 element is found, return 1 if the cdr of that element is non-nil. | |
13737 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
|
13738 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13739 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13740 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13741 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13742 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13743 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13744 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13745 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13746 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
|
13747 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13748 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13749 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13750 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13751 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13752 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13753 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13754 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13755 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
|
13756 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13757 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13758 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13759 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
|
13760 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13761 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13762 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13763 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13764 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13765 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13766 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13767 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13768 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13769 } |
25012 | 13770 |
13771 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13772 |
25012 | 13773 /*********************************************************************** |
13774 Initialization | |
13775 ***********************************************************************/ | |
13776 | |
277 | 13777 void |
13778 syms_of_xdisp () | |
13779 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13780 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
|
13781 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
|
13782 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13783 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13784 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13785 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13786 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13787 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13788 |
25012 | 13789 #if GLYPH_DEBUG |
13790 defsubr (&Sdump_glyph_matrix); | |
13791 defsubr (&Sdump_glyph_row); | |
25543 | 13792 defsubr (&Sdump_tool_bar_row); |
25012 | 13793 defsubr (&Strace_redisplay_toggle); |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
13794 defsubr (&Strace_to_stderr); |
25012 | 13795 #endif |
13796 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
13797 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
|
13798 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
|
13799 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
13800 staticpro (&Qoverriding_terminal_local_map); |
12267 | 13801 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
|
13802 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
13803 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
|
13804 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
|
13805 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13806 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13807 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
|
13808 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13809 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13810 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 13811 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13812 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13813 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
|
13814 |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13815 QCdata = intern (":data"); |
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13816 staticpro (&QCdata); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13817 Qdisplay = intern ("display"); |
25012 | 13818 staticpro (&Qdisplay); |
13819 Qspace_width = intern ("space-width"); | |
13820 staticpro (&Qspace_width); | |
13821 Qraise = intern ("raise"); | |
13822 staticpro (&Qraise); | |
13823 Qspace = intern ("space"); | |
13824 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13825 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13826 staticpro (&Qmargin); |
25012 | 13827 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13828 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13829 Qright_margin = intern ("right-margin"); |
25012 | 13830 staticpro (&Qright_margin); |
13831 Qalign_to = intern ("align-to"); | |
13832 staticpro (&Qalign_to); | |
13833 QCalign_to = intern (":align-to"); | |
13834 staticpro (&QCalign_to); | |
13835 Qrelative_width = intern ("relative-width"); | |
13836 staticpro (&Qrelative_width); | |
13837 QCrelative_width = intern (":relative-width"); | |
13838 staticpro (&QCrelative_width); | |
13839 QCrelative_height = intern (":relative-height"); | |
13840 staticpro (&QCrelative_height); | |
13841 QCeval = intern (":eval"); | |
13842 staticpro (&QCeval); | |
25614 | 13843 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13844 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13845 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13846 staticpro (&QCfile); |
25012 | 13847 Qfontified = intern ("fontified"); |
13848 staticpro (&Qfontified); | |
13849 Qfontification_functions = intern ("fontification-functions"); | |
13850 staticpro (&Qfontification_functions); | |
13851 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
13852 staticpro (&Qtrailing_whitespace); | |
13853 Qimage = intern ("image"); | |
13854 staticpro (&Qimage); | |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13855 Qmessage_truncate_lines = intern ("message-truncate-lines"); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13856 staticpro (&Qmessage_truncate_lines); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
13857 Qgrow_only = intern ("grow-only"); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
13858 staticpro (&Qgrow_only); |
25012 | 13859 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13860 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13861 last_arrow_string = Qnil; |
277 | 13862 staticpro (&last_arrow_position); |
13863 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
|
13864 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13865 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
|
13866 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13867 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13868 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13869 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
|
13870 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
|
13871 staticpro (&echo_area_buffer[1]); |
277 | 13872 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13873 Vmessages_buffer_name = build_string ("*Messages*"); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13874 staticpro (&Vmessages_buffer_name); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13875 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13876 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13877 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13878 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13879 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13880 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13881 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13882 "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
|
13883 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13884 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13885 |
277 | 13886 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
13887 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 13888 Vglobal_mode_string = Qnil; |
13889 | |
13890 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
13891 "Marker for where to display an arrow on top of the buffer text.\n\ | |
13892 This must be the beginning of a line in order to work.\n\ | |
13893 See also `overlay-arrow-string'."); | |
13894 Voverlay_arrow_position = Qnil; | |
13895 | |
13896 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
13897 "String to display as an arrow. See also `overlay-arrow-position'."); | |
13898 Voverlay_arrow_string = Qnil; | |
13899 | |
13900 DEFVAR_INT ("scroll-step", &scroll_step, | |
13901 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 13902 If that fails to bring point back on frame, point is centered instead.\n\ |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13903 If this is zero, point is always centered after it moves off frame.\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13904 If you want scrolling to always be a line at a time, you should set\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13905 `scroll-conservatively' to a large value rather than set this to 1."); |
277 | 13906 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13907 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
27681
2e811e86c10b
(syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents:
27634
diff
changeset
|
13908 "*Scroll up to this many lines, to bring point back on screen.\n\ |
2e811e86c10b
(syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents:
27634
diff
changeset
|
13909 A value of zero means to scroll the text to center point vertically\n\ |
2e811e86c10b
(syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents:
27634
diff
changeset
|
13910 in the window."); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13911 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13912 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13913 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13914 "*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
|
13915 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
|
13916 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13917 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13918 |
25012 | 13919 #if GLYPH_DEBUG |
277 | 13920 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 13921 #endif |
277 | 13922 |
13923 DEFVAR_BOOL ("truncate-partial-width-windows", | |
13924 &truncate_partial_width_windows, | |
769 | 13925 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 13926 truncate_partial_width_windows = 1; |
13927 | |
13928 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13929 "nil means display the mode-line/header-line/menu-bar in the default face.\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13930 Any other value means to use the appropriate face, `mode-line',\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13931 `header-line', or `menu' respectively.\n\ |
33721
c45f067779c1
(syms_of_xdisp): `mode-line-inverse-video' defualts to nil.
Miles Bader <miles@gnu.org>
parents:
33600
diff
changeset
|
13932 \n\ |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13933 This variable is deprecated; please change the above faces instead."); |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13934 mode_line_inverse_video = 1; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13935 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13936 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit, |
25012 | 13937 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 13938 If the buffer is bigger than this, the line number does not appear\n\ |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13939 in the mode line. A value of nil means no limit."); |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13940 Vline_number_display_limit = Qnil; |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13941 |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13942 DEFVAR_INT ("line-number-display-limit-width", |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13943 &line_number_display_limit_width, |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13944 "*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
|
13945 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
|
13946 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
|
13947 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13948 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
13949 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
|
13950 "*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
|
13951 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
|
13952 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13953 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
|
13954 "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
|
13955 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
|
13956 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
|
13957 `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
|
13958 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13959 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 13960 "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
|
13961 \(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
|
13962 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
|
13963 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
|
13964 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13965 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 13966 "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
|
13967 \(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
|
13968 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
|
13969 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
|
13970 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13971 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13972 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13973 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13974 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13975 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13976 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13977 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13978 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13979 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13980 Qnil))); |
10393 | 13981 |
13982 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
13983 "Maximum number of lines to keep in the message log buffer.\n\ | |
13984 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
13985 the buffer when it becomes large."); | |
13986 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13987 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13988 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
|
13989 "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
|
13990 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
|
13991 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
|
13992 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
|
13993 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
|
13994 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
|
13995 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13996 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 13997 "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
|
13998 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
|
13999 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
|
14000 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
|
14001 Vwindow_scroll_functions = Qnil; |
25012 | 14002 |
25543 | 14003 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
14004 "*Non-nil means automatically resize tool-bars.\n\ | |
14005 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
14006 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 14007 otherwise."); |
25543 | 14008 auto_resize_tool_bars_p = 1; |
14009 | |
14010 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
14011 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
14012 auto_raise_tool_bar_buttons_p = 1; | |
14013 | |
14014 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
14015 "*Margin around tool-bar buttons in pixels."); | |
14016 tool_bar_button_margin = 1; | |
14017 | |
14018 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
14019 "Relief thickness of tool-bar buttons."); | |
14020 tool_bar_button_relief = 3; | |
25012 | 14021 |
14022 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
14023 "List of functions to call to fontify regions of text.\n\ | |
14024 Each function is called with one argument POS. Functions must\n\ | |
14025 fontify a region starting at POS in the current buffer, and give\n\ | |
14026 fontified regions the property `fontified'.\n\ | |
14027 This variable automatically becomes buffer-local when set."); | |
14028 Vfontification_functions = Qnil; | |
33824
09db0c6cb714
(syms_of_xdisp): Make fontification-functions buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33762
diff
changeset
|
14029 Fmake_variable_buffer_local (Qfontification_functions); |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14030 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14031 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 14032 &unibyte_display_via_language_environment, |
14033 "*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
|
14034 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
|
14035 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
|
14036 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
|
14037 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14038 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
|
14039 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14040 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
|
14041 "*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
|
14042 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14043 If an integer, it specifies 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
|
14044 Vmax_mini_window_height = make_float (0.25); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14045 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14046 DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows, |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14047 "*How to resize the mini-window.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14048 A value of nil means don't automatically resize mini-windows.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14049 A value of t means resize it to fit the text displayed in it.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14050 A value of `grow-only', the default, means let mini-windows grow\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14051 only, until the its display becomes empty, at which point the mini-window\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14052 goes back to its normal size."); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14053 Vresize_mini_windows = Qgrow_only; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14054 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14055 DEFVAR_BOOL ("cursor-in-non-selected-windows", |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14056 &cursor_in_non_selected_windows, |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14057 "*Non-nil means display a hollow cursor in non-selected windows.\n\ |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14058 Nil means don't display a cursor there."); |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14059 cursor_in_non_selected_windows = 1; |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14060 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14061 DEFVAR_BOOL ("automatic-hscrolling", &automatic_hscrolling_p, |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14062 "*Non-nil means scroll the display automatically to make point visible."); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14063 automatic_hscrolling_p = 1; |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14064 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14065 DEFVAR_LISP ("image-types", &Vimage_types, |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14066 "List of supported image types.\n\ |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14067 Each element of the list is a symbol for a supported image type."); |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14068 Vimage_types = Qnil; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14069 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14070 DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines, |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14071 "If non-nil, messages are truncated instead of resizing the echo area.\n\ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14072 Bind this around calls to `message' to let it take effect."); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14073 message_truncate_lines = 0; |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14074 |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14075 DEFVAR_LISP ("menu-bar-update-hook", &Vmenu_bar_update_hook, |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14076 "Normal hook run for clicks on menu bar, before displaying a submenu.\n\ |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14077 Can be used to update submenus whose contents should vary."); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14078 Vmenu_bar_update_hook = Qnil; |
277 | 14079 } |
14080 | |
25012 | 14081 |
14082 /* Initialize this module when Emacs starts. */ | |
14083 | |
21514 | 14084 void |
277 | 14085 init_xdisp () |
14086 { | |
14087 Lisp_Object root_window; | |
25012 | 14088 struct window *mini_w; |
14089 | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14090 current_header_line_height = current_mode_line_height = -1; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14091 |
25012 | 14092 CHARPOS (this_line_start_pos) = 0; |
277 | 14093 |
14094 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
|
14095 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 14096 |
14097 if (!noninteractive) | |
14098 { | |
25012 | 14099 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
14100 int i; | |
14101 | |
14102 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
|
14103 set_window_height (root_window, |
25012 | 14104 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
|
14105 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14106 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 14107 set_window_height (minibuf_window, 1, 0); |
14108 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14109 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
|
14110 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 14111 |
14112 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
14113 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
14114 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
14115 | |
14116 /* The default ellipsis glyphs `...'. */ | |
14117 for (i = 0; i < 3; ++i) | |
14118 XSETFASTINT (default_invis_vector[i], '.'); | |
14119 } | |
14120 | |
14121 #ifdef HAVE_WINDOW_SYSTEM | |
14122 { | |
14123 /* Allocate the buffer for frame titles. */ | |
14124 int size = 100; | |
14125 frame_title_buf = (char *) xmalloc (size); | |
14126 frame_title_buf_end = frame_title_buf + size; | |
14127 frame_title_ptr = NULL; | |
14128 } | |
14129 #endif /* HAVE_WINDOW_SYSTEM */ | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14130 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14131 help_echo_showing_p = 0; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14132 } |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14133 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14134 |