Mercurial > emacs
annotate src/xdisp.c @ 30862:35b541973767
zone
author | Dave Love <fx@gnu.org> |
---|---|
date | Wed, 16 Aug 2000 19:25:25 +0000 |
parents | 8218291cc912 |
children | 8f6621d33f0b |
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" | |
769 | 173 #include "frame.h" |
277 | 174 #include "window.h" |
175 #include "termchar.h" | |
176 #include "dispextern.h" | |
177 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
178 #include "charset.h" |
277 | 179 #include "indent.h" |
180 #include "commands.h" | |
181 #include "macros.h" | |
182 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
183 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
184 #include "intervals.h" |
12081 | 185 #include "keyboard.h" |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
186 #include "coding.h" |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
187 #include "process.h" |
21514 | 188 #include "region-cache.h" |
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 |
277 | 197 |
25012 | 198 #define min(a, b) ((a) < (b) ? (a) : (b)) |
199 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
200 | |
201 #define INFINITY 10000000 | |
202 | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
203 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
204 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
|
205 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
|
206 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
207 |
277 | 208 extern int interrupt_input; |
209 extern int command_loop_level; | |
210 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
211 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
212 |
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
|
213 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
|
214 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
215 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
|
216 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 217 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
|
218 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
219 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
|
220 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
|
221 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
222 Lisp_Object Qinhibit_point_motion_hooks; |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
223 Lisp_Object QCeval, Qwhen, QCfile, QCdata; |
25012 | 224 Lisp_Object Qfontified; |
225 | |
226 /* Functions called to fontify regions of text. */ | |
227 | |
228 Lisp_Object Vfontification_functions; | |
229 Lisp_Object Qfontification_functions; | |
230 | |
25543 | 231 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 232 over them. */ |
233 | |
25543 | 234 int auto_raise_tool_bar_buttons_p; |
235 | |
236 /* Margin around tool bar buttons in pixels. */ | |
237 | |
238 int tool_bar_button_margin; | |
239 | |
240 /* Thickness of shadow to draw around tool bar buttons. */ | |
241 | |
242 int tool_bar_button_relief; | |
243 | |
244 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 245 items are visible, and no blank lines remain. */ |
246 | |
25543 | 247 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
|
248 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
249 /* 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
|
250 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
251 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
252 |
25012 | 253 /* Names of text properties relevant for redisplay. */ |
254 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
255 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
|
256 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 257 |
258 /* Symbols used in text property values. */ | |
259 | |
260 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
|
261 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
|
262 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
263 extern Lisp_Object Qheight; |
25012 | 264 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
265 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
266 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
267 Lisp_Object Vshow_trailing_whitespace; |
25012 | 268 |
269 /* Name of the face used to highlight trailing whitespace. */ | |
270 | |
271 Lisp_Object Qtrailing_whitespace; | |
272 | |
273 /* The symbol `image' which is the car of the lists used to represent | |
274 images in Lisp. */ | |
275 | |
276 Lisp_Object Qimage; | |
277 | |
278 /* Non-zero means print newline to stdout before next mini-buffer | |
279 message. */ | |
277 | 280 |
281 int noninteractive_need_newline; | |
282 | |
25012 | 283 /* 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
|
284 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
285 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
286 |
25012 | 287 |
288 /* The buffer position of the first character appearing entirely or | |
289 partially on the line of the selected window which contains the | |
290 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
291 redisplay optimization in redisplay_internal. */ | |
292 | |
293 static struct text_pos this_line_start_pos; | |
294 | |
295 /* Number of characters past the end of the line above, including the | |
296 terminating newline. */ | |
297 | |
298 static struct text_pos this_line_end_pos; | |
299 | |
300 /* The vertical positions and the height of this line. */ | |
301 | |
277 | 302 static int this_line_vpos; |
25012 | 303 static int this_line_y; |
304 static int this_line_pixel_height; | |
305 | |
306 /* X position at which this display line starts. Usually zero; | |
307 negative if first character is partially visible. */ | |
308 | |
309 static int this_line_start_x; | |
310 | |
311 /* Buffer that this_line_.* variables are referring to. */ | |
312 | |
277 | 313 static struct buffer *this_line_buffer; |
314 | |
25012 | 315 /* Nonzero means truncate lines in all windows less wide than the |
316 frame. */ | |
317 | |
277 | 318 int truncate_partial_width_windows; |
319 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
320 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 321 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
322 int unibyte_display_via_language_environment; |
25012 | 323 |
324 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
325 Not guaranteed to be accurate except while parsing | |
326 frame-title-format. */ | |
327 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
328 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
329 |
277 | 330 Lisp_Object Vglobal_mode_string; |
331 | |
332 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 333 |
277 | 334 Lisp_Object Voverlay_arrow_position; |
335 | |
25012 | 336 /* String to display for the arrow. Only used on terminal frames. */ |
337 | |
277 | 338 Lisp_Object Voverlay_arrow_string; |
339 | |
25012 | 340 /* Values of those variables at last redisplay. However, if |
341 Voverlay_arrow_position is a marker, last_arrow_position is its | |
342 numerical position. */ | |
343 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
344 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
345 |
25012 | 346 /* Like mode-line-format, but for the title bar on a visible frame. */ |
347 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
348 Lisp_Object Vframe_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
349 |
25012 | 350 /* Like mode-line-format, but for the title bar on an iconified 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 Vicon_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
353 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
354 /* 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
|
355 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
|
356 have changed. */ |
25012 | 357 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
358 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
359 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
360 Lisp_Object Qmenu_bar_update_hook; |
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
361 |
277 | 362 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 363 |
277 | 364 static int overlay_arrow_seen; |
365 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
366 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 367 |
368 int highlight_nonselected_windows; | |
369 | |
370 /* If cursor motion alone moves point off frame, try scrolling this | |
371 many lines up or down if that will bring it back. */ | |
372 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
373 static int scroll_step; |
277 | 374 |
25012 | 375 /* Non-0 means scroll just far enough to bring point back on the |
376 screen, when appropriate. */ | |
377 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
378 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
379 |
25012 | 380 /* Recenter the window whenever point gets within this many lines of |
381 the top or bottom of the window. This value is translated into a | |
382 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
383 there is really a fixed pixel height scroll margin. */ | |
384 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
385 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
386 |
25012 | 387 /* Number of windows showing the buffer of the selected window (or |
388 another buffer with the same base buffer). keyboard.c refers to | |
389 this. */ | |
390 | |
277 | 391 int buffer_shared; |
392 | |
25012 | 393 /* Vector containing glyphs for an ellipsis `...'. */ |
394 | |
395 static Lisp_Object default_invis_vector[3]; | |
396 | |
397 /* Nonzero means display mode line highlighted. */ | |
398 | |
277 | 399 int mode_line_inverse_video; |
400 | |
25012 | 401 /* Prompt to display in front of the mini-buffer contents. */ |
402 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
403 Lisp_Object minibuf_prompt; |
277 | 404 |
25012 | 405 /* Width of current mini-buffer prompt. Only set after display_line |
406 of the line that contains the prompt. */ | |
407 | |
277 | 408 int minibuf_prompt_width; |
25012 | 409 int minibuf_prompt_pixel_width; |
410 | |
411 /* This is the window where the echo area message was displayed. It | |
412 is always a mini-buffer window, but it may not be the same window | |
413 currently active as a mini-buffer. */ | |
414 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
415 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
|
416 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
417 /* 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
|
418 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
|
419 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
|
420 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
|
421 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
422 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
423 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
424 /* 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
|
425 message was specified. */ |
25012 | 426 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
427 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
428 |
25012 | 429 /* True if we should redraw the mode lines on the next redisplay. */ |
430 | |
277 | 431 int update_mode_lines; |
432 | |
25012 | 433 /* Nonzero if window sizes or contents have changed since last |
434 redisplay that finished */ | |
435 | |
277 | 436 int windows_or_buffers_changed; |
437 | |
25012 | 438 /* Nonzero after display_mode_line if %l was used and it displayed a |
439 line number. */ | |
440 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
441 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
442 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
443 /* Maximum buffer size for which to display line numbers. */ |
25012 | 444 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
445 Lisp_Object Vline_number_display_limit; |
10393 | 446 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
447 /* 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
|
448 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
449 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
450 |
25012 | 451 /* Number of lines to keep in the message log buffer. t means |
452 infinite. nil means don't log at all. */ | |
453 | |
10393 | 454 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
455 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
456 /* The name of the *Messages* buffer, a string. */ |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
457 |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
458 static Lisp_Object Vmessages_buffer_name; |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
459 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
460 /* 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
|
461 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
|
462 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
463 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
|
464 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
465 /* 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
|
466 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
467 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
|
468 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
469 /* 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
|
470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 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
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 /* 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
|
474 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
|
475 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
476 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
|
477 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
478 /* 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
|
479 message. */ |
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 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
482 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
483 /* 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
|
484 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
|
485 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
|
486 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
487 Lisp_Object Vmax_mini_window_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
488 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
489 /* 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
|
490 lines instead of being continued. */ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
491 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
492 int message_truncate_lines; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
493 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
|
494 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
495 /* 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
|
496 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
|
497 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
498 int cursor_in_non_selected_windows; |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
499 |
25012 | 500 /* A scratch glyph row with contents used for generating truncation |
501 glyphs. Also used in direct_output_for_insert. */ | |
502 | |
503 #define MAX_SCRATCH_GLYPHS 100 | |
504 struct glyph_row scratch_glyph_row; | |
505 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
506 | |
507 /* Ascent and height of the last line processed by move_it_to. */ | |
508 | |
509 static int last_max_ascent, last_height; | |
510 | |
511 /* The maximum distance to look ahead for text properties. Values | |
512 that are too small let us call compute_char_face and similar | |
513 functions too often which is expensive. Values that are too large | |
514 let us call compute_char_face and alike too often because we | |
515 might not be interested in text properties that far away. */ | |
516 | |
517 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
518 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
519 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
520 |
25012 | 521 /* Non-zero means print traces of redisplay if compiled with |
522 GLYPH_DEBUG != 0. */ | |
523 | |
524 int trace_redisplay_p; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
525 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
526 /* Non-zero means trace with TRACE_MOVE to stderr. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
527 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
528 int trace_move; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
529 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
530 #ifdef DEBUG_TRACE_MOVE |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
531 #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
|
532 #else |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
533 #define TRACE_MOVE(x) (void) 0 |
25012 | 534 #endif |
535 | |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
536 #else /* not GLYPH_DEBUG */ |
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
537 |
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
538 #define TRACE_MOVE(x) (void) 0 |
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
539 |
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
540 #endif /* not GLYPH_DEBUG */ |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
541 |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
542 /* 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
|
543 point visible. */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
544 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
545 int automatic_hscrolling_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
546 |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
547 /* 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
|
548 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
549 Lisp_Object Vimage_types; |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
550 |
25012 | 551 /* Value returned from text property handlers (see below). */ |
552 | |
553 enum prop_handled | |
554 { | |
555 HANDLED_NORMALLY, | |
556 HANDLED_RECOMPUTE_PROPS, | |
557 HANDLED_OVERLAY_STRING_CONSUMED, | |
558 HANDLED_RETURN | |
559 }; | |
560 | |
561 /* A description of text properties that redisplay is interested | |
562 in. */ | |
563 | |
564 struct props | |
565 { | |
566 /* The name of the property. */ | |
567 Lisp_Object *name; | |
568 | |
569 /* A unique index for the property. */ | |
570 enum prop_idx idx; | |
571 | |
572 /* A handler function called to set up iterator IT from the property | |
573 at IT's current position. Value is used to steer handle_stop. */ | |
574 enum prop_handled (*handler) P_ ((struct it *it)); | |
575 }; | |
576 | |
577 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
578 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
579 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
|
580 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 581 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
582 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
583 | |
584 /* Properties handled by iterators. */ | |
585 | |
586 static struct props it_props[] = | |
587 { | |
588 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
589 /* Handle `face' before `display' because some sub-properties of | |
590 `display' need to know the face. */ | |
591 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
592 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
593 {&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
|
594 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 595 {NULL, 0, NULL} |
596 }; | |
597 | |
598 /* Value is the position described by X. If X is a marker, value is | |
599 the marker_position of X. Otherwise, value is X. */ | |
600 | |
601 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
602 | |
603 /* Enumeration returned by some move_it_.* functions internally. */ | |
604 | |
605 enum move_it_result | |
606 { | |
607 /* Not used. Undefined value. */ | |
608 MOVE_UNDEFINED, | |
609 | |
610 /* Move ended at the requested buffer position or ZV. */ | |
611 MOVE_POS_MATCH_OR_ZV, | |
612 | |
613 /* Move ended at the requested X pixel position. */ | |
614 MOVE_X_REACHED, | |
615 | |
616 /* Move within a line ended at the end of a line that must be | |
617 continued. */ | |
618 MOVE_LINE_CONTINUED, | |
619 | |
620 /* Move within a line ended at the end of a line that would | |
621 be displayed truncated. */ | |
622 MOVE_LINE_TRUNCATED, | |
623 | |
624 /* Move within a line ended at a line end. */ | |
625 MOVE_NEWLINE_OR_CR | |
626 }; | |
627 | |
628 | |
629 | |
630 /* Function prototypes. */ | |
631 | |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
632 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
|
633 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
|
634 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
|
635 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
|
636 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
|
637 struct text_pos)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
638 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
|
639 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
|
640 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
|
641 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
|
642 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
|
643 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
|
644 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
|
645 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
|
646 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 647 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
648 struct glyph_row *, | |
649 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
650 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
|
651 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
|
652 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
|
653 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
|
654 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
|
655 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
|
656 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
|
657 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
|
658 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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 664 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
665 struct text_pos)); | |
666 static int compute_window_start_on_continuation_line P_ ((struct window *)); | |
667 static Lisp_Object eval_handler P_ ((Lisp_Object)); | |
668 static void insert_left_trunc_glyphs P_ ((struct it *)); | |
669 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
670 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
|
671 static int append_space P_ ((struct it *, int)); |
25012 | 672 static void make_cursor_line_fully_visible P_ ((struct window *)); |
673 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
|
674 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); |
25012 | 675 static int trailing_whitespace_p P_ ((int)); |
676 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
677 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
678 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
679 static void push_it P_ ((struct it *)); | |
680 static void pop_it P_ ((struct it *)); | |
681 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
682 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
|
683 static int echo_area_display P_ ((int)); |
25012 | 684 static void redisplay_windows P_ ((Lisp_Object)); |
685 static void redisplay_window P_ ((Lisp_Object, int)); | |
686 static void update_menu_bar P_ ((struct frame *, int)); | |
687 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
688 static int try_window_id P_ ((struct window *)); | |
689 static int display_line P_ ((struct it *)); | |
690 static void display_mode_lines P_ ((struct window *)); | |
691 static void display_mode_line P_ ((struct window *, enum face_id, | |
692 Lisp_Object)); | |
693 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
|
694 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 695 static void display_menu_bar P_ ((struct window *)); |
696 static int display_count_lines P_ ((int, int, int, int, int *)); | |
697 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
698 int, int, struct it *, int, int, int, int)); | |
699 static void compute_line_metrics P_ ((struct it *)); | |
700 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
701 static int get_overlay_strings P_ ((struct it *)); | |
702 static void next_overlay_string P_ ((struct it *)); | |
703 void set_iterator_to_next P_ ((struct it *)); | |
704 static void reseat P_ ((struct it *, struct text_pos, int)); | |
705 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
706 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
707 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
|
708 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 709 static int next_element_from_display_vector P_ ((struct it *)); |
710 static int next_element_from_string P_ ((struct it *)); | |
711 static int next_element_from_c_string P_ ((struct it *)); | |
712 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
|
713 static int next_element_from_composition P_ ((struct it *)); |
25012 | 714 static int next_element_from_image P_ ((struct it *)); |
715 static int next_element_from_stretch P_ ((struct it *)); | |
716 static void load_overlay_strings P_ ((struct it *)); | |
717 static void init_from_display_pos P_ ((struct it *, struct window *, | |
718 struct display_pos *)); | |
719 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
720 Lisp_Object, int, int, int, int)); | |
721 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
722 int, int, int)); | |
723 void move_it_vertically_backward P_ ((struct it *, int)); | |
724 static void init_to_row_start P_ ((struct it *, struct window *, | |
725 struct glyph_row *)); | |
726 static void init_to_row_end P_ ((struct it *, struct window *, | |
727 struct glyph_row *)); | |
728 static void back_to_previous_line_start P_ ((struct it *)); | |
729 static void forward_to_next_line_start P_ ((struct it *)); | |
730 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, | |
731 Lisp_Object, int)); | |
732 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
733 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
734 static int number_of_chars P_ ((unsigned char *, int)); | |
735 static void compute_stop_pos P_ ((struct it *)); | |
736 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
737 Lisp_Object)); | |
738 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
739 static int next_overlay_change P_ ((int)); | |
740 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
741 Lisp_Object, struct text_pos *)); | |
742 | |
743 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
744 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
745 | |
746 #ifdef HAVE_WINDOW_SYSTEM | |
747 | |
25543 | 748 static void update_tool_bar P_ ((struct frame *, int)); |
749 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
750 static int redisplay_tool_bar P_ ((struct frame *)); | |
751 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 752 |
753 #endif /* HAVE_WINDOW_SYSTEM */ | |
754 | |
755 | |
756 /*********************************************************************** | |
757 Window display dimensions | |
758 ***********************************************************************/ | |
759 | |
760 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
761 text in window W. This is the height of W minus the height of a | |
762 mode line, if any. */ | |
763 | |
764 INLINE int | |
765 window_text_bottom_y (w) | |
766 struct window *w; | |
767 { | |
768 struct frame *f = XFRAME (w->frame); | |
769 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
770 | |
771 if (WINDOW_WANTS_MODELINE_P (w)) | |
772 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
773 return height; | |
774 } | |
775 | |
776 | |
777 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
778 means return the total width of W, not including bitmap areas to | |
779 the left and right of the window. */ | |
780 | |
781 INLINE int | |
782 window_box_width (w, area) | |
783 struct window *w; | |
784 int area; | |
785 { | |
786 struct frame *f = XFRAME (w->frame); | |
787 int width = XFASTINT (w->width); | |
788 | |
789 if (!w->pseudo_window_p) | |
790 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
791 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 792 |
793 if (area == TEXT_AREA) | |
794 { | |
795 if (INTEGERP (w->left_margin_width)) | |
796 width -= XFASTINT (w->left_margin_width); | |
797 if (INTEGERP (w->right_margin_width)) | |
798 width -= XFASTINT (w->right_margin_width); | |
799 } | |
800 else if (area == LEFT_MARGIN_AREA) | |
801 width = (INTEGERP (w->left_margin_width) | |
802 ? XFASTINT (w->left_margin_width) : 0); | |
803 else if (area == RIGHT_MARGIN_AREA) | |
804 width = (INTEGERP (w->right_margin_width) | |
805 ? XFASTINT (w->right_margin_width) : 0); | |
806 } | |
807 | |
808 return width * CANON_X_UNIT (f); | |
809 } | |
810 | |
811 | |
812 /* Return the pixel height of the display area of window W, not | |
813 including mode lines of W, if any.. */ | |
814 | |
815 INLINE int | |
816 window_box_height (w) | |
817 struct window *w; | |
818 { | |
819 struct frame *f = XFRAME (w->frame); | |
820 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
821 | |
822 if (WINDOW_WANTS_MODELINE_P (w)) | |
823 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
824 | |
25546 | 825 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
826 height -= CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 827 |
828 return height; | |
829 } | |
830 | |
831 | |
832 /* Return the frame-relative coordinate of the left edge of display | |
833 area AREA of window W. AREA < 0 means return the left edge of the | |
834 whole window, to the right of any bitmap area at the left side of | |
835 W. */ | |
836 | |
837 INLINE int | |
838 window_box_left (w, area) | |
839 struct window *w; | |
840 int area; | |
841 { | |
842 struct frame *f = XFRAME (w->frame); | |
843 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
844 | |
845 if (!w->pseudo_window_p) | |
846 { | |
847 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
|
848 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 849 |
850 if (area == TEXT_AREA) | |
851 x += window_box_width (w, LEFT_MARGIN_AREA); | |
852 else if (area == RIGHT_MARGIN_AREA) | |
853 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
854 + window_box_width (w, TEXT_AREA)); | |
855 } | |
856 | |
857 return x; | |
858 } | |
859 | |
860 | |
861 /* Return the frame-relative coordinate of the right edge of display | |
862 area AREA of window W. AREA < 0 means return the left edge of the | |
863 whole window, to the left of any bitmap area at the right side of | |
864 W. */ | |
865 | |
866 INLINE int | |
867 window_box_right (w, area) | |
868 struct window *w; | |
869 int area; | |
870 { | |
871 return window_box_left (w, area) + window_box_width (w, area); | |
872 } | |
873 | |
874 | |
875 /* Get the bounding box of the display area AREA of window W, without | |
876 mode lines, in frame-relative coordinates. AREA < 0 means the | |
877 whole window, not including bitmap areas to the left and right of | |
878 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
879 coordinates of the upper-left corner of the box. Return in | |
880 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
881 | |
882 INLINE void | |
883 window_box (w, area, box_x, box_y, box_width, box_height) | |
884 struct window *w; | |
885 int area; | |
886 int *box_x, *box_y, *box_width, *box_height; | |
887 { | |
888 struct frame *f = XFRAME (w->frame); | |
889 | |
890 *box_width = window_box_width (w, area); | |
891 *box_height = window_box_height (w); | |
892 *box_x = window_box_left (w, area); | |
893 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
894 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 895 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
896 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 897 } |
898 | |
899 | |
900 /* Get the bounding box of the display area AREA of window W, without | |
901 mode lines. AREA < 0 means the whole window, not including bitmap | |
902 areas to the left and right of the window. Return in *TOP_LEFT_X | |
903 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
904 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
905 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
906 box. */ | |
907 | |
908 INLINE void | |
909 window_box_edges (w, area, top_left_x, top_left_y, | |
910 bottom_right_x, bottom_right_y) | |
911 struct window *w; | |
912 int area; | |
913 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
914 { | |
915 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
916 bottom_right_y); | |
917 *bottom_right_x += *top_left_x; | |
918 *bottom_right_y += *top_left_y; | |
919 } | |
920 | |
921 | |
922 | |
923 /*********************************************************************** | |
924 Utilities | |
925 ***********************************************************************/ | |
926 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
927 /* 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
|
928 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
|
929 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
|
930 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
|
931 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
932 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
933 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
934 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
|
935 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
936 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
937 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
938 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
939 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
940 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
|
941 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
942 /* 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
|
943 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
|
944 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
945 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
946 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
947 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
948 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
949 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
950 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
951 |
25012 | 952 /* Given a position POS containing a valid character and byte position |
953 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
954 | |
955 static struct text_pos | |
956 string_pos_nchars_ahead (pos, string, nchars) | |
957 struct text_pos pos; | |
958 Lisp_Object string; | |
959 int nchars; | |
960 { | |
961 xassert (STRINGP (string) && nchars >= 0); | |
962 | |
963 if (STRING_MULTIBYTE (string)) | |
964 { | |
965 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
966 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
967 int len; | |
968 | |
969 while (nchars--) | |
970 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
971 string_char_and_length (p, rest, &len); |
25012 | 972 p += len, rest -= len; |
973 xassert (rest >= 0); | |
974 CHARPOS (pos) += 1; | |
975 BYTEPOS (pos) += len; | |
976 } | |
977 } | |
978 else | |
979 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
980 | |
981 return pos; | |
982 } | |
983 | |
984 | |
985 /* Value is the text position, i.e. character and byte position, | |
986 for character position CHARPOS in STRING. */ | |
987 | |
988 static INLINE struct text_pos | |
989 string_pos (charpos, string) | |
990 int charpos; | |
991 Lisp_Object string; | |
992 { | |
993 struct text_pos pos; | |
994 xassert (STRINGP (string)); | |
995 xassert (charpos >= 0); | |
996 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
997 return pos; | |
998 } | |
999 | |
1000 | |
1001 /* Value is a text position, i.e. character and byte position, for | |
1002 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
1003 means recognize multibyte characters. */ | |
1004 | |
1005 static struct text_pos | |
1006 c_string_pos (charpos, s, multibyte_p) | |
1007 int charpos; | |
1008 unsigned char *s; | |
1009 int multibyte_p; | |
1010 { | |
1011 struct text_pos pos; | |
1012 | |
1013 xassert (s != NULL); | |
1014 xassert (charpos >= 0); | |
1015 | |
1016 if (multibyte_p) | |
1017 { | |
1018 int rest = strlen (s), len; | |
1019 | |
1020 SET_TEXT_POS (pos, 0, 0); | |
1021 while (charpos--) | |
1022 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1023 string_char_and_length (s, rest, &len); |
25012 | 1024 s += len, rest -= len; |
1025 xassert (rest >= 0); | |
1026 CHARPOS (pos) += 1; | |
1027 BYTEPOS (pos) += len; | |
1028 } | |
1029 } | |
1030 else | |
1031 SET_TEXT_POS (pos, charpos, charpos); | |
1032 | |
1033 return pos; | |
1034 } | |
1035 | |
1036 | |
1037 /* Value is the number of characters in C string S. MULTIBYTE_P | |
1038 non-zero means recognize multibyte characters. */ | |
1039 | |
1040 static int | |
1041 number_of_chars (s, multibyte_p) | |
1042 unsigned char *s; | |
1043 int multibyte_p; | |
1044 { | |
1045 int nchars; | |
1046 | |
1047 if (multibyte_p) | |
1048 { | |
1049 int rest = strlen (s), len; | |
1050 unsigned char *p = (unsigned char *) s; | |
1051 | |
1052 for (nchars = 0; rest > 0; ++nchars) | |
1053 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1054 string_char_and_length (p, rest, &len); |
25012 | 1055 rest -= len, p += len; |
1056 } | |
1057 } | |
1058 else | |
1059 nchars = strlen (s); | |
1060 | |
1061 return nchars; | |
1062 } | |
1063 | |
1064 | |
1065 /* Compute byte position NEWPOS->bytepos corresponding to | |
1066 NEWPOS->charpos. POS is a known position in string STRING. | |
1067 NEWPOS->charpos must be >= POS.charpos. */ | |
1068 | |
1069 static void | |
1070 compute_string_pos (newpos, pos, string) | |
1071 struct text_pos *newpos, pos; | |
1072 Lisp_Object string; | |
1073 { | |
1074 xassert (STRINGP (string)); | |
1075 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1076 | |
1077 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
|
1078 *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
|
1079 CHARPOS (*newpos) - CHARPOS (pos)); |
25012 | 1080 else |
1081 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1082 } | |
1083 | |
1084 | |
1085 | |
1086 /*********************************************************************** | |
1087 Lisp form evaluation | |
1088 ***********************************************************************/ | |
1089 | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1090 /* Error handler for eval_form and call_function. */ |
25012 | 1091 |
1092 static Lisp_Object | |
1093 eval_handler (arg) | |
1094 Lisp_Object arg; | |
1095 { | |
1096 return Qnil; | |
1097 } | |
1098 | |
1099 | |
1100 /* Evaluate SEXPR and return the result, or nil if something went | |
1101 wrong. */ | |
1102 | |
30202
bade676e0950
(eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
30159
diff
changeset
|
1103 Lisp_Object |
25012 | 1104 eval_form (sexpr) |
1105 Lisp_Object sexpr; | |
1106 { | |
1107 int count = specpdl_ptr - specpdl; | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1108 struct gcpro gcpro1; |
25012 | 1109 Lisp_Object val; |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1110 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1111 GCPRO1 (sexpr); |
25012 | 1112 specbind (Qinhibit_redisplay, Qt); |
1113 val = internal_condition_case_1 (Feval, sexpr, Qerror, eval_handler); | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1114 UNGCPRO; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1115 return unbind_to (count, val); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1116 } |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1117 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1118 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1119 /* 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
|
1120 Return the result, or nil if something went wrong. */ |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1121 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1122 Lisp_Object |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1123 call_function (nargs, args) |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1124 int nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1125 Lisp_Object *args; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1126 { |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1127 int count = specpdl_ptr - specpdl; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1128 Lisp_Object val; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1129 struct gcpro gcpro1; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1130 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1131 GCPRO1 (args[0]); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1132 gcpro1.nvars = nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1133 specbind (Qinhibit_redisplay, Qt); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1134 val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror, |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1135 eval_handler); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1136 UNGCPRO; |
25012 | 1137 return unbind_to (count, val); |
1138 } | |
1139 | |
1140 | |
1141 | |
1142 /*********************************************************************** | |
1143 Debugging | |
1144 ***********************************************************************/ | |
1145 | |
1146 #if 0 | |
1147 | |
1148 /* Define CHECK_IT to perform sanity checks on iterators. | |
1149 This is for debugging. It is too slow to do unconditionally. */ | |
1150 | |
1151 static void | |
1152 check_it (it) | |
1153 struct it *it; | |
1154 { | |
1155 if (it->method == next_element_from_string) | |
1156 { | |
1157 xassert (STRINGP (it->string)); | |
1158 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1159 } | |
1160 else if (it->method == next_element_from_buffer) | |
1161 { | |
1162 /* Check that character and byte positions agree. */ | |
1163 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1164 } | |
1165 | |
1166 if (it->dpvec) | |
1167 xassert (it->current.dpvec_index >= 0); | |
1168 else | |
1169 xassert (it->current.dpvec_index < 0); | |
1170 } | |
1171 | |
1172 #define CHECK_IT(IT) check_it ((IT)) | |
1173 | |
1174 #else /* not 0 */ | |
1175 | |
1176 #define CHECK_IT(IT) (void) 0 | |
1177 | |
1178 #endif /* not 0 */ | |
1179 | |
1180 | |
1181 #if GLYPH_DEBUG | |
1182 | |
1183 /* Check that the window end of window W is what we expect it | |
1184 to be---the last row in the current matrix displaying text. */ | |
1185 | |
1186 static void | |
1187 check_window_end (w) | |
1188 struct window *w; | |
1189 { | |
1190 if (!MINI_WINDOW_P (w) | |
1191 && !NILP (w->window_end_valid)) | |
1192 { | |
1193 struct glyph_row *row; | |
1194 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1195 XFASTINT (w->window_end_vpos)), | |
1196 !row->enabled_p | |
1197 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1198 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1199 } | |
1200 } | |
1201 | |
1202 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1203 | |
1204 #else /* not GLYPH_DEBUG */ | |
1205 | |
1206 #define CHECK_WINDOW_END(W) (void) 0 | |
1207 | |
1208 #endif /* not GLYPH_DEBUG */ | |
1209 | |
1210 | |
1211 | |
1212 /*********************************************************************** | |
1213 Iterator initialization | |
1214 ***********************************************************************/ | |
1215 | |
1216 /* Initialize IT for displaying current_buffer in window W, starting | |
1217 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1218 position is specified which is useful when the iterator is assigned | |
1219 a position later. BYTEPOS is the byte position corresponding to | |
1220 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1221 | |
1222 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1223 will produce glyphs in that row. | |
1224 | |
1225 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1226 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1227 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1228 displaying the tool-bar. |
25012 | 1229 |
1230 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1231 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1232 corresponding mode line glyph row of the desired matrix of W. */ |
1233 | |
1234 void | |
1235 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1236 struct it *it; | |
1237 struct window *w; | |
1238 int charpos, bytepos; | |
1239 struct glyph_row *row; | |
1240 enum face_id base_face_id; | |
1241 { | |
1242 int highlight_region_p; | |
1243 | |
1244 /* Some precondition checks. */ | |
1245 xassert (w != NULL && it != NULL); | |
1246 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1247 | |
1248 /* If face attributes have been changed since the last redisplay, | |
1249 free realized faces now because they depend on face definitions | |
1250 that might have changed. */ | |
1251 if (face_change_count) | |
1252 { | |
1253 face_change_count = 0; | |
1254 free_all_realized_faces (Qnil); | |
1255 } | |
1256 | |
1257 /* Use one of the mode line rows of W's desired matrix if | |
1258 appropriate. */ | |
1259 if (row == NULL) | |
1260 { | |
1261 if (base_face_id == MODE_LINE_FACE_ID) | |
1262 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1263 else if (base_face_id == HEADER_LINE_FACE_ID) |
1264 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1265 } |
1266 | |
1267 /* Clear IT. */ | |
1268 bzero (it, sizeof *it); | |
1269 it->current.overlay_string_index = -1; | |
1270 it->current.dpvec_index = -1; | |
1271 it->base_face_id = base_face_id; | |
1272 | |
1273 /* The window in which we iterate over current_buffer: */ | |
1274 XSETWINDOW (it->window, w); | |
1275 it->w = w; | |
1276 it->f = XFRAME (w->frame); | |
1277 | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1278 /* 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
|
1279 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
|
1280 && FRAME_WINDOW_P (it->f)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1281 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1282 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
|
1283 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
|
1284 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
|
1285 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
|
1286 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1287 |
25012 | 1288 /* If realized faces have been removed, e.g. because of face |
1289 attribute changes of named faces, recompute them. */ | |
1290 if (FRAME_FACE_CACHE (it->f)->used == 0) | |
1291 recompute_basic_faces (it->f); | |
1292 | |
1293 /* Current value of the `space-width', and 'height' properties. */ | |
1294 it->space_width = Qnil; | |
1295 it->font_height = Qnil; | |
1296 | |
1297 /* Are control characters displayed as `^C'? */ | |
1298 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1299 | |
1300 /* -1 means everything between a CR and the following line end | |
1301 is invisible. >0 means lines indented more than this value are | |
1302 invisible. */ | |
1303 it->selective = (INTEGERP (current_buffer->selective_display) | |
1304 ? XFASTINT (current_buffer->selective_display) | |
1305 : (!NILP (current_buffer->selective_display) | |
1306 ? -1 : 0)); | |
1307 it->selective_display_ellipsis_p | |
1308 = !NILP (current_buffer->selective_display_ellipses); | |
1309 | |
1310 /* Display table to use. */ | |
1311 it->dp = window_display_table (w); | |
1312 | |
1313 /* Are multibyte characters enabled in current_buffer? */ | |
1314 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1315 | |
1316 /* Non-zero if we should highlight the region. */ | |
1317 highlight_region_p | |
1318 = (!NILP (Vtransient_mark_mode) | |
1319 && !NILP (current_buffer->mark_active) | |
1320 && XMARKER (current_buffer->mark)->buffer != 0); | |
1321 | |
1322 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1323 start and end of a visible region in window IT->w. Set both to | |
1324 -1 to indicate no region. */ | |
1325 if (highlight_region_p | |
1326 /* Maybe highlight only in selected window. */ | |
1327 && (/* Either show region everywhere. */ | |
1328 highlight_nonselected_windows | |
1329 /* Or show region in the selected window. */ | |
1330 || w == XWINDOW (selected_window) | |
1331 /* Or show the region if we are in the mini-buffer and W is | |
1332 the window the mini-buffer refers to. */ | |
1333 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1334 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1335 { | |
1336 int charpos = marker_position (current_buffer->mark); | |
1337 it->region_beg_charpos = min (PT, charpos); | |
1338 it->region_end_charpos = max (PT, charpos); | |
1339 } | |
1340 else | |
1341 it->region_beg_charpos = it->region_end_charpos = -1; | |
1342 | |
1343 /* Get the position at which the redisplay_end_trigger hook should | |
1344 be run, if it is to be run at all. */ | |
1345 if (MARKERP (w->redisplay_end_trigger) | |
1346 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1347 it->redisplay_end_trigger_charpos | |
1348 = marker_position (w->redisplay_end_trigger); | |
1349 else if (INTEGERP (w->redisplay_end_trigger)) | |
1350 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1351 | |
1352 /* Correct bogus values of tab_width. */ | |
1353 it->tab_width = XINT (current_buffer->tab_width); | |
1354 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1355 it->tab_width = 8; | |
1356 | |
1357 /* Are lines in the display truncated? */ | |
1358 it->truncate_lines_p | |
1359 = (base_face_id != DEFAULT_FACE_ID | |
1360 || XINT (it->w->hscroll) | |
1361 || (truncate_partial_width_windows | |
1362 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1363 || !NILP (current_buffer->truncate_lines)); | |
1364 | |
1365 /* Get dimensions of truncation and continuation glyphs. These are | |
1366 displayed as bitmaps under X, so we don't need them for such | |
1367 frames. */ | |
1368 if (!FRAME_WINDOW_P (it->f)) | |
1369 { | |
1370 if (it->truncate_lines_p) | |
1371 { | |
1372 /* We will need the truncation glyph. */ | |
1373 xassert (it->glyph_row == NULL); | |
1374 produce_special_glyphs (it, IT_TRUNCATION); | |
1375 it->truncation_pixel_width = it->pixel_width; | |
1376 } | |
1377 else | |
1378 { | |
1379 /* We will need the continuation glyph. */ | |
1380 xassert (it->glyph_row == NULL); | |
1381 produce_special_glyphs (it, IT_CONTINUATION); | |
1382 it->continuation_pixel_width = it->pixel_width; | |
1383 } | |
1384 | |
1385 /* Reset these values to zero becaue the produce_special_glyphs | |
1386 above has changed them. */ | |
1387 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
|
1388 it->phys_ascent = it->phys_descent = 0; |
25012 | 1389 } |
1390 | |
1391 /* Set this after getting the dimensions of truncation and | |
1392 continuation glyphs, so that we don't produce glyphs when calling | |
1393 produce_special_glyphs, above. */ | |
1394 it->glyph_row = row; | |
1395 it->area = TEXT_AREA; | |
1396 | |
1397 /* Get the dimensions of the display area. The display area | |
1398 consists of the visible window area plus a horizontally scrolled | |
1399 part to the left of the window. All x-values are relative to the | |
1400 start of this total display area. */ | |
1401 if (base_face_id != DEFAULT_FACE_ID) | |
1402 { | |
1403 /* Mode lines, menu bar in terminal frames. */ | |
1404 it->first_visible_x = 0; | |
1405 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1406 } | |
1407 else | |
1408 { | |
1409 it->first_visible_x | |
1410 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1411 it->last_visible_x = (it->first_visible_x | |
1412 + window_box_width (w, TEXT_AREA)); | |
1413 | |
1414 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1415 the right margin. Otherwise, leave room for the continuation | |
1416 glyph(s). Truncation and continuation glyphs are not inserted | |
1417 for window-based redisplay. */ | |
1418 if (!FRAME_WINDOW_P (it->f)) | |
1419 { | |
1420 if (it->truncate_lines_p) | |
1421 it->last_visible_x -= it->truncation_pixel_width; | |
1422 else | |
1423 it->last_visible_x -= it->continuation_pixel_width; | |
1424 } | |
1425 | |
25546 | 1426 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1427 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1428 } |
1429 | |
1430 /* Leave room for a border glyph. */ | |
1431 if (!FRAME_WINDOW_P (it->f) | |
1432 && !WINDOW_RIGHTMOST_P (it->w)) | |
1433 it->last_visible_x -= 1; | |
1434 | |
1435 it->last_visible_y = window_text_bottom_y (w); | |
1436 | |
1437 /* For mode lines and alike, arrange for the first glyph having a | |
1438 left box line if the face specifies a box. */ | |
1439 if (base_face_id != DEFAULT_FACE_ID) | |
1440 { | |
1441 struct face *face; | |
1442 | |
1443 it->face_id = base_face_id; | |
1444 | |
1445 /* If we have a boxed mode line, make the first character appear | |
1446 with a left box line. */ | |
1447 face = FACE_FROM_ID (it->f, base_face_id); | |
1448 if (face->box != FACE_NO_BOX) | |
1449 it->start_of_box_run_p = 1; | |
1450 } | |
1451 | |
1452 /* If a buffer position was specified, set the iterator there, | |
1453 getting overlays and face properties from that position. */ | |
1454 if (charpos > 0) | |
1455 { | |
1456 it->end_charpos = ZV; | |
1457 it->face_id = -1; | |
1458 IT_CHARPOS (*it) = charpos; | |
1459 | |
1460 /* Compute byte position if not specified. */ | |
1461 if (bytepos <= 0) | |
1462 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1463 else | |
1464 IT_BYTEPOS (*it) = bytepos; | |
1465 | |
1466 /* Compute faces etc. */ | |
1467 reseat (it, it->current.pos, 1); | |
1468 } | |
1469 | |
1470 CHECK_IT (it); | |
1471 } | |
1472 | |
1473 | |
1474 /* Initialize IT for the display of window W with window start POS. */ | |
1475 | |
1476 void | |
1477 start_display (it, w, pos) | |
1478 struct it *it; | |
1479 struct window *w; | |
1480 struct text_pos pos; | |
1481 { | |
1482 int start_at_line_beg_p; | |
1483 struct glyph_row *row; | |
25546 | 1484 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1485 int first_y; |
1486 | |
1487 row = w->desired_matrix->rows + first_vpos; | |
1488 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1489 first_y = it->current_y; | |
1490 | |
1491 /* If window start is not at a line start, move back to the line | |
1492 start. This makes sure that we take continuation lines into | |
1493 account. */ | |
1494 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1495 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1496 if (!start_at_line_beg_p) | |
1497 reseat_at_previous_visible_line_start (it); | |
1498 | |
1499 /* If window start is not at a line start, skip forward to POS to | |
1500 get the correct continuation_lines_width and current_x. */ | |
1501 if (!start_at_line_beg_p) | |
1502 { | |
1503 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1504 | |
1505 /* If lines are continued, this line may end in the middle of a | |
1506 multi-glyph character (e.g. a control character displayed as | |
1507 \003, or in the middle of an overlay string). In this case | |
1508 move_it_to above will not have taken us to the start of | |
1509 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
|
1510 if (!it->truncate_lines_p) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1511 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1512 if (it->current_x > 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1513 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1514 if (it->current.dpvec_index >= 0 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1515 || it->current.overlay_string_index >= 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1516 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1517 set_iterator_to_next (it); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1518 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
|
1519 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1520 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1521 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
|
1522 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1523 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1524 /* 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
|
1525 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
|
1526 fields in the iterator structure. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1527 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
|
1528 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 1529 } |
1530 | |
1531 it->current_y = first_y; | |
1532 it->vpos = 0; | |
1533 it->current_x = it->hpos = 0; | |
1534 } | |
1535 | |
1536 #if 0 /* Don't assert the following because start_display is sometimes | |
1537 called intentionally with a window start that is not at a | |
1538 line start. Please leave this code in as a comment. */ | |
1539 | |
1540 /* Window start should be on a line start, now. */ | |
1541 xassert (it->continuation_lines_width | |
1542 || IT_CHARPOS (it) == BEGV | |
1543 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1544 #endif /* 0 */ | |
1545 } | |
1546 | |
1547 | |
1548 /* Initialize IT for stepping through current_buffer in window W, | |
1549 starting at position POS that includes overlay string and display | |
1550 vector/ control character translation position information. */ | |
1551 | |
1552 static void | |
1553 init_from_display_pos (it, w, pos) | |
1554 struct it *it; | |
1555 struct window *w; | |
1556 struct display_pos *pos; | |
1557 { | |
1558 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1559 text, so we might end up at a position different from POS. This | |
1560 is only a problem when POS is a row start after a newline and an | |
1561 overlay starts there with an after-string, and the overlay has an | |
1562 invisible property. Since we don't skip invisible text in | |
1563 display_line and elsewhere immediately after consuming the | |
1564 newline before the row start, such a POS will not be in a string, | |
1565 but the call to init_iterator below will move us to the | |
1566 after-string. */ | |
1567 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1568 NULL, DEFAULT_FACE_ID); | |
1569 | |
1570 /* If position is within an overlay string, set up IT to | |
1571 the right overlay string. */ | |
1572 if (pos->overlay_string_index >= 0) | |
1573 { | |
1574 int relative_index; | |
1575 | |
1576 /* We already have the first chunk of overlay strings in | |
1577 IT->overlay_strings. Load more until the one for | |
1578 pos->overlay_string_index is in IT->overlay_strings. */ | |
1579 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1580 { | |
1581 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1582 it->current.overlay_string_index = 0; | |
1583 while (n--) | |
1584 { | |
1585 load_overlay_strings (it); | |
1586 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1587 } | |
1588 } | |
1589 | |
1590 it->current.overlay_string_index = pos->overlay_string_index; | |
1591 relative_index = (it->current.overlay_string_index | |
1592 % OVERLAY_STRING_CHUNK_SIZE); | |
1593 it->string = it->overlay_strings[relative_index]; | |
1594 it->current.string_pos = pos->string_pos; | |
1595 it->method = next_element_from_string; | |
1596 } | |
1597 else if (CHARPOS (pos->string_pos) >= 0) | |
1598 { | |
1599 /* Recorded position is not in an overlay string, but in another | |
1600 string. This can only be a string from a `display' property. | |
1601 IT should already be filled with that string. */ | |
1602 it->current.string_pos = pos->string_pos; | |
1603 xassert (STRINGP (it->string)); | |
1604 } | |
1605 | |
1606 /* Restore position in display vector translations or control | |
1607 character translations. */ | |
1608 if (pos->dpvec_index >= 0) | |
1609 { | |
1610 /* This fills IT->dpvec. */ | |
1611 get_next_display_element (it); | |
1612 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1613 it->current.dpvec_index = pos->dpvec_index; | |
1614 } | |
1615 | |
1616 CHECK_IT (it); | |
1617 } | |
1618 | |
1619 | |
1620 /* Initialize IT for stepping through current_buffer in window W | |
1621 starting at ROW->start. */ | |
1622 | |
1623 static void | |
1624 init_to_row_start (it, w, row) | |
1625 struct it *it; | |
1626 struct window *w; | |
1627 struct glyph_row *row; | |
1628 { | |
1629 init_from_display_pos (it, w, &row->start); | |
1630 it->continuation_lines_width = row->continuation_lines_width; | |
1631 CHECK_IT (it); | |
1632 } | |
1633 | |
1634 | |
1635 /* Initialize IT for stepping through current_buffer in window W | |
1636 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1637 | |
1638 static void | |
1639 init_to_row_end (it, w, row) | |
1640 struct it *it; | |
1641 struct window *w; | |
1642 struct glyph_row *row; | |
1643 { | |
1644 init_from_display_pos (it, w, &row->end); | |
1645 | |
1646 if (row->continued_p) | |
1647 it->continuation_lines_width = (row->continuation_lines_width | |
1648 + row->pixel_width); | |
1649 CHECK_IT (it); | |
1650 } | |
1651 | |
1652 | |
1653 | |
1654 | |
1655 /*********************************************************************** | |
1656 Text properties | |
1657 ***********************************************************************/ | |
1658 | |
1659 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1660 overlay changes. Set IT->stop_charpos to the next position where | |
1661 to stop. */ | |
1662 | |
1663 static void | |
1664 handle_stop (it) | |
1665 struct it *it; | |
1666 { | |
1667 enum prop_handled handled; | |
1668 int handle_overlay_change_p = 1; | |
1669 struct props *p; | |
1670 | |
1671 it->dpvec = NULL; | |
1672 it->current.dpvec_index = -1; | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1673 it->add_overlay_start = 0; |
25012 | 1674 |
1675 do | |
1676 { | |
1677 handled = HANDLED_NORMALLY; | |
1678 | |
1679 /* Call text property handlers. */ | |
1680 for (p = it_props; p->handler; ++p) | |
1681 { | |
1682 handled = p->handler (it); | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1683 |
25012 | 1684 if (handled == HANDLED_RECOMPUTE_PROPS) |
1685 break; | |
1686 else if (handled == HANDLED_RETURN) | |
1687 return; | |
1688 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1689 handle_overlay_change_p = 0; | |
1690 } | |
1691 | |
1692 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1693 { | |
1694 /* Don't check for overlay strings below when set to deliver | |
1695 characters from a display vector. */ | |
1696 if (it->method == next_element_from_display_vector) | |
1697 handle_overlay_change_p = 0; | |
1698 | |
1699 /* Handle overlay changes. */ | |
1700 if (handle_overlay_change_p) | |
1701 handled = handle_overlay_change (it); | |
1702 | |
1703 /* Determine where to stop next. */ | |
1704 if (handled == HANDLED_NORMALLY) | |
1705 compute_stop_pos (it); | |
1706 } | |
1707 } | |
1708 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1709 } | |
1710 | |
1711 | |
1712 /* Compute IT->stop_charpos from text property and overlay change | |
1713 information for IT's current position. */ | |
1714 | |
1715 static void | |
1716 compute_stop_pos (it) | |
1717 struct it *it; | |
1718 { | |
1719 register INTERVAL iv, next_iv; | |
1720 Lisp_Object object, limit, position; | |
1721 | |
1722 /* If nowhere else, stop at the end. */ | |
1723 it->stop_charpos = it->end_charpos; | |
1724 | |
1725 if (STRINGP (it->string)) | |
1726 { | |
1727 /* Strings are usually short, so don't limit the search for | |
1728 properties. */ | |
1729 object = it->string; | |
1730 limit = Qnil; | |
1731 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1732 } | |
1733 else | |
1734 { | |
1735 int charpos; | |
1736 | |
1737 /* If next overlay change is in front of the current stop pos | |
1738 (which is IT->end_charpos), stop there. Note: value of | |
1739 next_overlay_change is point-max if no overlay change | |
1740 follows. */ | |
1741 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1742 if (charpos < it->stop_charpos) | |
1743 it->stop_charpos = charpos; | |
1744 | |
1745 /* If showing the region, we have to stop at the region | |
1746 start or end because the face might change there. */ | |
1747 if (it->region_beg_charpos > 0) | |
1748 { | |
1749 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1750 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1751 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1752 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1753 } | |
1754 | |
1755 /* Set up variables for computing the stop position from text | |
1756 property changes. */ | |
1757 XSETBUFFER (object, current_buffer); | |
1758 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1759 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1760 | |
1761 } | |
1762 | |
1763 /* Get the interval containing IT's position. Value is a null | |
1764 interval if there isn't such an interval. */ | |
1765 iv = validate_interval_range (object, &position, &position, 0); | |
1766 if (!NULL_INTERVAL_P (iv)) | |
1767 { | |
1768 Lisp_Object values_here[LAST_PROP_IDX]; | |
1769 struct props *p; | |
1770 | |
1771 /* Get properties here. */ | |
1772 for (p = it_props; p->handler; ++p) | |
1773 values_here[p->idx] = textget (iv->plist, *p->name); | |
1774 | |
1775 /* Look for an interval following iv that has different | |
1776 properties. */ | |
1777 for (next_iv = next_interval (iv); | |
1778 (!NULL_INTERVAL_P (next_iv) | |
1779 && (NILP (limit) | |
1780 || XFASTINT (limit) > next_iv->position)); | |
1781 next_iv = next_interval (next_iv)) | |
1782 { | |
1783 for (p = it_props; p->handler; ++p) | |
1784 { | |
1785 Lisp_Object new_value; | |
1786 | |
1787 new_value = textget (next_iv->plist, *p->name); | |
1788 if (!EQ (values_here[p->idx], new_value)) | |
1789 break; | |
1790 } | |
1791 | |
1792 if (p->handler) | |
1793 break; | |
1794 } | |
1795 | |
1796 if (!NULL_INTERVAL_P (next_iv)) | |
1797 { | |
1798 if (INTEGERP (limit) | |
1799 && next_iv->position >= XFASTINT (limit)) | |
1800 /* No text property change up to limit. */ | |
1801 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1802 else | |
1803 /* Text properties change in next_iv. */ | |
1804 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1805 } | |
1806 } | |
1807 | |
1808 xassert (STRINGP (it->string) | |
1809 || (it->stop_charpos >= BEGV | |
1810 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1811 } | |
1812 | |
1813 | |
1814 /* Return the position of the next overlay change after POS in | |
1815 current_buffer. Value is point-max if no overlay change | |
1816 follows. This is like `next-overlay-change' but doesn't use | |
1817 xmalloc. */ | |
1818 | |
1819 static int | |
1820 next_overlay_change (pos) | |
1821 int pos; | |
1822 { | |
1823 int noverlays; | |
1824 int endpos; | |
1825 Lisp_Object *overlays; | |
1826 int len; | |
1827 int i; | |
1828 | |
1829 /* Get all overlays at the given position. */ | |
1830 len = 10; | |
1831 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
|
1832 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1833 if (noverlays > len) |
1834 { | |
1835 len = noverlays; | |
1836 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
|
1837 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1838 } |
1839 | |
1840 /* If any of these overlays ends before endpos, | |
1841 use its ending point instead. */ | |
1842 for (i = 0; i < noverlays; ++i) | |
1843 { | |
1844 Lisp_Object oend; | |
1845 int oendpos; | |
1846 | |
1847 oend = OVERLAY_END (overlays[i]); | |
1848 oendpos = OVERLAY_POSITION (oend); | |
1849 endpos = min (endpos, oendpos); | |
1850 } | |
1851 | |
1852 return endpos; | |
1853 } | |
1854 | |
1855 | |
1856 | |
1857 /*********************************************************************** | |
1858 Fontification | |
1859 ***********************************************************************/ | |
1860 | |
1861 /* Handle changes in the `fontified' property of the current buffer by | |
1862 calling hook functions from Qfontification_functions to fontify | |
1863 regions of text. */ | |
1864 | |
1865 static enum prop_handled | |
1866 handle_fontified_prop (it) | |
1867 struct it *it; | |
1868 { | |
1869 Lisp_Object prop, pos; | |
1870 enum prop_handled handled = HANDLED_NORMALLY; | |
1871 | |
1872 /* Get the value of the `fontified' property at IT's current buffer | |
1873 position. (The `fontified' property doesn't have a special | |
1874 meaning in strings.) If the value is nil, call functions from | |
1875 Qfontification_functions. */ | |
1876 if (!STRINGP (it->string) | |
1877 && it->s == NULL | |
1878 && !NILP (Vfontification_functions) | |
1879 && (pos = make_number (IT_CHARPOS (*it)), | |
1880 prop = Fget_char_property (pos, Qfontified, Qnil), | |
1881 NILP (prop))) | |
1882 { | |
1883 Lisp_Object args[2]; | |
1884 | |
1885 /* Run the hook functions. */ | |
1886 args[0] = Qfontification_functions; | |
1887 args[1] = pos; | |
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
|
1888 Frun_hook_with_args (2, args); |
25012 | 1889 |
1890 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
1891 something. This avoids an endless loop if they failed to | |
1892 fontify the text for which reason ever. */ | |
1893 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
1894 handled = HANDLED_RECOMPUTE_PROPS; | |
1895 } | |
1896 | |
1897 return handled; | |
1898 } | |
1899 | |
1900 | |
1901 | |
1902 /*********************************************************************** | |
1903 Faces | |
1904 ***********************************************************************/ | |
1905 | |
1906 /* Set up iterator IT from face properties at its current position. | |
1907 Called from handle_stop. */ | |
1908 | |
1909 static enum prop_handled | |
1910 handle_face_prop (it) | |
1911 struct it *it; | |
1912 { | |
1913 int new_face_id, next_stop; | |
1914 | |
1915 if (!STRINGP (it->string)) | |
1916 { | |
1917 new_face_id | |
1918 = face_at_buffer_position (it->w, | |
1919 IT_CHARPOS (*it), | |
1920 it->region_beg_charpos, | |
1921 it->region_end_charpos, | |
1922 &next_stop, | |
1923 (IT_CHARPOS (*it) | |
1924 + TEXT_PROP_DISTANCE_LIMIT), | |
1925 0); | |
1926 | |
1927 /* Is this a start of a run of characters with box face? | |
1928 Caveat: this can be called for a freshly initialized | |
1929 iterator; face_id is -1 is this case. We know that the new | |
1930 face will not change until limit, i.e. if the new face has a | |
1931 box, all characters up to limit will have one. But, as | |
1932 usual, we don't know whether limit is really the end. */ | |
1933 if (new_face_id != it->face_id) | |
1934 { | |
1935 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1936 | |
1937 /* If new face has a box but old face has not, this is | |
1938 the start of a run of characters with box, i.e. it has | |
1939 a shadow on the left side. The value of face_id of the | |
1940 iterator will be -1 if this is the initial call that gets | |
1941 the face. In this case, we have to look in front of IT's | |
1942 position and see whether there is a face != new_face_id. */ | |
1943 it->start_of_box_run_p | |
1944 = (new_face->box != FACE_NO_BOX | |
1945 && (it->face_id >= 0 | |
1946 || IT_CHARPOS (*it) == BEG | |
1947 || new_face_id != face_before_it_pos (it))); | |
1948 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1949 } | |
1950 } | |
1951 else | |
1952 { | |
1953 new_face_id | |
1954 = face_at_string_position (it->w, | |
1955 it->string, | |
1956 IT_STRING_CHARPOS (*it), | |
1957 (it->current.overlay_string_index >= 0 | |
1958 ? IT_CHARPOS (*it) | |
1959 : 0), | |
1960 it->region_beg_charpos, | |
1961 it->region_end_charpos, | |
1962 &next_stop, | |
1963 it->base_face_id); | |
1964 | |
1965 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
1966 /* If IT is used to display a mode line we would really like to | |
1967 use the mode line face instead of the frame's default face. */ | |
1968 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
1969 && new_face_id == DEFAULT_FACE_ID) | |
1970 new_face_id = MODE_LINE_FACE_ID; | |
1971 #endif | |
1972 | |
1973 /* Is this a start of a run of characters with box? Caveat: | |
1974 this can be called for a freshly allocated iterator; face_id | |
1975 is -1 is this case. We know that the new face will not | |
1976 change until the next check pos, i.e. if the new face has a | |
1977 box, all characters up to that position will have a | |
1978 box. But, as usual, we don't know whether that position | |
1979 is really the end. */ | |
1980 if (new_face_id != it->face_id) | |
1981 { | |
1982 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1983 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
1984 | |
1985 /* If new face has a box but old face hasn't, this is the | |
1986 start of a run of characters with box, i.e. it has a | |
1987 shadow on the left side. */ | |
1988 it->start_of_box_run_p | |
1989 = new_face->box && (old_face == NULL || !old_face->box); | |
1990 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1991 } | |
1992 } | |
1993 | |
1994 it->face_id = new_face_id; | |
1995 return HANDLED_NORMALLY; | |
1996 } | |
1997 | |
1998 | |
1999 /* Compute the face one character before or after the current position | |
2000 of IT. BEFORE_P non-zero means get the face in front of IT's | |
2001 position. Value is the id of the face. */ | |
2002 | |
2003 static int | |
2004 face_before_or_after_it_pos (it, before_p) | |
2005 struct it *it; | |
2006 int before_p; | |
2007 { | |
2008 int face_id, limit; | |
2009 int next_check_charpos; | |
2010 struct text_pos pos; | |
2011 | |
2012 xassert (it->s == NULL); | |
2013 | |
2014 if (STRINGP (it->string)) | |
2015 { | |
2016 /* No face change past the end of the string (for the case | |
2017 we are padding with spaces). No face change before the | |
2018 string start. */ | |
2019 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
2020 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
2021 return it->face_id; | |
2022 | |
2023 /* Set pos to the position before or after IT's current position. */ | |
2024 if (before_p) | |
2025 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
2026 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2027 /* 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
|
2028 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2029 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2030 ? 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
|
2031 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 2032 |
2033 /* Get the face for ASCII, or unibyte. */ | |
2034 face_id | |
2035 = face_at_string_position (it->w, | |
2036 it->string, | |
2037 CHARPOS (pos), | |
2038 (it->current.overlay_string_index >= 0 | |
2039 ? IT_CHARPOS (*it) | |
2040 : 0), | |
2041 it->region_beg_charpos, | |
2042 it->region_end_charpos, | |
2043 &next_check_charpos, | |
2044 it->base_face_id); | |
2045 | |
2046 /* Correct the face for charsets different from ASCII. Do it | |
2047 for the multibyte case only. The face returned above is | |
2048 suitable for unibyte text if IT->string is unibyte. */ | |
2049 if (STRING_MULTIBYTE (it->string)) | |
2050 { | |
2051 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
2052 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
|
2053 int c, len; |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2054 struct face *face = FACE_FROM_ID (it->f, face_id); |
25012 | 2055 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
2056 c = string_char_and_length (p, rest, &len); |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2057 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2058 } |
2059 } | |
2060 else | |
2061 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2062 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
|
2063 || (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
|
2064 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2065 |
25012 | 2066 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
2067 pos = it->current.pos; | |
2068 | |
2069 if (before_p) | |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2070 DEC_TEXT_POS (pos, it->multibyte_p); |
25012 | 2071 else |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2072 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2073 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2074 /* 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
|
2075 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2076 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
|
2077 else |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2078 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
|
2079 } |
25012 | 2080 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2081 face_id = face_at_buffer_position (it->w, | |
2082 CHARPOS (pos), | |
2083 it->region_beg_charpos, | |
2084 it->region_end_charpos, | |
2085 &next_check_charpos, | |
2086 limit, 0); | |
2087 | |
2088 /* Correct the face for charsets different from ASCII. Do it | |
2089 for the multibyte case only. The face returned above is | |
2090 suitable for unibyte text if current_buffer is unibyte. */ | |
2091 if (it->multibyte_p) | |
2092 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2093 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos)); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2094 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
|
2095 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2096 } |
2097 } | |
2098 | |
2099 return face_id; | |
2100 } | |
2101 | |
2102 | |
2103 | |
2104 /*********************************************************************** | |
2105 Invisible text | |
2106 ***********************************************************************/ | |
2107 | |
2108 /* Set up iterator IT from invisible properties at its current | |
2109 position. Called from handle_stop. */ | |
2110 | |
2111 static enum prop_handled | |
2112 handle_invisible_prop (it) | |
2113 struct it *it; | |
2114 { | |
2115 enum prop_handled handled = HANDLED_NORMALLY; | |
2116 | |
2117 if (STRINGP (it->string)) | |
2118 { | |
2119 extern Lisp_Object Qinvisible; | |
2120 Lisp_Object prop, end_charpos, limit, charpos; | |
2121 | |
2122 /* Get the value of the invisible text property at the | |
2123 current position. Value will be nil if there is no such | |
2124 property. */ | |
2125 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2126 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2127 | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2128 if (!NILP (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2129 && IT_STRING_CHARPOS (*it) < it->end_charpos) |
25012 | 2130 { |
2131 handled = HANDLED_RECOMPUTE_PROPS; | |
2132 | |
2133 /* Get the position at which the next change of the | |
2134 invisible text property can be found in IT->string. | |
2135 Value will be nil if the property value is the same for | |
2136 all the rest of IT->string. */ | |
2137 XSETINT (limit, XSTRING (it->string)->size); | |
2138 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2139 it->string, limit); | |
2140 | |
2141 /* Text at current position is invisible. The next | |
2142 change in the property is at position end_charpos. | |
2143 Move IT's current position to that position. */ | |
2144 if (INTEGERP (end_charpos) | |
2145 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2146 { | |
2147 struct text_pos old; | |
2148 old = it->current.string_pos; | |
2149 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2150 compute_string_pos (&it->current.string_pos, old, it->string); | |
2151 } | |
2152 else | |
2153 { | |
2154 /* The rest of the string is invisible. If this is an | |
2155 overlay string, proceed with the next overlay string | |
2156 or whatever comes and return a character from there. */ | |
2157 if (it->current.overlay_string_index >= 0) | |
2158 { | |
2159 next_overlay_string (it); | |
2160 /* Don't check for overlay strings when we just | |
2161 finished processing them. */ | |
2162 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2163 } | |
2164 else | |
2165 { | |
2166 struct Lisp_String *s = XSTRING (it->string); | |
2167 IT_STRING_CHARPOS (*it) = s->size; | |
2168 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2169 } | |
2170 } | |
2171 } | |
2172 } | |
2173 else | |
2174 { | |
2175 int visible_p, newpos, next_stop; | |
2176 Lisp_Object pos, prop; | |
2177 | |
2178 /* First of all, is there invisible text at this position? */ | |
2179 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2180 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2181 | |
2182 /* 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
|
2183 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
|
2184 && IT_CHARPOS (*it) < it->end_charpos) |
25012 | 2185 { |
2186 /* Record whether we have to display an ellipsis for the | |
2187 invisible text. */ | |
2188 int display_ellipsis_p | |
2189 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2190 | |
2191 handled = HANDLED_RECOMPUTE_PROPS; | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2192 it->add_overlay_start = IT_CHARPOS (*it); |
25012 | 2193 |
2194 /* Loop skipping over invisible text. The loop is left at | |
2195 ZV or with IT on the first char being visible again. */ | |
2196 do | |
2197 { | |
2198 /* Try to skip some invisible text. Return value is the | |
2199 position reached which can be equal to IT's position | |
2200 if there is nothing invisible here. This skips both | |
2201 over invisible text properties and overlays with | |
2202 invisible property. */ | |
2203 newpos = skip_invisible (IT_CHARPOS (*it), | |
2204 &next_stop, ZV, it->window); | |
2205 | |
2206 /* If we skipped nothing at all we weren't at invisible | |
2207 text in the first place. If everything to the end of | |
2208 the buffer was skipped, end the loop. */ | |
2209 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2210 visible_p = 1; | |
2211 else | |
2212 { | |
2213 /* We skipped some characters but not necessarily | |
2214 all there are. Check if we ended up on visible | |
2215 text. Fget_char_property returns the property of | |
2216 the char before the given position, i.e. if we | |
2217 get visible_p = 1, this means that the char at | |
2218 newpos is visible. */ | |
2219 XSETFASTINT (pos, newpos); | |
2220 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2221 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2222 } | |
2223 | |
2224 /* If we ended up on invisible text, proceed to | |
2225 skip starting with next_stop. */ | |
2226 if (!visible_p) | |
2227 IT_CHARPOS (*it) = next_stop; | |
2228 } | |
2229 while (!visible_p); | |
2230 | |
2231 /* The position newpos is now either ZV or on visible text. */ | |
2232 IT_CHARPOS (*it) = newpos; | |
2233 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2234 | |
2235 /* Maybe return `...' next for the end of the invisible text. */ | |
2236 if (display_ellipsis_p) | |
2237 { | |
2238 if (it->dp | |
2239 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2240 { | |
2241 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2242 it->dpvec = v->contents; | |
2243 it->dpend = v->contents + v->size; | |
2244 } | |
2245 else | |
2246 { | |
2247 /* Default `...'. */ | |
2248 it->dpvec = default_invis_vector; | |
2249 it->dpend = default_invis_vector + 3; | |
2250 } | |
2251 | |
2252 /* The ellipsis display does not replace the display of | |
2253 the character at the new position. Indicate this by | |
2254 setting IT->dpvec_char_len to zero. */ | |
2255 it->dpvec_char_len = 0; | |
2256 | |
2257 it->current.dpvec_index = 0; | |
2258 it->method = next_element_from_display_vector; | |
2259 } | |
2260 } | |
2261 } | |
2262 | |
2263 return handled; | |
2264 } | |
2265 | |
2266 | |
277 | 2267 |
25012 | 2268 /*********************************************************************** |
2269 'display' property | |
2270 ***********************************************************************/ | |
2271 | |
2272 /* Set up iterator IT from `display' property at its current position. | |
2273 Called from handle_stop. */ | |
2274 | |
2275 static enum prop_handled | |
2276 handle_display_prop (it) | |
2277 struct it *it; | |
2278 { | |
2279 Lisp_Object prop, object; | |
2280 struct text_pos *position; | |
2281 int space_or_image_found_p; | |
2282 | |
2283 if (STRINGP (it->string)) | |
2284 { | |
2285 object = it->string; | |
2286 position = &it->current.string_pos; | |
2287 } | |
2288 else | |
2289 { | |
2290 object = Qnil; | |
2291 position = &it->current.pos; | |
2292 } | |
2293 | |
2294 /* Reset those iterator values set from display property values. */ | |
2295 it->font_height = Qnil; | |
2296 it->space_width = Qnil; | |
2297 it->voffset = 0; | |
2298 | |
2299 /* We don't support recursive `display' properties, i.e. string | |
2300 values that have a string `display' property, that have a string | |
2301 `display' property etc. */ | |
2302 if (!it->string_from_display_prop_p) | |
2303 it->area = TEXT_AREA; | |
2304 | |
2305 prop = Fget_char_property (make_number (position->charpos), | |
2306 Qdisplay, object); | |
2307 if (NILP (prop)) | |
2308 return HANDLED_NORMALLY; | |
2309 | |
2310 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
|
2311 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2312 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2313 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2314 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2315 /* A list of sub-properties. */ |
25012 | 2316 while (CONSP (prop)) |
2317 { | |
2318 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2319 space_or_image_found_p = 1; | |
2320 prop = XCDR (prop); | |
2321 } | |
2322 } | |
2323 else if (VECTORP (prop)) | |
2324 { | |
2325 int i; | |
2326 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2327 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2328 object, position)) | |
2329 space_or_image_found_p = 1; | |
2330 } | |
2331 else | |
2332 { | |
2333 if (handle_single_display_prop (it, prop, object, position)) | |
2334 space_or_image_found_p = 1; | |
2335 } | |
2336 | |
2337 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2338 } | |
2339 | |
2340 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2341 /* Value is the position of the end of the `display' property starting |
25012 | 2342 at START_POS in OBJECT. */ |
2343 | |
2344 static struct text_pos | |
2345 display_prop_end (it, object, start_pos) | |
2346 struct it *it; | |
2347 Lisp_Object object; | |
2348 struct text_pos start_pos; | |
2349 { | |
2350 Lisp_Object end; | |
2351 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2352 |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2353 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
|
2354 Qdisplay, object, Qnil); |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2355 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2356 if (STRINGP (object)) |
25012 | 2357 compute_string_pos (&end_pos, start_pos, it->string); |
2358 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2359 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2360 |
2361 return end_pos; | |
2362 } | |
2363 | |
2364 | |
2365 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2366 is the object in which the `display' property was found. *POSITION | |
2367 is the position at which it was found. | |
2368 | |
2369 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2370 end position of the `display' property. | |
2371 | |
2372 Value is non-zero if a `space' or `image' property value was found. */ | |
2373 | |
2374 static int | |
2375 handle_single_display_prop (it, prop, object, position) | |
2376 struct it *it; | |
2377 Lisp_Object prop; | |
2378 Lisp_Object object; | |
2379 struct text_pos *position; | |
2380 { | |
2381 Lisp_Object value; | |
2382 int space_or_image_found_p = 0; | |
2383 Lisp_Object form; | |
2384 | |
25614 | 2385 /* 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
|
2386 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2387 form = Qt; |
25614 | 2388 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2389 { |
2390 prop = XCDR (prop); | |
2391 if (!CONSP (prop)) | |
2392 return 0; | |
2393 form = XCAR (prop); | |
2394 prop = XCDR (prop); | |
2395 } | |
2396 | |
2397 if (!NILP (form) && !EQ (form, Qt)) | |
2398 { | |
2399 struct gcpro gcpro1; | |
2400 struct text_pos end_pos, pt; | |
2401 | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2402 GCPRO1 (form); |
25012 | 2403 end_pos = display_prop_end (it, object, *position); |
2404 | |
2405 /* Temporarily set point to the end position, and then evaluate | |
2406 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
|
2407 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2408 { |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2409 CHARPOS (pt) = PT; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2410 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
|
2411 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
|
2412 } |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2413 |
25012 | 2414 form = eval_form (form); |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2415 |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2416 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2417 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
25012 | 2418 UNGCPRO; |
2419 } | |
2420 | |
2421 if (NILP (form)) | |
2422 return 0; | |
2423 | |
2424 if (CONSP (prop) | |
2425 && EQ (XCAR (prop), Qheight) | |
2426 && CONSP (XCDR (prop))) | |
2427 { | |
2428 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2429 return 0; | |
2430 | |
2431 /* `(height HEIGHT)'. */ | |
2432 it->font_height = XCAR (XCDR (prop)); | |
2433 if (!NILP (it->font_height)) | |
2434 { | |
2435 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2436 int new_height = -1; | |
2437 | |
2438 if (CONSP (it->font_height) | |
2439 && (EQ (XCAR (it->font_height), Qplus) | |
2440 || EQ (XCAR (it->font_height), Qminus)) | |
2441 && CONSP (XCDR (it->font_height)) | |
2442 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2443 { | |
2444 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2445 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2446 if (EQ (XCAR (it->font_height), Qplus)) | |
2447 steps = - steps; | |
2448 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2449 } | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2450 else if (FUNCTIONP (it->font_height)) |
25012 | 2451 { |
2452 /* Call function with current height as argument. | |
2453 Value is the new height. */ | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2454 Lisp_Object args[2], height; |
25012 | 2455 |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2456 args[0] = it->font_height; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2457 args[1] = face->lface[LFACE_HEIGHT_INDEX]; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2458 height = call_function (2, args); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2459 |
25012 | 2460 if (NUMBERP (height)) |
2461 new_height = XFLOATINT (height); | |
2462 } | |
2463 else if (NUMBERP (it->font_height)) | |
2464 { | |
2465 /* Value is a multiple of the canonical char height. */ | |
2466 struct face *face; | |
2467 | |
2468 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2469 new_height = (XFLOATINT (it->font_height) | |
2470 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2471 } | |
2472 else | |
2473 { | |
2474 /* Evaluate IT->font_height with `height' bound to the | |
2475 current specified height to get the new height. */ | |
2476 Lisp_Object value; | |
2477 int count = specpdl_ptr - specpdl; | |
2478 | |
2479 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); | |
2480 value = eval_form (it->font_height); | |
2481 unbind_to (count, Qnil); | |
2482 | |
2483 if (NUMBERP (value)) | |
2484 new_height = XFLOATINT (value); | |
2485 } | |
2486 | |
2487 if (new_height > 0) | |
2488 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2489 } | |
2490 } | |
2491 else if (CONSP (prop) | |
2492 && EQ (XCAR (prop), Qspace_width) | |
2493 && CONSP (XCDR (prop))) | |
2494 { | |
2495 /* `(space_width WIDTH)'. */ | |
2496 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2497 return 0; | |
2498 | |
2499 value = XCAR (XCDR (prop)); | |
2500 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2501 it->space_width = value; | |
2502 } | |
2503 else if (CONSP (prop) | |
2504 && EQ (XCAR (prop), Qraise) | |
2505 && CONSP (XCDR (prop))) | |
2506 { | |
2507 /* `(raise FACTOR)'. */ | |
2508 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2509 return 0; | |
2510 | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2511 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2512 value = XCAR (XCDR (prop)); |
2513 if (NUMBERP (value)) | |
2514 { | |
2515 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2516 it->voffset = - (XFLOATINT (value) | |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
2517 * (FONT_HEIGHT (face->font))); |
25012 | 2518 } |
2519 #endif /* HAVE_WINDOW_SYSTEM */ | |
2520 } | |
2521 else if (!it->string_from_display_prop_p) | |
2522 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2523 /* `((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
|
2524 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2525 Lisp_Object location, value; |
2526 struct text_pos start_pos; | |
2527 int valid_p; | |
2528 | |
2529 /* Characters having this form of property are not displayed, so | |
2530 we have to find the end of the property. */ | |
2531 start_pos = *position; | |
2532 *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
|
2533 value = Qnil; |
25012 | 2534 |
2535 /* Let's stop at the new position and assume that all | |
2536 text properties change there. */ | |
2537 it->stop_charpos = position->charpos; | |
2538 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2539 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2540 if (CONSP (prop) && CONSP (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 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2543 |
25012 | 2544 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2545 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2546 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2547 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2548 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2549 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2550 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2551 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2552 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2553 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2554 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2555 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2556 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2557 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2558 if (EQ (location, Qunbound)) |
25012 | 2559 { |
2560 location = Qnil; | |
2561 value = prop; | |
2562 } | |
2563 | |
2564 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2565 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2566 valid_p = STRINGP (value); |
2567 else | |
2568 valid_p = (STRINGP (value) | |
2569 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2570 || valid_image_p (value)); | |
2571 #else /* not HAVE_WINDOW_SYSTEM */ | |
2572 valid_p = STRINGP (value); | |
2573 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2574 | |
2575 if ((EQ (location, Qleft_margin) | |
2576 || EQ (location, Qright_margin) | |
2577 || NILP (location)) | |
2578 && valid_p) | |
2579 { | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2580 space_or_image_found_p = 1; |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2581 |
25012 | 2582 /* Save current settings of IT so that we can restore them |
2583 when we are finished with the glyph property value. */ | |
2584 push_it (it); | |
2585 | |
2586 if (NILP (location)) | |
2587 it->area = TEXT_AREA; | |
2588 else if (EQ (location, Qleft_margin)) | |
2589 it->area = LEFT_MARGIN_AREA; | |
2590 else | |
2591 it->area = RIGHT_MARGIN_AREA; | |
2592 | |
2593 if (STRINGP (value)) | |
2594 { | |
2595 it->string = value; | |
2596 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2597 it->current.overlay_string_index = -1; | |
2598 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2599 it->end_charpos = it->string_nchars | |
2600 = XSTRING (it->string)->size; | |
2601 it->method = next_element_from_string; | |
2602 it->stop_charpos = 0; | |
2603 it->string_from_display_prop_p = 1; | |
2604 } | |
2605 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2606 { | |
2607 it->method = next_element_from_stretch; | |
2608 it->object = value; | |
2609 it->current.pos = it->position = start_pos; | |
2610 } | |
2611 #ifdef HAVE_WINDOW_SYSTEM | |
2612 else | |
2613 { | |
2614 it->what = IT_IMAGE; | |
2615 it->image_id = lookup_image (it->f, value); | |
2616 it->position = start_pos; | |
2617 it->object = NILP (object) ? it->w->buffer : object; | |
2618 it->method = next_element_from_image; | |
2619 | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
2620 /* Say that we haven't consumed the characters with |
25012 | 2621 `display' property yet. The call to pop_it in |
2622 set_iterator_to_next will clean this up. */ | |
2623 *position = start_pos; | |
2624 } | |
2625 #endif /* HAVE_WINDOW_SYSTEM */ | |
2626 } | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2627 else |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2628 /* 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
|
2629 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
|
2630 *position = start_pos; |
25012 | 2631 } |
2632 | |
2633 return space_or_image_found_p; | |
2634 } | |
2635 | |
2636 | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2637 /* 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
|
2638 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2639 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2640 static int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2641 single_display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2642 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2643 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2644 /* Skip over `when FORM'. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2645 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2646 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2647 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2648 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2649 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2650 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2651 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2652 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2653 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2654 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2655 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2656 /* 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
|
2657 we don't need to treat text as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2658 if (EQ (XCAR (prop), Qmargin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2659 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2660 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2661 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2662 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2663 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2664 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2665 if (!CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2666 || EQ (XCAR (prop), Qleft_margin) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2667 || EQ (XCAR (prop), Qright_margin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2668 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2669 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2670 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2671 return CONSP (prop) && EQ (XCAR (prop), Qimage); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2672 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2673 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2674 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2675 /* 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
|
2676 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2677 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2678 int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2679 display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2680 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2681 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2682 if (CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2683 && CONSP (XCAR (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2684 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2685 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2686 /* A list of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2687 while (CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2688 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2689 if (single_display_prop_intangible_p (XCAR (prop))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2690 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2691 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2692 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2693 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2694 else if (VECTORP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2695 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2696 /* A vector of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2697 int i; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2698 for (i = 0; i < XVECTOR (prop)->size; ++i) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2699 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
|
2700 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2701 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2702 else |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2703 return single_display_prop_intangible_p (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2704 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2705 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2706 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2707 |
25012 | 2708 |
2709 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2710 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2711 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2712 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2713 /* 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
|
2714 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2715 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2716 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2717 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2718 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2719 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2720 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2721 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2722 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2723 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2724 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2725 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2726 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2727 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2728 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2729 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2730 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2731 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2732 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2733 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2734 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2735 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2736 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2737 /* 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
|
2738 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
|
2739 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
|
2740 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
|
2741 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2742 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2743 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2744 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
|
2745 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2746 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2747 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2748 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2749 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2750 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2751 /* 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
|
2752 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2753 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
|
2754 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2755 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2756 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2757 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2758 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2759 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2760 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2761 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2762 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2763 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2764 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2765 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2766 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2767 /*********************************************************************** |
25012 | 2768 Overlay strings |
2769 ***********************************************************************/ | |
2770 | |
2771 /* The following structure is used to record overlay strings for | |
2772 later sorting in load_overlay_strings. */ | |
2773 | |
2774 struct overlay_entry | |
2775 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2776 Lisp_Object overlay; |
25012 | 2777 Lisp_Object string; |
2778 int priority; | |
2779 int after_string_p; | |
2780 }; | |
2781 | |
2782 | |
2783 /* Set up iterator IT from overlay strings at its current position. | |
2784 Called from handle_stop. */ | |
2785 | |
2786 static enum prop_handled | |
2787 handle_overlay_change (it) | |
2788 struct it *it; | |
2789 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2790 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
|
2791 return HANDLED_RECOMPUTE_PROPS; |
25012 | 2792 else |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2793 return HANDLED_NORMALLY; |
25012 | 2794 } |
2795 | |
2796 | |
2797 /* Set up the next overlay string for delivery by IT, if there is an | |
2798 overlay string to deliver. Called by set_iterator_to_next when the | |
2799 end of the current overlay string is reached. If there are more | |
2800 overlay strings to display, IT->string and | |
2801 IT->current.overlay_string_index are set appropriately here. | |
2802 Otherwise IT->string is set to nil. */ | |
2803 | |
2804 static void | |
2805 next_overlay_string (it) | |
2806 struct it *it; | |
2807 { | |
2808 ++it->current.overlay_string_index; | |
2809 if (it->current.overlay_string_index == it->n_overlay_strings) | |
2810 { | |
2811 /* No more overlay strings. Restore IT's settings to what | |
2812 they were before overlay strings were processed, and | |
2813 continue to deliver from current_buffer. */ | |
2814 pop_it (it); | |
2815 xassert (it->stop_charpos >= BEGV | |
2816 && it->stop_charpos <= it->end_charpos); | |
2817 it->string = Qnil; | |
2818 it->current.overlay_string_index = -1; | |
2819 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
2820 it->n_overlay_strings = 0; | |
2821 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
|
2822 |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2823 /* 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
|
2824 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
|
2825 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
|
2826 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
|
2827 it->overlay_strings_at_end_processed_p = 1; |
25012 | 2828 } |
2829 else | |
2830 { | |
2831 /* There are more overlay strings to process. If | |
2832 IT->current.overlay_string_index has advanced to a position | |
2833 where we must load IT->overlay_strings with more strings, do | |
2834 it. */ | |
2835 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
2836 | |
2837 if (it->current.overlay_string_index && i == 0) | |
2838 load_overlay_strings (it); | |
2839 | |
2840 /* Initialize IT to deliver display elements from the overlay | |
2841 string. */ | |
2842 it->string = it->overlay_strings[i]; | |
2843 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2844 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
2845 it->method = next_element_from_string; | |
2846 it->stop_charpos = 0; | |
2847 } | |
2848 | |
2849 CHECK_IT (it); | |
2850 } | |
2851 | |
2852 | |
2853 /* Compare two overlay_entry structures E1 and E2. Used as a | |
2854 comparison function for qsort in load_overlay_strings. Overlay | |
2855 strings for the same position are sorted so that | |
2856 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2857 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
|
2858 when they come from the same overlay. |
25012 | 2859 |
2860 2. Within after-strings, strings are sorted so that overlay strings | |
2861 from overlays with higher priorities come first. | |
2862 | |
2863 2. Within before-strings, strings are sorted so that overlay | |
2864 strings from overlays with higher priorities come last. | |
2865 | |
2866 Value is analogous to strcmp. */ | |
2867 | |
2868 | |
2869 static int | |
2870 compare_overlay_entries (e1, e2) | |
2871 void *e1, *e2; | |
2872 { | |
2873 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
2874 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
2875 int result; | |
2876 | |
2877 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
|
2878 { |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2879 /* 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
|
2880 they come from different overlays. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2881 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
|
2882 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
|
2883 else |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2884 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
|
2885 } |
25012 | 2886 else if (entry1->after_string_p) |
2887 /* After-strings sorted in order of decreasing priority. */ | |
2888 result = entry2->priority - entry1->priority; | |
2889 else | |
2890 /* Before-strings sorted in order of increasing priority. */ | |
2891 result = entry1->priority - entry2->priority; | |
2892 | |
2893 return result; | |
2894 } | |
2895 | |
2896 | |
2897 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
2898 current buffer position. Set IT->n_overlays to the total number of | |
2899 overlay strings found. | |
2900 | |
2901 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
2902 a time. On entry into load_overlay_strings, | |
2903 IT->current.overlay_string_index gives the number of overlay | |
2904 strings that have already been loaded by previous calls to this | |
2905 function. | |
2906 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2907 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
|
2908 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
|
2909 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
|
2910 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
|
2911 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
|
2912 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
|
2913 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
|
2914 in this case. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2915 |
25012 | 2916 Overlay strings are sorted so that after-string strings come in |
2917 front of before-string strings. Within before and after-strings, | |
2918 strings are sorted by overlay priority. See also function | |
2919 compare_overlay_entries. */ | |
2920 | |
2921 static void | |
2922 load_overlay_strings (it) | |
2923 struct it *it; | |
2924 { | |
2925 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority; | |
2926 Lisp_Object ov, overlay, window, str; | |
2927 int start, end; | |
2928 int size = 20; | |
2929 int n = 0, i, j; | |
2930 struct overlay_entry *entries | |
2931 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
2932 | |
2933 /* Append the overlay string STRING of overlay OVERLAY to vector | |
2934 `entries' which has size `size' and currently contains `n' | |
2935 elements. AFTER_P non-zero means STRING is an after-string of | |
2936 OVERLAY. */ | |
2937 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
2938 do \ | |
2939 { \ | |
2940 Lisp_Object priority; \ | |
2941 \ | |
2942 if (n == size) \ | |
2943 { \ | |
2944 int new_size = 2 * size; \ | |
2945 struct overlay_entry *old = entries; \ | |
2946 entries = \ | |
2947 (struct overlay_entry *) alloca (new_size \ | |
2948 * sizeof *entries); \ | |
2949 bcopy (old, entries, size * sizeof *entries); \ | |
2950 size = new_size; \ | |
2951 } \ | |
2952 \ | |
2953 entries[n].string = (STRING); \ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2954 entries[n].overlay = (OVERLAY); \ |
25012 | 2955 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
|
2956 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \ |
25012 | 2957 entries[n].after_string_p = (AFTER_P); \ |
2958 ++n; \ | |
2959 } \ | |
2960 while (0) | |
2961 | |
2962 /* 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
|
2963 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
|
2964 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2965 overlay = XCAR (ov); |
25012 | 2966 xassert (OVERLAYP (overlay)); |
2967 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
2968 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
2969 | |
2970 if (end < IT_CHARPOS (*it)) | |
2971 break; | |
2972 | |
2973 /* Skip this overlay if it doesn't start or end at IT's current | |
2974 position. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2975 if (end != IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2976 && start != IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2977 && it->add_overlay_start != IT_CHARPOS (*it)) |
25012 | 2978 continue; |
2979 | |
2980 /* Skip this overlay if it doesn't apply to IT->w. */ | |
2981 window = Foverlay_get (overlay, Qwindow); | |
2982 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
2983 continue; | |
2984 | |
2985 /* If overlay has a non-empty before-string, record it. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2986 if ((start == IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2987 || start == it->add_overlay_start) |
25012 | 2988 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
2989 && XSTRING (str)->size) | |
2990 RECORD_OVERLAY_STRING (overlay, str, 0); | |
2991 | |
2992 /* If overlay has a non-empty after-string, record it. */ | |
2993 if (end == IT_CHARPOS (*it) | |
2994 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
2995 && XSTRING (str)->size) | |
2996 RECORD_OVERLAY_STRING (overlay, str, 1); | |
2997 } | |
2998 | |
2999 /* 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
|
3000 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
|
3001 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3002 overlay = XCAR (ov); |
25012 | 3003 xassert (OVERLAYP (overlay)); |
3004 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3005 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3006 | |
3007 if (start > IT_CHARPOS (*it)) | |
3008 break; | |
3009 | |
3010 /* Skip this overlay if it doesn't start or end at IT's current | |
3011 position. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3012 if (end != IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3013 && start != IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3014 && it->add_overlay_start != IT_CHARPOS (*it)) |
25012 | 3015 continue; |
3016 | |
3017 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3018 window = Foverlay_get (overlay, Qwindow); | |
3019 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3020 continue; | |
3021 | |
3022 /* If overlay has a non-empty before-string, record it. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3023 if ((start == IT_CHARPOS (*it) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3024 || start == it->add_overlay_start) |
25012 | 3025 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3026 && XSTRING (str)->size) | |
3027 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3028 | |
3029 /* If overlay has a non-empty after-string, record it. */ | |
3030 if (end == IT_CHARPOS (*it) | |
3031 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
3032 && XSTRING (str)->size) | |
3033 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3034 } | |
3035 | |
3036 #undef RECORD_OVERLAY_STRING | |
3037 | |
3038 /* Sort entries. */ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3039 if (n) |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3040 qsort (entries, n, sizeof *entries, compare_overlay_entries); |
25012 | 3041 |
3042 /* Record the total number of strings to process. */ | |
3043 it->n_overlay_strings = n; | |
3044 | |
3045 /* IT->current.overlay_string_index is the number of overlay strings | |
3046 that have already been consumed by IT. Copy some of the | |
3047 remaining overlay strings to IT->overlay_strings. */ | |
3048 i = 0; | |
3049 j = it->current.overlay_string_index; | |
3050 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
3051 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
|
3052 |
25012 | 3053 CHECK_IT (it); |
3054 } | |
3055 | |
3056 | |
3057 /* Get the first chunk of overlay strings at IT's current buffer | |
3058 position. Value is non-zero if at least one overlay string was | |
3059 found. */ | |
3060 | |
3061 static int | |
3062 get_overlay_strings (it) | |
3063 struct it *it; | |
3064 { | |
3065 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
3066 process. This fills IT->overlay_strings with strings, and sets | |
3067 IT->n_overlay_strings to the total number of strings to process. | |
3068 IT->pos.overlay_string_index has to be set temporarily to zero | |
3069 because load_overlay_strings needs this; it must be set to -1 | |
3070 when no overlay strings are found because a zero value would | |
3071 indicate a position in the first overlay string. */ | |
3072 it->current.overlay_string_index = 0; | |
3073 load_overlay_strings (it); | |
3074 | |
3075 /* If we found overlay strings, set up IT to deliver display | |
3076 elements from the first one. Otherwise set up IT to deliver | |
3077 from current_buffer. */ | |
3078 if (it->n_overlay_strings) | |
3079 { | |
3080 /* Make sure we know settings in current_buffer, so that we can | |
3081 restore meaningful values when we're done with the overlay | |
3082 strings. */ | |
3083 compute_stop_pos (it); | |
3084 xassert (it->face_id >= 0); | |
3085 | |
3086 /* Save IT's settings. They are restored after all overlay | |
3087 strings have been processed. */ | |
3088 xassert (it->sp == 0); | |
3089 push_it (it); | |
3090 | |
3091 /* Set up IT to deliver display elements from the first overlay | |
3092 string. */ | |
3093 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
3094 it->stop_charpos = 0; | |
3095 it->string = it->overlay_strings[0]; | |
3096 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3097 xassert (STRINGP (it->string)); | |
3098 it->method = next_element_from_string; | |
3099 } | |
3100 else | |
3101 { | |
3102 it->string = Qnil; | |
3103 it->current.overlay_string_index = -1; | |
3104 it->method = next_element_from_buffer; | |
3105 } | |
3106 | |
3107 CHECK_IT (it); | |
3108 | |
3109 /* Value is non-zero if we found at least one overlay string. */ | |
3110 return STRINGP (it->string); | |
3111 } | |
3112 | |
3113 | |
3114 | |
3115 /*********************************************************************** | |
3116 Saving and restoring state | |
3117 ***********************************************************************/ | |
3118 | |
3119 /* Save current settings of IT on IT->stack. Called, for example, | |
3120 before setting up IT for an overlay string, to be able to restore | |
3121 IT's settings to what they were after the overlay string has been | |
3122 processed. */ | |
3123 | |
3124 static void | |
3125 push_it (it) | |
3126 struct it *it; | |
3127 { | |
3128 struct iterator_stack_entry *p; | |
3129 | |
3130 xassert (it->sp < 2); | |
3131 p = it->stack + it->sp; | |
3132 | |
3133 p->stop_charpos = it->stop_charpos; | |
3134 xassert (it->face_id >= 0); | |
3135 p->face_id = it->face_id; | |
3136 p->string = it->string; | |
3137 p->pos = it->current; | |
3138 p->end_charpos = it->end_charpos; | |
3139 p->string_nchars = it->string_nchars; | |
3140 p->area = it->area; | |
3141 p->multibyte_p = it->multibyte_p; | |
3142 p->space_width = it->space_width; | |
3143 p->font_height = it->font_height; | |
3144 p->voffset = it->voffset; | |
3145 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
3146 ++it->sp; | |
3147 } | |
3148 | |
3149 | |
3150 /* Restore IT's settings from IT->stack. Called, for example, when no | |
3151 more overlay strings must be processed, and we return to delivering | |
3152 display elements from a buffer, or when the end of a string from a | |
3153 `display' property is reached and we return to delivering display | |
3154 elements from an overlay string, or from a buffer. */ | |
3155 | |
3156 static void | |
3157 pop_it (it) | |
3158 struct it *it; | |
3159 { | |
3160 struct iterator_stack_entry *p; | |
3161 | |
3162 xassert (it->sp > 0); | |
3163 --it->sp; | |
3164 p = it->stack + it->sp; | |
3165 it->stop_charpos = p->stop_charpos; | |
3166 it->face_id = p->face_id; | |
3167 it->string = p->string; | |
3168 it->current = p->pos; | |
3169 it->end_charpos = p->end_charpos; | |
3170 it->string_nchars = p->string_nchars; | |
3171 it->area = p->area; | |
3172 it->multibyte_p = p->multibyte_p; | |
3173 it->space_width = p->space_width; | |
3174 it->font_height = p->font_height; | |
3175 it->voffset = p->voffset; | |
3176 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
3177 } | |
3178 | |
3179 | |
3180 | |
3181 /*********************************************************************** | |
3182 Moving over lines | |
3183 ***********************************************************************/ | |
3184 | |
3185 /* Set IT's current position to the previous line start. */ | |
3186 | |
3187 static void | |
3188 back_to_previous_line_start (it) | |
3189 struct it *it; | |
3190 { | |
3191 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3192 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3193 } | |
3194 | |
3195 | |
3196 /* Set IT's current position to the next line start. */ | |
3197 | |
3198 static void | |
3199 forward_to_next_line_start (it) | |
3200 struct it *it; | |
3201 { | |
3202 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), 1); | |
3203 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3204 } | |
3205 | |
3206 | |
3207 /* Set IT's current position to the previous visible line start. Skip | |
3208 invisible text that is so either due to text properties or due to | |
3209 selective display. Caution: this does not change IT->current_x and | |
3210 IT->hpos. */ | |
3211 | |
3212 static void | |
3213 back_to_previous_visible_line_start (it) | |
3214 struct it *it; | |
3215 { | |
3216 int visible_p = 0; | |
3217 | |
3218 /* Go back one newline if not on BEGV already. */ | |
3219 if (IT_CHARPOS (*it) > BEGV) | |
3220 back_to_previous_line_start (it); | |
3221 | |
3222 /* Move over lines that are invisible because of selective display | |
3223 or text properties. */ | |
3224 while (IT_CHARPOS (*it) > BEGV | |
3225 && !visible_p) | |
3226 { | |
3227 visible_p = 1; | |
3228 | |
3229 /* If selective > 0, then lines indented more than that values | |
3230 are invisible. */ | |
3231 if (it->selective > 0 | |
3232 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3233 it->selective)) | |
3234 visible_p = 0; | |
3235 else | |
3236 { | |
3237 Lisp_Object prop; | |
3238 | |
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
|
3239 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
|
3240 Qinvisible, it->window); |
25012 | 3241 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
3242 visible_p = 0; | |
3243 } | |
3244 | |
3245 /* Back one more newline if the current one is invisible. */ | |
3246 if (!visible_p) | |
3247 back_to_previous_line_start (it); | |
3248 } | |
3249 | |
3250 xassert (IT_CHARPOS (*it) >= BEGV); | |
3251 xassert (IT_CHARPOS (*it) == BEGV | |
3252 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3253 CHECK_IT (it); | |
3254 } | |
3255 | |
3256 | |
3257 /* Reseat iterator IT at the previous visible line start. Skip | |
3258 invisible text that is so either due to text properties or due to | |
3259 selective display. At the end, update IT's overlay information, | |
3260 face information etc. */ | |
3261 | |
3262 static void | |
3263 reseat_at_previous_visible_line_start (it) | |
3264 struct it *it; | |
3265 { | |
3266 back_to_previous_visible_line_start (it); | |
3267 reseat (it, it->current.pos, 1); | |
3268 CHECK_IT (it); | |
3269 } | |
3270 | |
3271 | |
3272 /* 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
|
3273 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
|
3274 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
|
3275 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
|
3276 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
|
3277 is invisible because of text properties. */ |
25012 | 3278 |
3279 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3280 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3281 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3282 int on_newline_p; |
25012 | 3283 { |
3284 /* Restore the buffer position when currently not delivering display | |
3285 elements from the current buffer. This is the case, for example, | |
3286 when called at the end of a truncated overlay string. */ | |
3287 while (it->sp) | |
3288 pop_it (it); | |
3289 it->method = next_element_from_buffer; | |
3290 | |
3291 /* Otherwise, scan_buffer would not work. */ | |
3292 if (IT_CHARPOS (*it) < ZV) | |
3293 { | |
3294 /* If on a newline, advance past it. Otherwise, find the next | |
3295 newline which automatically gives us the position following | |
3296 the newline. */ | |
3297 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n') | |
3298 { | |
3299 ++IT_CHARPOS (*it); | |
3300 ++IT_BYTEPOS (*it); | |
3301 } | |
3302 else | |
3303 forward_to_next_line_start (it); | |
3304 | |
3305 /* We must either have reached the end of the buffer or end up | |
3306 after a newline. */ | |
3307 xassert (IT_CHARPOS (*it) == ZV | |
3308 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3309 | |
3310 /* Skip over lines that are invisible because they are indented | |
3311 more than the value of IT->selective. */ | |
3312 if (it->selective > 0) | |
3313 while (IT_CHARPOS (*it) < ZV | |
3314 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3315 it->selective)) | |
3316 forward_to_next_line_start (it); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3317 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3318 /* Position on the newline if we should. */ |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3319 if (on_newline_p |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3320 && IT_CHARPOS (*it) > BEGV |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
3321 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n') |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3322 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3323 --IT_CHARPOS (*it); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3324 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3325 } |
25012 | 3326 |
3327 /* Set the iterator there. The 0 as the last parameter of | |
3328 reseat means don't force a text property lookup. The lookup | |
3329 is then only done if we've skipped past the iterator's | |
3330 check_charpos'es. This optimization is important because | |
3331 text property lookups tend to be expensive. */ | |
3332 reseat (it, it->current.pos, 0); | |
3333 } | |
3334 | |
3335 CHECK_IT (it); | |
3336 } | |
3337 | |
3338 | |
3339 | |
3340 /*********************************************************************** | |
3341 Changing an iterator's position | |
3342 ***********************************************************************/ | |
3343 | |
3344 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3345 is non-zero, always check for text properties at the new position. | |
3346 Otherwise, text properties are only looked up if POS >= | |
3347 IT->check_charpos of a property. */ | |
3348 | |
3349 static void | |
3350 reseat (it, pos, force_p) | |
3351 struct it *it; | |
3352 struct text_pos pos; | |
3353 int force_p; | |
3354 { | |
3355 int original_pos = IT_CHARPOS (*it); | |
3356 | |
3357 reseat_1 (it, pos, 0); | |
3358 | |
3359 /* Determine where to check text properties. Avoid doing it | |
3360 where possible because text property lookup is very expensive. */ | |
3361 if (force_p | |
3362 || CHARPOS (pos) > it->stop_charpos | |
3363 || CHARPOS (pos) < original_pos) | |
3364 handle_stop (it); | |
3365 | |
3366 CHECK_IT (it); | |
3367 } | |
3368 | |
3369 | |
3370 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3371 IT->stop_pos to POS, also. */ | |
3372 | |
3373 static void | |
3374 reseat_1 (it, pos, set_stop_p) | |
3375 struct it *it; | |
3376 struct text_pos pos; | |
3377 int set_stop_p; | |
3378 { | |
3379 /* Don't call this function when scanning a C string. */ | |
3380 xassert (it->s == NULL); | |
3381 | |
3382 /* POS must be a reasonable value. */ | |
3383 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3384 | |
3385 it->current.pos = it->position = pos; | |
3386 XSETBUFFER (it->object, current_buffer); | |
3387 it->dpvec = NULL; | |
3388 it->current.dpvec_index = -1; | |
3389 it->current.overlay_string_index = -1; | |
3390 IT_STRING_CHARPOS (*it) = -1; | |
3391 IT_STRING_BYTEPOS (*it) = -1; | |
3392 it->string = Qnil; | |
3393 it->method = next_element_from_buffer; | |
3394 it->sp = 0; | |
3395 | |
3396 if (set_stop_p) | |
3397 it->stop_charpos = CHARPOS (pos); | |
3398 } | |
3399 | |
3400 | |
3401 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3402 If S is non-null, it is a C string to iterate over. Otherwise, | |
3403 STRING gives a Lisp string to iterate over. | |
3404 | |
3405 If PRECISION > 0, don't return more then PRECISION number of | |
3406 characters from the string. | |
3407 | |
3408 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3409 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3410 field width. | |
3411 | |
3412 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3413 MULTIBYTE > 0 means enable it, | |
3414 MULTIBYTE < 0 means use IT->multibyte_p. | |
3415 | |
3416 IT must be initialized via a prior call to init_iterator before | |
3417 calling this function. */ | |
3418 | |
3419 static void | |
3420 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3421 struct it *it; | |
3422 unsigned char *s; | |
3423 Lisp_Object string; | |
3424 int charpos; | |
3425 int precision, field_width, multibyte; | |
3426 { | |
3427 /* No region in strings. */ | |
3428 it->region_beg_charpos = it->region_end_charpos = -1; | |
3429 | |
3430 /* No text property checks performed by default, but see below. */ | |
3431 it->stop_charpos = -1; | |
3432 | |
3433 /* Set iterator position and end position. */ | |
3434 bzero (&it->current, sizeof it->current); | |
3435 it->current.overlay_string_index = -1; | |
3436 it->current.dpvec_index = -1; | |
3437 xassert (charpos >= 0); | |
3438 | |
3439 /* Use the setting of MULTIBYTE if specified. */ | |
3440 if (multibyte >= 0) | |
3441 it->multibyte_p = multibyte > 0; | |
3442 | |
3443 if (s == NULL) | |
3444 { | |
3445 xassert (STRINGP (string)); | |
3446 it->string = string; | |
3447 it->s = NULL; | |
3448 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3449 it->method = next_element_from_string; | |
3450 it->current.string_pos = string_pos (charpos, string); | |
3451 } | |
3452 else | |
3453 { | |
3454 it->s = s; | |
3455 it->string = Qnil; | |
3456 | |
3457 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3458 for displaying C strings. */ | |
3459 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3460 if (it->multibyte_p) | |
3461 { | |
3462 it->current.pos = c_string_pos (charpos, s, 1); | |
3463 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3464 } | |
3465 else | |
3466 { | |
3467 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3468 it->end_charpos = it->string_nchars = strlen (s); | |
3469 } | |
3470 | |
3471 it->method = next_element_from_c_string; | |
3472 } | |
3473 | |
3474 /* PRECISION > 0 means don't return more than PRECISION characters | |
3475 from the string. */ | |
3476 if (precision > 0 && it->end_charpos - charpos > precision) | |
3477 it->end_charpos = it->string_nchars = charpos + precision; | |
3478 | |
3479 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3480 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3481 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3482 padding with `-' at the end of a mode line. */ | |
3483 if (field_width < 0) | |
3484 field_width = INFINITY; | |
3485 if (field_width > it->end_charpos - charpos) | |
3486 it->end_charpos = charpos + field_width; | |
3487 | |
3488 /* Use the standard display table for displaying strings. */ | |
3489 if (DISP_TABLE_P (Vstandard_display_table)) | |
3490 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3491 | |
3492 it->stop_charpos = charpos; | |
3493 CHECK_IT (it); | |
3494 } | |
3495 | |
3496 | |
3497 | |
3498 /*********************************************************************** | |
3499 Iteration | |
3500 ***********************************************************************/ | |
3501 | |
3502 /* Load IT's display element fields with information about the next | |
3503 display element from the current position of IT. Value is zero if | |
3504 end of buffer (or C string) is reached. */ | |
3505 | |
3506 int | |
3507 get_next_display_element (it) | |
3508 struct it *it; | |
3509 { | |
3510 /* Non-zero means that we found an display element. Zero means that | |
3511 we hit the end of what we iterate over. Performance note: the | |
3512 function pointer `method' used here turns out to be faster than | |
3513 using a sequence of if-statements. */ | |
3514 int success_p = (*it->method) (it); | |
3515 | |
3516 if (it->what == IT_CHARACTER) | |
3517 { | |
3518 /* Map via display table or translate control characters. | |
3519 IT->c, IT->len etc. have been set to the next character by | |
3520 the function call above. If we have a display table, and it | |
3521 contains an entry for IT->c, translate it. Don't do this if | |
3522 IT->c itself comes from a display table, otherwise we could | |
3523 end up in an infinite recursion. (An alternative could be to | |
3524 count the recursion depth of this function and signal an | |
3525 error when a certain maximum depth is reached.) Is it worth | |
3526 it? */ | |
3527 if (success_p && it->dpvec == NULL) | |
3528 { | |
3529 Lisp_Object dv; | |
3530 | |
3531 if (it->dp | |
3532 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3533 VECTORP (dv))) | |
3534 { | |
3535 struct Lisp_Vector *v = XVECTOR (dv); | |
3536 | |
3537 /* Return the first character from the display table | |
3538 entry, if not empty. If empty, don't display the | |
3539 current character. */ | |
3540 if (v->size) | |
3541 { | |
3542 it->dpvec_char_len = it->len; | |
3543 it->dpvec = v->contents; | |
3544 it->dpend = v->contents + v->size; | |
3545 it->current.dpvec_index = 0; | |
3546 it->method = next_element_from_display_vector; | |
3547 } | |
3548 | |
3549 success_p = get_next_display_element (it); | |
3550 } | |
3551 | |
3552 /* Translate control characters into `\003' or `^C' form. | |
3553 Control characters coming from a display table entry are | |
3554 currently not translated because we use IT->dpvec to hold | |
3555 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
|
3556 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
|
3557 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3558 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3559 octal form. */ |
25012 | 3560 else if ((it->c < ' ' |
3561 && (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
|
3562 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3563 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3564 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3565 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3566 { |
3567 /* IT->c is a control character which must be displayed | |
3568 either as '\003' or as `^C' where the '\\' and '^' | |
3569 can be defined in the display table. Fill | |
3570 IT->ctl_chars with glyphs for what we have to | |
3571 display. Then, set IT->dpvec to these glyphs. */ | |
3572 GLYPH g; | |
3573 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3574 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3575 { |
3576 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3577 if (it->dp | |
3578 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3579 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3580 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3581 else | |
3582 g = FAST_MAKE_GLYPH ('^', 0); | |
3583 XSETINT (it->ctl_chars[0], g); | |
3584 | |
3585 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3586 XSETINT (it->ctl_chars[1], g); | |
3587 | |
3588 /* Set up IT->dpvec and return first character from it. */ | |
3589 it->dpvec_char_len = it->len; | |
3590 it->dpvec = it->ctl_chars; | |
3591 it->dpend = it->dpvec + 2; | |
3592 it->current.dpvec_index = 0; | |
3593 it->method = next_element_from_display_vector; | |
3594 get_next_display_element (it); | |
3595 } | |
3596 else | |
3597 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3598 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
|
3599 int len; |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3600 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3601 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3602 |
25012 | 3603 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3604 if (it->dp | |
3605 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3606 && 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
|
3607 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3608 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3609 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3610 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3611 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
|
3612 str[0] = it->c, len = 1; |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3613 else |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3614 len = CHAR_STRING (it->c, str); |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3615 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3616 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3617 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3618 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
|
3619 /* 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
|
3620 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3621 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
|
3622 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
|
3623 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
|
3624 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
|
3625 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
|
3626 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
|
3627 } |
25012 | 3628 |
3629 /* Set up IT->dpvec and return the first character | |
3630 from it. */ | |
3631 it->dpvec_char_len = it->len; | |
3632 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3633 it->dpend = it->dpvec + len * 4; |
25012 | 3634 it->current.dpvec_index = 0; |
3635 it->method = next_element_from_display_vector; | |
3636 get_next_display_element (it); | |
3637 } | |
3638 } | |
3639 } | |
3640 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3641 /* 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
|
3642 multibyte character in unibyte text. */ |
25012 | 3643 if (it->multibyte_p |
3644 && success_p | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3645 && FRAME_WINDOW_P (it->f)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3646 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3647 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
|
3648 it->face_id = FACE_FOR_CHAR (it->f, face, it->c); |
25012 | 3649 } |
3650 } | |
3651 | |
3652 /* Is this character the last one of a run of characters with | |
3653 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3654 if (it->face_box_p | |
3655 && it->s == NULL) | |
3656 { | |
3657 int face_id; | |
3658 struct face *face; | |
3659 | |
3660 it->end_of_box_run_p | |
3661 = ((face_id = face_after_it_pos (it), | |
3662 face_id != it->face_id) | |
3663 && (face = FACE_FROM_ID (it->f, face_id), | |
3664 face->box == FACE_NO_BOX)); | |
3665 } | |
3666 | |
3667 /* Value is 0 if end of buffer or string reached. */ | |
3668 return success_p; | |
3669 } | |
3670 | |
3671 | |
3672 /* Move IT to the next display element. | |
3673 | |
3674 Functions get_next_display_element and set_iterator_to_next are | |
3675 separate because I find this arrangement easier to handle than a | |
3676 get_next_display_element function that also increments IT's | |
3677 position. The way it is we can first look at an iterator's current | |
3678 display element, decide whether it fits on a line, and if it does, | |
3679 increment the iterator position. The other way around we probably | |
3680 would either need a flag indicating whether the iterator has to be | |
3681 incremented the next time, or we would have to implement a | |
3682 decrement position function which would not be easy to write. */ | |
3683 | |
3684 void | |
3685 set_iterator_to_next (it) | |
3686 struct it *it; | |
3687 { | |
3688 if (it->method == next_element_from_buffer) | |
3689 { | |
3690 /* The current display element of IT is a character from | |
3691 current_buffer. Advance in the buffer, and maybe skip over | |
3692 invisible lines that are so because of selective display. */ | |
3693 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3694 reseat_at_next_visible_line_start (it, 0); |
25012 | 3695 else |
3696 { | |
3697 xassert (it->len != 0); | |
3698 IT_BYTEPOS (*it) += it->len; | |
3699 IT_CHARPOS (*it) += 1; | |
3700 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
3701 } | |
3702 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3703 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
|
3704 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3705 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
|
3706 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3707 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3708 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3709 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3710 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3711 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3712 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3713 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3714 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3715 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3716 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3717 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3718 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3719 } |
25012 | 3720 else if (it->method == next_element_from_c_string) |
3721 { | |
3722 /* Current display element of IT is from a C string. */ | |
3723 IT_BYTEPOS (*it) += it->len; | |
3724 IT_CHARPOS (*it) += 1; | |
3725 } | |
3726 else if (it->method == next_element_from_display_vector) | |
3727 { | |
3728 /* Current display element of IT is from a display table entry. | |
3729 Advance in the display table definition. Reset it to null if | |
3730 end reached, and continue with characters from buffers/ | |
3731 strings. */ | |
3732 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3733 |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3734 /* 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
|
3735 display vector entry (these entries may contain faces). */ |
25012 | 3736 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
|
3737 |
25012 | 3738 if (it->dpvec + it->current.dpvec_index == it->dpend) |
3739 { | |
3740 if (it->s) | |
3741 it->method = next_element_from_c_string; | |
3742 else if (STRINGP (it->string)) | |
3743 it->method = next_element_from_string; | |
3744 else | |
3745 it->method = next_element_from_buffer; | |
3746 | |
3747 it->dpvec = NULL; | |
3748 it->current.dpvec_index = -1; | |
3749 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3750 /* 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
|
3751 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
|
3752 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
|
3753 else if (it->dpvec_char_len > 0) |
25012 | 3754 { |
3755 it->len = it->dpvec_char_len; | |
3756 set_iterator_to_next (it); | |
3757 } | |
3758 } | |
3759 } | |
3760 else if (it->method == next_element_from_string) | |
3761 { | |
3762 /* Current display element is a character from a Lisp string. */ | |
3763 xassert (it->s == NULL && STRINGP (it->string)); | |
3764 IT_STRING_BYTEPOS (*it) += it->len; | |
3765 IT_STRING_CHARPOS (*it) += 1; | |
3766 | |
3767 consider_string_end: | |
3768 | |
3769 if (it->current.overlay_string_index >= 0) | |
3770 { | |
3771 /* IT->string is an overlay string. Advance to the | |
3772 next, if there is one. */ | |
3773 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3774 next_overlay_string (it); | |
3775 } | |
3776 else | |
3777 { | |
3778 /* IT->string is not an overlay string. If we reached | |
3779 its end, and there is something on IT->stack, proceed | |
3780 with what is on the stack. This can be either another | |
3781 string, this time an overlay string, or a buffer. */ | |
3782 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
3783 && it->sp > 0) | |
3784 { | |
3785 pop_it (it); | |
3786 if (!STRINGP (it->string)) | |
3787 it->method = next_element_from_buffer; | |
3788 } | |
3789 } | |
3790 } | |
3791 else if (it->method == next_element_from_image | |
3792 || it->method == next_element_from_stretch) | |
3793 { | |
3794 /* The position etc with which we have to proceed are on | |
3795 the stack. The position may be at the end of a string, | |
3796 if the `display' property takes up the whole string. */ | |
3797 pop_it (it); | |
3798 it->image_id = 0; | |
3799 if (STRINGP (it->string)) | |
3800 { | |
3801 it->method = next_element_from_string; | |
3802 goto consider_string_end; | |
3803 } | |
3804 else | |
3805 it->method = next_element_from_buffer; | |
3806 } | |
3807 else | |
3808 /* There are no other methods defined, so this should be a bug. */ | |
3809 abort (); | |
3810 | |
3811 /* Reset flags indicating start and end of a sequence of | |
3812 characters with box. */ | |
3813 it->start_of_box_run_p = it->end_of_box_run_p = 0; | |
3814 | |
3815 xassert (it->method != next_element_from_string | |
3816 || (STRINGP (it->string) | |
3817 && IT_STRING_CHARPOS (*it) >= 0)); | |
3818 } | |
3819 | |
3820 | |
3821 /* Load IT's display element fields with information about the next | |
3822 display element which comes from a display table entry or from the | |
3823 result of translating a control character to one of the forms `^C' | |
3824 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
3825 | |
3826 static int | |
3827 next_element_from_display_vector (it) | |
3828 struct it *it; | |
3829 { | |
3830 /* Precondition. */ | |
3831 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
3832 | |
3833 /* Remember the current face id in case glyphs specify faces. | |
3834 IT's face is restored in set_iterator_to_next. */ | |
3835 it->saved_face_id = it->face_id; | |
3836 | |
3837 if (INTEGERP (*it->dpvec) | |
3838 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
3839 { | |
3840 int lface_id; | |
3841 GLYPH g; | |
3842 | |
3843 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
3844 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
|
3845 it->len = CHAR_BYTES (it->c); |
25012 | 3846 |
3847 /* The entry may contain a face id to use. Such a face id is | |
3848 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
|
3849 zero means no face is specified. */ |
25012 | 3850 lface_id = FAST_GLYPH_FACE (g); |
3851 if (lface_id) | |
3852 { | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
3853 /* The function returns -1 if lface_id is invalid. */ |
25012 | 3854 int face_id = ascii_face_of_lisp_face (it->f, lface_id); |
3855 if (face_id >= 0) | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
3856 it->face_id = face_id; |
25012 | 3857 } |
3858 } | |
3859 else | |
3860 /* Display table entry is invalid. Return a space. */ | |
3861 it->c = ' ', it->len = 1; | |
3862 | |
3863 /* Don't change position and object of the iterator here. They are | |
3864 still the values of the character that had this display table | |
3865 entry or was translated, and that's what we want. */ | |
3866 it->what = IT_CHARACTER; | |
3867 return 1; | |
3868 } | |
3869 | |
3870 | |
3871 /* Load IT with the next display element from Lisp string IT->string. | |
3872 IT->current.string_pos is the current position within the string. | |
3873 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
3874 overlay string. */ | |
3875 | |
3876 static int | |
3877 next_element_from_string (it) | |
3878 struct it *it; | |
3879 { | |
3880 struct text_pos position; | |
3881 | |
3882 xassert (STRINGP (it->string)); | |
3883 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
3884 position = it->current.string_pos; | |
3885 | |
3886 /* Time to check for invisible text? */ | |
3887 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
3888 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
3889 { | |
3890 handle_stop (it); | |
3891 | |
3892 /* Since a handler may have changed IT->method, we must | |
3893 recurse here. */ | |
3894 return get_next_display_element (it); | |
3895 } | |
3896 | |
3897 if (it->current.overlay_string_index >= 0) | |
3898 { | |
3899 /* Get the next character from an overlay string. In overlay | |
3900 strings, There is no field width or padding with spaces to | |
3901 do. */ | |
3902 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3903 { | |
3904 it->what = IT_EOB; | |
3905 return 0; | |
3906 } | |
3907 else if (STRING_MULTIBYTE (it->string)) | |
3908 { | |
3909 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
3910 - IT_STRING_BYTEPOS (*it)); | |
3911 unsigned char *s = (XSTRING (it->string)->data | |
3912 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3913 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 3914 } |
3915 else | |
3916 { | |
3917 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3918 it->len = 1; | |
3919 } | |
3920 } | |
3921 else | |
3922 { | |
3923 /* Get the next character from a Lisp string that is not an | |
3924 overlay string. Such strings come from the mode line, for | |
3925 example. We may have to pad with spaces, or truncate the | |
3926 string. See also next_element_from_c_string. */ | |
3927 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
3928 { | |
3929 it->what = IT_EOB; | |
3930 return 0; | |
3931 } | |
3932 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
3933 { | |
3934 /* Pad with spaces. */ | |
3935 it->c = ' ', it->len = 1; | |
3936 CHARPOS (position) = BYTEPOS (position) = -1; | |
3937 } | |
3938 else if (STRING_MULTIBYTE (it->string)) | |
3939 { | |
3940 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
3941 - IT_STRING_BYTEPOS (*it)); | |
3942 unsigned char *s = (XSTRING (it->string)->data | |
3943 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3944 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 3945 } |
3946 else | |
3947 { | |
3948 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3949 it->len = 1; | |
3950 } | |
3951 } | |
3952 | |
3953 /* Record what we have and where it came from. Note that we store a | |
3954 buffer position in IT->position although it could arguably be a | |
3955 string position. */ | |
3956 it->what = IT_CHARACTER; | |
3957 it->object = it->string; | |
3958 it->position = position; | |
3959 return 1; | |
3960 } | |
3961 | |
3962 | |
3963 /* Load IT with next display element from C string IT->s. | |
3964 IT->string_nchars is the maximum number of characters to return | |
3965 from the string. IT->end_charpos may be greater than | |
3966 IT->string_nchars when this function is called, in which case we | |
3967 may have to return padding spaces. Value is zero if end of string | |
3968 reached, including padding spaces. */ | |
3969 | |
3970 static int | |
3971 next_element_from_c_string (it) | |
3972 struct it *it; | |
3973 { | |
3974 int success_p = 1; | |
3975 | |
3976 xassert (it->s); | |
3977 it->what = IT_CHARACTER; | |
3978 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
3979 it->object = Qnil; | |
3980 | |
3981 /* IT's position can be greater IT->string_nchars in case a field | |
3982 width or precision has been specified when the iterator was | |
3983 initialized. */ | |
3984 if (IT_CHARPOS (*it) >= it->end_charpos) | |
3985 { | |
3986 /* End of the game. */ | |
3987 it->what = IT_EOB; | |
3988 success_p = 0; | |
3989 } | |
3990 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
3991 { | |
3992 /* Pad with spaces. */ | |
3993 it->c = ' ', it->len = 1; | |
3994 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
3995 } | |
3996 else if (it->multibyte_p) | |
3997 { | |
3998 /* Implementation note: The calls to strlen apparently aren't a | |
3999 performance problem because there is no noticeable performance | |
4000 difference between Emacs running in unibyte or multibyte mode. */ | |
4001 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
|
4002 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
|
4003 maxlen, &it->len); |
25012 | 4004 } |
4005 else | |
4006 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
4007 | |
4008 return success_p; | |
4009 } | |
4010 | |
4011 | |
4012 /* Set up IT to return characters from an ellipsis, if appropriate. | |
4013 The definition of the ellipsis glyphs may come from a display table | |
4014 entry. This function Fills IT with the first glyph from the | |
4015 ellipsis if an ellipsis is to be displayed. */ | |
4016 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4017 static int |
25012 | 4018 next_element_from_ellipsis (it) |
4019 struct it *it; | |
4020 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4021 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4022 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4023 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
|
4024 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4025 /* 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
|
4026 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
|
4027 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
|
4028 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4029 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4030 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4031 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4032 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
|
4033 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4034 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4035 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4036 /* 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
|
4037 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4038 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4039 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4040 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4041 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
|
4042 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4043 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4044 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4045 reseat_at_next_visible_line_start (it, 1); |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4046 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4047 return get_next_display_element (it); |
25012 | 4048 } |
4049 | |
4050 | |
4051 /* Deliver an image display element. The iterator IT is already | |
4052 filled with image information (done in handle_display_prop). Value | |
4053 is always 1. */ | |
4054 | |
4055 | |
4056 static int | |
4057 next_element_from_image (it) | |
4058 struct it *it; | |
4059 { | |
4060 it->what = IT_IMAGE; | |
4061 return 1; | |
4062 } | |
4063 | |
4064 | |
4065 /* Fill iterator IT with next display element from a stretch glyph | |
4066 property. IT->object is the value of the text property. Value is | |
4067 always 1. */ | |
4068 | |
4069 static int | |
4070 next_element_from_stretch (it) | |
4071 struct it *it; | |
4072 { | |
4073 it->what = IT_STRETCH; | |
4074 return 1; | |
4075 } | |
4076 | |
4077 | |
4078 /* Load IT with the next display element from current_buffer. Value | |
4079 is zero if end of buffer reached. IT->stop_charpos is the next | |
4080 position at which to stop and check for text properties or buffer | |
4081 end. */ | |
4082 | |
4083 static int | |
4084 next_element_from_buffer (it) | |
4085 struct it *it; | |
4086 { | |
4087 int success_p = 1; | |
4088 | |
4089 /* Check this assumption, otherwise, we would never enter the | |
4090 if-statement, below. */ | |
4091 xassert (IT_CHARPOS (*it) >= BEGV | |
4092 && IT_CHARPOS (*it) <= it->stop_charpos); | |
4093 | |
4094 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
4095 { | |
4096 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4097 { | |
4098 int overlay_strings_follow_p; | |
4099 | |
4100 /* End of the game, except when overlay strings follow that | |
4101 haven't been returned yet. */ | |
4102 if (it->overlay_strings_at_end_processed_p) | |
4103 overlay_strings_follow_p = 0; | |
4104 else | |
4105 { | |
4106 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
|
4107 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 4108 } |
4109 | |
4110 if (overlay_strings_follow_p) | |
4111 success_p = get_next_display_element (it); | |
4112 else | |
4113 { | |
4114 it->what = IT_EOB; | |
4115 it->position = it->current.pos; | |
4116 success_p = 0; | |
4117 } | |
4118 } | |
4119 else | |
4120 { | |
4121 handle_stop (it); | |
4122 return get_next_display_element (it); | |
4123 } | |
4124 } | |
4125 else | |
4126 { | |
4127 /* No face changes, overlays etc. in sight, so just return a | |
4128 character from current_buffer. */ | |
4129 unsigned char *p; | |
4130 | |
4131 /* Maybe run the redisplay end trigger hook. Performance note: | |
4132 This doesn't seem to cost measurable time. */ | |
4133 if (it->redisplay_end_trigger_charpos | |
4134 && it->glyph_row | |
4135 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
4136 run_redisplay_end_trigger_hook (it); | |
4137 | |
4138 /* Get the next character, maybe multibyte. */ | |
4139 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
|
4140 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 4141 { |
4142 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
4143 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4144 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 4145 } |
4146 else | |
4147 it->c = *p, it->len = 1; | |
4148 | |
4149 /* Record what we have and where it came from. */ | |
4150 it->what = IT_CHARACTER;; | |
4151 it->object = it->w->buffer; | |
4152 it->position = it->current.pos; | |
4153 | |
4154 /* Normally we return the character found above, except when we | |
4155 really want to return an ellipsis for selective display. */ | |
4156 if (it->selective) | |
4157 { | |
4158 if (it->c == '\n') | |
4159 { | |
4160 /* A value of selective > 0 means hide lines indented more | |
4161 than that number of columns. */ | |
4162 if (it->selective > 0 | |
4163 && IT_CHARPOS (*it) + 1 < ZV | |
4164 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
4165 IT_BYTEPOS (*it) + 1, | |
4166 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4167 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4168 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
|
4169 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4170 } |
25012 | 4171 } |
4172 else if (it->c == '\r' && it->selective == -1) | |
4173 { | |
4174 /* A value of selective == -1 means that everything from the | |
4175 CR to the end of the line is invisible, with maybe an | |
4176 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4177 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
|
4178 it->dpvec_char_len = -1; |
25012 | 4179 } |
4180 } | |
4181 } | |
4182 | |
4183 /* 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
|
4184 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4185 return success_p; |
4186 } | |
4187 | |
4188 | |
4189 /* Run the redisplay end trigger hook for IT. */ | |
4190 | |
4191 static void | |
4192 run_redisplay_end_trigger_hook (it) | |
4193 struct it *it; | |
4194 { | |
4195 Lisp_Object args[3]; | |
4196 | |
4197 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4198 displaying something, or otherwise we should not run the hook. */ | |
4199 xassert (it->glyph_row); | |
4200 | |
4201 /* Set up hook arguments. */ | |
4202 args[0] = Qredisplay_end_trigger_functions; | |
4203 args[1] = it->window; | |
4204 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4205 it->redisplay_end_trigger_charpos = 0; | |
4206 | |
4207 /* Since we are *trying* to run these functions, don't try to run | |
4208 them again, even if they get an error. */ | |
4209 it->w->redisplay_end_trigger = Qnil; | |
4210 Frun_hook_with_args (3, args); | |
4211 | |
4212 /* Notice if it changed the face of the character we are on. */ | |
4213 handle_face_prop (it); | |
4214 } | |
4215 | |
4216 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4217 /* 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
|
4218 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4219 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4220 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4221 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4222 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4223 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4224 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4225 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4226 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4227 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4228 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4229 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4230 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4231 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4232 |
25012 | 4233 |
4234 /*********************************************************************** | |
4235 Moving an iterator without producing glyphs | |
4236 ***********************************************************************/ | |
4237 | |
4238 /* Move iterator IT to a specified buffer or X position within one | |
4239 line on the display without producing glyphs. | |
4240 | |
4241 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4242 whichever is reached first. | |
4243 | |
4244 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4245 | |
4246 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4247 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4248 TO_X includes the amount by which a window is horizontally | |
4249 scrolled. | |
4250 | |
4251 Value is | |
4252 | |
4253 MOVE_POS_MATCH_OR_ZV | |
4254 - when TO_POS or ZV was reached. | |
4255 | |
4256 MOVE_X_REACHED | |
4257 -when TO_X was reached before TO_POS or ZV were reached. | |
4258 | |
4259 MOVE_LINE_CONTINUED | |
4260 - when we reached the end of the display area and the line must | |
4261 be continued. | |
4262 | |
4263 MOVE_LINE_TRUNCATED | |
4264 - when we reached the end of the display area and the line is | |
4265 truncated. | |
4266 | |
4267 MOVE_NEWLINE_OR_CR | |
4268 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4269 display is on. */ | |
4270 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4271 static enum move_it_result |
25012 | 4272 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4273 struct it *it; | |
4274 int to_charpos, to_x, op; | |
4275 { | |
4276 enum move_it_result result = MOVE_UNDEFINED; | |
4277 struct glyph_row *saved_glyph_row; | |
4278 | |
4279 /* Don't produce glyphs in produce_glyphs. */ | |
4280 saved_glyph_row = it->glyph_row; | |
4281 it->glyph_row = NULL; | |
4282 | |
4283 while (1) | |
4284 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4285 int x, i, ascent, descent; |
25012 | 4286 |
4287 /* Stop when ZV or TO_CHARPOS reached. */ | |
4288 if (!get_next_display_element (it) | |
4289 || ((op & MOVE_TO_POS) != 0 | |
4290 && BUFFERP (it->object) | |
4291 && IT_CHARPOS (*it) >= to_charpos)) | |
4292 { | |
4293 result = MOVE_POS_MATCH_OR_ZV; | |
4294 break; | |
4295 } | |
4296 | |
4297 /* The call to produce_glyphs will get the metrics of the | |
4298 display element IT is loaded with. We record in x the | |
4299 x-position before this display element in case it does not | |
4300 fit on the line. */ | |
4301 x = it->current_x; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4302 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4303 /* 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
|
4304 fit on the line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4305 if (!it->truncate_lines_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4306 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4307 ascent = it->max_ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4308 descent = it->max_descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4309 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4310 |
25012 | 4311 PRODUCE_GLYPHS (it); |
4312 | |
4313 if (it->area != TEXT_AREA) | |
4314 { | |
4315 set_iterator_to_next (it); | |
4316 continue; | |
4317 } | |
4318 | |
4319 /* The number of glyphs we get back in IT->nglyphs will normally | |
4320 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4321 character on a terminal frame, or (iii) a line end. For the | |
4322 second case, IT->nglyphs - 1 padding glyphs will be present | |
4323 (on X frames, there is only one glyph produced for a | |
4324 composite character. | |
4325 | |
4326 The behavior implemented below means, for continuation lines, | |
4327 that as many spaces of a TAB as fit on the current line are | |
4328 displayed there. For terminal frames, as many glyphs of a | |
4329 multi-glyph character are displayed in the current line, too. | |
4330 This is what the old redisplay code did, and we keep it that | |
4331 way. Under X, the whole shape of a complex character must | |
4332 fit on the line or it will be completely displayed in the | |
4333 next line. | |
4334 | |
4335 Note that both for tabs and padding glyphs, all glyphs have | |
4336 the same width. */ | |
4337 if (it->nglyphs) | |
4338 { | |
4339 /* More than one glyph or glyph doesn't fit on line. All | |
4340 glyphs have the same width. */ | |
4341 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4342 int new_x; | |
4343 | |
4344 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4345 { | |
4346 new_x = x + single_glyph_width; | |
4347 | |
4348 /* We want to leave anything reaching TO_X to the caller. */ | |
4349 if ((op & MOVE_TO_X) && new_x > to_x) | |
4350 { | |
4351 it->current_x = x; | |
4352 result = MOVE_X_REACHED; | |
4353 break; | |
4354 } | |
4355 else if (/* Lines are continued. */ | |
4356 !it->truncate_lines_p | |
4357 && (/* And glyph doesn't fit on the line. */ | |
4358 new_x > it->last_visible_x | |
4359 /* Or it fits exactly and we're on a window | |
4360 system frame. */ | |
4361 || (new_x == it->last_visible_x | |
4362 && FRAME_WINDOW_P (it->f)))) | |
4363 { | |
4364 if (/* IT->hpos == 0 means the very first glyph | |
4365 doesn't fit on the line, e.g. a wide image. */ | |
4366 it->hpos == 0 | |
4367 || (new_x == it->last_visible_x | |
4368 && FRAME_WINDOW_P (it->f))) | |
4369 { | |
4370 ++it->hpos; | |
4371 it->current_x = new_x; | |
4372 if (i == it->nglyphs - 1) | |
4373 set_iterator_to_next (it); | |
4374 } | |
4375 else | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4376 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4377 it->current_x = x; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4378 it->max_ascent = ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4379 it->max_descent = descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4380 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4381 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4382 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
|
4383 IT_CHARPOS (*it))); |
25012 | 4384 result = MOVE_LINE_CONTINUED; |
4385 break; | |
4386 } | |
4387 else if (new_x > it->first_visible_x) | |
4388 { | |
4389 /* Glyph is visible. Increment number of glyphs that | |
4390 would be displayed. */ | |
4391 ++it->hpos; | |
4392 } | |
4393 else | |
4394 { | |
4395 /* Glyph is completely off the left margin of the display | |
4396 area. Nothing to do. */ | |
4397 } | |
4398 } | |
4399 | |
4400 if (result != MOVE_UNDEFINED) | |
4401 break; | |
4402 } | |
4403 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4404 { | |
4405 /* Stop when TO_X specified and reached. This check is | |
4406 necessary here because of lines consisting of a line end, | |
4407 only. The line end will not produce any glyphs and we | |
4408 would never get MOVE_X_REACHED. */ | |
4409 xassert (it->nglyphs == 0); | |
4410 result = MOVE_X_REACHED; | |
4411 break; | |
4412 } | |
4413 | |
4414 /* Is this a line end? If yes, we're done. */ | |
4415 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4416 { | |
4417 result = MOVE_NEWLINE_OR_CR; | |
4418 break; | |
4419 } | |
4420 | |
4421 /* The current display element has been consumed. Advance | |
4422 to the next. */ | |
4423 set_iterator_to_next (it); | |
4424 | |
4425 /* Stop if lines are truncated and IT's current x-position is | |
4426 past the right edge of the window now. */ | |
4427 if (it->truncate_lines_p | |
4428 && it->current_x >= it->last_visible_x) | |
4429 { | |
4430 result = MOVE_LINE_TRUNCATED; | |
4431 break; | |
4432 } | |
4433 } | |
4434 | |
4435 /* Restore the iterator settings altered at the beginning of this | |
4436 function. */ | |
4437 it->glyph_row = saved_glyph_row; | |
4438 return result; | |
4439 } | |
4440 | |
4441 | |
4442 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4443 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4444 the description of enum move_operation_enum. | |
4445 | |
4446 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4447 screen line, this function will set IT to the next position > | |
4448 TO_CHARPOS. */ | |
4449 | |
4450 void | |
4451 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4452 struct it *it; | |
4453 int to_charpos, to_x, to_y, to_vpos; | |
4454 int op; | |
4455 { | |
4456 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4457 int line_height; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4458 int reached = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4459 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4460 for (;;) |
25012 | 4461 { |
4462 if (op & MOVE_TO_VPOS) | |
4463 { | |
4464 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4465 start of the line TO_VPOS. */ | |
4466 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4467 { | |
4468 if (it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4469 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4470 reached = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4471 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4472 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4473 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4474 skip = move_it_in_display_line_to (it, -1, -1, 0); |
25012 | 4475 } |
4476 else | |
4477 { | |
4478 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4479 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
|
4480 if (it->vpos == to_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4481 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4482 reached = 2; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4483 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4484 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4485 |
25012 | 4486 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); |
4487 | |
4488 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
|
4489 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4490 reached = 3; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4491 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4492 } |
25012 | 4493 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) |
4494 { | |
4495 /* We have reached TO_X but not in the line we want. */ | |
4496 skip = move_it_in_display_line_to (it, to_charpos, | |
4497 -1, MOVE_TO_POS); | |
4498 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4499 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4500 reached = 4; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4501 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4502 } |
25012 | 4503 } |
4504 } | |
4505 } | |
4506 else if (op & MOVE_TO_Y) | |
4507 { | |
4508 struct it it_backup; | |
4509 | |
4510 /* TO_Y specified means stop at TO_X in the line containing | |
4511 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4512 problem is that we can't really tell whether the line | |
4513 contains TO_Y before we have completely scanned it, and | |
4514 this may skip past TO_X. What we do is to first scan to | |
4515 TO_X. | |
4516 | |
4517 If TO_X is not specified, use a TO_X of zero. The reason | |
4518 is to make the outcome of this function more predictable. | |
4519 If we didn't use TO_X == 0, we would stop at the end of | |
4520 the line which is probably not what a caller would expect | |
4521 to happen. */ | |
4522 skip = move_it_in_display_line_to (it, to_charpos, | |
4523 ((op & MOVE_TO_X) | |
4524 ? to_x : 0), | |
4525 (MOVE_TO_X | |
4526 | (op & MOVE_TO_POS))); | |
4527 | |
4528 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4529 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4530 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4531 reached = 5; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4532 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4533 } |
25012 | 4534 |
4535 /* If TO_X was reached, we would like to know whether TO_Y | |
4536 is in the line. This can only be said if we know the | |
4537 total line height which requires us to scan the rest of | |
4538 the line. */ | |
4539 if (skip == MOVE_X_REACHED) | |
4540 { | |
4541 it_backup = *it; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4542 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it))); |
25012 | 4543 skip2 = move_it_in_display_line_to (it, to_charpos, -1, |
4544 op & MOVE_TO_POS); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4545 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it))); |
25012 | 4546 } |
4547 | |
4548 /* Now, decide whether TO_Y is in this line. */ | |
4549 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
|
4550 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height)); |
25012 | 4551 |
4552 if (to_y >= it->current_y | |
4553 && to_y < it->current_y + line_height) | |
4554 { | |
4555 if (skip == MOVE_X_REACHED) | |
4556 /* If TO_Y is in this line and TO_X was reached above, | |
4557 we scanned too far. We have to restore IT's settings | |
4558 to the ones before skipping. */ | |
4559 *it = it_backup; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4560 reached = 6; |
25012 | 4561 } |
4562 else if (skip == MOVE_X_REACHED) | |
4563 { | |
4564 skip = skip2; | |
4565 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4566 reached = 7; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4567 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4568 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4569 if (reached) |
25012 | 4570 break; |
4571 } | |
4572 else | |
4573 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4574 | |
4575 switch (skip) | |
4576 { | |
4577 case MOVE_POS_MATCH_OR_ZV: | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4578 reached = 8; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4579 goto out; |
25012 | 4580 |
4581 case MOVE_NEWLINE_OR_CR: | |
4582 set_iterator_to_next (it); | |
4583 it->continuation_lines_width = 0; | |
4584 break; | |
4585 | |
4586 case MOVE_LINE_TRUNCATED: | |
4587 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
|
4588 reseat_at_next_visible_line_start (it, 0); |
25012 | 4589 if ((op & MOVE_TO_POS) != 0 |
4590 && IT_CHARPOS (*it) > to_charpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4591 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4592 reached = 9; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4593 goto out; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4594 } |
25012 | 4595 break; |
4596 | |
4597 case MOVE_LINE_CONTINUED: | |
4598 it->continuation_lines_width += it->current_x; | |
4599 break; | |
4600 | |
4601 default: | |
4602 abort (); | |
4603 } | |
4604 | |
4605 /* Reset/increment for the next run. */ | |
4606 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4607 it->current_x = it->hpos = 0; | |
4608 it->current_y += it->max_ascent + it->max_descent; | |
4609 ++it->vpos; | |
4610 last_height = it->max_ascent + it->max_descent; | |
4611 last_max_ascent = it->max_ascent; | |
4612 it->max_ascent = it->max_descent = 0; | |
4613 } | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4614 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4615 out: |
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 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached)); |
25012 | 4618 } |
4619 | |
4620 | |
4621 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4622 | |
4623 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4624 means move IT backward to the preceding line start or BEGV. This | |
4625 function may move over more than DY pixels if IT->current_y - DY | |
4626 ends up in the middle of a line; in this case IT->current_y will be | |
4627 set to the top of the line moved to. */ | |
4628 | |
4629 void | |
4630 move_it_vertically_backward (it, dy) | |
4631 struct it *it; | |
4632 int dy; | |
4633 { | |
4634 int nlines, h, line_height; | |
4635 struct it it2; | |
4636 int start_pos = IT_CHARPOS (*it); | |
4637 | |
4638 xassert (dy >= 0); | |
4639 | |
4640 /* Estimate how many newlines we must move back. */ | |
4641 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4642 | |
4643 /* Set the iterator's position that many lines back. */ | |
4644 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4645 back_to_previous_visible_line_start (it); | |
4646 | |
4647 /* Reseat the iterator here. When moving backward, we don't want | |
4648 reseat to skip forward over invisible text, set up the iterator | |
4649 to deliver from overlay strings at the new position etc. So, | |
4650 use reseat_1 here. */ | |
4651 reseat_1 (it, it->current.pos, 1); | |
4652 | |
4653 /* We are now surely at a line start. */ | |
4654 it->current_x = it->hpos = 0; | |
4655 | |
4656 /* Move forward and see what y-distance we moved. First move to the | |
4657 start of the next line so that we get its height. We need this | |
4658 height to be able to tell whether we reached the specified | |
4659 y-distance. */ | |
4660 it2 = *it; | |
4661 it2.max_ascent = it2.max_descent = 0; | |
4662 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
4663 MOVE_TO_POS | MOVE_TO_VPOS); | |
4664 xassert (IT_CHARPOS (*it) >= BEGV); | |
4665 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
|
4666 |
25012 | 4667 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); |
4668 xassert (IT_CHARPOS (*it) >= BEGV); | |
4669 h = it2.current_y - it->current_y; | |
4670 nlines = it2.vpos - it->vpos; | |
4671 | |
4672 /* Correct IT's y and vpos position. */ | |
4673 it->vpos -= nlines; | |
4674 it->current_y -= h; | |
4675 | |
4676 if (dy == 0) | |
4677 { | |
4678 /* DY == 0 means move to the start of the screen line. The | |
4679 value of nlines is > 0 if continuation lines were involved. */ | |
4680 if (nlines > 0) | |
4681 move_it_by_lines (it, nlines, 1); | |
4682 xassert (IT_CHARPOS (*it) <= start_pos); | |
4683 } | |
4684 else if (nlines) | |
4685 { | |
4686 /* The y-position we try to reach. Note that h has been | |
4687 subtracted in front of the if-statement. */ | |
4688 int target_y = it->current_y + h - dy; | |
4689 | |
4690 /* If we did not reach target_y, try to move further backward if | |
4691 we can. If we moved too far backward, try to move forward. */ | |
4692 if (target_y < it->current_y | |
4693 && IT_CHARPOS (*it) > BEGV) | |
4694 { | |
4695 move_it_vertically (it, target_y - it->current_y); | |
4696 xassert (IT_CHARPOS (*it) >= BEGV); | |
4697 } | |
4698 else if (target_y >= it->current_y + line_height | |
4699 && IT_CHARPOS (*it) < ZV) | |
4700 { | |
4701 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
4702 xassert (IT_CHARPOS (*it) >= BEGV); | |
4703 } | |
4704 } | |
4705 } | |
4706 | |
4707 | |
4708 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
4709 move backwards. DY = 0 means move to start of screen line. At the | |
4710 end, IT will be on the start of a screen line. */ | |
4711 | |
4712 void | |
4713 move_it_vertically (it, dy) | |
4714 struct it *it; | |
4715 int dy; | |
4716 { | |
4717 if (dy <= 0) | |
4718 move_it_vertically_backward (it, -dy); | |
4719 else if (dy > 0) | |
4720 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4721 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy)); |
25012 | 4722 move_it_to (it, ZV, -1, it->current_y + dy, -1, |
4723 MOVE_TO_POS | MOVE_TO_Y); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4724 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it))); |
25012 | 4725 |
4726 /* If buffer ends in ZV without a newline, move to the start of | |
4727 the line to satisfy the post-condition. */ | |
4728 if (IT_CHARPOS (*it) == ZV | |
4729 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
4730 move_it_by_lines (it, 0, 0); | |
4731 } | |
4732 } | |
4733 | |
4734 | |
4735 /* Return non-zero if some text between buffer positions START_CHARPOS | |
4736 and END_CHARPOS is invisible. IT->window is the window for text | |
4737 property lookup. */ | |
4738 | |
4739 static int | |
4740 invisible_text_between_p (it, start_charpos, end_charpos) | |
4741 struct it *it; | |
4742 int start_charpos, end_charpos; | |
4743 { | |
4744 Lisp_Object prop, limit; | |
4745 int invisible_found_p; | |
4746 | |
4747 xassert (it != NULL && start_charpos <= end_charpos); | |
4748 | |
4749 /* Is text at START invisible? */ | |
4750 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
4751 it->window); | |
4752 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
4753 invisible_found_p = 1; | |
4754 else | |
4755 { | |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
4756 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
|
4757 Qinvisible, Qnil, |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
4758 make_number (end_charpos)); |
25012 | 4759 invisible_found_p = XFASTINT (limit) < end_charpos; |
4760 } | |
4761 | |
4762 return invisible_found_p; | |
4763 } | |
4764 | |
4765 | |
4766 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
4767 negative means move up. DVPOS == 0 means move to the start of the | |
4768 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
4769 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
4770 | |
4771 Further optimization ideas: If we would know that IT->f doesn't use | |
4772 a face with proportional font, we could be faster for | |
4773 truncate-lines nil. */ | |
4774 | |
4775 void | |
4776 move_it_by_lines (it, dvpos, need_y_p) | |
4777 struct it *it; | |
4778 int dvpos, need_y_p; | |
4779 { | |
4780 struct position pos; | |
4781 | |
4782 if (!FRAME_WINDOW_P (it->f)) | |
4783 { | |
4784 struct text_pos textpos; | |
4785 | |
4786 /* We can use vmotion on frames without proportional fonts. */ | |
4787 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
4788 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
4789 reseat (it, textpos, 1); | |
4790 it->vpos += pos.vpos; | |
4791 it->current_y += pos.vpos; | |
4792 } | |
4793 else if (dvpos == 0) | |
4794 { | |
4795 /* DVPOS == 0 means move to the start of the screen line. */ | |
4796 move_it_vertically_backward (it, 0); | |
4797 xassert (it->current_x == 0 && it->hpos == 0); | |
4798 } | |
4799 else if (dvpos > 0) | |
4800 { | |
4801 /* If there are no continuation lines, and if there is no | |
4802 selective display, try the simple method of moving forward | |
4803 DVPOS newlines, then see where we are. */ | |
4804 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4805 { | |
4806 int shortage = 0, charpos; | |
4807 | |
4808 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n')) | |
4809 charpos = IT_CHARPOS (*it) + 1; | |
4810 else | |
4811 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
4812 &shortage, 0); | |
4813 | |
4814 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
4815 { | |
4816 struct text_pos pos; | |
4817 CHARPOS (pos) = charpos; | |
4818 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4819 reseat (it, pos, 1); | |
4820 it->vpos += dvpos - shortage; | |
4821 it->hpos = it->current_x = 0; | |
4822 return; | |
4823 } | |
4824 } | |
4825 | |
4826 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
4827 } | |
4828 else | |
4829 { | |
4830 struct it it2; | |
4831 int start_charpos, i; | |
4832 | |
4833 /* If there are no continuation lines, and if there is no | |
4834 selective display, try the simple method of moving backward | |
4835 -DVPOS newlines. */ | |
4836 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4837 { | |
4838 int shortage; | |
4839 int charpos = IT_CHARPOS (*it); | |
4840 int bytepos = IT_BYTEPOS (*it); | |
4841 | |
4842 /* If in the middle of a line, go to its start. */ | |
4843 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
4844 { | |
4845 charpos = find_next_newline_no_quit (charpos, -1); | |
4846 bytepos = CHAR_TO_BYTE (charpos); | |
4847 } | |
4848 | |
4849 if (charpos == BEGV) | |
4850 { | |
4851 struct text_pos pos; | |
4852 CHARPOS (pos) = charpos; | |
4853 BYTEPOS (pos) = bytepos; | |
4854 reseat (it, pos, 1); | |
4855 it->hpos = it->current_x = 0; | |
4856 return; | |
4857 } | |
4858 else | |
4859 { | |
4860 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
4861 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
4862 { | |
4863 struct text_pos pos; | |
4864 CHARPOS (pos) = charpos; | |
4865 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4866 reseat (it, pos, 1); | |
4867 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
4868 it->hpos = it->current_x = 0; | |
4869 return; | |
4870 } | |
4871 } | |
4872 } | |
4873 | |
4874 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
4875 start_charpos = IT_CHARPOS (*it); | |
4876 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
4877 back_to_previous_visible_line_start (it); | |
4878 reseat (it, it->current.pos, 1); | |
4879 it->current_x = it->hpos = 0; | |
4880 | |
4881 /* Above call may have moved too far if continuation lines | |
4882 are involved. Scan forward and see if it did. */ | |
4883 it2 = *it; | |
4884 it2.vpos = it2.current_y = 0; | |
4885 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
4886 it->vpos -= it2.vpos; | |
4887 it->current_y -= it2.current_y; | |
4888 it->current_x = it->hpos = 0; | |
4889 | |
4890 /* If we moved too far, move IT some lines forward. */ | |
4891 if (it2.vpos > -dvpos) | |
4892 { | |
4893 int delta = it2.vpos + dvpos; | |
4894 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
4895 } | |
4896 } | |
4897 } | |
4898 | |
4899 | |
4900 | |
4901 /*********************************************************************** | |
4902 Messages | |
4903 ***********************************************************************/ | |
4904 | |
4905 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4906 /* 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
|
4907 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4908 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4909 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4910 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
|
4911 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4912 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4913 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4914 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4915 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4916 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4917 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4918 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
|
4919 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4920 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4921 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4922 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4923 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
|
4924 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4925 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
|
4926 msg = Fformat (3, args); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4927 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4928 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
|
4929 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4930 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4931 |
28876
04cbb0510d7e
(add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents:
28869
diff
changeset
|
4932 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
|
4933 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4934 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4935 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4936 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4937 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4938 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4939 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4940 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4941 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4942 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4943 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
|
4944 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4945 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4946 |
25012 | 4947 /* Add a string M of length LEN to the message log, optionally |
4948 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
4949 nonzero, means interpret the contents of M as multibyte. This | |
4950 function calls low-level routines in order to bypass text property | |
4951 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
|
4952 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4953 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4954 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4955 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4956 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4957 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4958 if (!NILP (Vmessage_log_max)) |
10393 | 4959 { |
4960 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4961 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
|
4962 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
|
4963 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
|
4964 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
|
4965 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
|
4966 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
|
4967 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4968 old_deactivate_mark = Vdeactivate_mark; |
10393 | 4969 oldbuf = current_buffer; |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
4970 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
|
4971 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4972 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4973 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4974 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4975 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4976 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4977 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4978 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
|
4979 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4980 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
|
4981 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4982 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4983 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4984 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4985 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4986 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4987 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
|
4988 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4989 /* 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
|
4990 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
|
4991 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
|
4992 && 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
|
4993 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4994 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4995 unsigned char work[1]; |
25012 | 4996 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4997 /* 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
|
4998 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
|
4999 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
|
5000 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
5001 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
|
5002 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
|
5003 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5004 : 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
|
5005 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
|
5006 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5007 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5008 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
|
5009 && ! 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
|
5010 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5011 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
|
5012 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5013 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
|
5014 /* 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
|
5015 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
|
5016 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
|
5017 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5018 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
|
5019 nbytes = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5020 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
|
5021 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5022 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5023 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5024 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
|
5025 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5026 if (nlflag) |
10393 | 5027 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5028 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
|
5029 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5030 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5031 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
|
5032 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5033 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5034 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5035 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5036 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5037 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
|
5038 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5039 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5040 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
5041 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
|
5042 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5043 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5044 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5045 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5046 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5047 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5048 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5049 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5050 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5051 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5052 /* 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
|
5053 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5054 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5055 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5056 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
|
5057 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5058 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5059 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5060 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5061 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5062 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5063 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5064 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5065 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5066 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
|
5067 } |
10393 | 5068 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5069 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5070 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5071 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5072 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5073 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5074 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5075 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5076 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5077 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5078 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5079 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5080 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5081 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5082 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5083 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5084 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
|
5085 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5086 /* 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
|
5087 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5088 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
|
5089 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5090 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5091 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5092 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5093 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5094 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5095 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5096 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 5097 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5098 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5099 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
|
5100 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5101 Vdeactivate_mark = old_deactivate_mark; |
10393 | 5102 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5103 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5104 |
25012 | 5105 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5106 /* 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
|
5107 (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
|
5108 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
|
5109 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
|
5110 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
|
5111 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5112 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5113 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
|
5114 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5115 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5116 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5117 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
5118 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
|
5119 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5120 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
|
5121 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
|
5122 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5123 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5124 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5125 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.' |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5126 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5127 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5128 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5129 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5130 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5131 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5132 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5133 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5134 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5135 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5136 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5137 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5138 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5139 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5140 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5141 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5142 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5143 } |
25012 | 5144 |
5145 | |
5146 /* Display an echo area message M with a specified length of LEN | |
5147 chars. The string may include null characters. If M is 0, clear | |
5148 out any existing message, and let the mini-buffer text show through. | |
5149 | |
5150 The buffer M must continue to exist until after the echo area gets | |
5151 cleared or some other message gets displayed there. This means do | |
5152 not pass text that is stored in a Lisp string; do not pass text in | |
5153 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5154 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5155 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5156 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5157 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5158 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5159 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5160 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5161 /* 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
|
5162 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5163 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5164 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5165 message2_nolog (m, len, multibyte); |
10393 | 5166 } |
5167 | |
5168 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5169 /* The non-logging counterpart of message2. */ |
10393 | 5170 |
5171 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5172 message2_nolog (m, len, multibyte) |
10393 | 5173 char *m; |
5174 int len; | |
5175 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5176 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5177 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5178 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5179 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5180 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5181 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5182 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5183 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
|
5184 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
5185 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5186 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5187 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5188 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5189 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5190 /* 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
|
5191 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5192 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 5193 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5194 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5195 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5196 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5197 Lisp_Object mini_window; |
25012 | 5198 struct frame *f; |
5199 | |
5200 /* 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
|
5201 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5202 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
|
5203 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
|
5204 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5205 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5206 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
|
5207 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5208 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
|
5209 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5210 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5211 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5212 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5213 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5214 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5215 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5216 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5217 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5218 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5219 do_pending_window_change (0); |
25012 | 5220 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
|
5221 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
|
5222 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
|
5223 (*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
|
5224 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5225 } |
25012 | 5226 |
5227 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5228 /* 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
|
5229 bytes. The string may include null characters. If M is not a |
25012 | 5230 string, clear out any existing message, and let the mini-buffer |
5231 text show through. */ | |
5232 | |
5233 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5234 message3 (m, nbytes, multibyte) |
25012 | 5235 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5236 int nbytes; |
25012 | 5237 int multibyte; |
5238 { | |
5239 struct gcpro gcpro1; | |
5240 | |
5241 GCPRO1 (m); | |
5242 | |
5243 /* First flush out any partial line written with print. */ | |
5244 message_log_maybe_newline (); | |
5245 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5246 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
|
5247 message3_nolog (m, nbytes, multibyte); |
25012 | 5248 |
5249 UNGCPRO; | |
5250 } | |
5251 | |
5252 | |
5253 /* The non-logging version of message3. */ | |
5254 | |
5255 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5256 message3_nolog (m, nbytes, multibyte) |
25012 | 5257 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5258 int nbytes, multibyte; |
25012 | 5259 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5260 struct frame *sf = SELECTED_FRAME (); |
25012 | 5261 message_enable_multibyte = multibyte; |
5262 | |
5263 if (noninteractive) | |
5264 { | |
5265 if (noninteractive_need_newline) | |
5266 putc ('\n', stderr); | |
5267 noninteractive_need_newline = 0; | |
5268 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5269 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5270 if (cursor_in_echo_area == 0) |
5271 fprintf (stderr, "\n"); | |
5272 fflush (stderr); | |
5273 } | |
5274 /* A null message buffer means that the frame hasn't really been | |
5275 initialized yet. Error messages get reported properly by | |
5276 cmd_error, so this must be just an informative message; toss it. */ | |
5277 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5278 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5279 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5280 { |
5281 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
|
5282 Lisp_Object frame; |
25012 | 5283 struct frame *f; |
5284 | |
5285 /* Get the frame containing the mini-buffer | |
5286 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5287 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
|
5288 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
|
5289 f = XFRAME (frame); |
25012 | 5290 |
5291 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5292 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
|
5293 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5294 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5295 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5296 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
|
5297 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5298 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
|
5299 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5300 Fraise_frame (frame); |
25012 | 5301 } |
5302 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5303 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5304 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5305 do_pending_window_change (0); |
25012 | 5306 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
|
5307 do_pending_window_change (0); |
25012 | 5308 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5309 (*frame_up_to_date_hook) (f); | |
5310 } | |
5311 } | |
5312 | |
5313 | |
5314 /* Display a null-terminated echo area message M. If M is 0, clear | |
5315 out any existing message, and let the mini-buffer text show through. | |
5316 | |
5317 The buffer M must continue to exist until after the echo area gets | |
5318 cleared or some other message gets displayed there. Do not pass | |
5319 text that is stored in a Lisp string. Do not pass text in a buffer | |
5320 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
|
5321 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5322 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5323 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5324 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5325 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5326 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
|
5327 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5328 |
25012 | 5329 |
5330 /* The non-logging counterpart of message1. */ | |
5331 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5332 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5333 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5334 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5335 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5336 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
|
5337 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5338 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5339 /* 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
|
5340 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5341 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5342 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5343 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5344 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5345 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5346 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5347 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5348 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5349 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5350 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5351 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5352 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5353 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5354 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5355 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5356 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5357 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5358 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5359 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5360 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5361 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5362 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5363 /* 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
|
5364 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
|
5365 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
|
5366 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5367 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5368 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5369 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5370 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5371 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5372 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5373 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5374 /* 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
|
5375 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
|
5376 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
|
5377 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5378 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5379 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5380 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5381 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5382 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5383 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5384 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
|
5385 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5386 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5387 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5388 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5389 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5390 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5391 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5392 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5393 /* 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
|
5394 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5395 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5396 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5397 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5398 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5399 |
25012 | 5400 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5401 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5402 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
|
5403 |
277 | 5404 /* VARARGS 1 */ |
5405 void | |
5406 message (m, a1, a2, a3) | |
5407 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5408 EMACS_INT a1, a2, a3; |
277 | 5409 { |
5410 if (noninteractive) | |
5411 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5412 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5413 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5414 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
|
5415 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
|
5416 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
|
5417 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5418 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5419 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
|
5420 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5421 } |
277 | 5422 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5423 else if (INTERACTIVE) |
277 | 5424 { |
25012 | 5425 /* The frame whose mini-buffer we're going to display the message |
5426 on. It may be larger than the selected frame, so we need to | |
5427 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
|
5428 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5429 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5430 |
5431 /* 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
|
5432 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5433 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
|
5434 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5435 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5436 /* 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
|
5437 initialized yet. Error messages get reported properly by |
25012 | 5438 cmd_error, so this must be just an informative message; toss |
5439 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5440 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
|
5441 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5442 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5443 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5444 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
|
5445 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5446 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5447 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5448 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5449 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5450 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5451 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5452 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
|
5453 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5454 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5455 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
|
5456 (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
|
5457 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5458 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5459 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
|
5460 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5461 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5462 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5463 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5464 /* 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
|
5465 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
|
5466 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
|
5467 } |
277 | 5468 } |
5469 } | |
5470 | |
25012 | 5471 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5472 /* The non-logging version of message. */ |
25012 | 5473 |
11193 | 5474 void |
5475 message_nolog (m, a1, a2, a3) | |
5476 char *m; | |
5477 EMACS_INT a1, a2, a3; | |
5478 { | |
5479 Lisp_Object old_log_max; | |
5480 old_log_max = Vmessage_log_max; | |
5481 Vmessage_log_max = Qnil; | |
5482 message (m, a1, a2, a3); | |
5483 Vmessage_log_max = old_log_max; | |
5484 } | |
5485 | |
25012 | 5486 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5487 /* 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
|
5488 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
|
5489 critical. */ |
25012 | 5490 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5491 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5492 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5493 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5494 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
|
5495 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5496 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5497 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5498 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
|
5499 !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
|
5500 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5501 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5502 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5503 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5504 /* 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
|
5505 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5506 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5507 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5508 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5509 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5510 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5511 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5512 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5513 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5514 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5515 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5516 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
|
5517 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
|
5518 int j; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5519 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5520 old_buffer = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5521 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5522 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
|
5523 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
|
5524 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5525 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
|
5526 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
|
5527 echo_area_buffer[j] = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5528 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5529 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5530 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5531 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5532 /* 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
|
5533 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
|
5534 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5535 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
|
5536 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
|
5537 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
|
5538 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5539 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
|
5540 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
|
5541 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5542 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
|
5543 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
|
5544 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
|
5545 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5546 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
|
5547 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5548 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5549 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
|
5550 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5551 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
|
5552 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
|
5553 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
|
5554 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
|
5555 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
|
5556 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5557 Lisp_Object buffer; |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
5558 int this_one, the_other, clear_buffer_p, rc; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5559 int count = specpdl_ptr - specpdl; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5560 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5561 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5562 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
|
5563 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5564 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5565 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5566 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5567 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
|
5568 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5569 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
|
5570 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5571 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5572 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
|
5573 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5574 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5575 /* 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
|
5576 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
|
5577 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
|
5578 && 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
|
5579 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
|
5580 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5581 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5582 /* 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
|
5583 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5584 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
|
5585 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5586 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
|
5587 = (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
|
5588 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5589 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5590 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5591 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5592 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5593 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
|
5594 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5595 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
|
5596 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
|
5597 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5598 /* 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
|
5599 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
|
5600 == 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
|
5601 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
|
5602 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
|
5603 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
|
5604 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5605 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
|
5606 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5607 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5608 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5609 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
|
5610 } |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5611 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5612 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
|
5613 current_buffer->read_only = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5614 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5615 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
|
5616 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5617 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5618 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5619 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
|
5620 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5621 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
|
5622 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5623 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5624 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
|
5625 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5626 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5627 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5628 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5629 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5630 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5631 /* 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
|
5632 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
|
5633 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5634 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5635 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
|
5636 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5637 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5638 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5639 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5640 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5641 /* 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
|
5642 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
|
5643 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
|
5644 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
|
5645 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5646 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5647 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
|
5648 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5649 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
|
5650 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
|
5651 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
|
5652 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5653 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5654 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5655 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
|
5656 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
|
5657 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5658 = 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
|
5659 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5660 = 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
|
5661 } |
25012 | 5662 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5663 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5664 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5665 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5666 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
|
5667 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5668 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5669 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
|
5670 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5671 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5672 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5673 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5674 /* 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
|
5675 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
|
5676 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5677 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5678 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
|
5679 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5680 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5681 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5682 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5683 set_buffer_internal_1 (XBUFFER (XVECTOR (vector)->contents[i])); ++i; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5684 Vdeactivate_mark = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5685 windows_or_buffers_changed = XFASTINT (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5686 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5687 if (WINDOWP (XVECTOR (vector)->contents[i])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5688 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5689 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5690 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
|
5691 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5692 w = XWINDOW (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5693 buffer = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5694 charpos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5695 bytepos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5696 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5697 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5698 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
|
5699 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5700 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5701 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5702 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
|
5703 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5704 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5705 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5706 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5707 /* 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
|
5708 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
|
5709 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5710 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5711 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
|
5712 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5713 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5714 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5715 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5716 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5717 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5718 /* 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
|
5719 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
|
5720 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
|
5721 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
|
5722 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5723 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
|
5724 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5725 /* 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
|
5726 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5727 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5728 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5729 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
|
5730 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5731 /* 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
|
5732 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5733 != !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
|
5734 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
|
5735 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5736 /* 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
|
5737 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5738 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5739 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
|
5740 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5741 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
|
5742 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
|
5743 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5744 |
29643
77f1e8db4147
(setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents:
29634
diff
changeset
|
5745 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
|
5746 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5747 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5748 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5749 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5750 if (NILP (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5751 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5752 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
|
5753 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
|
5754 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5755 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
|
5756 } |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5757 |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5758 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
|
5759 /* Someone switched buffers between print requests. */ |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5760 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
|
5761 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5762 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5763 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5764 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5765 /* 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
|
5766 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
|
5767 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
|
5768 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
|
5769 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5770 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5771 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5772 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5773 { |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5774 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
|
5775 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5776 /* 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
|
5777 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
|
5778 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
|
5779 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
|
5780 redisplay. */ |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5781 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
|
5782 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5783 /* 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
|
5784 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
|
5785 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
|
5786 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
|
5787 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
|
5788 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
|
5789 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5790 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5791 = 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
|
5792 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
|
5793 (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
|
5794 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5795 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5796 echo_area_buffer[i] = Qnil; |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5797 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5798 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
|
5799 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
|
5800 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5801 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5802 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5803 /* 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
|
5804 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
|
5805 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
|
5806 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
|
5807 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
|
5808 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5809 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5810 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
|
5811 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
|
5812 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
|
5813 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5814 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5815 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
|
5816 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5817 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5818 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
|
5819 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5820 /* 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
|
5821 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5822 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
|
5823 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5824 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5825 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
|
5826 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5827 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
|
5828 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5829 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5830 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
|
5831 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5832 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5833 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5834 /* 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
|
5835 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
|
5836 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5837 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5838 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5839 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5840 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5841 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5842 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5843 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
|
5844 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5845 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5846 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
|
5847 (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
|
5848 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5849 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5850 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5851 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5852 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5853 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5854 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5855 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5856 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5857 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5858 /* 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
|
5859 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
|
5860 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
|
5861 returns. */ |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5862 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5863 static int |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5864 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
|
5865 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
|
5866 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
|
5867 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5868 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5869 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
|
5870 } |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5871 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5872 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5873 /* 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
|
5874 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
|
5875 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
|
5876 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
|
5877 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5878 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5879 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
|
5880 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5881 int exact_p; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5882 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5883 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
|
5884 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
|
5885 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5886 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5887 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5888 /* Nil means don't try to resize. */ |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5889 if (NILP (Vmax_mini_window_height) |
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5890 || (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
|
5891 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5892 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5893 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
|
5894 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5895 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5896 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
|
5897 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
|
5898 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5899 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
|
5900 struct text_pos start; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5901 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5902 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
|
5903 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5904 /* 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
|
5905 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
|
5906 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
|
5907 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
|
5908 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
|
5909 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5910 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
|
5911 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5912 /* 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
|
5913 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
|
5914 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
|
5915 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5916 /* 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
|
5917 if (it.truncate_lines_p) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5918 height = 1; |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
5919 else |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5920 { |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5921 last_height = 0; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5922 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
|
5923 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
|
5924 height = it.current_y + last_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5925 else |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5926 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
|
5927 height -= it.extra_line_spacing; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5928 height = (height + unit - 1) / unit; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5929 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5930 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5931 /* 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
|
5932 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5933 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5934 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5935 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
|
5936 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
|
5937 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5938 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5939 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5940 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
|
5941 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
|
5942 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5943 /* Let it grow only, until we display an empty message, in which |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5944 case the window shrinks again. */ |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5945 if (height > XFASTINT (w->height)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5946 { |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5947 int old_height = XFASTINT (w->height); |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5948 freeze_window_starts (f, 1); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5949 grow_mini_window (w, height - XFASTINT (w->height)); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5950 window_height_changed_p = XFASTINT (w->height) != old_height; |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5951 } |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5952 else if (height < XFASTINT (w->height) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5953 && (exact_p || BEGV == ZV)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5954 { |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5955 int old_height = XFASTINT (w->height); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5956 freeze_window_starts (f, 0); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5957 shrink_mini_window (w); |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5958 window_height_changed_p = XFASTINT (w->height) != old_height; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5959 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5960 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5961 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5962 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
|
5963 } |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5966 /* 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
|
5967 current message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5968 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5969 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5970 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5971 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5972 Lisp_Object msg; |
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 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
|
5975 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5976 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5977 { |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5978 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
|
5979 (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
|
5980 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5981 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
|
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 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5985 } |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5988 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5989 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
|
5990 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
|
5991 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
|
5992 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5993 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5994 Lisp_Object *msg = (Lisp_Object *) a1; |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5995 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5997 *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
|
5998 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5999 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6000 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6001 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6002 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6003 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6004 /* 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
|
6005 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
|
6006 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
|
6007 worth optimizing. */ |
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 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6010 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6011 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6012 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6013 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6014 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
|
6015 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6016 } |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6019 /* 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
|
6020 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6021 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6022 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6023 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6024 Lisp_Object msg; |
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 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6027 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6028 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6029 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
|
6030 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6031 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
|
6032 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6033 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6034 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6035 /* 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
|
6036 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6037 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6038 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6039 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6040 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6041 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
|
6042 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6043 |
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 /* 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
|
6046 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
|
6047 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6048 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6049 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6050 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6051 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6052 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6053 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6054 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6055 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6056 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6057 /* 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
|
6058 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
|
6059 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6060 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6061 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6062 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6063 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6064 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6065 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
|
6066 /* 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
|
6067 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
|
6068 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
|
6069 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6070 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6071 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6072 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6073 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6074 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
|
6075 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
|
6076 } |
25358
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6079 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6080 /* 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
|
6081 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
|
6082 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6083 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6084 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
|
6085 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
|
6086 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
|
6087 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
|
6088 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6089 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6090 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
|
6091 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6092 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
|
6093 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6094 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6095 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6096 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6097 /* 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
|
6098 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6099 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
|
6100 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
|
6101 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
|
6102 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6103 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
|
6104 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
|
6105 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
|
6106 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6107 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6108 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
|
6109 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6110 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6111 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6112 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6113 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6114 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6115 || (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
|
6116 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6117 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
|
6118 (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
|
6119 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6120 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6121 |
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 /* 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
|
6124 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
|
6125 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
|
6126 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6127 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6128 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6129 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
|
6130 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
|
6131 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
|
6132 EMACS_INT nbytes, multibyte_p; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6133 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6134 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
|
6135 Lisp_Object string = a2; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6136 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6137 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6138 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6139 /* 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
|
6140 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6141 != !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
|
6142 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
|
6143 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6144 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
|
6145 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6146 /* 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
|
6147 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
|
6148 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6149 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6150 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6151 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6152 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6153 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6154 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
|
6155 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
|
6156 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6157 /* 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
|
6158 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
|
6159 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
|
6160 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
|
6161 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6162 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6163 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6164 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6165 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6166 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6167 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
|
6168 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6169 /* 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
|
6170 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6171 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6172 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6173 /* 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
|
6174 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
|
6175 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6176 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
|
6177 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
|
6178 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6179 : 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
|
6180 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
|
6181 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6182 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6183 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6184 && !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
|
6185 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6186 /* 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
|
6187 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6188 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6189 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
|
6190 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6191 /* 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
|
6192 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
|
6193 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6194 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
|
6195 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6196 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
|
6197 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6198 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6199 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6200 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
|
6201 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6202 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6203 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6204 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6205 |
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 /* 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
|
6208 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
|
6209 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6210 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6211 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6212 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
|
6213 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
|
6214 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6215 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6216 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
|
6217 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6218 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6219 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
|
6220 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6221 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6222 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6223 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6224 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6225 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6226 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
|
6227 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
|
6228 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
|
6229 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
|
6230 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
|
6231 and ensure a complete redisplay of all windows. */ |
25012 | 6232 |
277 | 6233 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6234 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6235 { |
769 | 6236 if (frame_garbaged) |
277 | 6237 { |
25012 | 6238 Lisp_Object tail, frame; |
6239 | |
6240 FOR_EACH_FRAME (tail, frame) | |
6241 { | |
6242 struct frame *f = XFRAME (frame); | |
6243 | |
6244 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
6245 { | |
6246 clear_current_matrices (f); | |
6247 f->garbaged = 0; | |
6248 } | |
6249 } | |
6250 | |
769 | 6251 frame_garbaged = 0; |
25012 | 6252 ++windows_or_buffers_changed; |
6253 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6254 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6255 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6256 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6257 /* 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
|
6258 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
|
6259 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
|
6260 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6261 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6262 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
|
6263 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6264 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6265 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6266 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6267 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6268 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6269 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6270 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6271 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
|
6272 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6273 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
|
6274 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6275 /* 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
|
6276 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
|
6277 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6278 |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6279 #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
|
6280 /* 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
|
6281 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
|
6282 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
|
6283 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
|
6284 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6285 return 0; |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6286 #endif /* HAVE_WINDOW_SYSTEM */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6287 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6288 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6289 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6290 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6291 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6292 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
|
6293 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6294 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
|
6295 window_height_changed_p = display_echo_area (w); |
25012 | 6296 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
|
6297 |
25012 | 6298 if (update_frame_p) |
6299 { | |
30721
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6300 /* Not called from redisplay_internal. If we changed window |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6301 configuration, we must redisplay thoroughly, of course. |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6302 |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6303 Likewise if input is pending, because the pending input |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6304 can have interrupted a previous redisplay, or redisplay |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6305 wasn't called because of the pending input (see |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6306 keyboard.c). In both cases, we would display the message |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6307 fine, but the rest of the display would be garbage. |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6308 |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6309 Otherwise, we can do with updating just what we displayed |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6310 above. */ |
30721
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6311 |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6312 if (window_height_changed_p || detect_input_pending ()) |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6313 { |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6314 int count = specpdl_ptr - specpdl; |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6315 |
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6316 specbind (Qredisplay_dont_pause, Qt); |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6317 ++windows_or_buffers_changed; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6318 ++update_mode_lines; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6319 redisplay_internal (0); |
30721
43684600b975
(echo_area_display): Display thoroughly if input is
Gerd Moellmann <gerd@gnu.org>
parents:
30697
diff
changeset
|
6320 unbind_to (count, Qnil); |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6321 } |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6322 else if (FRAME_WINDOW_P (f)) |
25012 | 6323 { |
6324 update_single_window (w, 1); | |
6325 rif->flush_display (f); | |
6326 } | |
6327 else | |
6328 update_frame (f, 1, 1); | |
6329 } | |
277 | 6330 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6331 else if (!EQ (mini_window, selected_window)) |
277 | 6332 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
|
6333 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6334 /* 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
|
6335 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
|
6336 |
25012 | 6337 /* Prevent redisplay optimization in redisplay_internal by resetting |
6338 this_line_start_pos. This is done because the mini-buffer now | |
6339 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
|
6340 if (EQ (mini_window, selected_window)) |
25012 | 6341 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
|
6342 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6343 return window_height_changed_p; |
25012 | 6344 } |
6345 | |
6346 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6347 |
25012 | 6348 /*********************************************************************** |
6349 Frame Titles | |
6350 ***********************************************************************/ | |
6351 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6352 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6353 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6354 |
6355 /* A buffer for constructing frame titles in it; allocated from the | |
6356 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6357 | |
6358 static char *frame_title_buf; | |
6359 | |
6360 /* The buffer's end, and a current output position in it. */ | |
6361 | |
6362 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
|
6363 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
|
6364 |
25012 | 6365 |
6366 /* Store a single character C for the frame title in frame_title_buf. | |
6367 Re-allocate frame_title_buf if necessary. */ | |
6368 | |
6369 static void | |
6370 store_frame_title_char (c) | |
6371 char c; | |
6372 { | |
6373 /* If output position has reached the end of the allocated buffer, | |
6374 double the buffer's size. */ | |
6375 if (frame_title_ptr == frame_title_buf_end) | |
6376 { | |
6377 int len = frame_title_ptr - frame_title_buf; | |
6378 int new_size = 2 * len * sizeof *frame_title_buf; | |
6379 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6380 frame_title_buf_end = frame_title_buf + new_size; | |
6381 frame_title_ptr = frame_title_buf + len; | |
6382 } | |
6383 | |
6384 *frame_title_ptr++ = c; | |
6385 } | |
6386 | |
6387 | |
6388 /* Store part of a frame title in frame_title_buf, beginning at | |
6389 frame_title_ptr. STR is the string to store. Do not copy more | |
6390 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
6391 the whole string. Pad with spaces until FIELD_WIDTH number of | |
6392 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
6393 Called from display_mode_element when it is used to build a frame | |
6394 title. */ | |
6395 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6396 static int |
25012 | 6397 store_frame_title (str, field_width, precision) |
6398 unsigned char *str; | |
6399 int field_width, precision; | |
6400 { | |
6401 int n = 0; | |
6402 | |
6403 /* Copy at most PRECISION chars from STR. */ | |
6404 while ((precision <= 0 || n < precision) | |
6405 && *str) | |
6406 { | |
6407 store_frame_title_char (*str++); | |
6408 ++n; | |
6409 } | |
6410 | |
6411 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6412 while (field_width > 0 | |
6413 && n < field_width) | |
6414 { | |
6415 store_frame_title_char (' '); | |
6416 ++n; | |
6417 } | |
6418 | |
6419 return n; | |
6420 } | |
6421 | |
6422 | |
6423 /* Set the title of FRAME, if it has changed. The title format is | |
6424 Vicon_title_format if FRAME is iconified, otherwise it is | |
6425 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6426 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6427 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6428 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
|
6429 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6430 { |
25012 | 6431 struct frame *f = XFRAME (frame); |
6432 | |
6433 if (FRAME_WINDOW_P (f) | |
6434 || FRAME_MINIBUF_ONLY_P (f) | |
6435 || f->explicit_name) | |
6436 { | |
6437 /* Do we have more than one visible frame on this X display? */ | |
6438 Lisp_Object tail; | |
6439 Lisp_Object fmt; | |
6440 struct buffer *obuf; | |
6441 int len; | |
6442 struct it it; | |
6443 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6444 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
|
6445 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6446 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6447 |
6448 if (tf != f | |
6449 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6450 && !FRAME_MINIBUF_ONLY_P (tf) | |
6451 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6452 break; | |
6453 } | |
6454 | |
6455 /* Set global variable indicating that multiple frames exist. */ | |
6456 multiple_frames = CONSP (tail); | |
6457 | |
6458 /* Switch to the buffer of selected window of the frame. Set up | |
6459 frame_title_ptr so that display_mode_element will output into it; | |
6460 then display the title. */ | |
6461 obuf = current_buffer; | |
6462 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6463 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6464 frame_title_ptr = frame_title_buf; | |
6465 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6466 NULL, DEFAULT_FACE_ID); | |
6467 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6468 frame_title_ptr = NULL; | |
6469 set_buffer_internal (obuf); | |
6470 | |
6471 /* Set the title only if it's changed. This avoids consing in | |
6472 the common case where it hasn't. (If it turns out that we've | |
6473 already wasted too much time by walking through the list with | |
6474 display_mode_element, then we might need to optimize at a | |
6475 higher level than this.) */ | |
6476 if (! STRINGP (f->name) | |
6477 || STRING_BYTES (XSTRING (f->name)) != len | |
6478 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6479 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6480 } | |
6481 } | |
6482 | |
6483 #else /* not HAVE_WINDOW_SYSTEM */ | |
6484 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6485 #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
|
6486 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6487 |
6488 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6489 | |
6490 | |
6491 | |
277 | 6492 |
25012 | 6493 /*********************************************************************** |
6494 Menu Bars | |
6495 ***********************************************************************/ | |
6496 | |
6497 | |
6498 /* Prepare for redisplay by updating menu-bar item lists when | |
6499 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6500 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6501 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6502 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6503 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6504 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6505 struct gcpro gcpro1, gcpro2; |
25012 | 6506 struct frame *f; |
6507 struct frame *tooltip_frame; | |
6508 | |
6509 #ifdef HAVE_X_WINDOWS | |
6510 tooltip_frame = tip_frame; | |
6511 #else | |
6512 tooltip_frame = NULL; | |
6513 #endif | |
6514 | |
6515 /* Update all frame titles based on their buffer names, etc. We do | |
6516 this before the menu bars so that the buffer-menu will show the | |
6517 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6518 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6519 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
|
6520 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6521 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6522 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6523 FOR_EACH_FRAME (tail, frame) |
25012 | 6524 { |
6525 f = XFRAME (frame); | |
6526 if (f != tooltip_frame | |
6527 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) | |
6528 x_consider_frame_title (frame); | |
6529 } | |
6530 } | |
6531 #endif /* HAVE_WINDOW_SYSTEM */ | |
6532 | |
6533 /* Update the menu bar item lists, if appropriate. This has to be | |
6534 done before any actual redisplay or generation of display lines. */ | |
6535 all_windows = (update_mode_lines | |
6536 || buffer_shared > 1 | |
6537 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6538 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6539 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6540 Lisp_Object tail, frame; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6541 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6542 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6543 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
|
6544 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6545 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6546 { |
25012 | 6547 f = XFRAME (frame); |
6548 | |
6549 /* Ignore tooltip frame. */ | |
6550 if (f == tooltip_frame) | |
6551 continue; | |
6552 | |
6553 /* If a window on this frame changed size, report that to | |
6554 the user and clear the size-change flag. */ | |
6555 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6556 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6557 Lisp_Object functions; |
25012 | 6558 |
6559 /* Clear flag first in case we get an error below. */ | |
6560 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6561 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6562 GCPRO2 (tail, functions); |
25012 | 6563 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6564 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6565 { |
25012 | 6566 call1 (XCAR (functions), frame); |
6567 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6568 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6569 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6570 } |
25012 | 6571 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6572 GCPRO1 (tail); |
25012 | 6573 update_menu_bar (f, 0); |
6574 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6575 update_tool_bar (f, 0); |
25012 | 6576 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6577 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6578 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6579 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6580 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6581 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6582 else |
25012 | 6583 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6584 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6585 update_menu_bar (sf, 1); |
25012 | 6586 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6587 update_tool_bar (sf, 1); |
25012 | 6588 #endif |
6589 } | |
6590 | |
6591 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6592 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6593 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6594 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6595 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6596 } |
25012 | 6597 |
6598 | |
6599 /* Update the menu bar item list for frame F. This has to be done | |
6600 before we start to fill in any display lines, because it can call | |
6601 eval. | |
6602 | |
6603 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
|
6604 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6605 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6606 update_menu_bar (f, save_match_data) |
25012 | 6607 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6608 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6609 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6610 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6611 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
|
6612 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6613 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6614 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6615 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6616 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6617 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6618 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6619 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
|
6620 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
6621 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6622 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
|
6623 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6624 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
|
6625 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6626 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6627 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6628 /* 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
|
6629 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
|
6630 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
|
6631 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
|
6632 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
|
6633 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
|
6634 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6635 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
|
6636 || !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
|
6637 || ((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
|
6638 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6639 != !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
|
6640 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6641 && !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
|
6642 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6643 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6644 struct buffer *prev = current_buffer; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6645 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6646 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6647 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
|
6648 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6649 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
|
6650 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6651 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6652 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6653 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6654 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6655 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6656 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6657 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 6658 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6659 /* If it has changed current-menubar from previous value, |
25012 | 6660 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
|
6661 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6662 call0 (Qrecompute_lucid_menubar); |
25012 | 6663 |
14299 | 6664 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
|
6665 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 6666 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6667 /* Redisplay the menu bar in case we changed it. */ |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6668 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6669 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
|
6670 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
|
6671 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6672 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 6673 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
|
6674 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6675 #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
|
6676 /* 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
|
6677 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
|
6678 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6679 #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
|
6680 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6681 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
|
6682 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6683 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6684 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6685 } |
25012 | 6686 |
6687 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6688 |
25012 | 6689 /*********************************************************************** |
25543 | 6690 Tool-bars |
25012 | 6691 ***********************************************************************/ |
6692 | |
6693 #ifdef HAVE_WINDOW_SYSTEM | |
6694 | |
25543 | 6695 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 6696 before we start to fill in any display lines. Called from |
6697 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
6698 and restore it here. */ | |
6699 | |
6700 static void | |
25543 | 6701 update_tool_bar (f, save_match_data) |
25012 | 6702 struct frame *f; |
6703 int save_match_data; | |
6704 { | |
25543 | 6705 if (WINDOWP (f->tool_bar_window) |
6706 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 6707 { |
6708 Lisp_Object window; | |
6709 struct window *w; | |
6710 | |
6711 window = FRAME_SELECTED_WINDOW (f); | |
6712 w = XWINDOW (window); | |
6713 | |
6714 /* If the user has switched buffers or windows, we need to | |
6715 recompute to reflect the new bindings. But we'll | |
6716 recompute when update_mode_lines is set too; that means | |
6717 that people can use force-mode-line-update to request | |
6718 that the menu bar be recomputed. The adverse effect on | |
6719 the rest of the redisplay algorithm is about the same as | |
6720 windows_or_buffers_changed anyway. */ | |
6721 if (windows_or_buffers_changed | |
6722 || !NILP (w->update_mode_line) | |
6723 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
6724 < BUF_MODIFF (XBUFFER (w->buffer))) | |
6725 != !NILP (w->last_had_star)) | |
6726 || ((!NILP (Vtransient_mark_mode) | |
6727 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
6728 != !NILP (w->region_showing))) | |
6729 { | |
6730 struct buffer *prev = current_buffer; | |
6731 int count = specpdl_ptr - specpdl; | |
6732 | |
6733 /* Set current_buffer to the buffer of the selected | |
6734 window of the frame, so that we get the right local | |
6735 keymaps. */ | |
6736 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
6737 | |
6738 /* Save match data, if we must. */ | |
6739 if (save_match_data) | |
6740 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
6741 | |
6742 /* Make sure that we don't accidentally use bogus keymaps. */ | |
6743 if (NILP (Voverriding_local_map_menu_flag)) | |
6744 { | |
6745 specbind (Qoverriding_terminal_local_map, Qnil); | |
6746 specbind (Qoverriding_local_map, Qnil); | |
6747 } | |
6748 | |
25543 | 6749 /* Build desired tool-bar items from keymaps. */ |
6750 f->desired_tool_bar_items | |
6751 = tool_bar_items (f->desired_tool_bar_items, | |
6752 &f->n_desired_tool_bar_items); | |
25012 | 6753 |
25543 | 6754 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 6755 w->update_mode_line = Qt; |
6756 | |
6757 unbind_to (count, Qnil); | |
6758 set_buffer_internal_1 (prev); | |
6759 } | |
6760 } | |
6761 } | |
6762 | |
6763 | |
25543 | 6764 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
6765 F's desired tool-bar contents. F->desired_tool_bar_items must have | |
25012 | 6766 been set up previously by calling prepare_menu_bars. */ |
6767 | |
6768 static void | |
25543 | 6769 build_desired_tool_bar_string (f) |
25012 | 6770 struct frame *f; |
6771 { | |
6772 int i, size, size_needed, string_idx; | |
6773 struct gcpro gcpro1, gcpro2, gcpro3; | |
6774 Lisp_Object image, plist, props; | |
6775 | |
6776 image = plist = props = Qnil; | |
6777 GCPRO3 (image, plist, props); | |
6778 | |
25543 | 6779 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 6780 Otherwise, make a new string. */ |
6781 | |
6782 /* The size of the string we might be able to reuse. */ | |
25543 | 6783 size = (STRINGP (f->desired_tool_bar_string) |
6784 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 6785 : 0); |
6786 | |
6787 /* Each image in the string we build is preceded by a space, | |
6788 and there is a space at the end. */ | |
25543 | 6789 size_needed = f->n_desired_tool_bar_items + 1; |
6790 | |
6791 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 6792 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
|
6793 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
|
6794 make_number (' ')); |
25012 | 6795 else |
6796 { | |
6797 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
6798 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 6799 props, f->desired_tool_bar_string); |
25012 | 6800 } |
6801 | |
6802 /* Put a `display' property on the string for the images to display, | |
25543 | 6803 put a `menu_item' property on tool-bar items with a value that |
6804 is the index of the item in F's tool-bar item vector. */ | |
25012 | 6805 for (i = 0, string_idx = 0; |
25543 | 6806 i < f->n_desired_tool_bar_items; |
25012 | 6807 ++i, string_idx += 1) |
6808 { | |
6809 #define PROP(IDX) \ | |
25543 | 6810 (XVECTOR (f->desired_tool_bar_items) \ |
6811 ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)]) | |
6812 | |
6813 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
6814 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
25012 | 6815 int margin, relief; |
6816 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; | |
6817 extern Lisp_Object Qlaplace; | |
6818 | |
6819 /* If image is a vector, choose the image according to the | |
6820 button state. */ | |
25543 | 6821 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 6822 if (VECTORP (image)) |
6823 { | |
25543 | 6824 enum tool_bar_item_image idx; |
25012 | 6825 |
6826 if (enabled_p) | |
6827 idx = (selected_p | |
25543 | 6828 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
6829 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 6830 else |
6831 idx = (selected_p | |
25543 | 6832 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
6833 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 6834 |
6835 xassert (XVECTOR (image)->size >= idx); | |
6836 image = XVECTOR (image)->contents[idx]; | |
6837 } | |
6838 | |
6839 /* Ignore invalid image specifications. */ | |
6840 if (!valid_image_p (image)) | |
6841 continue; | |
6842 | |
25543 | 6843 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 6844 plist = Fcopy_sequence (XCDR (image)); |
6845 | |
6846 /* Compute margin and relief to draw. */ | |
25543 | 6847 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
6848 margin = relief + max (0, tool_bar_button_margin); | |
6849 | |
6850 if (auto_raise_tool_bar_buttons_p) | |
25012 | 6851 { |
6852 /* Add a `:relief' property to the image spec if the item is | |
6853 selected. */ | |
6854 if (selected_p) | |
6855 { | |
6856 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
6857 margin -= relief; | |
6858 } | |
6859 } | |
6860 else | |
6861 { | |
6862 /* If image is selected, display it pressed, i.e. with a | |
6863 negative relief. If it's not selected, display it with a | |
6864 raised relief. */ | |
6865 plist = Fplist_put (plist, QCrelief, | |
6866 (selected_p | |
6867 ? make_number (-relief) | |
6868 : make_number (relief))); | |
6869 margin -= relief; | |
6870 } | |
6871 | |
6872 /* Put a margin around the image. */ | |
6873 if (margin) | |
6874 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
6875 | |
6876 /* If button is not enabled, make the image appear disabled by | |
6877 applying an appropriate algorithm to it. */ | |
6878 if (!enabled_p) | |
6879 plist = Fplist_put (plist, QCalgorithm, Qlaplace); | |
6880 | |
6881 /* Put a `display' text property on the string for the image to | |
6882 display. Put a `menu-item' property on the string that gives | |
25543 | 6883 the start of this item's properties in the tool-bar items |
25012 | 6884 vector. */ |
6885 image = Fcons (Qimage, plist); | |
6886 props = list4 (Qdisplay, image, | |
25543 | 6887 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 6888 Fadd_text_properties (make_number (string_idx), |
6889 make_number (string_idx + 1), | |
25543 | 6890 props, f->desired_tool_bar_string); |
25012 | 6891 #undef PROP |
6892 } | |
6893 | |
6894 UNGCPRO; | |
6895 } | |
6896 | |
6897 | |
25543 | 6898 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 6899 |
6900 static void | |
25543 | 6901 display_tool_bar_line (it) |
25012 | 6902 struct it *it; |
6903 { | |
6904 struct glyph_row *row = it->glyph_row; | |
6905 int max_x = it->last_visible_x; | |
6906 struct glyph *last; | |
6907 | |
6908 prepare_desired_row (row); | |
6909 row->y = it->current_y; | |
6910 | |
6911 while (it->current_x < max_x) | |
6912 { | |
6913 int x_before, x, n_glyphs_before, i, nglyphs; | |
6914 | |
6915 /* Get the next display element. */ | |
6916 if (!get_next_display_element (it)) | |
6917 break; | |
6918 | |
6919 /* Produce glyphs. */ | |
6920 x_before = it->current_x; | |
6921 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
6922 PRODUCE_GLYPHS (it); | |
6923 | |
6924 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
6925 i = 0; | |
6926 x = x_before; | |
6927 while (i < nglyphs) | |
6928 { | |
6929 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
6930 | |
6931 if (x + glyph->pixel_width > max_x) | |
6932 { | |
6933 /* Glyph doesn't fit on line. */ | |
6934 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
6935 it->current_x = x; | |
6936 goto out; | |
6937 } | |
6938 | |
6939 ++it->hpos; | |
6940 x += glyph->pixel_width; | |
6941 ++i; | |
6942 } | |
6943 | |
6944 /* Stop at line ends. */ | |
6945 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
6946 break; | |
6947 | |
6948 set_iterator_to_next (it); | |
6949 } | |
6950 | |
6951 out:; | |
6952 | |
6953 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
6954 extend_face_to_end_of_line (it); | |
6955 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
6956 last->right_box_line_p = 1; | |
6957 compute_line_metrics (it); | |
6958 | |
25543 | 6959 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 6960 if (!row->displays_text_p) |
6961 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
6962 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
|
6963 row->ascent = row->phys_ascent = 0; |
25012 | 6964 } |
6965 | |
6966 row->full_width_p = 1; | |
6967 row->continued_p = 0; | |
6968 row->truncated_on_left_p = 0; | |
6969 row->truncated_on_right_p = 0; | |
6970 | |
6971 it->current_x = it->hpos = 0; | |
6972 it->current_y += row->height; | |
6973 ++it->vpos; | |
6974 ++it->glyph_row; | |
6975 } | |
6976 | |
6977 | |
25543 | 6978 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 6979 items of frame F visible. */ |
6980 | |
6981 static int | |
25543 | 6982 tool_bar_lines_needed (f) |
25012 | 6983 struct frame *f; |
6984 { | |
25543 | 6985 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 6986 struct it it; |
6987 | |
25543 | 6988 /* Initialize an iterator for iteration over |
6989 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
6990 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 6991 it.first_visible_x = 0; |
6992 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 6993 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 6994 |
6995 while (!ITERATOR_AT_END_P (&it)) | |
6996 { | |
6997 it.glyph_row = w->desired_matrix->rows; | |
6998 clear_glyph_row (it.glyph_row); | |
25543 | 6999 display_tool_bar_line (&it); |
25012 | 7000 } |
7001 | |
7002 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
7003 } | |
7004 | |
7005 | |
25543 | 7006 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 7007 height should be changed. */ |
7008 | |
7009 static int | |
25543 | 7010 redisplay_tool_bar (f) |
25012 | 7011 struct frame *f; |
7012 { | |
7013 struct window *w; | |
7014 struct it it; | |
7015 struct glyph_row *row; | |
7016 int change_height_p = 0; | |
7017 | |
25543 | 7018 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
7019 do anything. This means you must start with tool-bar-lines | |
25012 | 7020 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 7021 can turn off tool-bars by specifying tool-bar-lines zero. */ |
7022 if (!WINDOWP (f->tool_bar_window) | |
7023 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 7024 XFASTINT (w->height) == 0)) |
7025 return 0; | |
7026 | |
25543 | 7027 /* Set up an iterator for the tool-bar window. */ |
7028 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7029 it.first_visible_x = 0; |
7030 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
7031 row = it.glyph_row; | |
7032 | |
25543 | 7033 /* Build a string that represents the contents of the tool-bar. */ |
7034 build_desired_tool_bar_string (f); | |
7035 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
7036 | |
7037 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 7038 while (it.current_y < it.last_visible_y) |
25543 | 7039 display_tool_bar_line (&it); |
7040 | |
7041 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 7042 window, so don't do it. */ |
7043 w->desired_matrix->no_scrolling_p = 1; | |
7044 w->must_be_updated_p = 1; | |
7045 | |
25543 | 7046 if (auto_resize_tool_bars_p) |
25012 | 7047 { |
7048 int nlines; | |
7049 | |
7050 /* If there are blank lines at the end, except for a partially | |
7051 visible blank line at the end that is smaller than | |
25543 | 7052 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 7053 row = it.glyph_row - 1; |
7054 if (!row->displays_text_p | |
7055 && row->height >= CANON_Y_UNIT (f)) | |
7056 change_height_p = 1; | |
7057 | |
25543 | 7058 /* If row displays tool-bar items, but is partially visible, |
7059 change the tool-bar's height. */ | |
25012 | 7060 if (row->displays_text_p |
7061 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
7062 change_height_p = 1; | |
7063 | |
25543 | 7064 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 7065 frame parameter. */ |
7066 if (change_height_p | |
25543 | 7067 && (nlines = tool_bar_lines_needed (f), |
25012 | 7068 nlines != XFASTINT (w->height))) |
7069 { | |
25543 | 7070 extern Lisp_Object Qtool_bar_lines; |
25012 | 7071 Lisp_Object frame; |
7072 | |
7073 XSETFRAME (frame, f); | |
7074 clear_glyph_matrix (w->desired_matrix); | |
7075 Fmodify_frame_parameters (frame, | |
25543 | 7076 Fcons (Fcons (Qtool_bar_lines, |
25012 | 7077 make_number (nlines)), |
7078 Qnil)); | |
7079 fonts_changed_p = 1; | |
7080 } | |
7081 } | |
7082 | |
7083 return change_height_p; | |
7084 } | |
7085 | |
7086 | |
25543 | 7087 /* Get information about the tool-bar item which is displayed in GLYPH |
7088 on frame F. Return in *PROP_IDX the index where tool-bar item | |
7089 properties start in F->current_tool_bar_items. Value is zero if | |
7090 GLYPH doesn't display a tool-bar item. */ | |
25012 | 7091 |
7092 int | |
25543 | 7093 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 7094 struct frame *f; |
7095 struct glyph *glyph; | |
7096 int *prop_idx; | |
7097 { | |
7098 Lisp_Object prop; | |
7099 int success_p; | |
7100 | |
7101 /* Get the text property `menu-item' at pos. The value of that | |
7102 property is the start index of this item's properties in | |
25543 | 7103 F->current_tool_bar_items. */ |
25012 | 7104 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 7105 Qmenu_item, f->current_tool_bar_string); |
25012 | 7106 if (INTEGERP (prop)) |
7107 { | |
7108 *prop_idx = XINT (prop); | |
7109 success_p = 1; | |
7110 } | |
7111 else | |
7112 success_p = 0; | |
7113 | |
7114 return success_p; | |
7115 } | |
7116 | |
7117 #endif /* HAVE_WINDOW_SYSTEM */ | |
7118 | |
7119 | |
7120 | |
7121 /************************************************************************ | |
7122 Horizontal scrolling | |
7123 ************************************************************************/ | |
7124 | |
7125 static int hscroll_window_tree P_ ((Lisp_Object)); | |
7126 static int hscroll_windows P_ ((Lisp_Object)); | |
7127 | |
7128 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
7129 hscroll value so that PT is (i) visible in the window, and (ii) so | |
7130 that it is not within a certain margin at the window's left and | |
7131 right border. Value is non-zero if any window's hscroll has been | |
7132 changed. */ | |
7133 | |
7134 static int | |
7135 hscroll_window_tree (window) | |
7136 Lisp_Object window; | |
7137 { | |
7138 int hscrolled_p = 0; | |
7139 | |
7140 while (WINDOWP (window)) | |
7141 { | |
7142 struct window *w = XWINDOW (window); | |
7143 | |
7144 if (WINDOWP (w->hchild)) | |
7145 hscrolled_p |= hscroll_window_tree (w->hchild); | |
7146 else if (WINDOWP (w->vchild)) | |
7147 hscrolled_p |= hscroll_window_tree (w->vchild); | |
7148 else if (w->cursor.vpos >= 0) | |
7149 { | |
7150 int hscroll_margin, text_area_x, text_area_y; | |
7151 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
|
7152 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7153 = 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
|
7154 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7155 = 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
|
7156 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7157 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7158 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7159 : current_cursor_row); |
25012 | 7160 |
7161 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
7162 &text_area_width, &text_area_height); | |
7163 | |
7164 /* Scroll when cursor is inside this scroll margin. */ | |
7165 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
7166 | |
7167 if ((XFASTINT (w->hscroll) | |
7168 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7169 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7170 && cursor_row->truncated_on_right_p |
25012 | 7171 && (w->cursor.x > text_area_width - hscroll_margin))) |
7172 { | |
7173 struct it it; | |
7174 int hscroll; | |
7175 struct buffer *saved_current_buffer; | |
7176 int pt; | |
7177 | |
7178 /* Find point in a display of infinite width. */ | |
7179 saved_current_buffer = current_buffer; | |
7180 current_buffer = XBUFFER (w->buffer); | |
7181 | |
7182 if (w == XWINDOW (selected_window)) | |
7183 pt = BUF_PT (current_buffer); | |
7184 else | |
7185 { | |
7186 pt = marker_position (w->pointm); | |
7187 pt = max (BEGV, pt); | |
7188 pt = min (ZV, pt); | |
7189 } | |
7190 | |
7191 /* Move iterator to pt starting at cursor_row->start in | |
7192 a line with infinite width. */ | |
7193 init_to_row_start (&it, w, cursor_row); | |
7194 it.last_visible_x = INFINITY; | |
7195 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
7196 current_buffer = saved_current_buffer; | |
7197 | |
7198 /* Center cursor in window. */ | |
7199 hscroll = (max (0, it.current_x - text_area_width / 2) | |
7200 / CANON_X_UNIT (it.f)); | |
7201 | |
7202 /* Don't call Fset_window_hscroll if value hasn't | |
7203 changed because it will prevent redisplay | |
7204 optimizations. */ | |
7205 if (XFASTINT (w->hscroll) != hscroll) | |
7206 { | |
7207 Fset_window_hscroll (window, make_number (hscroll)); | |
7208 hscrolled_p = 1; | |
7209 } | |
7210 } | |
7211 } | |
7212 | |
7213 window = w->next; | |
7214 } | |
7215 | |
7216 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
7217 return hscrolled_p; | |
7218 } | |
7219 | |
7220 | |
7221 /* Set hscroll so that cursor is visible and not inside horizontal | |
7222 scroll margins for all windows in the tree rooted at WINDOW. See | |
7223 also hscroll_window_tree above. Value is non-zero if any window's | |
7224 hscroll has been changed. If it has, desired matrices on the frame | |
7225 of WINDOW are cleared. */ | |
7226 | |
7227 static int | |
7228 hscroll_windows (window) | |
7229 Lisp_Object window; | |
7230 { | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7231 int hscrolled_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7232 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7233 if (automatic_hscrolling_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7234 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7235 hscrolled_p = hscroll_window_tree (window); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7236 if (hscrolled_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7237 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
|
7238 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7239 else |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7240 hscrolled_p = 0; |
25012 | 7241 return hscrolled_p; |
7242 } | |
7243 | |
7244 | |
7245 | |
7246 /************************************************************************ | |
7247 Redisplay | |
7248 ************************************************************************/ | |
7249 | |
7250 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
7251 to a non-zero value. This is sometimes handy to have in a debugger | |
7252 session. */ | |
7253 | |
7254 #if GLYPH_DEBUG | |
7255 | |
7256 /* First and last unchanged row for try_window_id. */ | |
7257 | |
7258 int debug_first_unchanged_at_end_vpos; | |
7259 int debug_last_unchanged_at_beg_vpos; | |
7260 | |
7261 /* Delta vpos and y. */ | |
7262 | |
7263 int debug_dvpos, debug_dy; | |
7264 | |
7265 /* Delta in characters and bytes for try_window_id. */ | |
7266 | |
7267 int debug_delta, debug_delta_bytes; | |
7268 | |
7269 /* Values of window_end_pos and window_end_vpos at the end of | |
7270 try_window_id. */ | |
7271 | |
7272 int debug_end_pos, debug_end_vpos; | |
7273 | |
7274 /* Append a string to W->desired_matrix->method. FMT is a printf | |
7275 format string. A1...A9 are a supplement for a variable-length | |
7276 argument list. If trace_redisplay_p is non-zero also printf the | |
7277 resulting string to stderr. */ | |
7278 | |
7279 static void | |
7280 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
7281 struct window *w; | |
7282 char *fmt; | |
7283 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
7284 { | |
7285 char buffer[512]; | |
7286 char *method = w->desired_matrix->method; | |
7287 int len = strlen (method); | |
7288 int size = sizeof w->desired_matrix->method; | |
7289 int remaining = size - len - 1; | |
7290 | |
7291 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
7292 if (len && remaining) | |
7293 { | |
7294 method[len] = '|'; | |
7295 --remaining, ++len; | |
7296 } | |
7297 | |
7298 strncpy (method + len, buffer, remaining); | |
7299 | |
7300 if (trace_redisplay_p) | |
7301 fprintf (stderr, "%p (%s): %s\n", | |
7302 w, | |
7303 ((BUFFERP (w->buffer) | |
7304 && STRINGP (XBUFFER (w->buffer)->name)) | |
7305 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
7306 : "no buffer"), | |
7307 buffer); | |
7308 } | |
7309 | |
7310 #endif /* GLYPH_DEBUG */ | |
7311 | |
7312 | |
7313 /* This counter is used to clear the face cache every once in a while | |
7314 in redisplay_internal. It is incremented for each redisplay. | |
7315 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7316 cleared. */ | |
7317 | |
7318 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7319 static int clear_face_cache_count; | |
7320 | |
7321 /* Record the previous terminal frame we displayed. */ | |
7322 | |
7323 static struct frame *previous_terminal_frame; | |
7324 | |
7325 /* Non-zero while redisplay_internal is in progress. */ | |
7326 | |
7327 int redisplaying_p; | |
7328 | |
7329 | |
7330 /* Value is non-zero if all changes in window W, which displays | |
7331 current_buffer, are in the text between START and END. START is a | |
7332 buffer position, END is given as a distance from Z. Used in | |
7333 redisplay_internal for display optimization. */ | |
7334 | |
7335 static INLINE int | |
7336 text_outside_line_unchanged_p (w, start, end) | |
7337 struct window *w; | |
7338 int start, end; | |
7339 { | |
7340 int unchanged_p = 1; | |
7341 | |
7342 /* If text or overlays have changed, see where. */ | |
7343 if (XFASTINT (w->last_modified) < MODIFF | |
7344 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7345 { | |
7346 /* Gap in the line? */ | |
7347 if (GPT < start || Z - GPT < end) | |
7348 unchanged_p = 0; | |
7349 | |
7350 /* Changes start in front of the line, or end after it? */ | |
7351 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7352 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7353 || END_UNCHANGED < end)) |
25012 | 7354 unchanged_p = 0; |
7355 | |
7356 /* If selective display, can't optimize if changes start at the | |
7357 beginning of the line. */ | |
7358 if (unchanged_p | |
7359 && INTEGERP (current_buffer->selective_display) | |
7360 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7361 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7362 unchanged_p = 0; |
7363 } | |
7364 | |
7365 return unchanged_p; | |
7366 } | |
7367 | |
7368 | |
7369 /* Do a frame update, taking possible shortcuts into account. This is | |
7370 the main external entry point for redisplay. | |
7371 | |
7372 If the last redisplay displayed an echo area message and that message | |
7373 is no longer requested, we clear the echo area or bring back the | |
7374 mini-buffer if that is in use. */ | |
7375 | |
7376 void | |
7377 redisplay () | |
7378 { | |
7379 redisplay_internal (0); | |
7380 } | |
7381 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7382 /* 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
|
7383 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
|
7384 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
|
7385 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7386 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7387 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
|
7388 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7389 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7390 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7391 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7392 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7393 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7394 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7395 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7396 /* 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
|
7397 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7398 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7399 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7400 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7401 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7402 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7403 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7404 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
|
7405 && 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
|
7406 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7407 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7408 /* 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
|
7409 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7410 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7411 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7412 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7413 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7414 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
|
7415 && 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
|
7416 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7417 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7418 } |
25012 | 7419 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7420 /* 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
|
7421 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7422 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7423 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7424 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7425 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7426 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7427 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7428 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7429 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7430 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7431 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7432 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7433 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7434 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7435 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7436 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7437 /* 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
|
7438 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
|
7439 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
|
7440 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
|
7441 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7442 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7443 && 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
|
7444 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7445 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7446 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7447 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7448 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7449 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7450 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7451 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7452 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
|
7453 || pt != XINT (w->last_point)) |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7454 && 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
|
7455 XINT (w->last_point), |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7456 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7457 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7458 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7459 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7460 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7461 |
25012 | 7462 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7463 response to any user action; therefore, we should preserve the echo | |
7464 area. (Actually, our caller does that job.) Perhaps in the future | |
7465 avoid recentering windows if it is not necessary; currently that | |
7466 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7467 |
277 | 7468 static void |
25012 | 7469 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7470 int preserve_echo_area; |
277 | 7471 { |
25012 | 7472 struct window *w = XWINDOW (selected_window); |
7473 struct frame *f = XFRAME (w->frame); | |
7474 int pause; | |
7475 int must_finish = 0; | |
7476 struct text_pos tlbufpos, tlendpos; | |
7477 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7478 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7479 struct frame *sf = SELECTED_FRAME (); |
25012 | 7480 |
7481 /* Non-zero means redisplay has to consider all windows on all | |
7482 frames. Zero means, only selected_window is considered. */ | |
7483 int consider_all_windows_p; | |
7484 | |
7485 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7486 | |
7487 /* No redisplay if running in batch mode or frame is not yet fully | |
7488 initialized, or redisplay is explicitly turned off by setting | |
7489 Vinhibit_redisplay. */ | |
7490 if (noninteractive | |
7491 || !NILP (Vinhibit_redisplay) | |
7492 || !f->glyphs_initialized_p) | |
7493 return; | |
7494 | |
7495 /* The flag redisplay_performed_directly_p is set by | |
7496 direct_output_for_insert when it already did the whole screen | |
7497 update necessary. */ | |
7498 if (redisplay_performed_directly_p) | |
7499 { | |
7500 redisplay_performed_directly_p = 0; | |
7501 if (!hscroll_windows (selected_window)) | |
7502 return; | |
7503 } | |
7504 | |
7505 #ifdef USE_X_TOOLKIT | |
7506 if (popup_activated ()) | |
7507 return; | |
7508 #endif | |
7509 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7510 /* I don't think this happens but let's be paranoid. */ |
25012 | 7511 if (redisplaying_p) |
7512 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7513 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7514 /* 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
|
7515 when we leave this function. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7516 count = specpdl_ptr - specpdl; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7517 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7518 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7519 |
25012 | 7520 retry: |
7521 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7522 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7523 |
25012 | 7524 /* If new fonts have been loaded that make a glyph matrix adjustment |
7525 necessary, do it. */ | |
7526 if (fonts_changed_p) | |
7527 { | |
7528 adjust_glyphs (NULL); | |
7529 ++windows_or_buffers_changed; | |
7530 fonts_changed_p = 0; | |
7531 } | |
7532 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7533 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7534 && previous_terminal_frame != sf) |
25012 | 7535 { |
7536 /* Since frames on an ASCII terminal share the same display | |
7537 area, displaying a different frame means redisplay the whole | |
7538 thing. */ | |
7539 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7540 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7541 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7542 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7543 previous_terminal_frame = sf; |
25012 | 7544 |
7545 /* Set the visible flags for all frames. Do this before checking | |
7546 for resized or garbaged frames; they want to know if their frames | |
7547 are visible. See the comment in frame.h for | |
7548 FRAME_SAMPLE_VISIBILITY. */ | |
7549 { | |
7550 Lisp_Object tail, frame; | |
7551 | |
7552 number_of_visible_frames = 0; | |
7553 | |
7554 FOR_EACH_FRAME (tail, frame) | |
7555 { | |
7556 struct frame *f = XFRAME (frame); | |
7557 | |
7558 FRAME_SAMPLE_VISIBILITY (f); | |
7559 if (FRAME_VISIBLE_P (f)) | |
7560 ++number_of_visible_frames; | |
7561 clear_desired_matrices (f); | |
7562 } | |
7563 } | |
7564 | |
7565 /* 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
|
7566 do_pending_window_change (1); |
25012 | 7567 |
7568 /* Clear frames marked as garbaged. */ | |
7569 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7570 clear_garbaged_frames (); |
25012 | 7571 |
25543 | 7572 /* Build menubar and tool-bar items. */ |
25012 | 7573 prepare_menu_bars (); |
7574 | |
7575 if (windows_or_buffers_changed) | |
7576 update_mode_lines++; | |
7577 | |
7578 /* Detect case that we need to write or remove a star in the mode line. */ | |
7579 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7580 { | |
7581 w->update_mode_line = Qt; | |
7582 if (buffer_shared > 1) | |
7583 update_mode_lines++; | |
7584 } | |
7585 | |
7586 /* If %c is in the mode line, update it if needed. */ | |
7587 if (!NILP (w->column_number_displayed) | |
7588 /* This alternative quickly identifies a common case | |
7589 where no change is needed. */ | |
7590 && !(PT == XFASTINT (w->last_point) | |
7591 && XFASTINT (w->last_modified) >= MODIFF | |
7592 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7593 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7594 w->update_mode_line = Qt; | |
7595 | |
7596 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
7597 | |
7598 /* The variable buffer_shared is set in redisplay_window and | |
7599 indicates that we redisplay a buffer in different windows. See | |
7600 there. */ | |
7601 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
7602 | |
7603 /* If specs for an arrow have changed, do thorough redisplay | |
7604 to ensure we remove any arrow that should no longer exist. */ | |
7605 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
7606 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
7607 consider_all_windows_p = windows_or_buffers_changed = 1; | |
7608 | |
7609 /* Normally the message* functions will have already displayed and | |
7610 updated the echo area, but the frame may have been trashed, or | |
7611 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
|
7612 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
|
7613 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
|
7614 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
|
7615 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7616 int window_height_changed_p = echo_area_display (0); |
25012 | 7617 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7618 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7619 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7620 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7621 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
|
7622 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7623 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
|
7624 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7625 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7626 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7627 /* 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
|
7628 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7629 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7630 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7631 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7632 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7633 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7634 else if (w == XWINDOW (minibuf_window) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7635 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7636 || 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
|
7637 || 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
|
7638 && 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
|
7639 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7640 /* 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
|
7641 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
|
7642 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7643 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
|
7644 ++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
|
7645 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7646 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7647 /* 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
|
7648 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7649 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7650 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7651 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7652 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7653 |
25012 | 7654 |
7655 /* If showing the region, and mark has changed, we must redisplay | |
7656 the whole window. The assignment to this_line_start_pos prevents | |
7657 the optimization directly below this if-statement. */ | |
7658 if (((!NILP (Vtransient_mark_mode) | |
7659 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7660 != !NILP (w->region_showing)) | |
7661 || (!NILP (w->region_showing) | |
7662 && !EQ (w->region_showing, | |
7663 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
7664 CHARPOS (this_line_start_pos) = 0; | |
7665 | |
7666 /* Optimize the case that only the line containing the cursor in the | |
7667 selected window has changed. Variables starting with this_ are | |
7668 set in display_line and record information about the line | |
7669 containing the cursor. */ | |
7670 tlbufpos = this_line_start_pos; | |
7671 tlendpos = this_line_end_pos; | |
7672 if (!consider_all_windows_p | |
7673 && CHARPOS (tlbufpos) > 0 | |
7674 && NILP (w->update_mode_line) | |
7675 && !current_buffer->clip_changed | |
7676 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
7677 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
7678 /* Make sure recorded data applies to current buffer, etc. */ | |
7679 && this_line_buffer == current_buffer | |
7680 && current_buffer == XBUFFER (w->buffer) | |
7681 && NILP (w->force_start) | |
7682 /* Point must be on the line that we have info recorded about. */ | |
7683 && PT >= CHARPOS (tlbufpos) | |
7684 && PT <= Z - CHARPOS (tlendpos) | |
7685 /* All text outside that line, including its final newline, | |
7686 must be unchanged */ | |
7687 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
7688 CHARPOS (tlendpos))) | |
7689 { | |
7690 if (CHARPOS (tlbufpos) > BEGV | |
7691 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
7692 && (CHARPOS (tlbufpos) == ZV | |
7693 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
7694 /* Former continuation line has disappeared by becoming empty */ | |
7695 goto cancel; | |
7696 else if (XFASTINT (w->last_modified) < MODIFF | |
7697 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
7698 || MINI_WINDOW_P (w)) | |
7699 { | |
7700 /* We have to handle the case of continuation around a | |
7701 wide-column character (See the comment in indent.c around | |
7702 line 885). | |
7703 | |
7704 For instance, in the following case: | |
7705 | |
7706 -------- Insert -------- | |
7707 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
7708 J_I_ ==> J_I_ `^^' are cursors. | |
7709 ^^ ^^ | |
7710 -------- -------- | |
7711 | |
7712 As we have to redraw the line above, we should goto cancel. */ | |
7713 | |
7714 struct it it; | |
7715 int line_height_before = this_line_pixel_height; | |
7716 | |
7717 /* Note that start_display will handle the case that the | |
7718 line starting at tlbufpos is a continuation lines. */ | |
7719 start_display (&it, w, tlbufpos); | |
7720 | |
7721 /* Implementation note: It this still necessary? */ | |
7722 if (it.current_x != this_line_start_x) | |
7723 goto cancel; | |
7724 | |
7725 TRACE ((stderr, "trying display optimization 1\n")); | |
7726 w->cursor.vpos = -1; | |
7727 overlay_arrow_seen = 0; | |
7728 it.vpos = this_line_vpos; | |
7729 it.current_y = this_line_y; | |
7730 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
7731 display_line (&it); | |
7732 | |
7733 /* If line contains point, is not continued, | |
7734 and ends at same distance from eob as before, we win */ | |
7735 if (w->cursor.vpos >= 0 | |
7736 /* Line is not continued, otherwise this_line_start_pos | |
7737 would have been set to 0 in display_line. */ | |
7738 && CHARPOS (this_line_start_pos) | |
7739 /* Line ends as before. */ | |
7740 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
7741 /* Line has same height as before. Otherwise other lines | |
7742 would have to be shifted up or down. */ | |
7743 && this_line_pixel_height == line_height_before) | |
7744 { | |
7745 /* If this is not the window's last line, we must adjust | |
7746 the charstarts of the lines below. */ | |
7747 if (it.current_y < it.last_visible_y) | |
7748 { | |
7749 struct glyph_row *row | |
7750 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
7751 int delta, delta_bytes; | |
7752 | |
7753 if (Z - CHARPOS (tlendpos) == ZV) | |
7754 { | |
7755 /* This line ends at end of (accessible part of) | |
7756 buffer. There is no newline to count. */ | |
7757 delta = (Z | |
7758 - CHARPOS (tlendpos) | |
7759 - MATRIX_ROW_START_CHARPOS (row)); | |
7760 delta_bytes = (Z_BYTE | |
7761 - BYTEPOS (tlendpos) | |
7762 - MATRIX_ROW_START_BYTEPOS (row)); | |
7763 } | |
7764 else | |
7765 { | |
7766 /* This line ends in a newline. Must take | |
7767 account of the newline and the rest of the | |
7768 text that follows. */ | |
7769 delta = (Z | |
7770 - CHARPOS (tlendpos) | |
7771 - MATRIX_ROW_START_CHARPOS (row)); | |
7772 delta_bytes = (Z_BYTE | |
7773 - BYTEPOS (tlendpos) | |
7774 - MATRIX_ROW_START_BYTEPOS (row)); | |
7775 } | |
7776 | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7777 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
|
7778 this_line_vpos + 1, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7779 w->current_matrix->nrows, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7780 delta, delta_bytes); |
25012 | 7781 } |
7782 | |
7783 /* If this row displays text now but previously didn't, | |
7784 or vice versa, w->window_end_vpos may have to be | |
7785 adjusted. */ | |
7786 if ((it.glyph_row - 1)->displays_text_p) | |
7787 { | |
7788 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
7789 XSETINT (w->window_end_vpos, this_line_vpos); | |
7790 } | |
7791 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
7792 && this_line_vpos > 0) | |
7793 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
7794 w->window_end_valid = Qnil; | |
7795 | |
7796 /* Update hint: No need to try to scroll in update_window. */ | |
7797 w->desired_matrix->no_scrolling_p = 1; | |
7798 | |
7799 #if GLYPH_DEBUG | |
7800 *w->desired_matrix->method = 0; | |
7801 debug_method_add (w, "optimization 1"); | |
7802 #endif | |
7803 goto update; | |
7804 } | |
7805 else | |
7806 goto cancel; | |
7807 } | |
7808 else if (/* Cursor position hasn't changed. */ | |
7809 PT == XFASTINT (w->last_point) | |
7810 /* Make sure the cursor was last displayed | |
7811 in this window. Otherwise we have to reposition it. */ | |
7812 && 0 <= w->cursor.vpos | |
7813 && XINT (w->height) > w->cursor.vpos) | |
7814 { | |
7815 if (!must_finish) | |
7816 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7817 do_pending_window_change (1); |
25012 | 7818 |
7819 /* We used to always goto end_of_redisplay here, but this | |
7820 isn't enough if we have a blinking cursor. */ | |
7821 if (w->cursor_off_p == w->last_cursor_off_p) | |
7822 goto end_of_redisplay; | |
7823 } | |
7824 goto update; | |
7825 } | |
7826 /* If highlighting the region, or if the cursor is in the echo area, | |
7827 then we can't just move the cursor. */ | |
7828 else if (! (!NILP (Vtransient_mark_mode) | |
7829 && !NILP (current_buffer->mark_active)) | |
7830 && (w == XWINDOW (current_buffer->last_selected_window) | |
7831 || highlight_nonselected_windows) | |
7832 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
7833 && NILP (Vshow_trailing_whitespace) |
25012 | 7834 && !cursor_in_echo_area) |
7835 { | |
7836 struct it it; | |
7837 struct glyph_row *row; | |
7838 | |
7839 /* Skip from tlbufpos to PT and see where it is. Note that | |
7840 PT may be in invisible text. If so, we will end at the | |
7841 next visible position. */ | |
7842 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
7843 NULL, DEFAULT_FACE_ID); | |
7844 it.current_x = this_line_start_x; | |
7845 it.current_y = this_line_y; | |
7846 it.vpos = this_line_vpos; | |
7847 | |
7848 /* The call to move_it_to stops in front of PT, but | |
7849 moves over before-strings. */ | |
7850 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
7851 | |
7852 if (it.vpos == this_line_vpos | |
7853 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
7854 row->enabled_p)) | |
7855 { | |
7856 xassert (this_line_vpos == it.vpos); | |
7857 xassert (this_line_y == it.current_y); | |
7858 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
7859 goto update; | |
7860 } | |
7861 else | |
7862 goto cancel; | |
7863 } | |
7864 | |
7865 cancel: | |
7866 /* Text changed drastically or point moved off of line. */ | |
7867 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
7868 } | |
7869 | |
7870 CHARPOS (this_line_start_pos) = 0; | |
7871 consider_all_windows_p |= buffer_shared > 1; | |
7872 ++clear_face_cache_count; | |
7873 | |
7874 | |
7875 /* Build desired matrices. If consider_all_windows_p is non-zero, | |
7876 do it for all windows on all frames. Otherwise do it for | |
7877 selected_window, only. */ | |
7878 | |
7879 if (consider_all_windows_p) | |
7880 { | |
7881 Lisp_Object tail, frame; | |
7882 | |
7883 /* Clear the face cache eventually. */ | |
7884 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
7885 { | |
7886 clear_face_cache (0); | |
7887 clear_face_cache_count = 0; | |
7888 } | |
7889 | |
7890 /* Recompute # windows showing selected buffer. This will be | |
7891 incremented each time such a window is displayed. */ | |
7892 buffer_shared = 0; | |
7893 | |
7894 FOR_EACH_FRAME (tail, frame) | |
7895 { | |
7896 struct frame *f = XFRAME (frame); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7897 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 7898 { |
7899 /* Mark all the scroll bars to be removed; we'll redeem | |
7900 the ones we want when we redisplay their windows. */ | |
7901 if (condemn_scroll_bars_hook) | |
7902 (*condemn_scroll_bars_hook) (f); | |
7903 | |
7904 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
7905 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
7906 | |
7907 /* Any scroll bars which redisplay_windows should have | |
7908 nuked should now go away. */ | |
7909 if (judge_scroll_bars_hook) | |
7910 (*judge_scroll_bars_hook) (f); | |
7911 } | |
7912 } | |
7913 } | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7914 else if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7915 && !FRAME_OBSCURED_P (sf)) |
25012 | 7916 redisplay_window (selected_window, 1); |
7917 | |
7918 | |
7919 /* Compare desired and current matrices, perform output. */ | |
7920 | |
7921 update: | |
7922 | |
7923 /* If fonts changed, display again. */ | |
7924 if (fonts_changed_p) | |
7925 goto retry; | |
7926 | |
7927 /* Prevent various kinds of signals during display update. | |
7928 stdio is not robust about handling signals, | |
7929 which can cause an apparent I/O error. */ | |
7930 if (interrupt_input) | |
7931 unrequest_sigio (); | |
7932 stop_polling (); | |
7933 | |
7934 if (consider_all_windows_p) | |
7935 { | |
7936 Lisp_Object tail; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7937 struct frame *f; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7938 int hscrolled_p; |
25012 | 7939 |
7940 pause = 0; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7941 hscrolled_p = 0; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7942 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7943 /* See if we have to hscroll. */ |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7944 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7945 if (FRAMEP (XCAR (tail))) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7946 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7947 f = XFRAME (XCAR (tail)); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7948 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7949 if ((FRAME_WINDOW_P (f) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7950 || f == sf) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7951 && FRAME_VISIBLE_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7952 && !FRAME_OBSCURED_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7953 && hscroll_windows (f->root_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7954 hscrolled_p = 1; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7955 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7956 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7957 if (hscrolled_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7958 goto retry; |
25012 | 7959 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7960 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
25012 | 7961 { |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7962 if (!FRAMEP (XCAR (tail))) |
25012 | 7963 continue; |
7964 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7965 f = XFRAME (XCAR (tail)); |
25012 | 7966 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7967 if ((FRAME_WINDOW_P (f) || f == sf) |
25012 | 7968 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
7969 { | |
7970 /* Mark all windows as to be updated. */ | |
7971 set_window_update_flags (XWINDOW (f->root_window), 1); | |
7972 pause |= update_frame (f, 0, 0); | |
7973 if (!pause) | |
7974 { | |
7975 mark_window_display_accurate (f->root_window, 1); | |
7976 if (frame_up_to_date_hook != 0) | |
7977 (*frame_up_to_date_hook) (f); | |
7978 } | |
7979 } | |
7980 } | |
7981 } | |
7982 else | |
7983 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7984 if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7985 && !FRAME_OBSCURED_P (sf)) |
25012 | 7986 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7987 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7988 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7989 |
25012 | 7990 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
|
7991 pause = update_frame (sf, 0, 0); |
25012 | 7992 } |
7993 else | |
7994 pause = 0; | |
7995 | |
7996 /* We may have called echo_area_display at the top of this | |
7997 function. If the echo area is on another frame, that may | |
7998 have put text on a frame other than the selected one, so the | |
7999 above call to update_frame would not have caught it. Catch | |
8000 it here. */ | |
8001 { | |
8002 Lisp_Object mini_window; | |
8003 struct frame *mini_frame; | |
8004 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8005 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25012 | 8006 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
8007 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8008 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame)) |
25012 | 8009 { |
8010 XWINDOW (mini_window)->must_be_updated_p = 1; | |
8011 pause |= update_frame (mini_frame, 0, 0); | |
8012 if (!pause && hscroll_windows (mini_window)) | |
8013 goto retry; | |
8014 } | |
8015 } | |
8016 } | |
8017 | |
8018 /* If display was paused because of pending input, make sure we do a | |
8019 thorough update the next time. */ | |
8020 if (pause) | |
8021 { | |
8022 /* Prevent the optimization at the beginning of | |
8023 redisplay_internal that tries a single-line update of the | |
8024 line containing the cursor in the selected window. */ | |
8025 CHARPOS (this_line_start_pos) = 0; | |
8026 | |
8027 /* Let the overlay arrow be updated the next time. */ | |
8028 if (!NILP (last_arrow_position)) | |
8029 { | |
8030 last_arrow_position = Qt; | |
8031 last_arrow_string = Qt; | |
8032 } | |
8033 | |
8034 /* If we pause after scrolling, some rows in the current | |
8035 matrices of some windows are not valid. */ | |
8036 if (!WINDOW_FULL_WIDTH_P (w) | |
8037 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
8038 update_mode_lines = 1; | |
8039 } | |
8040 | |
8041 /* Now text on frame agrees with windows, so put info into the | |
8042 windows for partial redisplay to follow. */ | |
8043 if (!pause) | |
8044 { | |
8045 register struct buffer *b = XBUFFER (w->buffer); | |
8046 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8047 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8048 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
|
8049 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
|
8050 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 8051 |
8052 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8053 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 8054 else |
8055 { | |
8056 XSETFASTINT (w->last_point, BUF_PT (b)); | |
8057 w->last_cursor = w->cursor; | |
8058 w->last_cursor_off_p = w->cursor_off_p; | |
8059 | |
8060 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8061 b->prevent_redisplay_optimizations_p = 0; |
25012 | 8062 w->update_mode_line = Qnil; |
8063 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
8064 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
8065 w->last_had_star | |
8066 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
8067 ? Qt : Qnil); | |
8068 | |
8069 /* Record if we are showing a region, so can make sure to | |
8070 update it fully at next redisplay. */ | |
8071 w->region_showing = (!NILP (Vtransient_mark_mode) | |
8072 && (w == XWINDOW (current_buffer->last_selected_window) | |
8073 || highlight_nonselected_windows) | |
8074 && !NILP (XBUFFER (w->buffer)->mark_active) | |
8075 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
8076 : Qnil); | |
8077 | |
8078 w->window_end_valid = w->buffer; | |
8079 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8080 last_arrow_string = Voverlay_arrow_string; | |
8081 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8082 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8083 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8084 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8085 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8086 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8087 } |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
8088 |
25012 | 8089 update_mode_lines = 0; |
8090 windows_or_buffers_changed = 0; | |
8091 } | |
8092 | |
8093 /* Start SIGIO interrupts coming again. Having them off during the | |
8094 code above makes it less likely one will discard output, but not | |
8095 impossible, since there might be stuff in the system buffer here. | |
8096 But it is much hairier to try to do anything about that. */ | |
8097 if (interrupt_input) | |
8098 request_sigio (); | |
8099 start_polling (); | |
8100 | |
8101 /* If a frame has become visible which was not before, redisplay | |
8102 again, so that we display it. Expose events for such a frame | |
8103 (which it gets when becoming visible) don't call the parts of | |
8104 redisplay constructing glyphs, so simply exposing a frame won't | |
8105 display anything in this case. So, we have to display these | |
8106 frames here explicitly. */ | |
8107 if (!pause) | |
8108 { | |
8109 Lisp_Object tail, frame; | |
8110 int new_count = 0; | |
8111 | |
8112 FOR_EACH_FRAME (tail, frame) | |
8113 { | |
8114 int this_is_visible = 0; | |
8115 | |
8116 if (XFRAME (frame)->visible) | |
8117 this_is_visible = 1; | |
8118 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
8119 if (XFRAME (frame)->visible) | |
8120 this_is_visible = 1; | |
8121 | |
8122 if (this_is_visible) | |
8123 new_count++; | |
8124 } | |
8125 | |
8126 if (new_count != number_of_visible_frames) | |
8127 windows_or_buffers_changed++; | |
8128 } | |
8129 | |
8130 /* 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
|
8131 do_pending_window_change (1); |
25012 | 8132 |
8133 /* If we just did a pending size change, or have additional | |
8134 visible frames, redisplay again. */ | |
8135 if (windows_or_buffers_changed && !pause) | |
8136 goto retry; | |
8137 | |
8138 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8139 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8140 unbind_to (count, Qnil); |
25012 | 8141 } |
8142 | |
8143 | |
8144 /* Redisplay, but leave alone any recent echo area message unless | |
8145 another message has been requested in its place. | |
8146 | |
8147 This is useful in situations where you need to redisplay but no | |
8148 user action has occurred, making it inappropriate for the message | |
8149 area to be cleared. See tracking_off and | |
8150 wait_reading_process_input for examples of these situations. */ | |
8151 | |
8152 void | |
8153 redisplay_preserve_echo_area () | |
8154 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8155 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
|
8156 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8157 /* 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
|
8158 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
|
8159 display_last_displayed_message_p = 1; |
25012 | 8160 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8161 display_last_displayed_message_p = 0; |
25012 | 8162 } |
8163 else | |
8164 redisplay_internal (1); | |
8165 } | |
8166 | |
8167 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8168 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8169 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
|
8170 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8171 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8172 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8173 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8174 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8175 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8176 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
|
8177 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8178 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8179 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8180 |
25012 | 8181 /* Mark the display of windows in the window tree rooted at WINDOW as |
8182 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
8183 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
8184 the next time redisplay_internal is called. */ | |
8185 | |
8186 void | |
8187 mark_window_display_accurate (window, accurate_p) | |
8188 Lisp_Object window; | |
8189 int accurate_p; | |
8190 { | |
8191 struct window *w; | |
8192 | |
8193 for (; !NILP (window); window = w->next) | |
8194 { | |
8195 w = XWINDOW (window); | |
8196 | |
8197 if (BUFFERP (w->buffer)) | |
8198 { | |
8199 struct buffer *b = XBUFFER (w->buffer); | |
8200 | |
8201 XSETFASTINT (w->last_modified, | |
8202 accurate_p ? BUF_MODIFF (b) : 0); | |
8203 XSETFASTINT (w->last_overlay_modified, | |
8204 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
8205 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
8206 ? Qt : Qnil); | |
8207 | |
8208 #if 0 /* I don't think this is necessary because display_line does it. | |
8209 Let's check it. */ | |
8210 /* Record if we are showing a region, so can make sure to | |
8211 update it fully at next redisplay. */ | |
8212 w->region_showing | |
8213 = (!NILP (Vtransient_mark_mode) | |
8214 && (w == XWINDOW (current_buffer->last_selected_window) | |
8215 || highlight_nonselected_windows) | |
8216 && (!NILP (b->mark_active) | |
8217 ? Fmarker_position (b->mark) | |
8218 : Qnil)); | |
8219 #endif | |
8220 | |
8221 if (accurate_p) | |
8222 { | |
8223 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8224 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8225 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8226 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8227 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8228 w->last_cursor = w->cursor; |
8229 w->last_cursor_off_p = w->cursor_off_p; | |
8230 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
|
8231 w->last_point = make_number (BUF_PT (b)); |
25012 | 8232 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
|
8233 w->last_point = make_number (XMARKER (w->pointm)->charpos); |
25012 | 8234 } |
8235 } | |
8236 | |
8237 w->window_end_valid = w->buffer; | |
8238 w->update_mode_line = Qnil; | |
8239 | |
8240 if (!NILP (w->vchild)) | |
8241 mark_window_display_accurate (w->vchild, accurate_p); | |
8242 if (!NILP (w->hchild)) | |
8243 mark_window_display_accurate (w->hchild, accurate_p); | |
8244 } | |
8245 | |
8246 if (accurate_p) | |
8247 { | |
8248 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8249 last_arrow_string = Voverlay_arrow_string; | |
8250 } | |
8251 else | |
8252 { | |
8253 /* Force a thorough redisplay the next time by setting | |
8254 last_arrow_position and last_arrow_string to t, which is | |
8255 unequal to any useful value of Voverlay_arrow_... */ | |
8256 last_arrow_position = Qt; | |
8257 last_arrow_string = Qt; | |
8258 } | |
8259 } | |
8260 | |
277 | 8261 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8262 /* 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
|
8263 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
|
8264 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
|
8265 macro DISP_CHAR_VECTOR. */ |
25012 | 8266 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8267 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8268 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
|
8269 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
|
8270 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8271 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8272 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8273 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8274 |
25012 | 8275 if (SINGLE_BYTE_CHAR_P (c)) |
8276 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
|
8277 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
8278 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
|
8279 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8280 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8281 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8282 code[2] = -1; |
25012 | 8283 |
8284 /* Here, the possible range of code[0] (== charset ID) is | |
8285 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
|
8286 for multibyte characters after 256th element, we must increment |
25012 | 8287 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
|
8288 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8289 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8290 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8291 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
|
8292 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8293 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
|
8294 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
|
8295 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
|
8296 } |
25012 | 8297 |
8298 /* Here, val is a sub char table. We return the default value of | |
8299 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8300 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8301 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8302 |
25012 | 8303 |
8304 | |
8305 /*********************************************************************** | |
8306 Window Redisplay | |
8307 ***********************************************************************/ | |
8308 | |
8309 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
8310 | |
8311 static void | |
8312 redisplay_windows (window) | |
8313 Lisp_Object window; | |
8314 { | |
8315 while (!NILP (window)) | |
8316 { | |
8317 struct window *w = XWINDOW (window); | |
8318 | |
8319 if (!NILP (w->hchild)) | |
8320 redisplay_windows (w->hchild); | |
8321 else if (!NILP (w->vchild)) | |
8322 redisplay_windows (w->vchild); | |
8323 else | |
8324 redisplay_window (window, 0); | |
8325 | |
8326 window = w->next; | |
8327 } | |
8328 } | |
8329 | |
8330 | |
8331 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8332 DELTA is the number of bytes by which positions recorded in ROW | |
8333 differ from current buffer positions. */ | |
8334 | |
8335 void | |
8336 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8337 struct window *w; | |
8338 struct glyph_row *row; | |
8339 struct glyph_matrix *matrix; | |
8340 int delta, delta_bytes, dy, dvpos; | |
8341 { | |
8342 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8343 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8344 int x = row->x; | |
8345 int pt_old = PT - delta; | |
8346 | |
8347 /* Skip over glyphs not having an object at the start of the row. | |
8348 These are special glyphs like truncation marks on terminal | |
8349 frames. */ | |
8350 if (row->displays_text_p) | |
8351 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
|
8352 && INTEGERP (glyph->object) |
25012 | 8353 && glyph->charpos < 0) |
8354 { | |
8355 x += glyph->pixel_width; | |
8356 ++glyph; | |
8357 } | |
8358 | |
8359 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
|
8360 && !INTEGERP (glyph->object) |
25012 | 8361 && (!BUFFERP (glyph->object) |
8362 || glyph->charpos < pt_old)) | |
8363 { | |
8364 x += glyph->pixel_width; | |
8365 ++glyph; | |
8366 } | |
8367 | |
8368 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8369 w->cursor.x = x; | |
8370 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8371 w->cursor.y = row->y + dy; | |
8372 | |
8373 if (w == XWINDOW (selected_window)) | |
8374 { | |
8375 if (!row->continued_p | |
8376 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8377 && row->x == 0) | |
8378 { | |
8379 this_line_buffer = XBUFFER (w->buffer); | |
8380 | |
8381 CHARPOS (this_line_start_pos) | |
8382 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8383 BYTEPOS (this_line_start_pos) | |
8384 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8385 | |
8386 CHARPOS (this_line_end_pos) | |
8387 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8388 BYTEPOS (this_line_end_pos) | |
8389 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8390 | |
8391 this_line_y = w->cursor.y; | |
8392 this_line_pixel_height = row->height; | |
8393 this_line_vpos = w->cursor.vpos; | |
8394 this_line_start_x = row->x; | |
8395 } | |
8396 else | |
8397 CHARPOS (this_line_start_pos) = 0; | |
8398 } | |
8399 } | |
8400 | |
8401 | |
8402 /* 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
|
8403 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
|
8404 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8405 We assume that the window's buffer is really current. */ |
25012 | 8406 |
8407 static INLINE struct text_pos | |
8408 run_window_scroll_functions (window, startp) | |
8409 Lisp_Object window; | |
8410 struct text_pos startp; | |
8411 { | |
8412 struct window *w = XWINDOW (window); | |
8413 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
|
8414 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8415 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
|
8416 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8417 |
25012 | 8418 if (!NILP (Vwindow_scroll_functions)) |
8419 { | |
8420 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8421 make_number (CHARPOS (startp))); | |
8422 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
|
8423 /* 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
|
8424 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
|
8425 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8426 } |
8427 | |
8428 return startp; | |
8429 } | |
8430 | |
8431 | |
8432 /* Modify the desired matrix of window W and W->vscroll so that the | |
8433 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8434 |
277 | 8435 static void |
25012 | 8436 make_cursor_line_fully_visible (w) |
8437 struct window *w; | |
8438 { | |
8439 struct glyph_matrix *matrix; | |
8440 struct glyph_row *row; | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8441 int window_height, header_line_height; |
25012 | 8442 |
8443 /* It's not always possible to find the cursor, e.g, when a window | |
8444 is full of overlay strings. Don't do anything in that case. */ | |
8445 if (w->cursor.vpos < 0) | |
8446 return; | |
8447 | |
8448 matrix = w->desired_matrix; | |
8449 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8450 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8451 /* 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
|
8452 to do. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8453 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
|
8454 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8455 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8456 /* 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
|
8457 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
|
8458 window_height = window_box_height (w); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8459 if (row->height >= window_height) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8460 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8461 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8462 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) |
25012 | 8463 { |
8464 int dy = row->height - row->visible_height; | |
8465 w->vscroll = 0; | |
8466 w->cursor.y += dy; | |
8467 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8468 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8469 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */ |
25012 | 8470 { |
8471 int dy = - (row->height - row->visible_height); | |
8472 w->vscroll = dy; | |
8473 w->cursor.y += dy; | |
8474 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8475 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8476 |
25012 | 8477 /* When we change the cursor y-position of the selected window, |
8478 change this_line_y as well so that the display optimization for | |
8479 the cursor line of the selected window in redisplay_internal uses | |
8480 the correct y-position. */ | |
8481 if (w == XWINDOW (selected_window)) | |
8482 this_line_y = w->cursor.y; | |
8483 } | |
8484 | |
8485 | |
8486 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8487 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8488 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8489 in redisplay_window to bring a partially visible line into view in | |
8490 the case that only the cursor has moved. | |
8491 | |
8492 Value is | |
8493 | |
8494 1 if scrolling succeeded | |
8495 | |
8496 0 if scrolling didn't find point. | |
8497 | |
8498 -1 if new fonts have been loaded so that we must interrupt | |
8499 redisplay, adjust glyph matrices, and try again. */ | |
8500 | |
8501 static int | |
8502 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8503 scroll_step, temp_scroll_step) | |
277 | 8504 Lisp_Object window; |
25012 | 8505 int just_this_one_p; |
8506 int scroll_conservatively, scroll_step; | |
8507 int temp_scroll_step; | |
8508 { | |
8509 struct window *w = XWINDOW (window); | |
8510 struct frame *f = XFRAME (w->frame); | |
8511 struct text_pos scroll_margin_pos; | |
8512 struct text_pos pos; | |
8513 struct text_pos startp; | |
8514 struct it it; | |
8515 Lisp_Object window_end; | |
8516 int this_scroll_margin; | |
8517 int dy = 0; | |
8518 int scroll_max; | |
8519 int line_height, rc; | |
8520 int amount_to_scroll = 0; | |
8521 Lisp_Object aggressive; | |
277 | 8522 int height; |
25012 | 8523 |
8524 #if GLYPH_DEBUG | |
8525 debug_method_add (w, "try_scrolling"); | |
8526 #endif | |
8527 | |
8528 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8529 | |
8530 /* Compute scroll margin height in pixels. We scroll when point is | |
8531 within this distance from the top or bottom of the window. */ | |
8532 if (scroll_margin > 0) | |
8533 { | |
8534 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8535 this_scroll_margin *= CANON_Y_UNIT (f); | |
8536 } | |
8537 else | |
8538 this_scroll_margin = 0; | |
8539 | |
8540 /* Compute how much we should try to scroll maximally to bring point | |
8541 into view. */ | |
8542 if (scroll_step) | |
8543 scroll_max = scroll_step; | |
8544 else if (scroll_conservatively) | |
8545 scroll_max = scroll_conservatively; | |
8546 else if (temp_scroll_step) | |
8547 scroll_max = temp_scroll_step; | |
8548 else if (NUMBERP (current_buffer->scroll_down_aggressively) | |
8549 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8550 /* We're trying to scroll because of aggressive scrolling | |
8551 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8552 there should be a variable for this. */ | |
8553 scroll_max = 10; | |
8554 else | |
8555 scroll_max = 0; | |
8556 scroll_max *= CANON_Y_UNIT (f); | |
8557 | |
8558 /* Decide whether we have to scroll down. Start at the window end | |
8559 and move this_scroll_margin up to find the position of the scroll | |
8560 margin. */ | |
8561 window_end = Fwindow_end (window, Qt); | |
8562 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8563 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8564 if (this_scroll_margin) | |
8565 { | |
8566 start_display (&it, w, scroll_margin_pos); | |
8567 move_it_vertically (&it, - this_scroll_margin); | |
8568 scroll_margin_pos = it.current.pos; | |
8569 } | |
8570 | |
8571 if (PT >= CHARPOS (scroll_margin_pos)) | |
8572 { | |
8573 int y0; | |
8574 | |
8575 /* Point is in the scroll margin at the bottom of the window, or | |
8576 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
|
8577 |
25012 | 8578 /* Compute the distance from the scroll margin to PT. |
8579 Give up if the distance is greater than scroll_max. */ | |
8580 start_display (&it, w, scroll_margin_pos); | |
8581 y0 = it.current_y; | |
8582 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8583 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8584 line_height = (it.max_ascent + it.max_descent | |
8585 ? it.max_ascent + it.max_descent | |
8586 : last_height); | |
8587 dy = it.current_y + line_height - y0; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8588 |
25012 | 8589 if (dy > scroll_max) |
8590 return 0; | |
8591 | |
8592 /* Move the window start down. If scrolling conservatively, | |
8593 move it just enough down to make point visible. If | |
8594 scroll_step is set, move it down by scroll_step. */ | |
8595 start_display (&it, w, startp); | |
8596 | |
8597 if (scroll_conservatively) | |
8598 amount_to_scroll = dy; | |
8599 else if (scroll_step || temp_scroll_step) | |
8600 amount_to_scroll = scroll_max; | |
8601 else | |
8602 { | |
8603 aggressive = current_buffer->scroll_down_aggressively; | |
8604 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8605 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8606 if (NUMBERP (aggressive)) |
8607 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8608 } | |
8609 | |
8610 if (amount_to_scroll <= 0) | |
8611 return 0; | |
8612 | |
8613 move_it_vertically (&it, amount_to_scroll); | |
8614 startp = it.current.pos; | |
8615 } | |
8616 else | |
8617 { | |
8618 /* See if point is inside the scroll margin at the top of the | |
8619 window. */ | |
8620 scroll_margin_pos = startp; | |
8621 if (this_scroll_margin) | |
8622 { | |
8623 start_display (&it, w, startp); | |
8624 move_it_vertically (&it, this_scroll_margin); | |
8625 scroll_margin_pos = it.current.pos; | |
8626 } | |
8627 | |
8628 if (PT < CHARPOS (scroll_margin_pos)) | |
8629 { | |
8630 /* Point is in the scroll margin at the top of the window or | |
8631 above what is displayed in the window. */ | |
8632 int y0; | |
8633 | |
8634 /* Compute the vertical distance from PT to the scroll | |
8635 margin position. Give up if distance is greater than | |
8636 scroll_max. */ | |
8637 SET_TEXT_POS (pos, PT, PT_BYTE); | |
8638 start_display (&it, w, pos); | |
8639 y0 = it.current_y; | |
8640 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
8641 it.last_visible_y, -1, | |
8642 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8643 dy = it.current_y - y0; | |
8644 if (dy > scroll_max) | |
8645 return 0; | |
8646 | |
8647 /* Compute new window start. */ | |
8648 start_display (&it, w, startp); | |
8649 | |
8650 if (scroll_conservatively) | |
8651 amount_to_scroll = dy; | |
8652 else if (scroll_step || temp_scroll_step) | |
8653 amount_to_scroll = scroll_max; | |
8654 else | |
8655 { | |
8656 aggressive = current_buffer->scroll_up_aggressively; | |
8657 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8658 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8659 if (NUMBERP (aggressive)) |
8660 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8661 } | |
8662 | |
8663 if (amount_to_scroll <= 0) | |
8664 return 0; | |
8665 | |
8666 move_it_vertically (&it, - amount_to_scroll); | |
8667 startp = it.current.pos; | |
8668 } | |
8669 } | |
8670 | |
8671 /* Run window scroll functions. */ | |
8672 startp = run_window_scroll_functions (window, startp); | |
8673 | |
8674 /* Display the window. Give up if new fonts are loaded, or if point | |
8675 doesn't appear. */ | |
8676 if (!try_window (window, startp)) | |
8677 rc = -1; | |
8678 else if (w->cursor.vpos < 0) | |
8679 { | |
8680 clear_glyph_matrix (w->desired_matrix); | |
8681 rc = 0; | |
8682 } | |
8683 else | |
8684 { | |
8685 /* Maybe forget recorded base line for line number display. */ | |
8686 if (!just_this_one_p | |
8687 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8688 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 8689 w->base_line_number = Qnil; |
8690 | |
8691 /* If cursor ends up on a partially visible line, shift display | |
8692 lines up or down. */ | |
8693 make_cursor_line_fully_visible (w); | |
8694 rc = 1; | |
8695 } | |
8696 | |
8697 return rc; | |
8698 } | |
8699 | |
8700 | |
8701 /* Compute a suitable window start for window W if display of W starts | |
8702 on a continuation line. Value is non-zero if a new window start | |
8703 was computed. | |
8704 | |
8705 The new window start will be computed, based on W's width, starting | |
8706 from the start of the continued line. It is the start of the | |
8707 screen line with the minimum distance from the old start W->start. */ | |
8708 | |
8709 static int | |
8710 compute_window_start_on_continuation_line (w) | |
8711 struct window *w; | |
8712 { | |
8713 struct text_pos pos, start_pos; | |
8714 int window_start_changed_p = 0; | |
8715 | |
8716 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
8717 | |
8718 /* If window start is on a continuation line... Window start may be | |
8719 < BEGV in case there's invisible text at the start of the | |
8720 buffer (M-x rmail, for example). */ | |
8721 if (CHARPOS (start_pos) > BEGV | |
8722 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
8723 { | |
8724 struct it it; | |
8725 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8726 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8727 /* 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
|
8728 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8729 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
|
8730 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8731 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 8732 |
8733 /* Find the start of the continued line. This should be fast | |
8734 because scan_buffer is fast (newline cache). */ | |
25546 | 8735 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 8736 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
8737 row, DEFAULT_FACE_ID); | |
8738 reseat_at_previous_visible_line_start (&it); | |
8739 | |
8740 /* If the line start is "too far" away from the window start, | |
8741 say it takes too much time to compute a new window start. */ | |
8742 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
8743 < XFASTINT (w->height) * XFASTINT (w->width)) | |
8744 { | |
8745 int min_distance, distance; | |
8746 | |
8747 /* Move forward by display lines to find the new window | |
8748 start. If window width was enlarged, the new start can | |
8749 be expected to be > the old start. If window width was | |
8750 decreased, the new window start will be < the old start. | |
8751 So, we're looking for the display line start with the | |
8752 minimum distance from the old window start. */ | |
8753 pos = it.current.pos; | |
8754 min_distance = INFINITY; | |
8755 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
8756 distance < min_distance) | |
8757 { | |
8758 min_distance = distance; | |
8759 pos = it.current.pos; | |
8760 move_it_by_lines (&it, 1, 0); | |
8761 } | |
8762 | |
8763 /* Set the window start there. */ | |
8764 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
8765 window_start_changed_p = 1; | |
8766 } | |
8767 } | |
8768 | |
8769 return window_start_changed_p; | |
8770 } | |
8771 | |
8772 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8773 /* 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
|
8774 with window start STARTP. Value is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8775 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8776 1 if successful |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8777 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8778 0 if this method cannot be used |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8779 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8780 -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
|
8781 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
|
8782 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
|
8783 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8784 static int |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8785 try_cursor_movement (window, startp, scroll_step) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8786 Lisp_Object window; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8787 struct text_pos startp; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8788 int *scroll_step; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8789 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8790 struct window *w = XWINDOW (window); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8791 struct frame *f = XFRAME (w->frame); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8792 int rc = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8793 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8794 /* 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
|
8795 not moved off the frame. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8796 if (/* Point may be in this window. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8797 PT >= CHARPOS (startp) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8798 /* If we don't check this, we are called to move the cursor in a |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8799 horizontally split window with a current matrix that doesn't |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8800 fit the display. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8801 && !windows_or_buffers_changed |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8802 /* Selective display hasn't changed. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8803 && !current_buffer->clip_changed |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8804 /* If force-mode-line-update was called, really redisplay; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8805 that's how redisplay is forced after e.g. changing |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8806 buffer-invisibility-spec. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8807 && NILP (w->update_mode_line) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8808 /* 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
|
8809 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
|
8810 set the cursor. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8811 && !(!NILP (Vtransient_mark_mode) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8812 && !NILP (current_buffer->mark_active)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8813 && NILP (w->region_showing) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8814 && NILP (Vshow_trailing_whitespace) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8815 /* 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
|
8816 && INTEGERP (w->last_point) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8817 /* 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
|
8818 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
|
8819 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
|
8820 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
|
8821 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
|
8822 handles the same cases. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8823 && !EQ (window, minibuf_window) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8824 /* 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
|
8825 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
|
8826 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
|
8827 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
|
8828 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
|
8829 && INTEGERP (w->window_end_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8830 && 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
|
8831 && (FRAME_WINDOW_P (f) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8832 || !MARKERP (Voverlay_arrow_position) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8833 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8834 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8835 int this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8836 struct glyph_row *row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8837 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8838 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8839 debug_method_add (w, "cursor movement"); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8840 #endif |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8841 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8842 /* 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
|
8843 of the window. This is a pixel value. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8844 this_scroll_margin = max (0, scroll_margin); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8845 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
|
8846 this_scroll_margin *= CANON_Y_UNIT (f); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8847 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8848 /* 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
|
8849 not paused redisplay. Give up if that row is not valid. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8850 if (w->last_cursor.vpos >= w->current_matrix->nrows) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8851 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8852 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8853 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8854 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
|
8855 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8856 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8857 if (!row->enabled_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8858 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8859 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8860 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8861 if (rc == 0) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8862 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8863 int scroll_p = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8864 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8865 if (PT > XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8866 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8867 /* Point has moved forward. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8868 int last_y = window_text_bottom_y (w) - this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8869 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8870 while (MATRIX_ROW_END_CHARPOS (row) < PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8871 && MATRIX_ROW_BOTTOM_Y (row) < last_y) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8872 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8873 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8874 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8875 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8876 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8877 /* 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
|
8878 of the next row. If PT is there, we would rather |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8879 display it in the next line. Exceptions are when the |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8880 row ends in the middle of a character, or ends in |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8881 ZV. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8882 if (MATRIX_ROW_BOTTOM_Y (row) < last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8883 && MATRIX_ROW_END_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8884 && !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
|
8885 && !row->ends_at_zv_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8886 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8887 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8888 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8889 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8890 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8891 /* If within the scroll margin, scroll. Note that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8892 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
|
8893 the next line would be drawn, and that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8894 this_scroll_margin can be zero. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8895 if (MATRIX_ROW_BOTTOM_Y (row) > last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8896 || PT > MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8897 /* Line is completely visible last line in window |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8898 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
|
8899 || (MATRIX_ROW_BOTTOM_Y (row) == last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8900 && PT == MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8901 && !row->ends_at_zv_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8902 && !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
|
8903 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8904 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8905 else if (PT < XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8906 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8907 /* 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
|
8908 CHARPOS (startp) because of the outer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8909 if-statement. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8910 while (!row->mode_line_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8911 && (MATRIX_ROW_START_CHARPOS (row) > PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8912 || (MATRIX_ROW_START_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8913 && 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
|
8914 && (row->y > this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8915 || CHARPOS (startp) == BEGV)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8916 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8917 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8918 --row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8919 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8920 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8921 /* Consider the following case: Window starts at BEGV, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8922 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
|
8923 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
|
8924 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
|
8925 BEGV and START. Try to handle that case. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8926 if (row < w->current_matrix->rows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8927 || row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8928 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8929 row = w->current_matrix->rows; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8930 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8931 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8932 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8933 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8934 /* 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
|
8935 skip forward over overlay strings. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8936 while (MATRIX_ROW_END_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8937 && MATRIX_ROW_ENDS_IN_OVERLAY_STRING_P (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8938 && !row->ends_at_zv_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8939 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8940 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8941 /* If within the scroll margin, scroll. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8942 if (row->y < this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8943 && CHARPOS (startp) != BEGV) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8944 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8945 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8946 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8947 if (PT < MATRIX_ROW_START_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8948 || PT > MATRIX_ROW_END_CHARPOS (row)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8949 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8950 /* 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
|
8951 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8952 } |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8953 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
|
8954 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8955 /* 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
|
8956 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
|
8957 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
|
8958 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
|
8959 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8960 *scroll_step = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8961 rc = -1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8962 } |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8963 else |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8964 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8965 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
|
8966 try_window (window, startp); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8967 make_cursor_line_fully_visible (w); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8968 rc = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
8969 } |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8970 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8971 else if (scroll_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8972 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8973 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8974 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8975 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
|
8976 rc = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8977 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8978 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8979 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8980 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8981 return rc; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8982 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8983 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8984 |
25012 | 8985 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only |
8986 selected_window is redisplayed. */ | |
8987 | |
8988 static void | |
8989 redisplay_window (window, just_this_one_p) | |
8990 Lisp_Object window; | |
8991 int just_this_one_p; | |
8992 { | |
8993 struct window *w = XWINDOW (window); | |
8994 struct frame *f = XFRAME (w->frame); | |
8995 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 8996 struct buffer *old = current_buffer; |
25012 | 8997 struct text_pos lpoint, opoint, startp; |
8998 int update_mode_line; | |
277 | 8999 int tem; |
25012 | 9000 struct it it; |
9001 /* Record it now because it's overwritten. */ | |
9002 int current_matrix_up_to_date_p = 0; | |
9003 int temp_scroll_step = 0; | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9004 int count = specpdl_ptr - specpdl; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9005 int rc; |
277 | 9006 |
25012 | 9007 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
9008 opoint = lpoint; | |
9009 | |
9010 /* W must be a leaf window here. */ | |
9011 xassert (!NILP (w->buffer)); | |
9012 #if GLYPH_DEBUG | |
9013 *w->desired_matrix->method = 0; | |
9014 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9015 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9016 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9017 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9018 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9019 |
25012 | 9020 /* Has the mode line to be updated? */ |
9021 update_mode_line = (!NILP (w->update_mode_line) | |
9022 || update_mode_lines | |
9023 || buffer->clip_changed); | |
433 | 9024 |
9025 if (MINI_WINDOW_P (w)) | |
9026 { | |
25012 | 9027 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
|
9028 && !NILP (echo_area_buffer[0])) |
25012 | 9029 { |
9030 if (update_mode_line) | |
9031 /* We may have to update a tty frame's menu bar or a | |
25543 | 9032 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 9033 goto finish_menu_bars; |
9034 else | |
9035 /* We've already displayed the echo area glyphs in this window. */ | |
9036 goto finish_scroll_bars; | |
9037 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
9038 else if (w != XWINDOW (minibuf_window)) |
433 | 9039 { |
25012 | 9040 /* W is a mini-buffer window, but it's not the currently |
9041 active one, so clear it. */ | |
9042 int yb = window_text_bottom_y (w); | |
9043 struct glyph_row *row; | |
9044 int y; | |
9045 | |
9046 for (y = 0, row = w->desired_matrix->rows; | |
9047 y < yb; | |
9048 y += row->height, ++row) | |
9049 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
|
9050 goto finish_scroll_bars; |
433 | 9051 } |
9052 } | |
277 | 9053 |
25012 | 9054 /* Otherwise set up data on this window; select its buffer and point |
9055 value. */ | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9056 /* 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
|
9057 variables. */ |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9058 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9059 SET_TEXT_POS (opoint, PT, PT_BYTE); |
9060 | |
9061 current_matrix_up_to_date_p | |
9062 = (!NILP (w->window_end_valid) | |
9063 && !current_buffer->clip_changed | |
9064 && XFASTINT (w->last_modified) >= MODIFF | |
9065 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
9066 | |
9067 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
9068 the window end being valid, so set it to nil there. */ | |
9069 if (windows_or_buffers_changed) | |
9070 { | |
9071 /* If window starts on a continuation line, maybe adjust the | |
9072 window start in case the window's width changed. */ | |
9073 if (XMARKER (w->start)->buffer == current_buffer) | |
9074 compute_window_start_on_continuation_line (w); | |
9075 | |
9076 w->window_end_valid = Qnil; | |
9077 } | |
9078 | |
9079 /* Some sanity checks. */ | |
9080 CHECK_WINDOW_END (w); | |
9081 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
|
9082 abort (); |
25012 | 9083 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9084 abort (); |
277 | 9085 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9086 /* 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
|
9087 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9088 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9089 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9090 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9091 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9092 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9093 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9094 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9095 |
25012 | 9096 /* Count number of windows showing the selected buffer. An indirect |
9097 buffer counts as its base buffer. */ | |
9098 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9099 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9100 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9101 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9102 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
|
9103 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9104 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9105 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9106 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9107 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9108 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9109 } |
277 | 9110 |
25012 | 9111 /* Point refers normally to the selected window. For any other |
9112 window, set up appropriate value. */ | |
277 | 9113 if (!EQ (window, selected_window)) |
9114 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9115 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9116 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
|
9117 if (new_pt < BEGV) |
277 | 9118 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9119 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9120 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9121 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 9122 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9123 else if (new_pt > (ZV - 1)) |
277 | 9124 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9125 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9126 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9127 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 9128 } |
25012 | 9129 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9130 /* 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
|
9131 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 9132 } |
9133 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9134 /* If any of the character widths specified in the display table |
25012 | 9135 have changed, invalidate the width run cache. It's true that |
9136 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
|
9137 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
|
9138 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
|
9139 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
|
9140 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
9141 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
|
9142 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9143 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
|
9144 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
|
9145 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9146 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
|
9147 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
|
9148 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9149 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
|
9150 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9151 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9152 |
277 | 9153 /* If window-start is screwed up, choose a new one. */ |
9154 if (XMARKER (w->start)->buffer != current_buffer) | |
9155 goto recenter; | |
9156 | |
25012 | 9157 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 9158 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9159 /* 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
|
9160 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9161 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9162 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9163 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9164 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9165 w->optional_new_start = Qnil; |
25012 | 9166 start_display (&it, w, startp); |
9167 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9168 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9169 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9170 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9171 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9172 |
433 | 9173 /* 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
|
9174 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
|
9175 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9176 || w->frozen_window_start_p) |
277 | 9177 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9178 w->force_start = Qnil; |
25012 | 9179 w->vscroll = 0; |
9180 w->window_end_valid = Qnil; | |
9181 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9182 /* Forget any recorded base line for line number display. */ |
25012 | 9183 if (!current_matrix_up_to_date_p |
9184 || current_buffer->clip_changed) | |
9185 w->base_line_number = Qnil; | |
9186 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9187 /* 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
|
9188 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
|
9189 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9190 /* 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
|
9191 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
|
9192 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
|
9193 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
|
9194 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9195 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9196 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9197 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9198 w->update_mode_line = Qt; |
25012 | 9199 startp = run_window_scroll_functions (window, startp); |
9200 } | |
9201 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9202 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9203 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9204 if (CHARPOS (startp) < BEGV) |
9205 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
9206 else if (CHARPOS (startp) > ZV) | |
9207 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
9208 | |
9209 /* Redisplay, then check if cursor has been set during the | |
9210 redisplay. Give up if new fonts were loaded. */ | |
9211 if (!try_window (window, startp)) | |
9212 { | |
9213 w->force_start = Qt; | |
9214 clear_glyph_matrix (w->desired_matrix); | |
9215 goto restore_buffers; | |
9216 } | |
9217 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9218 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 9219 { |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9220 /* 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
|
9221 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
|
9222 can use it here. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9223 int window_height; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9224 struct glyph_row *row; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9225 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9226 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
|
9227 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
|
9228 while (MATRIX_ROW_BOTTOM_Y (row) < window_height) |
25012 | 9229 ++row; |
9230 | |
9231 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
9232 MATRIX_ROW_START_BYTEPOS (row)); | |
9233 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
9234 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9235 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 9236 else if (current_buffer == old) |
9237 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
9238 | |
9239 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
9240 | |
9241 /* If we are highlighting the region, then we just changed | |
9242 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
|
9243 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
|
9244 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9245 { |
25012 | 9246 clear_glyph_matrix (w->desired_matrix); |
9247 if (!try_window (window, startp)) | |
9248 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9249 } |
277 | 9250 } |
25012 | 9251 |
9252 make_cursor_line_fully_visible (w); | |
9253 #if GLYPH_DEBUG | |
9254 debug_method_add (w, "forced window start"); | |
9255 #endif | |
277 | 9256 goto done; |
9257 } | |
9258 | |
25012 | 9259 /* Handle case where text has not changed, only point, and it has |
9260 not moved off the frame. */ | |
9261 if (current_matrix_up_to_date_p | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9262 && (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
|
9263 rc != 0)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9264 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9265 if (rc == -1) |
25012 | 9266 goto try_to_scroll; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9267 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9268 goto done; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9269 } |
277 | 9270 /* If current starting point was originally the beginning of a line |
9271 but no longer is, find a new starting point. */ | |
485 | 9272 else if (!NILP (w->start_at_line_beg) |
25012 | 9273 && !(CHARPOS (startp) <= BEGV |
9274 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
9275 { | |
9276 #if GLYPH_DEBUG | |
9277 debug_method_add (w, "recenter 1"); | |
9278 #endif | |
277 | 9279 goto recenter; |
9280 } | |
25012 | 9281 |
9282 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9283 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9284 !windows_or_buffers_changed |
25012 | 9285 /* Window must be either use window-based redisplay or |
9286 be full width. */ | |
9287 && (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
|
9288 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 9289 && !MINI_WINDOW_P (w) |
9290 /* Point is not known NOT to appear in window. */ | |
9291 && PT >= CHARPOS (startp) | |
277 | 9292 && XFASTINT (w->last_modified) |
25012 | 9293 /* Window is not hscrolled. */ |
9294 && XFASTINT (w->hscroll) == 0 | |
9295 /* Selective display has not changed. */ | |
9296 && !current_buffer->clip_changed | |
9297 /* Current matrix is up to date. */ | |
9298 && !NILP (w->window_end_valid) | |
9299 /* Can't use this case if highlighting a region because | |
9300 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
|
9301 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9302 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9303 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9304 && NILP (Vshow_trailing_whitespace) |
25012 | 9305 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
9306 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 9307 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 9308 /* Value is > 0 if update has been done, it is -1 if we |
9309 know that the same window start will not work. It is 0 | |
9310 if unsuccessful for some other reason. */ | |
9311 && (tem = try_window_id (w)) != 0) | |
9312 { | |
9313 #if GLYPH_DEBUG | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9314 debug_method_add (w, "try_window_id %d", tem); |
25012 | 9315 #endif |
9316 | |
9317 if (fonts_changed_p) | |
9318 goto restore_buffers; | |
277 | 9319 if (tem > 0) |
9320 goto done; | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9321 |
25012 | 9322 /* Otherwise try_window_id has returned -1 which means that we |
9323 don't want the alternative below this comment to execute. */ | |
9324 } | |
9325 else if (CHARPOS (startp) >= BEGV | |
9326 && CHARPOS (startp) <= ZV | |
9327 && PT >= CHARPOS (startp) | |
9328 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
9329 /* Avoid starting at end of buffer. */ |
25012 | 9330 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9331 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9332 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 9333 { |
25012 | 9334 #if GLYPH_DEBUG |
9335 debug_method_add (w, "same window start"); | |
9336 #endif | |
9337 | |
9338 /* Try to redisplay starting at same place as before. | |
9339 If point has not moved off frame, accept the results. */ | |
9340 if (!current_matrix_up_to_date_p | |
9341 /* 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
|
9342 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
|
9343 buffer. */ |
25012 | 9344 || !NILP (Vwindow_scroll_functions) |
9345 || MINI_WINDOW_P (w) | |
9346 || !try_window_reusing_current_matrix (w)) | |
9347 { | |
9348 IF_DEBUG (debug_method_add (w, "1")); | |
9349 try_window (window, startp); | |
9350 } | |
9351 | |
9352 if (fonts_changed_p) | |
9353 goto restore_buffers; | |
9354 | |
9355 if (w->cursor.vpos >= 0) | |
9356 { | |
9357 if (!just_this_one_p | |
9358 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9359 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9360 /* 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
|
9361 w->base_line_number = Qnil; |
25012 | 9362 |
9363 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9364 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9365 } |
277 | 9366 else |
25012 | 9367 clear_glyph_matrix (w->desired_matrix); |
9368 } | |
9369 | |
9370 try_to_scroll: | |
277 | 9371 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9372 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9373 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9374 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9375 /* 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
|
9376 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9377 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9378 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9379 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9380 } |
277 | 9381 |
25012 | 9382 /* Try to scroll by specified few lines. */ |
9383 if ((scroll_conservatively | |
9384 || scroll_step | |
9385 || temp_scroll_step | |
9386 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9387 || 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
|
9388 && !current_buffer->clip_changed |
25012 | 9389 && CHARPOS (startp) >= BEGV |
9390 && CHARPOS (startp) <= ZV) | |
9391 { | |
9392 /* The function returns -1 if new fonts were loaded, 1 if | |
9393 successful, 0 if not successful. */ | |
9394 int rc = try_scrolling (window, just_this_one_p, | |
9395 scroll_conservatively, | |
9396 scroll_step, | |
9397 temp_scroll_step); | |
9398 if (rc > 0) | |
9399 goto done; | |
9400 else if (rc < 0) | |
9401 goto restore_buffers; | |
9402 } | |
9403 | |
9404 /* Finally, just choose place to start which centers point */ | |
9405 | |
9406 recenter: | |
9407 | |
9408 #if GLYPH_DEBUG | |
9409 debug_method_add (w, "recenter"); | |
9410 #endif | |
9411 | |
9412 /* w->vscroll = 0; */ | |
9413 | |
9414 /* Forget any previously recorded base line for line number display. */ | |
9415 if (!current_matrix_up_to_date_p | |
9416 || current_buffer->clip_changed) | |
9417 w->base_line_number = Qnil; | |
9418 | |
9419 /* Move backward half the height of the window. */ | |
9420 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9421 it.current_y = it.last_visible_y; | |
9422 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9423 xassert (IT_CHARPOS (it) >= BEGV); | |
9424 | |
9425 /* The function move_it_vertically_backward may move over more | |
9426 than the specified y-distance. If it->w is small, e.g. a | |
9427 mini-buffer window, we may end up in front of the window's | |
9428 display area. Start displaying at the start of the line | |
9429 containing PT in this case. */ | |
9430 if (it.current_y <= 0) | |
9431 { | |
9432 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9433 move_it_vertically (&it, 0); | |
9434 xassert (IT_CHARPOS (it) <= PT); | |
9435 it.current_y = 0; | |
9436 } | |
9437 | |
9438 it.current_x = it.hpos = 0; | |
9439 | |
9440 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9441 in case the window-scroll-functions functions get errors. */ | |
9442 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9443 | |
9444 /* Run scroll hooks. */ | |
9445 startp = run_window_scroll_functions (window, it.current.pos); | |
9446 | |
9447 /* Redisplay the window. */ | |
9448 if (!current_matrix_up_to_date_p | |
9449 || windows_or_buffers_changed | |
9450 /* Don't use try_window_reusing_current_matrix in this case | |
9451 because it can have changed the buffer. */ | |
9452 || !NILP (Vwindow_scroll_functions) | |
9453 || !just_this_one_p | |
9454 || MINI_WINDOW_P (w) | |
9455 || !try_window_reusing_current_matrix (w)) | |
9456 try_window (window, startp); | |
9457 | |
9458 /* If new fonts have been loaded (due to fontsets), give up. We | |
9459 have to start a new redisplay since we need to re-adjust glyph | |
9460 matrices. */ | |
9461 if (fonts_changed_p) | |
9462 goto restore_buffers; | |
9463 | |
9464 /* If cursor did not appear assume that the middle of the window is | |
9465 in the first line of the window. Do it again with the next line. | |
9466 (Imagine a window of height 100, displaying two lines of height | |
9467 60. Moving back 50 from it->last_visible_y will end in the first | |
9468 line.) */ | |
9469 if (w->cursor.vpos < 0) | |
9470 { | |
9471 if (!NILP (w->window_end_valid) | |
9472 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9473 { | |
9474 clear_glyph_matrix (w->desired_matrix); | |
9475 move_it_by_lines (&it, 1, 0); | |
9476 try_window (window, it.current.pos); | |
9477 } | |
9478 else if (PT < IT_CHARPOS (it)) | |
9479 { | |
9480 clear_glyph_matrix (w->desired_matrix); | |
9481 move_it_by_lines (&it, -1, 0); | |
9482 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
|
9483 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9484 else |
25012 | 9485 { |
9486 /* Not much we can do about it. */ | |
9487 } | |
9488 } | |
9489 | |
9490 /* Consider the following case: Window starts at BEGV, there is | |
9491 invisible, intangible text at BEGV, so that display starts at | |
9492 some point START > BEGV. It can happen that we are called with | |
9493 PT somewhere between BEGV and START. Try to handle that case. */ | |
9494 if (w->cursor.vpos < 0) | |
9495 { | |
9496 struct glyph_row *row = w->current_matrix->rows; | |
9497 if (row->mode_line_p) | |
9498 ++row; | |
9499 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
9500 } | |
9501 | |
9502 make_cursor_line_fully_visible (w); | |
9503 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9504 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9505 |
25012 | 9506 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
9507 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
9508 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
9509 ? Qt : Qnil); | |
9510 | |
9511 /* 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
|
9512 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9513 /* If window not full width, must redo its mode line |
25012 | 9514 if (a) the window to its side is being redone and |
9515 (b) we do a frame-based redisplay. This is a consequence | |
9516 of how inverted lines are drawn in frame-based redisplay. */ | |
9517 || (!just_this_one_p | |
9518 && !FRAME_WINDOW_P (f) | |
9519 && !WINDOW_FULL_WIDTH_P (w)) | |
9520 /* 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
|
9521 || INTEGERP (w->base_line_pos) |
25012 | 9522 /* 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
|
9523 || (!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
|
9524 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 9525 /* This means that the window has a mode line. */ |
9526 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 9527 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 9528 { |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9529 Lisp_Object old_selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9530 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9531 old_selected_frame = selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9532 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9533 XSETFRAME (selected_frame, f); |
25012 | 9534 display_mode_lines (w); |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9535 selected_frame = old_selected_frame; |
25012 | 9536 |
9537 /* If mode line height has changed, arrange for a thorough | |
9538 immediate redisplay using the correct mode line height. */ | |
9539 if (WINDOW_WANTS_MODELINE_P (w) | |
9540 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
9541 { | |
9542 fonts_changed_p = 1; | |
9543 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
9544 = DESIRED_MODE_LINE_HEIGHT (w); | |
9545 } | |
9546 | |
9547 /* If top line height has changed, arrange for a thorough | |
9548 immediate redisplay using the correct mode line height. */ | |
25546 | 9549 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9550 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 9551 { |
9552 fonts_changed_p = 1; | |
25546 | 9553 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
9554 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9555 } |
9556 | |
9557 if (fonts_changed_p) | |
9558 goto restore_buffers; | |
9559 } | |
9560 | |
9561 if (!line_number_displayed | |
9562 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9563 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9564 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9565 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9566 } |
277 | 9567 |
25012 | 9568 finish_menu_bars: |
9569 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9570 /* 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
|
9571 if (update_mode_line |
25012 | 9572 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9573 { | |
9574 int redisplay_menu_p = 0; | |
9575 | |
9576 if (FRAME_WINDOW_P (f)) | |
9577 { | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
9578 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
25012 | 9579 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
|
9580 #else |
25012 | 9581 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
|
9582 #endif |
25012 | 9583 } |
9584 else | |
9585 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9586 | |
9587 if (redisplay_menu_p) | |
9588 display_menu_bar (w); | |
9589 | |
9590 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9591 if (WINDOWP (f->tool_bar_window) |
9592 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9593 || auto_resize_tool_bars_p)) | |
9594 redisplay_tool_bar (f); | |
25012 | 9595 #endif |
9596 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9597 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9598 finish_scroll_bars: |
25012 | 9599 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9600 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
|
9601 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9602 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9603 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9604 /* 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
|
9605 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
|
9606 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
|
9607 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
|
9608 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9609 |
25012 | 9610 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
|
9611 if (!MINI_WINDOW_P (w) |
25012 | 9612 || (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
|
9613 && 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
|
9614 { |
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
|
9615 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
9616 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
|
9617 /* 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
|
9618 moment, we'll pretend it is. */ |
25012 | 9619 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
9620 | |
9621 if (end < start) | |
9622 end = start; | |
9623 if (whole < (end - start)) | |
9624 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9625 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9626 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9627 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9628 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9629 /* 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
|
9630 (*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
|
9631 |
25012 | 9632 /* Note that we actually used the scroll bar attached to this |
9633 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
|
9634 (*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
|
9635 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9636 |
25012 | 9637 restore_buffers: |
9638 | |
9639 /* Restore current_buffer and value of point in it. */ | |
9640 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
|
9641 set_buffer_internal_1 (old); |
25012 | 9642 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
|
9643 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9644 unbind_to (count, Qnil); |
277 | 9645 } |
25012 | 9646 |
9647 | |
9648 /* Build the complete desired matrix of WINDOW with a window start | |
9649 buffer position POS. Value is non-zero if successful. It is zero | |
9650 if fonts were loaded during redisplay which makes re-adjusting | |
9651 glyph matrices necessary. */ | |
9652 | |
9653 int | |
277 | 9654 try_window (window, pos) |
9655 Lisp_Object window; | |
25012 | 9656 struct text_pos pos; |
9657 { | |
9658 struct window *w = XWINDOW (window); | |
9659 struct it it; | |
9660 struct glyph_row *last_text_row = NULL; | |
9661 | |
9662 /* Make POS the new window start. */ | |
9663 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
9664 | |
9665 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
9666 w->cursor.vpos = -1; | |
277 | 9667 overlay_arrow_seen = 0; |
25012 | 9668 |
9669 /* Initialize iterator and info to start at POS. */ | |
9670 start_display (&it, w, pos); | |
9671 | |
9672 /* Display all lines of W. */ | |
9673 while (it.current_y < it.last_visible_y) | |
9674 { | |
9675 if (display_line (&it)) | |
9676 last_text_row = it.glyph_row - 1; | |
9677 if (fonts_changed_p) | |
9678 return 0; | |
9679 } | |
9680 | |
9681 /* If bottom moved off end of frame, change mode line percentage. */ | |
9682 if (XFASTINT (w->window_end_pos) <= 0 | |
9683 && Z != IT_CHARPOS (it)) | |
277 | 9684 w->update_mode_line = Qt; |
9685 | |
25012 | 9686 /* Set window_end_pos to the offset of the last character displayed |
9687 on the window from the end of current_buffer. Set | |
9688 window_end_vpos to its row number. */ | |
9689 if (last_text_row) | |
9690 { | |
9691 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
9692 w->window_end_bytepos | |
9693 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9694 XSETFASTINT (w->window_end_pos, | |
9695 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9696 XSETFASTINT (w->window_end_vpos, | |
9697 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9698 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
9699 ->displays_text_p); | |
9700 } | |
9701 else | |
9702 { | |
9703 w->window_end_bytepos = 0; | |
9704 XSETFASTINT (w->window_end_pos, 0); | |
9705 XSETFASTINT (w->window_end_vpos, 0); | |
9706 } | |
9707 | |
277 | 9708 /* But that is not valid info until redisplay finishes. */ |
9709 w->window_end_valid = Qnil; | |
25012 | 9710 return 1; |
9711 } | |
9712 | |
9713 | |
277 | 9714 |
25012 | 9715 /************************************************************************ |
9716 Window redisplay reusing current matrix when buffer has not changed | |
9717 ************************************************************************/ | |
9718 | |
9719 /* Try redisplay of window W showing an unchanged buffer with a | |
9720 different window start than the last time it was displayed by | |
9721 reusing its current matrix. Value is non-zero if successful. | |
9722 W->start is the new window start. */ | |
9723 | |
9724 static int | |
9725 try_window_reusing_current_matrix (w) | |
9726 struct window *w; | |
9727 { | |
9728 struct frame *f = XFRAME (w->frame); | |
9729 struct glyph_row *row, *bottom_row; | |
9730 struct it it; | |
9731 struct run run; | |
9732 struct text_pos start, new_start; | |
9733 int nrows_scrolled, i; | |
9734 struct glyph_row *last_text_row; | |
9735 struct glyph_row *last_reused_text_row; | |
9736 struct glyph_row *start_row; | |
9737 int start_vpos, min_y, max_y; | |
9738 | |
29981
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9739 |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9740 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
|
9741 !FRAME_WINDOW_P (f) |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9742 /* 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
|
9743 or such. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9744 || windows_or_buffers_changed) |
25012 | 9745 return 0; |
9746 | |
9747 /* Can't do this if region may have changed. */ | |
9748 if ((!NILP (Vtransient_mark_mode) | |
9749 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9750 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9751 || !NILP (Vshow_trailing_whitespace)) |
25012 | 9752 return 0; |
9753 | |
9754 /* If top-line visibility has changed, give up. */ | |
25546 | 9755 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9756 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 9757 return 0; |
9758 | |
9759 /* Give up if old or new display is scrolled vertically. We could | |
9760 make this function handle this, but right now it doesn't. */ | |
9761 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9762 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
9763 return 0; | |
9764 | |
9765 /* The variable new_start now holds the new window start. The old | |
9766 start `start' can be determined from the current matrix. */ | |
9767 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
9768 start = start_row->start.pos; | |
9769 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
9770 | |
9771 /* Clear the desired matrix for the display below. */ | |
9772 clear_glyph_matrix (w->desired_matrix); | |
9773 | |
9774 if (CHARPOS (new_start) <= CHARPOS (start)) | |
9775 { | |
9776 int first_row_y; | |
9777 | |
9778 IF_DEBUG (debug_method_add (w, "twu1")); | |
9779 | |
9780 /* Display up to a row that can be reused. The variable | |
9781 last_text_row is set to the last row displayed that displays | |
9782 text. */ | |
9783 start_display (&it, w, new_start); | |
9784 first_row_y = it.current_y; | |
9785 w->cursor.vpos = -1; | |
9786 last_text_row = last_reused_text_row = NULL; | |
9787 while (it.current_y < it.last_visible_y | |
9788 && IT_CHARPOS (it) < CHARPOS (start) | |
9789 && !fonts_changed_p) | |
9790 if (display_line (&it)) | |
9791 last_text_row = it.glyph_row - 1; | |
9792 | |
9793 /* A value of current_y < last_visible_y means that we stopped | |
9794 at the previous window start, which in turn means that we | |
9795 have at least one reusable row. */ | |
9796 if (it.current_y < it.last_visible_y) | |
9797 { | |
9798 nrows_scrolled = it.vpos; | |
9799 | |
9800 /* Find PT if not already found in the lines displayed. */ | |
9801 if (w->cursor.vpos < 0) | |
9802 { | |
9803 int dy = it.current_y - first_row_y; | |
9804 | |
9805 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9806 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9807 { | |
9808 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
9809 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
9810 { | |
9811 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
9812 dy, nrows_scrolled); | |
9813 break; | |
9814 } | |
9815 | |
9816 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
9817 break; | |
9818 | |
9819 ++row; | |
9820 } | |
9821 | |
9822 /* Give up if point was not found. This shouldn't | |
9823 happen often; not more often than with try_window | |
9824 itself. */ | |
9825 if (w->cursor.vpos < 0) | |
9826 { | |
9827 clear_glyph_matrix (w->desired_matrix); | |
9828 return 0; | |
9829 } | |
9830 } | |
9831 | |
9832 /* Scroll the display. Do it before the current matrix is | |
9833 changed. The problem here is that update has not yet | |
9834 run, i.e. part of the current matrix is not up to date. | |
9835 scroll_run_hook will clear the cursor, and use the | |
9836 current matrix to get the height of the row the cursor is | |
9837 in. */ | |
9838 run.current_y = first_row_y; | |
9839 run.desired_y = it.current_y; | |
9840 run.height = it.last_visible_y - it.current_y; | |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
9841 if (run.height > 0 |
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
9842 && run.current_y != run.desired_y) |
25012 | 9843 { |
9844 update_begin (f); | |
9845 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
|
9846 rif->clear_mouse_face (w); |
25012 | 9847 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
|
9848 rif->update_window_end_hook (w, 0, 0); |
25012 | 9849 update_end (f); |
9850 } | |
9851 | |
9852 /* Shift current matrix down by nrows_scrolled lines. */ | |
9853 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9854 rotate_matrix (w->current_matrix, | |
9855 start_vpos, | |
9856 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9857 nrows_scrolled); | |
9858 | |
9859 /* Disable lines not reused. */ | |
9860 for (i = 0; i < it.vpos; ++i) | |
9861 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
9862 | |
9863 /* Re-compute Y positions. */ | |
9864 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix) + nrows_scrolled; | |
25546 | 9865 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9866 max_y = it.last_visible_y; |
9867 while (row < bottom_row) | |
9868 { | |
9869 row->y = it.current_y; | |
9870 | |
9871 if (row->y < min_y) | |
9872 row->visible_height = row->height - (min_y - row->y); | |
9873 else if (row->y + row->height > max_y) | |
9874 row->visible_height | |
9875 = row->height - (row->y + row->height - max_y); | |
9876 else | |
9877 row->visible_height = row->height; | |
9878 | |
9879 it.current_y += row->height; | |
9880 ++it.vpos; | |
9881 | |
9882 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9883 last_reused_text_row = row; | |
9884 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
9885 break; | |
9886 ++row; | |
9887 } | |
9888 } | |
9889 | |
9890 /* Update window_end_pos etc.; last_reused_text_row is the last | |
9891 reused row from the current matrix containing text, if any. | |
9892 The value of last_text_row is the last displayed line | |
9893 containing text. */ | |
9894 if (last_reused_text_row) | |
9895 { | |
9896 w->window_end_bytepos | |
9897 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
9898 XSETFASTINT (w->window_end_pos, | |
9899 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
9900 XSETFASTINT (w->window_end_vpos, | |
9901 MATRIX_ROW_VPOS (last_reused_text_row, | |
9902 w->current_matrix)); | |
9903 } | |
9904 else if (last_text_row) | |
9905 { | |
9906 w->window_end_bytepos | |
9907 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9908 XSETFASTINT (w->window_end_pos, | |
9909 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9910 XSETFASTINT (w->window_end_vpos, | |
9911 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9912 } | |
9913 else | |
9914 { | |
9915 /* This window must be completely empty. */ | |
9916 w->window_end_bytepos = 0; | |
9917 XSETFASTINT (w->window_end_pos, 0); | |
9918 XSETFASTINT (w->window_end_vpos, 0); | |
9919 } | |
9920 w->window_end_valid = Qnil; | |
9921 | |
9922 /* Update hint: don't try scrolling again in update_window. */ | |
9923 w->desired_matrix->no_scrolling_p = 1; | |
9924 | |
9925 #if GLYPH_DEBUG | |
9926 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
9927 #endif | |
9928 return 1; | |
9929 } | |
9930 else if (CHARPOS (new_start) > CHARPOS (start)) | |
9931 { | |
9932 struct glyph_row *pt_row, *row; | |
9933 struct glyph_row *first_reusable_row; | |
9934 struct glyph_row *first_row_to_display; | |
9935 int dy; | |
9936 int yb = window_text_bottom_y (w); | |
9937 | |
9938 IF_DEBUG (debug_method_add (w, "twu2")); | |
9939 | |
9940 /* Find the row starting at new_start, if there is one. Don't | |
9941 reuse a partially visible line at the end. */ | |
9942 first_reusable_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9943 while (first_reusable_row->enabled_p | |
9944 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
9945 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
9946 < CHARPOS (new_start))) | |
9947 ++first_reusable_row; | |
9948 | |
9949 /* Give up if there is no row to reuse. */ | |
9950 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
|
9951 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9952 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9953 != CHARPOS (new_start))) |
25012 | 9954 return 0; |
9955 | |
9956 /* We can reuse fully visible rows beginning with | |
9957 first_reusable_row to the end of the window. Set | |
9958 first_row_to_display to the first row that cannot be reused. | |
9959 Set pt_row to the row containing point, if there is any. */ | |
9960 first_row_to_display = first_reusable_row; | |
9961 pt_row = NULL; | |
9962 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
9963 { | |
9964 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
9965 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
9966 pt_row = first_row_to_display; | |
9967 | |
9968 ++first_row_to_display; | |
9969 } | |
9970 | |
9971 /* Start displaying at the start of first_row_to_display. */ | |
9972 xassert (first_row_to_display->y < yb); | |
9973 init_to_row_start (&it, w, first_row_to_display); | |
9974 nrows_scrolled = MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix); | |
9975 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) | |
9976 - nrows_scrolled); | |
9977 it.current_y = first_row_to_display->y - first_reusable_row->y; | |
9978 | |
9979 /* Display lines beginning with first_row_to_display in the | |
9980 desired matrix. Set last_text_row to the last row displayed | |
9981 that displays text. */ | |
9982 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
9983 if (pt_row == NULL) | |
9984 w->cursor.vpos = -1; | |
9985 last_text_row = NULL; | |
9986 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
9987 if (display_line (&it)) | |
9988 last_text_row = it.glyph_row - 1; | |
9989 | |
9990 /* Give up If point isn't in a row displayed or reused. */ | |
9991 if (w->cursor.vpos < 0) | |
9992 { | |
9993 clear_glyph_matrix (w->desired_matrix); | |
9994 return 0; | |
9995 } | |
9996 | |
9997 /* If point is in a reused row, adjust y and vpos of the cursor | |
9998 position. */ | |
9999 if (pt_row) | |
10000 { | |
10001 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
10002 w->current_matrix); | |
10003 w->cursor.y -= first_reusable_row->y; | |
10004 } | |
10005 | |
10006 /* Scroll the display. */ | |
10007 run.current_y = first_reusable_row->y; | |
25546 | 10008 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10009 run.height = it.last_visible_y - run.current_y; |
10010 if (run.height) | |
10011 { | |
10012 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10013 update_begin (f); | |
10014 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
|
10015 rif->clear_mouse_face (w); |
25012 | 10016 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
|
10017 rif->update_window_end_hook (w, 0, 0); |
25012 | 10018 update_end (f); |
10019 } | |
10020 | |
10021 /* Adjust Y positions of reused rows. */ | |
10022 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
10023 row = first_reusable_row; | |
10024 dy = first_reusable_row->y; | |
25546 | 10025 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10026 max_y = it.last_visible_y; |
10027 while (row < first_row_to_display) | |
10028 { | |
10029 row->y -= dy; | |
10030 if (row->y < min_y) | |
10031 row->visible_height = row->height - (min_y - row->y); | |
10032 else if (row->y + row->height > max_y) | |
10033 row->visible_height | |
10034 = row->height - (row->y + row->height - max_y); | |
10035 else | |
10036 row->visible_height = row->height; | |
10037 ++row; | |
10038 } | |
10039 | |
10040 /* Disable rows not reused. */ | |
10041 while (row < bottom_row) | |
10042 { | |
10043 row->enabled_p = 0; | |
10044 ++row; | |
10045 } | |
10046 | |
10047 /* Scroll the current matrix. */ | |
10048 xassert (nrows_scrolled > 0); | |
10049 rotate_matrix (w->current_matrix, | |
10050 start_vpos, | |
10051 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10052 -nrows_scrolled); | |
10053 | |
10054 /* Adjust window end. A null value of last_text_row means that | |
10055 the window end is in reused rows which in turn means that | |
10056 only its vpos can have changed. */ | |
10057 if (last_text_row) | |
10058 { | |
10059 w->window_end_bytepos | |
10060 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10061 XSETFASTINT (w->window_end_pos, | |
10062 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10063 XSETFASTINT (w->window_end_vpos, | |
10064 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10065 } | |
10066 else | |
10067 { | |
10068 XSETFASTINT (w->window_end_vpos, | |
10069 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
10070 } | |
10071 | |
10072 w->window_end_valid = Qnil; | |
10073 w->desired_matrix->no_scrolling_p = 1; | |
10074 | |
10075 #if GLYPH_DEBUG | |
10076 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
10077 #endif | |
10078 return 1; | |
10079 } | |
10080 | |
10081 return 0; | |
10082 } | |
10083 | |
10084 | |
10085 | |
10086 /************************************************************************ | |
10087 Window redisplay reusing current matrix when buffer has changed | |
10088 ************************************************************************/ | |
10089 | |
10090 static struct glyph_row *get_last_unchanged_at_beg_row P_ ((struct window *)); | |
10091 static struct glyph_row *get_first_unchanged_at_end_row P_ ((struct window *, | |
10092 int *, int *)); | |
10093 static struct glyph_row * | |
10094 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
10095 struct glyph_row *)); | |
10096 | |
10097 | |
10098 /* Return the last row in MATRIX displaying text. If row START is | |
10099 non-null, start searching with that row. IT gives the dimensions | |
10100 of the display. Value is null if matrix is empty; otherwise it is | |
10101 a pointer to the row found. */ | |
10102 | |
10103 static struct glyph_row * | |
10104 find_last_row_displaying_text (matrix, it, start) | |
10105 struct glyph_matrix *matrix; | |
10106 struct it *it; | |
10107 struct glyph_row *start; | |
10108 { | |
10109 struct glyph_row *row, *row_found; | |
10110 | |
10111 /* Set row_found to the last row in IT->w's current matrix | |
10112 displaying text. The loop looks funny but think of partially | |
10113 visible lines. */ | |
10114 row_found = NULL; | |
10115 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
10116 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10117 { | |
10118 xassert (row->enabled_p); | |
10119 row_found = row; | |
10120 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
10121 break; | |
10122 ++row; | |
10123 } | |
10124 | |
10125 return row_found; | |
10126 } | |
10127 | |
10128 | |
10129 /* Return the last row in the current matrix of W that is not affected | |
10130 by changes at the start of current_buffer that occurred since the | |
10131 last time W was redisplayed. Value is null if no such row exists. | |
10132 | |
10133 The global variable beg_unchanged has to contain the number of | |
10134 bytes unchanged at the start of current_buffer. BEG + | |
10135 beg_unchanged is the buffer position of the first changed byte in | |
10136 current_buffer. Characters at positions < BEG + beg_unchanged are | |
10137 at the same buffer positions as they were when the current matrix | |
10138 was built. */ | |
10139 | |
10140 static struct glyph_row * | |
10141 get_last_unchanged_at_beg_row (w) | |
10142 struct window *w; | |
10143 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10144 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 10145 struct glyph_row *row; |
10146 struct glyph_row *row_found = NULL; | |
10147 int yb = window_text_bottom_y (w); | |
10148 | |
10149 /* Find the last row displaying unchanged text. */ | |
10150 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10151 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
10152 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
10153 { | |
10154 if (/* If row ends before first_changed_pos, it is unchanged, | |
10155 except in some case. */ | |
10156 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
10157 /* When row ends in ZV and we write at ZV it is not | |
10158 unchanged. */ | |
10159 && !row->ends_at_zv_p | |
10160 /* When first_changed_pos is the end of a continued line, | |
10161 row is not unchanged because it may be no longer | |
10162 continued. */ | |
10163 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
10164 && row->continued_p)) | |
10165 row_found = row; | |
10166 | |
10167 /* Stop if last visible row. */ | |
10168 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
10169 break; | |
10170 | |
10171 ++row; | |
10172 } | |
10173 | |
10174 return row_found; | |
10175 } | |
10176 | |
10177 | |
10178 /* Find the first glyph row in the current matrix of W that is not | |
10179 affected by changes at the end of current_buffer since the last | |
10180 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
|
10181 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
|
10182 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
|
10183 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
|
10184 exists, i.e. all rows are affected by changes. */ |
25012 | 10185 |
10186 static struct glyph_row * | |
10187 get_first_unchanged_at_end_row (w, delta, delta_bytes) | |
10188 struct window *w; | |
10189 int *delta, *delta_bytes; | |
10190 { | |
10191 struct glyph_row *row; | |
10192 struct glyph_row *row_found = NULL; | |
10193 | |
10194 *delta = *delta_bytes = 0; | |
10195 | |
10196 /* A value of window_end_pos >= end_unchanged means that the window | |
10197 end is in the range of changed text. If so, there is no | |
10198 unchanged row at the end of W's current matrix. */ | |
10199 xassert (!NILP (w->window_end_valid)); | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10200 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 10201 return NULL; |
10202 | |
10203 /* Set row to the last row in W's current matrix displaying text. */ | |
10204 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10205 | |
10206 /* If matrix is entirely empty, no unchanged row exists. */ | |
10207 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10208 { | |
10209 /* The value of row is the last glyph row in the matrix having a | |
10210 meaningful buffer position in it. The end position of row | |
10211 corresponds to window_end_pos. This allows us to translate | |
10212 buffer positions in the current matrix to current buffer | |
10213 positions for characters not in changed text. */ | |
10214 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
10215 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
10216 int last_unchanged_pos, last_unchanged_pos_old; | |
10217 struct glyph_row *first_text_row | |
10218 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10219 | |
10220 *delta = Z - Z_old; | |
10221 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
10222 | |
10223 /* Set last_unchanged_pos to the buffer position of the last | |
10224 character in the buffer that has not been changed. Z is the | |
10225 index + 1 of the last byte in current_buffer, i.e. by | |
10226 subtracting end_unchanged we get the index of the last | |
10227 unchanged character, and we have to add BEG to get its buffer | |
10228 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10229 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 10230 last_unchanged_pos_old = last_unchanged_pos - *delta; |
10231 | |
10232 /* Search backward from ROW for a row displaying a line that | |
10233 starts at a minimum position >= last_unchanged_pos_old. */ | |
10234 while (row >= first_text_row) | |
10235 { | |
10236 xassert (row->enabled_p); | |
10237 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
10238 | |
10239 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
10240 row_found = row; | |
10241 --row; | |
10242 } | |
10243 } | |
10244 | |
10245 xassert (!row_found || MATRIX_ROW_DISPLAYS_TEXT_P (row_found)); | |
10246 return row_found; | |
10247 } | |
10248 | |
10249 | |
10250 /* Make sure that glyph rows in the current matrix of window W | |
10251 reference the same glyph memory as corresponding rows in the | |
10252 frame's frame matrix. This function is called after scrolling W's | |
10253 current matrix on a terminal frame in try_window_id and | |
10254 try_window_reusing_current_matrix. */ | |
10255 | |
10256 static void | |
10257 sync_frame_with_window_matrix_rows (w) | |
10258 struct window *w; | |
10259 { | |
10260 struct frame *f = XFRAME (w->frame); | |
10261 struct glyph_row *window_row, *window_row_end, *frame_row; | |
10262 | |
10263 /* Preconditions: W must be a leaf window and full-width. Its frame | |
10264 must have a frame matrix. */ | |
10265 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
10266 xassert (WINDOW_FULL_WIDTH_P (w)); | |
10267 xassert (!FRAME_WINDOW_P (f)); | |
10268 | |
10269 /* If W is a full-width window, glyph pointers in W's current matrix | |
10270 have, by definition, to be the same as glyph pointers in the | |
10271 corresponding frame matrix. */ | |
10272 window_row = w->current_matrix->rows; | |
10273 window_row_end = window_row + w->current_matrix->nrows; | |
10274 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
10275 while (window_row < window_row_end) | |
10276 { | |
10277 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10278 |
25012 | 10279 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
10280 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
|
10281 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10282 /* 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
|
10283 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
|
10284 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10285 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10286 |
25012 | 10287 ++window_row, ++frame_row; |
10288 } | |
10289 } | |
10290 | |
10291 | |
25543 | 10292 /* Find the glyph row in window W containing CHARPOS. Consider all |
10293 rows between START and END (not inclusive). END null means search | |
10294 all rows to the end of the display area of W. Value is the row | |
10295 containing CHARPOS or null. */ | |
10296 | |
10297 static struct glyph_row * | |
10298 row_containing_pos (w, charpos, start, end) | |
10299 struct window *w; | |
10300 int charpos; | |
10301 struct glyph_row *start, *end; | |
10302 { | |
10303 struct glyph_row *row = start; | |
10304 int last_y; | |
10305 | |
10306 /* If we happen to start on a header-line, skip that. */ | |
10307 if (row->mode_line_p) | |
10308 ++row; | |
10309 | |
10310 if ((end && row >= end) || !row->enabled_p) | |
10311 return NULL; | |
10312 | |
10313 last_y = window_text_bottom_y (w); | |
10314 | |
10315 while ((end == NULL || row < end) | |
10316 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
10317 /* The end position of a row equals the start | |
10318 position of the next row. If CHARPOS is there, we | |
10319 would rather display it in the next line, except | |
10320 when this line ends in ZV. */ | |
10321 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
10322 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
10323 || !row->ends_at_zv_p))) | |
10324 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
10325 ++row; | |
10326 | |
10327 /* Give up if CHARPOS not found. */ | |
10328 if ((end && row >= end) | |
10329 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
10330 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
10331 row = NULL; | |
10332 | |
10333 return row; | |
10334 } | |
10335 | |
10336 | |
25012 | 10337 /* Try to redisplay window W by reusing its existing display. W's |
10338 current matrix must be up to date when this function is called, | |
10339 i.e. window_end_valid must not be nil. | |
10340 | |
10341 Value is | |
10342 | |
10343 1 if display has been updated | |
10344 0 if otherwise unsuccessful | |
10345 -1 if redisplay with same window start is known not to succeed | |
10346 | |
10347 The following steps are performed: | |
10348 | |
10349 1. Find the last row in the current matrix of W that is not | |
10350 affected by changes at the start of current_buffer. If no such row | |
10351 is found, give up. | |
10352 | |
10353 2. Find the first row in W's current matrix that is not affected by | |
10354 changes at the end of current_buffer. Maybe there is no such row. | |
10355 | |
10356 3. Display lines beginning with the row + 1 found in step 1 to the | |
10357 row found in step 2 or, if step 2 didn't find a row, to the end of | |
10358 the window. | |
10359 | |
10360 4. If cursor is not known to appear on the window, give up. | |
10361 | |
10362 5. If display stopped at the row found in step 2, scroll the | |
10363 display and current matrix as needed. | |
10364 | |
10365 6. Maybe display some lines at the end of W, if we must. This can | |
10366 happen under various circumstances, like a partially visible line | |
10367 becoming fully visible, or because newly displayed lines are displayed | |
10368 in smaller font sizes. | |
10369 | |
10370 7. Update W's window end information. */ | |
10371 | |
10372 /* Check that window end is what we expect it to be. */ | |
277 | 10373 |
10374 static int | |
25012 | 10375 try_window_id (w) |
10376 struct window *w; | |
10377 { | |
10378 struct frame *f = XFRAME (w->frame); | |
10379 struct glyph_matrix *current_matrix = w->current_matrix; | |
10380 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10381 struct glyph_row *last_unchanged_at_beg_row; | |
10382 struct glyph_row *first_unchanged_at_end_row; | |
10383 struct glyph_row *row; | |
10384 struct glyph_row *bottom_row; | |
10385 int bottom_vpos; | |
10386 struct it it; | |
10387 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10388 struct text_pos start_pos; | |
10389 struct run run; | |
10390 int first_unchanged_at_end_vpos = 0; | |
10391 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10392 struct text_pos start; | |
10393 | |
10394 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10395 | |
10396 /* Check pre-conditions. Window end must be valid, otherwise | |
10397 the current matrix would not be up to date. */ | |
10398 xassert (!NILP (w->window_end_valid)); | |
10399 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10400 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10401 | |
10402 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10403 only if buffer has really changed. The reason is that the gap is | |
10404 initially at Z for freshly visited files. The code below would | |
10405 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
|
10406 if (MODIFF > SAVE_MODIFF |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10407 /* 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
|
10408 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) |
25012 | 10409 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10410 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10411 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10412 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10413 END_UNCHANGED = Z - GPT; |
25012 | 10414 } |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
10415 |
25012 | 10416 /* If window starts after a line end, and the last change is in |
10417 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
|
10418 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
|
10419 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
|
10420 be adjusted, of course. */ |
25012 | 10421 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); |
10422 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10423 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10424 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10425 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10426 { | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10427 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
|
10428 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
|
10429 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10430 if (delta) |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10431 { |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10432 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
|
10433 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
|
10434 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10435 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
|
10436 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
|
10437 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
|
10438 delta, delta_bytes); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10439 } |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10440 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10441 #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
|
10442 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
|
10443 changed. */ |
25012 | 10444 w->window_end_pos |
10445 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10446 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
|
10447 = 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
|
10448 #endif |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10449 |
25012 | 10450 return 1; |
10451 } | |
10452 | |
10453 /* Return quickly if changes are all below what is displayed in the | |
10454 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
|
10455 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10456 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10457 { | |
10458 /* We have to update window end positions because the buffer's | |
10459 size has changed. */ | |
10460 w->window_end_pos | |
10461 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10462 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
|
10463 = 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
|
10464 |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10465 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
|
10466 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
|
10467 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
|
10468 return 2; |
25012 | 10469 } |
10470 | |
10471 /* Check that window start agrees with the start of the first glyph | |
10472 row in its current matrix. Check this after we know the window | |
10473 start is not in changed text, otherwise positions would not be | |
10474 comparable. */ | |
10475 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10476 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10477 return 0; | |
10478 | |
10479 /* Compute the position at which we have to start displaying new | |
10480 lines. Some of the lines at the top of the window might be | |
10481 reusable because they are not displaying changed text. Find the | |
10482 last row in W's current matrix not affected by changes at the | |
10483 start of current_buffer. Value is null if changes start in the | |
10484 first line of window. */ | |
10485 last_unchanged_at_beg_row = get_last_unchanged_at_beg_row (w); | |
10486 if (last_unchanged_at_beg_row) | |
10487 { | |
10488 init_to_row_end (&it, w, last_unchanged_at_beg_row); | |
10489 start_pos = it.current.pos; | |
10490 | |
10491 /* Start displaying new lines in the desired matrix at the same | |
10492 vpos we would use in the current matrix, i.e. below | |
10493 last_unchanged_at_beg_row. */ | |
10494 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
10495 current_matrix); | |
10496 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10497 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
10498 | |
10499 xassert (it.hpos == 0 && it.current_x == 0); | |
10500 } | |
277 | 10501 else |
25012 | 10502 { |
10503 /* There are no reusable lines at the start of the window. | |
10504 Start displaying in the first line. */ | |
10505 start_display (&it, w, start); | |
10506 start_pos = it.current.pos; | |
10507 } | |
10508 | |
10509 /* Find the first row that is not affected by changes at the end of | |
10510 the buffer. Value will be null if there is no unchanged row, in | |
10511 which case we must redisplay to the end of the window. delta | |
10512 will be set to the value by which buffer positions beginning with | |
10513 first_unchanged_at_end_row have to be adjusted due to text | |
10514 changes. */ | |
10515 first_unchanged_at_end_row | |
10516 = get_first_unchanged_at_end_row (w, &delta, &delta_bytes); | |
10517 IF_DEBUG (debug_delta = delta); | |
10518 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
10519 | |
10520 /* Set stop_pos to the buffer position up to which we will have to | |
10521 display new lines. If first_unchanged_at_end_row != NULL, this | |
10522 is the buffer position of the start of the line displayed in that | |
10523 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
10524 that we don't stop at a buffer position. */ | |
10525 stop_pos = 0; | |
10526 if (first_unchanged_at_end_row) | |
10527 { | |
10528 xassert (last_unchanged_at_beg_row == NULL | |
10529 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
10530 | |
10531 /* If this is a continuation line, move forward to the next one | |
10532 that isn't. Changes in lines above affect this line. | |
10533 Caution: this may move first_unchanged_at_end_row to a row | |
10534 not displaying text. */ | |
10535 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
10536 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10537 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10538 < it.last_visible_y)) | |
10539 ++first_unchanged_at_end_row; | |
10540 | |
10541 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10542 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10543 >= it.last_visible_y)) | |
10544 first_unchanged_at_end_row = NULL; | |
10545 else | |
10546 { | |
10547 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
10548 + delta); | |
10549 first_unchanged_at_end_vpos | |
10550 = 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
|
10551 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 10552 } |
10553 } | |
10554 else if (last_unchanged_at_beg_row == NULL) | |
10555 return 0; | |
10556 | |
10557 | |
10558 #if GLYPH_DEBUG | |
10559 | |
10560 /* Either there is no unchanged row at the end, or the one we have | |
10561 now displays text. This is a necessary condition for the window | |
10562 end pos calculation at the end of this function. */ | |
10563 xassert (first_unchanged_at_end_row == NULL | |
10564 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
10565 | |
10566 debug_last_unchanged_at_beg_vpos | |
10567 = (last_unchanged_at_beg_row | |
10568 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
10569 : -1); | |
10570 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
10571 | |
10572 #endif /* GLYPH_DEBUG != 0 */ | |
10573 | |
10574 | |
10575 /* Display new lines. Set last_text_row to the last new line | |
10576 displayed which has text on it, i.e. might end up as being the | |
10577 line where the window_end_vpos is. */ | |
10578 w->cursor.vpos = -1; | |
10579 last_text_row = NULL; | |
277 | 10580 overlay_arrow_seen = 0; |
25012 | 10581 while (it.current_y < it.last_visible_y |
10582 && !fonts_changed_p | |
10583 && (first_unchanged_at_end_row == NULL | |
10584 || IT_CHARPOS (it) < stop_pos)) | |
10585 { | |
10586 if (display_line (&it)) | |
10587 last_text_row = it.glyph_row - 1; | |
10588 } | |
10589 | |
10590 if (fonts_changed_p) | |
10591 return -1; | |
10592 | |
10593 | |
10594 /* Compute differences in buffer positions, y-positions etc. for | |
10595 lines reused at the bottom of the window. Compute what we can | |
10596 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10597 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
|
10598 /* 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
|
10599 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10600 && it.current_y < it.last_visible_y) |
25012 | 10601 { |
10602 dvpos = (it.vpos | |
10603 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
10604 current_matrix)); | |
10605 dy = it.current_y - first_unchanged_at_end_row->y; | |
10606 run.current_y = first_unchanged_at_end_row->y; | |
10607 run.desired_y = run.current_y + dy; | |
10608 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
10609 } | |
10610 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10611 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10612 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
|
10613 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
|
10614 } |
25012 | 10615 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
10616 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
10617 |
25012 | 10618 /* Find the cursor if not already found. We have to decide whether |
10619 PT will appear on this window (it sometimes doesn't, but this is | |
10620 not a very frequent case.) This decision has to be made before | |
10621 the current matrix is altered. A value of cursor.vpos < 0 means | |
10622 that PT is either in one of the lines beginning at | |
10623 first_unchanged_at_end_row or below the window. Don't care for | |
10624 lines that might be displayed later at the window end; as | |
10625 mentioned, this is not a frequent case. */ | |
10626 if (w->cursor.vpos < 0) | |
10627 { | |
10628 /* Cursor in unchanged rows at the top? */ | |
10629 if (PT < CHARPOS (start_pos) | |
10630 && last_unchanged_at_beg_row) | |
10631 { | |
25543 | 10632 row = row_containing_pos (w, PT, |
10633 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
10634 last_unchanged_at_beg_row + 1); | |
10635 xassert (row && row <= last_unchanged_at_beg_row); | |
25012 | 10636 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
10637 } | |
10638 | |
10639 /* Start from first_unchanged_at_end_row looking for PT. */ | |
10640 else if (first_unchanged_at_end_row) | |
10641 { | |
25543 | 10642 row = row_containing_pos (w, PT - delta, |
10643 first_unchanged_at_end_row, NULL); | |
10644 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
10645 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
|
10646 delta_bytes, dy, dvpos); |
25012 | 10647 } |
10648 | |
10649 /* Give up if cursor was not found. */ | |
10650 if (w->cursor.vpos < 0) | |
10651 { | |
10652 clear_glyph_matrix (w->desired_matrix); | |
10653 return -1; | |
10654 } | |
10655 } | |
10656 | |
10657 /* Don't let the cursor end in the scroll margins. */ | |
10658 { | |
10659 int this_scroll_margin, cursor_height; | |
10660 | |
10661 this_scroll_margin = max (0, scroll_margin); | |
10662 this_scroll_margin = min (this_scroll_margin, | |
10663 XFASTINT (w->height) / 4); | |
10664 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
10665 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
10666 | |
10667 if ((w->cursor.y < this_scroll_margin | |
10668 && CHARPOS (start) > BEGV) | |
10669 /* Don't take scroll margin into account at the bottom because | |
10670 old redisplay didn't do it either. */ | |
10671 || w->cursor.y + cursor_height > it.last_visible_y) | |
10672 { | |
10673 w->cursor.vpos = -1; | |
10674 clear_glyph_matrix (w->desired_matrix); | |
10675 return -1; | |
10676 } | |
10677 } | |
10678 | |
10679 /* Scroll the display. Do it before changing the current matrix so | |
10680 that xterm.c doesn't get confused about where the cursor glyph is | |
10681 found. */ | |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
10682 if (dy && run.height) |
25012 | 10683 { |
10684 update_begin (f); | |
10685 | |
10686 if (FRAME_WINDOW_P (f)) | |
10687 { | |
10688 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
|
10689 rif->clear_mouse_face (w); |
25012 | 10690 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
|
10691 rif->update_window_end_hook (w, 0, 0); |
25012 | 10692 } |
10693 else | |
10694 { | |
10695 /* Terminal frame. In this case, dvpos gives the number of | |
10696 lines to scroll by; dvpos < 0 means scroll up. */ | |
10697 int first_unchanged_at_end_vpos | |
10698 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
10699 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
10700 int end = XFASTINT (w->top) + window_internal_height (w); | |
10701 | |
10702 /* Perform the operation on the screen. */ | |
10703 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
10704 { |
25012 | 10705 /* Scroll last_unchanged_at_beg_row to the end of the |
10706 window down dvpos lines. */ | |
10707 set_terminal_window (end); | |
10708 | |
10709 /* On dumb terminals delete dvpos lines at the end | |
10710 before inserting dvpos empty lines. */ | |
10711 if (!scroll_region_ok) | |
10712 ins_del_lines (end - dvpos, -dvpos); | |
10713 | |
10714 /* Insert dvpos empty lines in front of | |
10715 last_unchanged_at_beg_row. */ | |
10716 ins_del_lines (from, dvpos); | |
10717 } | |
10718 else if (dvpos < 0) | |
10719 { | |
10720 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
10721 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
10722 set_terminal_window (end); | |
10723 | |
10724 /* Delete dvpos lines in front of | |
10725 last_unchanged_at_beg_vpos. ins_del_lines will set | |
10726 the cursor to the given vpos and emit |dvpos| delete | |
10727 line sequences. */ | |
10728 ins_del_lines (from + dvpos, dvpos); | |
10729 | |
10730 /* On a dumb terminal insert dvpos empty lines at the | |
10731 end. */ | |
10732 if (!scroll_region_ok) | |
10733 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
|
10734 } |
25012 | 10735 |
10736 set_terminal_window (0); | |
10737 } | |
10738 | |
10739 update_end (f); | |
10740 } | |
10741 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10742 /* 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
|
10743 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
|
10744 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10745 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
|
10746 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 10747 if (dvpos < 0) |
10748 { | |
10749 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
10750 bottom_vpos, dvpos); | |
10751 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
10752 bottom_vpos, 0); | |
10753 } | |
10754 else if (dvpos > 0) | |
10755 { | |
10756 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
10757 bottom_vpos, dvpos); | |
10758 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
10759 first_unchanged_at_end_vpos + dvpos, 0); | |
10760 } | |
10761 | |
10762 /* For frame-based redisplay, make sure that current frame and window | |
10763 matrix are in sync with respect to glyph memory. */ | |
10764 if (!FRAME_WINDOW_P (f)) | |
10765 sync_frame_with_window_matrix_rows (w); | |
10766 | |
10767 /* Adjust buffer positions in reused rows. */ | |
10768 if (delta) | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10769 increment_matrix_positions (current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10770 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
|
10771 bottom_vpos, delta, delta_bytes); |
25012 | 10772 |
10773 /* Adjust Y positions. */ | |
10774 if (dy) | |
10775 shift_glyph_matrix (w, current_matrix, | |
10776 first_unchanged_at_end_vpos + dvpos, | |
10777 bottom_vpos, dy); | |
10778 | |
10779 if (first_unchanged_at_end_row) | |
10780 first_unchanged_at_end_row += dvpos; | |
10781 | |
10782 /* If scrolling up, there may be some lines to display at the end of | |
10783 the window. */ | |
10784 last_text_row_at_end = NULL; | |
10785 if (dy < 0) | |
10786 { | |
10787 /* Set last_row to the glyph row in the current matrix where the | |
10788 window end line is found. It has been moved up or down in | |
10789 the matrix by dvpos. */ | |
10790 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
10791 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
10792 | |
10793 /* If last_row is the window end line, it should display text. */ | |
10794 xassert (last_row->displays_text_p); | |
10795 | |
10796 /* If window end line was partially visible before, begin | |
10797 displaying at that line. Otherwise begin displaying with the | |
10798 line following it. */ | |
10799 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
10800 { | |
10801 init_to_row_start (&it, w, last_row); | |
10802 it.vpos = last_vpos; | |
10803 it.current_y = last_row->y; | |
10804 } | |
10805 else | |
10806 { | |
10807 init_to_row_end (&it, w, last_row); | |
10808 it.vpos = 1 + last_vpos; | |
10809 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
10810 ++last_row; | |
10811 } | |
10812 | |
10813 /* We may start in a continuation line. If so, we have to get | |
10814 the right continuation_lines_width and current_x. */ | |
10815 it.continuation_lines_width = last_row->continuation_lines_width; | |
10816 it.hpos = it.current_x = 0; | |
10817 | |
10818 /* Display the rest of the lines at the window end. */ | |
10819 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10820 while (it.current_y < it.last_visible_y | |
10821 && !fonts_changed_p) | |
10822 { | |
10823 /* Is it always sure that the display agrees with lines in | |
10824 the current matrix? I don't think so, so we mark rows | |
10825 displayed invalid in the current matrix by setting their | |
10826 enabled_p flag to zero. */ | |
10827 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
10828 if (display_line (&it)) | |
10829 last_text_row_at_end = it.glyph_row - 1; | |
10830 } | |
10831 } | |
10832 | |
10833 /* Update window_end_pos and window_end_vpos. */ | |
10834 if (first_unchanged_at_end_row | |
10835 && first_unchanged_at_end_row->y < it.last_visible_y | |
10836 && !last_text_row_at_end) | |
10837 { | |
10838 /* Window end line if one of the preserved rows from the current | |
10839 matrix. Set row to the last row displaying text in current | |
10840 matrix starting at first_unchanged_at_end_row, after | |
10841 scrolling. */ | |
10842 xassert (first_unchanged_at_end_row->displays_text_p); | |
10843 row = find_last_row_displaying_text (w->current_matrix, &it, | |
10844 first_unchanged_at_end_row); | |
10845 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
10846 | |
10847 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
10848 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
10849 XSETFASTINT (w->window_end_vpos, | |
10850 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
10851 } | |
10852 else if (last_text_row_at_end) | |
10853 { | |
10854 XSETFASTINT (w->window_end_pos, | |
10855 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
10856 w->window_end_bytepos | |
10857 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
10858 XSETFASTINT (w->window_end_vpos, | |
10859 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
10860 } | |
10861 else if (last_text_row) | |
10862 { | |
10863 /* We have displayed either to the end of the window or at the | |
10864 end of the window, i.e. the last row with text is to be found | |
10865 in the desired matrix. */ | |
10866 XSETFASTINT (w->window_end_pos, | |
10867 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10868 w->window_end_bytepos | |
10869 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10870 XSETFASTINT (w->window_end_vpos, | |
10871 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
10872 } | |
10873 else if (first_unchanged_at_end_row == NULL | |
10874 && last_text_row == NULL | |
10875 && last_text_row_at_end == NULL) | |
10876 { | |
10877 /* Displayed to end of window, but no line containing text was | |
10878 displayed. Lines were deleted at the end of the window. */ | |
10879 int vpos; | |
25546 | 10880 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 10881 |
10882 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 10883 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
10884 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
10885 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
10886 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 10887 break; |
10888 | |
10889 w->window_end_vpos = make_number (vpos); | |
10890 } | |
10891 else | |
10892 abort (); | |
10893 | |
10894 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
10895 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
10896 | |
10897 /* Record that display has not been completed. */ | |
277 | 10898 w->window_end_valid = Qnil; |
25012 | 10899 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
|
10900 return 3; |
277 | 10901 } |
25012 | 10902 |
10903 | |
10904 | |
10905 /*********************************************************************** | |
10906 More debugging support | |
10907 ***********************************************************************/ | |
10908 | |
10909 #if GLYPH_DEBUG | |
10910 | |
10911 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
10912 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
10913 | |
10914 | |
10915 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
10916 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
10917 | |
29748
1cd9b7a33ad1
(dump_glyph_matrix): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents:
29698
diff
changeset
|
10918 static void |
25012 | 10919 dump_glyph_matrix (matrix, with_glyphs_p) |
10920 struct glyph_matrix *matrix; | |
10921 int with_glyphs_p; | |
10922 { | |
10923 int i; | |
10924 for (i = 0; i < matrix->nrows; ++i) | |
10925 dump_glyph_row (matrix, i, with_glyphs_p); | |
10926 } | |
10927 | |
10928 | |
10929 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
10930 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
10931 | |
10932 void | |
10933 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
10934 struct glyph_matrix *matrix; | |
10935 int vpos, with_glyphs_p; | |
10936 { | |
10937 struct glyph_row *row; | |
10938 | |
10939 if (vpos < 0 || vpos >= matrix->nrows) | |
10940 return; | |
10941 | |
10942 row = MATRIX_ROW (matrix, vpos); | |
10943 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10944 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
|
10945 fprintf (stderr, "=======================================================================\n"); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10946 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10947 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1 \ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10948 1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
25012 | 10949 row - matrix->rows, |
10950 MATRIX_ROW_START_CHARPOS (row), | |
10951 MATRIX_ROW_END_CHARPOS (row), | |
10952 row->used[TEXT_AREA], | |
10953 row->contains_overlapping_glyphs_p, | |
10954 row->enabled_p, | |
10955 row->inverse_p, | |
10956 row->truncated_on_left_p, | |
10957 row->truncated_on_right_p, | |
10958 row->overlay_arrow_p, | |
10959 row->continued_p, | |
10960 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
10961 row->displays_text_p, | |
10962 row->ends_at_zv_p, | |
10963 row->fill_line_p, | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
10964 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
|
10965 row->starts_in_middle_of_char_p, |
25012 | 10966 row->x, |
10967 row->y, | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10968 row->pixel_width, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10969 row->height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10970 row->visible_height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10971 row->ascent, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
10972 row->phys_ascent); |
25012 | 10973 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, |
10974 row->end.overlay_string_index); | |
10975 fprintf (stderr, "%9d %5d\n", | |
10976 CHARPOS (row->start.string_pos), | |
10977 CHARPOS (row->end.string_pos)); | |
10978 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
10979 row->end.dpvec_index); | |
10980 | |
10981 if (with_glyphs_p) | |
10982 { | |
10983 struct glyph *glyph, *glyph_end; | |
10984 int prev_had_glyphs_p; | |
10985 | |
10986 glyph = row->glyphs[TEXT_AREA]; | |
10987 glyph_end = glyph + row->used[TEXT_AREA]; | |
10988 | |
10989 /* Glyph for a line end in text. */ | |
10990 if (glyph == glyph_end && glyph->charpos > 0) | |
10991 ++glyph_end; | |
10992 | |
10993 if (glyph < glyph_end) | |
10994 { | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
10995 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n"); |
25012 | 10996 prev_had_glyphs_p = 1; |
10997 } | |
10998 else | |
10999 prev_had_glyphs_p = 0; | |
11000 | |
11001 while (glyph < glyph_end) | |
11002 { | |
11003 if (glyph->type == CHAR_GLYPH) | |
11004 { | |
11005 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11006 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11007 glyph - row->glyphs[TEXT_AREA], |
11008 'C', | |
11009 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11010 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11011 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11012 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11013 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11014 : '-')), |
25012 | 11015 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11016 glyph->u.ch, |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11017 (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
|
11018 ? glyph->u.ch |
25012 | 11019 : '.'), |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11020 glyph->face_id, |
25012 | 11021 glyph->left_box_line_p, |
11022 glyph->right_box_line_p); | |
11023 } | |
11024 else if (glyph->type == STRETCH_GLYPH) | |
11025 { | |
11026 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11027 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11028 glyph - row->glyphs[TEXT_AREA], |
11029 'S', | |
11030 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11031 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11032 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11033 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11034 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11035 : '-')), |
25012 | 11036 glyph->pixel_width, |
11037 0, | |
11038 '.', | |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11039 glyph->face_id, |
25012 | 11040 glyph->left_box_line_p, |
11041 glyph->right_box_line_p); | |
11042 } | |
11043 else if (glyph->type == IMAGE_GLYPH) | |
11044 { | |
11045 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11046 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11047 glyph - row->glyphs[TEXT_AREA], |
11048 'I', | |
11049 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11050 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11051 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11052 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11053 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11054 : '-')), |
25012 | 11055 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11056 glyph->u.img_id, |
25012 | 11057 '.', |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11058 glyph->face_id, |
25012 | 11059 glyph->left_box_line_p, |
11060 glyph->right_box_line_p); | |
11061 } | |
11062 ++glyph; | |
11063 } | |
11064 } | |
11065 } | |
11066 | |
11067 | |
11068 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
11069 Sdump_glyph_matrix, 0, 1, "p", | |
11070 "Dump the current matrix of the selected window to stderr.\n\ | |
11071 Shows contents of glyph row structures. With non-nil optional\n\ | |
11072 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
11073 (with_glyphs_p) | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
11074 Lisp_Object with_glyphs_p; |
25012 | 11075 { |
11076 struct window *w = XWINDOW (selected_window); | |
11077 struct buffer *buffer = XBUFFER (w->buffer); | |
11078 | |
11079 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
11080 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
11081 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
11082 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
11083 fprintf (stderr, "=============================================\n"); | |
11084 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
11085 return Qnil; | |
11086 } | |
11087 | |
11088 | |
11089 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
11090 "Dump glyph row ROW to stderr.") | |
11091 (row) | |
11092 Lisp_Object row; | |
11093 { | |
11094 CHECK_NUMBER (row, 0); | |
11095 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
11096 return Qnil; | |
11097 } | |
11098 | |
11099 | |
25543 | 11100 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 11101 0, 0, "", "") |
11102 () | |
11103 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11104 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11105 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 11106 ->current_matrix); |
11107 dump_glyph_row (m, 0, 1); | |
11108 return Qnil; | |
11109 } | |
11110 | |
11111 | |
11112 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
11113 Strace_redisplay_toggle, 0, 0, "", | |
11114 "Toggle tracing of redisplay.") | |
11115 () | |
11116 { | |
11117 trace_redisplay_p = !trace_redisplay_p; | |
11118 return Qnil; | |
11119 } | |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11120 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11121 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11122 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
|
11123 "Print STRING to stderr.") |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11124 (string) |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11125 Lisp_Object string; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11126 { |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11127 CHECK_STRING (string, 0); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11128 fprintf (stderr, "%s", XSTRING (string)->data); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11129 return Qnil; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11130 } |
25012 | 11131 |
11132 #endif /* GLYPH_DEBUG */ | |
11133 | |
11134 | |
277 | 11135 |
25012 | 11136 /*********************************************************************** |
11137 Building Desired Matrix Rows | |
11138 ***********************************************************************/ | |
11139 | |
11140 /* Return a temporary glyph row holding the glyphs of an overlay | |
11141 arrow. Only used for non-window-redisplay windows. */ | |
11142 | |
11143 static struct glyph_row * | |
11144 get_overlay_arrow_glyph_row (w) | |
11145 struct window *w; | |
11146 { | |
11147 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
11148 struct buffer *buffer = XBUFFER (w->buffer); | |
11149 struct buffer *old = current_buffer; | |
11150 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
11151 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
11152 unsigned char *arrow_end = arrow_string + arrow_len; | |
11153 unsigned char *p; | |
11154 struct it it; | |
11155 int multibyte_p; | |
11156 int n_glyphs_before; | |
11157 | |
11158 set_buffer_temp (buffer); | |
11159 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
11160 it.glyph_row->used[TEXT_AREA] = 0; | |
11161 SET_TEXT_POS (it.position, 0, 0); | |
11162 | |
11163 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
11164 p = arrow_string; | |
11165 while (p < arrow_end) | |
11166 { | |
11167 Lisp_Object face, ilisp; | |
11168 | |
11169 /* Get the next character. */ | |
11170 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
11171 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 11172 else |
11173 it.c = *p, it.len = 1; | |
11174 p += it.len; | |
11175 | |
11176 /* Get its face. */ | |
11177 XSETFASTINT (ilisp, p - arrow_string); | |
11178 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
11179 it.face_id = compute_char_face (f, it.c, face); | |
11180 | |
11181 /* Compute its width, get its glyphs. */ | |
11182 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
|
11183 SET_TEXT_POS (it.position, -1, -1); |
25012 | 11184 PRODUCE_GLYPHS (&it); |
11185 | |
11186 /* If this character doesn't fit any more in the line, we have | |
11187 to remove some glyphs. */ | |
11188 if (it.current_x > it.last_visible_x) | |
11189 { | |
11190 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
11191 break; | |
11192 } | |
11193 } | |
11194 | |
11195 set_buffer_temp (old); | |
11196 return it.glyph_row; | |
11197 } | |
11198 | |
11199 | |
11200 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
11201 glyphs are only inserted for terminal frames since we can't really | |
11202 win with truncation glyphs when partially visible glyphs are | |
11203 involved. Which glyphs to insert is determined by | |
11204 produce_special_glyphs. */ | |
11205 | |
11206 static void | |
11207 insert_left_trunc_glyphs (it) | |
11208 struct it *it; | |
11209 { | |
11210 struct it truncate_it; | |
11211 struct glyph *from, *end, *to, *toend; | |
11212 | |
11213 xassert (!FRAME_WINDOW_P (it->f)); | |
11214 | |
11215 /* Get the truncation glyphs. */ | |
11216 truncate_it = *it; | |
11217 truncate_it.current_x = 0; | |
11218 truncate_it.face_id = DEFAULT_FACE_ID; | |
11219 truncate_it.glyph_row = &scratch_glyph_row; | |
11220 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
11221 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
|
11222 truncate_it.object = make_number (0); |
25012 | 11223 produce_special_glyphs (&truncate_it, IT_TRUNCATION); |
11224 | |
11225 /* Overwrite glyphs from IT with truncation glyphs. */ | |
11226 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
11227 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
11228 to = it->glyph_row->glyphs[TEXT_AREA]; | |
11229 toend = to + it->glyph_row->used[TEXT_AREA]; | |
11230 | |
11231 while (from < end) | |
11232 *to++ = *from++; | |
11233 | |
11234 /* There may be padding glyphs left over. Remove them. */ | |
11235 from = to; | |
11236 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
11237 ++from; | |
11238 while (from < toend) | |
11239 *to++ = *from++; | |
11240 | |
11241 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
11242 } | |
11243 | |
11244 | |
11245 /* Compute the pixel height and width of IT->glyph_row. | |
11246 | |
11247 Most of the time, ascent and height of a display line will be equal | |
11248 to the max_ascent and max_height values of the display iterator | |
11249 structure. This is not the case if | |
11250 | |
11251 1. We hit ZV without displaying anything. In this case, max_ascent | |
11252 and max_height will be zero. | |
11253 | |
11254 2. We have some glyphs that don't contribute to the line height. | |
11255 (The glyph row flag contributes_to_line_height_p is for future | |
11256 pixmap extensions). | |
11257 | |
11258 The first case is easily covered by using default values because in | |
11259 these cases, the line height does not really matter, except that it | |
11260 must not be zero. */ | |
11261 | |
11262 static void | |
11263 compute_line_metrics (it) | |
11264 struct it *it; | |
11265 { | |
11266 struct glyph_row *row = it->glyph_row; | |
11267 int area, i; | |
11268 | |
11269 if (FRAME_WINDOW_P (it->f)) | |
11270 { | |
25546 | 11271 int i, header_line_height; |
25012 | 11272 |
11273 /* The line may consist of one space only, that was added to | |
11274 place the cursor on it. If so, the row's height hasn't been | |
11275 computed yet. */ | |
11276 if (row->height == 0) | |
11277 { | |
11278 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
|
11279 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 11280 row->ascent = it->max_ascent; |
11281 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
|
11282 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
|
11283 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11284 } |
11285 | |
11286 /* Compute the width of this line. */ | |
11287 row->pixel_width = row->x; | |
11288 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
11289 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
11290 | |
11291 xassert (row->pixel_width >= 0); | |
11292 xassert (row->ascent >= 0 && row->height > 0); | |
11293 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11294 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
|
11295 || 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
|
11296 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11297 /* 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
|
11298 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
|
11299 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
|
11300 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
|
11301 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11302 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11303 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
|
11304 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11305 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11306 |
25012 | 11307 /* Compute how much of the line is visible. */ |
11308 row->visible_height = row->height; | |
11309 | |
25546 | 11310 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
11311 if (row->y < header_line_height) | |
11312 row->visible_height -= header_line_height - row->y; | |
25012 | 11313 else |
11314 { | |
11315 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
11316 if (row->y + row->height > max_y) | |
11317 row->visible_height -= row->y + row->height - max_y; | |
11318 } | |
11319 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
11320 else |
25012 | 11321 { |
11322 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
|
11323 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
|
11324 row->height = row->phys_height = row->visible_height = 1; |
25012 | 11325 } |
11326 | |
11327 /* Compute a hash code for this row. */ | |
11328 row->hash = 0; | |
11329 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
11330 for (i = 0; i < row->used[area]; ++i) | |
11331 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
11332 + 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
|
11333 + 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
|
11334 + row->glyphs[area][i].padding_p |
25012 | 11335 + (row->glyphs[area][i].type << 2)); |
11336 | |
11337 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
|
11338 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 11339 } |
11340 | |
11341 | |
11342 /* Append one space to the glyph row of iterator IT if doing a | |
11343 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
11344 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
|
11345 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
|
11346 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11347 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
|
11348 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
|
11349 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
|
11350 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
|
11351 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11352 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
|
11353 end of the line if the row ends in italic text. */ |
25012 | 11354 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11355 static int |
25012 | 11356 append_space (it, default_face_p) |
11357 struct it *it; | |
11358 int default_face_p; | |
11359 { | |
11360 if (FRAME_WINDOW_P (it->f)) | |
11361 { | |
11362 int n = it->glyph_row->used[TEXT_AREA]; | |
11363 | |
11364 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
11365 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
11366 { | |
11367 /* Save some values that must not be changed. */ | |
11368 int saved_x = it->current_x; | |
11369 struct text_pos saved_pos; | |
11370 int saved_what = it->what; | |
11371 int saved_face_id = it->face_id; | |
11372 Lisp_Object saved_object; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11373 struct face *face; |
25012 | 11374 |
11375 saved_object = it->object; | |
11376 saved_pos = it->position; | |
11377 | |
11378 it->what = IT_CHARACTER; | |
11379 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
|
11380 it->object = make_number (0); |
25012 | 11381 it->c = ' '; |
11382 it->len = 1; | |
11383 | |
11384 if (default_face_p) | |
11385 it->face_id = DEFAULT_FACE_ID; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11386 face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11387 it->face_id = FACE_FOR_CHAR (it->f, face, 0); |
25012 | 11388 |
11389 PRODUCE_GLYPHS (it); | |
11390 | |
11391 it->current_x = saved_x; | |
11392 it->object = saved_object; | |
11393 it->position = saved_pos; | |
11394 it->what = saved_what; | |
11395 it->face_id = saved_face_id; | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11396 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11397 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11398 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11399 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11400 return 0; |
25012 | 11401 } |
11402 | |
11403 | |
11404 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
11405 to the end of the display line. Called from display_line. | |
11406 If the glyph row is empty, add a space glyph to it so that we | |
11407 know the face to draw. Set the glyph row flag fill_line_p. */ | |
11408 | |
11409 static void | |
11410 extend_face_to_end_of_line (it) | |
11411 struct it *it; | |
11412 { | |
11413 struct face *face; | |
11414 struct frame *f = it->f; | |
11415 | |
11416 /* If line is already filled, do nothing. */ | |
11417 if (it->current_x >= it->last_visible_x) | |
11418 return; | |
11419 | |
11420 /* Face extension extends the background and box of IT->face_id | |
11421 to the end of the line. If the background equals the background | |
11422 of the frame, we haven't to do anything. */ | |
11423 face = FACE_FROM_ID (f, it->face_id); | |
11424 if (FRAME_WINDOW_P (f) | |
11425 && face->box == FACE_NO_BOX | |
11426 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
11427 && !face->stipple) | |
11428 return; | |
11429 | |
11430 /* Set the glyph row flag indicating that the face of the last glyph | |
11431 in the text area has to be drawn to the end of the text area. */ | |
11432 it->glyph_row->fill_line_p = 1; | |
11433 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11434 /* 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
|
11435 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
|
11436 get_next_display_element returns a multibyte character. Note |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11437 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
|
11438 if (!SINGLE_BYTE_CHAR_P (it->c)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11439 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11440 it->face_id = FACE_FOR_CHAR (f, face, 0); |
25012 | 11441 } |
11442 | |
11443 if (FRAME_WINDOW_P (f)) | |
11444 { | |
11445 /* If the row is empty, add a space with the current face of IT, | |
11446 so that we know which face to draw. */ | |
11447 if (it->glyph_row->used[TEXT_AREA] == 0) | |
11448 { | |
11449 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
|
11450 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 11451 it->glyph_row->used[TEXT_AREA] = 1; |
11452 } | |
11453 } | |
11454 else | |
11455 { | |
11456 /* Save some values that must not be changed. */ | |
11457 int saved_x = it->current_x; | |
11458 struct text_pos saved_pos; | |
11459 Lisp_Object saved_object; | |
11460 int saved_what = it->what; | |
11461 | |
11462 saved_object = it->object; | |
11463 saved_pos = it->position; | |
11464 | |
11465 it->what = IT_CHARACTER; | |
11466 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
|
11467 it->object = make_number (0); |
25012 | 11468 it->c = ' '; |
11469 it->len = 1; | |
11470 | |
11471 PRODUCE_GLYPHS (it); | |
11472 | |
11473 while (it->current_x <= it->last_visible_x) | |
11474 PRODUCE_GLYPHS (it); | |
11475 | |
11476 /* Don't count these blanks really. It would let us insert a left | |
11477 truncation glyph below and make us set the cursor on them, maybe. */ | |
11478 it->current_x = saved_x; | |
11479 it->object = saved_object; | |
11480 it->position = saved_pos; | |
11481 it->what = saved_what; | |
11482 } | |
11483 } | |
11484 | |
11485 | |
11486 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
11487 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11488 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11489 static int |
25012 | 11490 trailing_whitespace_p (charpos) |
11491 int charpos; | |
11492 { | |
11493 int bytepos = CHAR_TO_BYTE (charpos); | |
11494 int c = 0; | |
11495 | |
11496 while (bytepos < ZV_BYTE | |
11497 && (c = FETCH_CHAR (bytepos), | |
11498 c == ' ' || c == '\t')) | |
11499 ++bytepos; | |
11500 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11501 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11502 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11503 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11504 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11505 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11506 return 0; |
25012 | 11507 } |
11508 | |
11509 | |
11510 /* Highlight trailing whitespace, if any, in ROW. */ | |
11511 | |
11512 void | |
11513 highlight_trailing_whitespace (f, row) | |
11514 struct frame *f; | |
11515 struct glyph_row *row; | |
11516 { | |
11517 int used = row->used[TEXT_AREA]; | |
11518 | |
11519 if (used) | |
11520 { | |
11521 struct glyph *start = row->glyphs[TEXT_AREA]; | |
11522 struct glyph *glyph = start + used - 1; | |
11523 | |
11524 /* Skip over the space glyph inserted to display the | |
11525 cursor at the end of a line. */ | |
11526 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
|
11527 && 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
|
11528 && INTEGERP (glyph->object)) |
25012 | 11529 --glyph; |
11530 | |
11531 /* If last glyph is a space or stretch, and it's trailing | |
11532 whitespace, set the face of all trailing whitespace glyphs in | |
11533 IT->glyph_row to `trailing-whitespace'. */ | |
11534 if (glyph >= start | |
11535 && BUFFERP (glyph->object) | |
11536 && (glyph->type == STRETCH_GLYPH | |
11537 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11538 && glyph->u.ch == ' ')) |
25012 | 11539 && trailing_whitespace_p (glyph->charpos)) |
11540 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11541 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0); |
25012 | 11542 |
11543 while (glyph >= start | |
11544 && BUFFERP (glyph->object) | |
11545 && (glyph->type == STRETCH_GLYPH | |
11546 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11547 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11548 (glyph--)->face_id = face_id; |
25012 | 11549 } |
11550 } | |
11551 } | |
11552 | |
11553 | |
11554 /* Construct the glyph row IT->glyph_row in the desired matrix of | |
11555 IT->w from text at the current position of IT. See dispextern.h | |
11556 for an overview of struct it. Value is non-zero if | |
11557 IT->glyph_row displays text, as opposed to a line displaying ZV | |
11558 only. */ | |
11559 | |
11560 static int | |
11561 display_line (it) | |
11562 struct it *it; | |
11563 { | |
11564 struct glyph_row *row = it->glyph_row; | |
11565 | |
11566 /* We always start displaying at hpos zero even if hscrolled. */ | |
11567 xassert (it->hpos == 0 && it->current_x == 0); | |
11568 | |
11569 /* We must not display in a row that's not a text row. */ | |
11570 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
11571 < it->w->desired_matrix->nrows); | |
11572 | |
11573 /* Is IT->w showing the region? */ | |
11574 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
11575 | |
11576 /* Clear the result glyph row and enable it. */ | |
11577 prepare_desired_row (row); | |
11578 | |
11579 row->y = it->current_y; | |
11580 row->start = it->current; | |
11581 row->continuation_lines_width = it->continuation_lines_width; | |
11582 row->displays_text_p = 1; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11583 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
|
11584 it->starts_in_middle_of_char_p = 0; |
277 | 11585 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
11586 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 11587 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
|
11588 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
|
11589 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
|
11590 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 11591 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
11592 | |
11593 /* Move over display elements that are not visible because we are | |
11594 hscrolled. This may stop at an x-position < IT->first_visible_x | |
11595 if the first glyph is partially visible or if we hit a line end. */ | |
11596 if (it->current_x < it->first_visible_x) | |
11597 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
11598 MOVE_TO_POS | MOVE_TO_X); | |
11599 | |
11600 /* Get the initial row height. This is either the height of the | |
11601 text hscrolled, if there is any, or zero. */ | |
11602 row->ascent = it->max_ascent; | |
11603 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
|
11604 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
|
11605 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11606 |
11607 /* Loop generating characters. The loop is left with IT on the next | |
11608 character to display. */ | |
11609 while (1) | |
11610 { | |
11611 int n_glyphs_before, hpos_before, x_before; | |
11612 int x, i, nglyphs; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11613 int ascent, descent, phys_ascent, phys_descent; |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11614 |
25012 | 11615 /* Retrieve the next thing to display. Value is zero if end of |
11616 buffer reached. */ | |
11617 if (!get_next_display_element (it)) | |
11618 { | |
11619 /* 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
|
11620 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
|
11621 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
|
11622 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11623 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
|
11624 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11625 { |
25012 | 11626 row->glyphs[TEXT_AREA]->charpos = -1; |
11627 row->displays_text_p = 0; | |
11628 | |
11629 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
11630 row->indicate_empty_line_p = 1; | |
11631 } | |
11632 | |
11633 it->continuation_lines_width = 0; | |
11634 row->ends_at_zv_p = 1; | |
11635 break; | |
11636 } | |
11637 | |
11638 /* Now, get the metrics of what we want to display. This also | |
11639 generates glyphs in `row' (which is IT->glyph_row). */ | |
11640 n_glyphs_before = row->used[TEXT_AREA]; | |
11641 x = it->current_x; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11642 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11643 /* 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
|
11644 fit on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11645 if (!it->truncate_lines_p) |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11646 { |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11647 ascent = it->max_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11648 descent = it->max_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11649 phys_ascent = it->max_phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11650 phys_descent = it->max_phys_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11651 } |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11652 |
25012 | 11653 PRODUCE_GLYPHS (it); |
11654 | |
11655 /* If this display element was in marginal areas, continue with | |
11656 the next one. */ | |
11657 if (it->area != TEXT_AREA) | |
11658 { | |
11659 row->ascent = max (row->ascent, it->max_ascent); | |
11660 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
|
11661 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
|
11662 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
|
11663 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11664 set_iterator_to_next (it); |
11665 continue; | |
11666 } | |
11667 | |
11668 /* Does the display element fit on the line? If we truncate | |
11669 lines, we should draw past the right edge of the window. If | |
11670 we don't truncate, we want to stop so that we can display the | |
11671 continuation glyph before the right margin. If lines are | |
11672 continued, there are two possible strategies for characters | |
11673 resulting in more than 1 glyph (e.g. tabs): Display as many | |
11674 glyphs as possible in this line and leave the rest for the | |
11675 continuation line, or display the whole element in the next | |
11676 line. Original redisplay did the former, so we do it also. */ | |
11677 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
11678 hpos_before = it->hpos; | |
11679 x_before = x; | |
11680 | |
11681 if (nglyphs == 1 | |
11682 && it->current_x < it->last_visible_x) | |
11683 { | |
11684 ++it->hpos; | |
11685 row->ascent = max (row->ascent, it->max_ascent); | |
11686 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
|
11687 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
|
11688 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
|
11689 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11690 if (it->current_x - it->pixel_width < it->first_visible_x) |
11691 row->x = x - it->first_visible_x; | |
11692 } | |
11693 else | |
11694 { | |
11695 int new_x; | |
11696 struct glyph *glyph; | |
11697 | |
11698 for (i = 0; i < nglyphs; ++i, x = new_x) | |
11699 { | |
11700 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
11701 new_x = x + glyph->pixel_width; | |
11702 | |
11703 if (/* Lines are continued. */ | |
11704 !it->truncate_lines_p | |
11705 && (/* Glyph doesn't fit on the line. */ | |
11706 new_x > it->last_visible_x | |
11707 /* Or it fits exactly on a window system frame. */ | |
11708 || (new_x == it->last_visible_x | |
11709 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11710 { |
25012 | 11711 /* End of a continued line. */ |
11712 | |
11713 if (it->hpos == 0 | |
11714 || (new_x == it->last_visible_x | |
11715 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11716 { |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11717 /* 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
|
11718 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
|
11719 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
|
11720 after the glyph. */ |
25012 | 11721 row->continued_p = 1; |
11722 it->current_x = new_x; | |
11723 it->continuation_lines_width += new_x; | |
11724 ++it->hpos; | |
11725 if (i == nglyphs - 1) | |
11726 set_iterator_to_next (it); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11727 } |
29461
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11728 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
|
11729 && !FRAME_WINDOW_P (it->f)) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11730 { |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11731 /* 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
|
11732 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
|
11733 on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11734 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
|
11735 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11736 /* 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
|
11737 glyphs like in 20.x. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11738 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
|
11739 < row->glyphs[1 + TEXT_AREA]) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11740 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
|
11741 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11742 row->continued_p = 1; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11743 it->current_x = x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11744 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
|
11745 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11746 /* 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
|
11747 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
|
11748 it->max_ascent = ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11749 it->max_descent = descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11750 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
|
11751 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
|
11752 } |
25012 | 11753 else |
11754 { | |
11755 /* Display element draws past the right edge of | |
11756 the window. Restore positions to values | |
11757 before the element. The next line starts | |
11758 with current_x before the glyph that could | |
11759 not be displayed, so that TAB works right. */ | |
11760 row->used[TEXT_AREA] = n_glyphs_before + i; | |
11761 | |
11762 /* Display continuation glyphs. */ | |
11763 if (!FRAME_WINDOW_P (it->f)) | |
11764 produce_special_glyphs (it, IT_CONTINUATION); | |
11765 row->continued_p = 1; | |
11766 | |
11767 it->current_x = x; | |
11768 it->continuation_lines_width += x; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11769 if (nglyphs > 1 && i > 0) |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11770 { |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11771 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
|
11772 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
|
11773 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11774 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11775 /* 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
|
11776 element not fitting on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11777 it->max_ascent = ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11778 it->max_descent = descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11779 it->max_phys_ascent = phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11780 it->max_phys_descent = phys_descent; |
25012 | 11781 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11782 |
25012 | 11783 break; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11784 } |
25012 | 11785 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
|
11786 { |
25012 | 11787 /* Increment number of glyphs actually displayed. */ |
11788 ++it->hpos; | |
11789 | |
11790 if (x < it->first_visible_x) | |
11791 /* Glyph is partially visible, i.e. row starts at | |
11792 negative X position. */ | |
11793 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
|
11794 } |
25012 | 11795 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11796 { |
25012 | 11797 /* Glyph is completely off the left margin of the |
11798 window. This should not happen because of the | |
11799 move_it_in_display_line at the start of | |
11800 this function. */ | |
11801 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11802 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11803 } |
25012 | 11804 |
11805 row->ascent = max (row->ascent, it->max_ascent); | |
11806 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
|
11807 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
|
11808 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
|
11809 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11810 |
11811 /* End of this display line if row is continued. */ | |
11812 if (row->continued_p) | |
11813 break; | |
11814 } | |
11815 | |
11816 /* Is this a line end? If yes, we're also done, after making | |
11817 sure that a non-default face is extended up to the right | |
11818 margin of the window. */ | |
11819 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
11820 { | |
11821 int used_before = row->used[TEXT_AREA]; | |
11822 | |
11823 /* Add a space at the end of the line that is used to | |
11824 display the cursor there. */ | |
11825 append_space (it, 0); | |
11826 | |
11827 /* Extend the face to the end of the line. */ | |
11828 extend_face_to_end_of_line (it); | |
11829 | |
11830 /* Make sure we have the position. */ | |
11831 if (used_before == 0) | |
11832 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
11833 | |
11834 /* Consume the line end. This skips over invisible lines. */ | |
11835 set_iterator_to_next (it); | |
11836 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
|
11837 break; |
277 | 11838 } |
25012 | 11839 |
11840 /* Proceed with next display element. Note that this skips | |
11841 over lines invisible because of selective display. */ | |
11842 set_iterator_to_next (it); | |
11843 | |
11844 /* If we truncate lines, we are done when the last displayed | |
11845 glyphs reach past the right margin of the window. */ | |
11846 if (it->truncate_lines_p | |
11847 && (FRAME_WINDOW_P (it->f) | |
11848 ? (it->current_x >= it->last_visible_x) | |
11849 : (it->current_x > it->last_visible_x))) | |
11850 { | |
11851 /* Maybe add truncation glyphs. */ | |
11852 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11853 { |
25012 | 11854 --it->glyph_row->used[TEXT_AREA]; |
11855 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 11856 } |
25012 | 11857 |
11858 row->truncated_on_right_p = 1; | |
11859 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
|
11860 reseat_at_next_visible_line_start (it, 0); |
25012 | 11861 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
11862 it->hpos = hpos_before; | |
11863 it->current_x = x_before; | |
11864 break; | |
11865 } | |
11866 } | |
11867 | |
11868 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
11869 at the left window margin. */ | |
11870 if (it->first_visible_x | |
11871 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
11872 { | |
11873 if (!FRAME_WINDOW_P (it->f)) | |
11874 insert_left_trunc_glyphs (it); | |
11875 row->truncated_on_left_p = 1; | |
11876 } | |
11877 | |
11878 /* If the start of this line is the overlay arrow-position, then | |
11879 mark this glyph row as the one containing the overlay arrow. | |
11880 This is clearly a mess with variable size fonts. It would be | |
11881 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
|
11882 if (MARKERP (Voverlay_arrow_position) |
277 | 11883 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 11884 && (MATRIX_ROW_START_CHARPOS (row) |
11885 == 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
|
11886 && STRINGP (Voverlay_arrow_string) |
277 | 11887 && ! overlay_arrow_seen) |
11888 { | |
25012 | 11889 /* Overlay arrow in window redisplay is a bitmap. */ |
11890 if (!FRAME_WINDOW_P (it->f)) | |
11891 { | |
11892 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
11893 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
11894 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
11895 struct glyph *p = row->glyphs[TEXT_AREA]; | |
11896 struct glyph *p2, *end; | |
11897 | |
11898 /* Copy the arrow glyphs. */ | |
11899 while (glyph < arrow_end) | |
11900 *p++ = *glyph++; | |
11901 | |
11902 /* Throw away padding glyphs. */ | |
11903 p2 = p; | |
11904 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
11905 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
11906 ++p2; | |
11907 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
|
11908 { |
25012 | 11909 while (p2 < end) |
11910 *p++ = *p2++; | |
11911 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
|
11912 } |
25012 | 11913 } |
11914 | |
277 | 11915 overlay_arrow_seen = 1; |
25012 | 11916 row->overlay_arrow_p = 1; |
11917 } | |
11918 | |
11919 /* Compute pixel dimensions of this line. */ | |
11920 compute_line_metrics (it); | |
11921 | |
11922 /* Remember the position at which this line ends. */ | |
11923 row->end = it->current; | |
11924 | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11925 /* Maybe set the cursor. */ |
25012 | 11926 if (it->w->cursor.vpos < 0 |
11927 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11928 && PT <= MATRIX_ROW_END_CHARPOS (row)) |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11929 { |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11930 /* Also see redisplay_window, case cursor movement in unchanged |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11931 window. */ |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11932 if (MATRIX_ROW_END_CHARPOS (row) == PT |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11933 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11934 && !row->ends_at_zv_p) |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11935 ; |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11936 else |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11937 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); |
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
11938 } |
25012 | 11939 |
11940 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11941 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 11942 highlight_trailing_whitespace (it->f, it->glyph_row); |
11943 | |
11944 /* Prepare for the next line. This line starts horizontally at (X | |
11945 HPOS) = (0 0). Vertical positions are incremented. As a | |
11946 convenience for the caller, IT->glyph_row is set to the next | |
11947 row to be used. */ | |
11948 it->current_x = it->hpos = 0; | |
11949 it->current_y += row->height; | |
11950 ++it->vpos; | |
11951 ++it->glyph_row; | |
11952 return row->displays_text_p; | |
11953 } | |
11954 | |
11955 | |
277 | 11956 |
25012 | 11957 /*********************************************************************** |
11958 Menu Bar | |
11959 ***********************************************************************/ | |
11960 | |
11961 /* Redisplay the menu bar in the frame for window W. | |
11962 | |
11963 The menu bar of X frames that don't have X toolkit support is | |
11964 displayed in a special window W->frame->menu_bar_window. | |
11965 | |
11966 The menu bar of terminal frames is treated specially as far as | |
11967 glyph matrices are concerned. Menu bar lines are not part of | |
11968 windows, so the update is done directly on the frame matrix rows | |
11969 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11970 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11971 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11972 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11973 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11974 { |
25012 | 11975 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
11976 struct it it; | |
11977 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11978 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11979 |
25012 | 11980 /* 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
|
11981 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11982 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11983 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11984 #endif |
25012 | 11985 #ifdef USE_X_TOOLKIT |
11986 if (FRAME_X_P (f)) | |
11987 return; | |
11988 #endif | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11989 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11990 #ifdef USE_X_TOOLKIT |
25012 | 11991 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
|
11992 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 11993 it.first_visible_x = 0; |
11994 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
11995 #else /* not USE_X_TOOLKIT */ | |
11996 if (FRAME_WINDOW_P (f)) | |
11997 { | |
11998 /* Menu bar lines are displayed in the desired matrix of the | |
11999 dummy window menu_bar_window. */ | |
12000 struct window *menu_w; | |
12001 xassert (WINDOWP (f->menu_bar_window)); | |
12002 menu_w = XWINDOW (f->menu_bar_window); | |
12003 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
|
12004 MENU_FACE_ID); |
25012 | 12005 it.first_visible_x = 0; |
12006 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12007 } | |
12008 else | |
12009 { | |
12010 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
12011 pixel x/y. */ | |
12012 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
|
12013 MENU_FACE_ID); |
25012 | 12014 it.first_visible_x = 0; |
12015 it.last_visible_x = FRAME_WIDTH (f); | |
12016 } | |
12017 #endif /* not USE_X_TOOLKIT */ | |
12018 | |
12019 /* Clear all rows of the menu bar. */ | |
12020 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
12021 { | |
12022 struct glyph_row *row = it.glyph_row + i; | |
12023 clear_glyph_row (row); | |
12024 row->enabled_p = 1; | |
12025 row->full_width_p = 1; | |
12026 } | |
12027 | |
12028 /* Make the first line of the menu bar appear in reverse video. */ | |
12029 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
12030 | |
12031 /* Display all items of the menu bar. */ | |
12032 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
|
12033 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
|
12034 { |
25012 | 12035 Lisp_Object string; |
12036 | |
12037 /* 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
|
12038 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
|
12039 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12040 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12041 |
25012 | 12042 /* Remember where item was displayed. */ |
12043 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
12044 | |
12045 /* Display the item, pad with one space. */ | |
12046 if (it.current_x < it.last_visible_x) | |
12047 display_string (NULL, string, Qnil, 0, 0, &it, | |
12048 XSTRING (string)->size + 1, 0, 0, -1); | |
12049 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12050 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12051 /* Fill out the line with spaces. */ |
25012 | 12052 if (it.current_x < it.last_visible_x) |
12053 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
12054 | |
12055 /* Compute the total height of the lines. */ | |
12056 compute_line_metrics (&it); | |
12057 } | |
12058 | |
12059 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12060 |
25012 | 12061 /*********************************************************************** |
12062 Mode Line | |
12063 ***********************************************************************/ | |
12064 | |
12065 /* Display the mode and/or top line of window W. */ | |
277 | 12066 |
12067 static void | |
25012 | 12068 display_mode_lines (w) |
277 | 12069 struct window *w; |
12070 { | |
25012 | 12071 /* 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
|
12072 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
|
12073 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12074 |
25012 | 12075 if (WINDOW_WANTS_MODELINE_P (w)) |
25546 | 12076 display_mode_line (w, MODE_LINE_FACE_ID, |
12077 current_buffer->mode_line_format); | |
12078 | |
12079 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
12080 display_mode_line (w, HEADER_LINE_FACE_ID, | |
12081 current_buffer->header_line_format); | |
25012 | 12082 } |
12083 | |
12084 | |
12085 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 12086 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
25012 | 12087 FORMAT is the mode line format to display. */ |
12088 | |
12089 static void | |
12090 display_mode_line (w, face_id, format) | |
12091 struct window *w; | |
12092 enum face_id face_id; | |
12093 Lisp_Object format; | |
12094 { | |
12095 struct it it; | |
12096 struct face *face; | |
12097 | |
12098 init_iterator (&it, w, -1, -1, NULL, face_id); | |
12099 prepare_desired_row (it.glyph_row); | |
12100 | |
12101 /* Temporarily make frame's keyboard the current kboard so that | |
12102 kboard-local variables in the mode_line_format will get the right | |
12103 values. */ | |
12104 push_frame_kboard (it.f); | |
12105 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
|
12106 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
12107 |
25012 | 12108 /* Fill up with spaces. */ |
12109 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
12110 | |
12111 compute_line_metrics (&it); | |
12112 it.glyph_row->full_width_p = 1; | |
12113 it.glyph_row->mode_line_p = 1; | |
12114 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
12115 it.glyph_row->continued_p = 0; | |
12116 it.glyph_row->truncated_on_left_p = 0; | |
12117 it.glyph_row->truncated_on_right_p = 0; | |
12118 | |
12119 /* Make a 3D mode-line have a shadow at its right end. */ | |
12120 face = FACE_FROM_ID (it.f, face_id); | |
12121 extend_face_to_end_of_line (&it); | |
12122 if (face->box != FACE_NO_BOX) | |
12123 { | |
12124 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
12125 + it.glyph_row->used[TEXT_AREA] - 1); | |
12126 last->right_box_line_p = 1; | |
12127 } | |
12128 } | |
12129 | |
12130 | |
12131 /* Contribute ELT to the mode line for window IT->w. How it | |
12132 translates into text depends on its data type. | |
12133 | |
12134 IT describes the display environment in which we display, as usual. | |
277 | 12135 |
12136 DEPTH is the depth in recursion. It is used to prevent | |
12137 infinite recursion here. | |
12138 | |
25012 | 12139 FIELD_WIDTH is the number of characters the display of ELT should |
12140 occupy in the mode line, and PRECISION is the maximum number of | |
12141 characters to display from ELT's representation. See | |
12142 display_string for details. * | |
12143 | |
12144 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 12145 |
12146 static int | |
25012 | 12147 display_mode_element (it, depth, field_width, precision, elt) |
12148 struct it *it; | |
277 | 12149 int depth; |
25012 | 12150 int field_width, precision; |
12151 Lisp_Object elt; | |
12152 { | |
12153 int n = 0, field, prec; | |
12154 | |
277 | 12155 tail_recurse: |
12156 if (depth > 10) | |
12157 goto invalid; | |
12158 | |
12159 depth++; | |
12160 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
12161 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 12162 { |
12163 case Lisp_String: | |
12164 { | |
12165 /* A string: output it and check for %-constructs within it. */ | |
25012 | 12166 unsigned char c; |
12167 unsigned char *this = XSTRING (elt)->data; | |
12168 unsigned char *lisp_string = this; | |
12169 | |
12170 while ((precision <= 0 || n < precision) | |
12171 && *this | |
12172 && (frame_title_ptr | |
12173 || it->current_x < it->last_visible_x)) | |
277 | 12174 { |
12175 unsigned char *last = this; | |
25012 | 12176 |
12177 /* Advance to end of string or next format specifier. */ | |
277 | 12178 while ((c = *this++) != '\0' && c != '%') |
12179 ; | |
25012 | 12180 |
277 | 12181 if (this - 1 != last) |
12182 { | |
25012 | 12183 /* Output to end of string or up to '%'. Field width |
12184 is length of string. Don't output more than | |
12185 PRECISION allows us. */ | |
12186 prec = --this - last; | |
12187 if (precision > 0 && prec > precision - n) | |
12188 prec = precision - n; | |
12189 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12190 if (frame_title_ptr) |
25012 | 12191 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
|
12192 else |
25012 | 12193 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
12194 it, 0, prec, 0, -1); | |
277 | 12195 } |
12196 else /* c == '%' */ | |
12197 { | |
25012 | 12198 unsigned char *percent_position = this; |
12199 | |
12200 /* Get the specified minimum width. Zero means | |
12201 don't pad. */ | |
12202 field = 0; | |
277 | 12203 while ((c = *this++) >= '0' && c <= '9') |
25012 | 12204 field = field * 10 + c - '0'; |
12205 | |
12206 /* Don't pad beyond the total padding allowed. */ | |
12207 if (field_width - n > 0 && field > field_width - n) | |
12208 field = field_width - n; | |
12209 | |
12210 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
12211 prec = precision - n; | |
12212 | |
277 | 12213 if (c == 'M') |
25012 | 12214 n += display_mode_element (it, depth, field, prec, |
12215 Vglobal_mode_string); | |
277 | 12216 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
|
12217 { |
25012 | 12218 unsigned char *spec |
12219 = decode_mode_spec (it->w, c, field, prec); | |
12220 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12221 if (frame_title_ptr) |
25012 | 12222 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
|
12223 else |
25012 | 12224 { |
12225 int nglyphs_before | |
12226 = it->glyph_row->used[TEXT_AREA]; | |
12227 int charpos | |
12228 = percent_position - XSTRING (elt)->data; | |
12229 int nwritten | |
12230 = display_string (spec, Qnil, elt, charpos, 0, it, | |
12231 field, prec, 0, -1); | |
12232 | |
12233 /* Assign to the glyphs written above the | |
12234 string where the `%x' came from, position | |
12235 of the `%'. */ | |
12236 if (nwritten > 0) | |
12237 { | |
12238 struct glyph *glyph | |
12239 = (it->glyph_row->glyphs[TEXT_AREA] | |
12240 + nglyphs_before); | |
12241 int i; | |
12242 | |
12243 for (i = 0; i < nwritten; ++i) | |
12244 { | |
12245 glyph[i].object = elt; | |
12246 glyph[i].charpos = charpos; | |
12247 } | |
12248 | |
12249 n += nwritten; | |
12250 } | |
12251 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12252 } |
277 | 12253 } |
12254 } | |
12255 } | |
12256 break; | |
12257 | |
12258 case Lisp_Symbol: | |
12259 /* A symbol: process the value of the symbol recursively | |
12260 as if it appeared here directly. Avoid error if symbol void. | |
12261 Special case: if value of symbol is a string, output the string | |
12262 literally. */ | |
12263 { | |
12264 register Lisp_Object tem; | |
12265 tem = Fboundp (elt); | |
485 | 12266 if (!NILP (tem)) |
277 | 12267 { |
12268 tem = Fsymbol_value (elt); | |
12269 /* If value is a string, output that string literally: | |
12270 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
|
12271 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12272 { |
25012 | 12273 prec = XSTRING (tem)->size; |
12274 if (precision > 0 && prec > precision - n) | |
12275 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12276 if (frame_title_ptr) |
25012 | 12277 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
|
12278 else |
25012 | 12279 n += display_string (NULL, tem, Qnil, 0, 0, it, |
12280 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
|
12281 } |
277 | 12282 else if (!EQ (tem, elt)) |
25012 | 12283 { |
12284 /* Give up right away for nil or t. */ | |
12285 elt = tem; | |
12286 goto tail_recurse; | |
12287 } | |
277 | 12288 } |
12289 } | |
12290 break; | |
12291 | |
12292 case Lisp_Cons: | |
12293 { | |
12294 register Lisp_Object car, tem; | |
12295 | |
12296 /* A cons cell: three distinct cases. | |
12297 If first element is a string or a cons, process all the elements | |
12298 and effectively concatenate them. | |
12299 If first element is a negative number, truncate displaying cdr to | |
12300 at most that many characters. If positive, pad (with spaces) | |
12301 to at least that many characters. | |
12302 If first element is a symbol, process the cadr or caddr recursively | |
12303 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
|
12304 car = XCAR (elt); |
25012 | 12305 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
12306 { | |
12307 /* An element of the form (:eval FORM) means evaluate FORM | |
12308 and use the result as mode line elements. */ | |
12309 struct gcpro gcpro1; | |
12310 Lisp_Object spec; | |
12311 | |
12312 spec = eval_form (XCAR (XCDR (elt))); | |
12313 GCPRO1 (spec); | |
12314 n += display_mode_element (it, depth, field_width - n, | |
12315 precision - n, spec); | |
12316 UNGCPRO; | |
12317 } | |
12318 else if (SYMBOLP (car)) | |
277 | 12319 { |
12320 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12321 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
|
12322 if (!CONSP (elt)) |
277 | 12323 goto invalid; |
12324 /* elt is now the cdr, and we know it is a cons cell. | |
12325 Use its car if CAR has a non-nil value. */ | |
485 | 12326 if (!NILP (tem)) |
277 | 12327 { |
12328 tem = Fsymbol_value (car); | |
485 | 12329 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12330 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12331 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12332 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12333 } |
277 | 12334 } |
12335 /* Symbol's value is nil (or symbol is unbound) | |
12336 Get the cddr of the original list | |
12337 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
|
12338 elt = XCDR (elt); |
485 | 12339 if (NILP (elt)) |
277 | 12340 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12341 else if (!CONSP (elt)) |
277 | 12342 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12343 elt = XCAR (elt); |
277 | 12344 goto tail_recurse; |
12345 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12346 else if (INTEGERP (car)) |
277 | 12347 { |
12348 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12349 elt = XCDR (elt); |
277 | 12350 if (lim < 0) |
25012 | 12351 { |
12352 /* Negative int means reduce maximum width. */ | |
12353 if (precision <= 0) | |
12354 precision = -lim; | |
12355 else | |
12356 precision = min (precision, -lim); | |
12357 } | |
277 | 12358 else if (lim > 0) |
12359 { | |
12360 /* Padding specified. Don't let it be more than | |
12361 current maximum. */ | |
25012 | 12362 if (precision > 0) |
12363 lim = min (precision, lim); | |
12364 | |
277 | 12365 /* If that's more padding than already wanted, queue it. |
12366 But don't reduce padding already specified even if | |
12367 that is beyond the current truncation point. */ | |
25012 | 12368 field_width = max (lim, field_width); |
277 | 12369 } |
12370 goto tail_recurse; | |
12371 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12372 else if (STRINGP (car) || CONSP (car)) |
277 | 12373 { |
12374 register int limit = 50; | |
25012 | 12375 /* Limit is to protect against circular lists. */ |
12376 while (CONSP (elt) | |
12377 && --limit > 0 | |
12378 && (precision <= 0 || n < precision)) | |
277 | 12379 { |
25012 | 12380 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
|
12381 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12382 elt = XCDR (elt); |
277 | 12383 } |
12384 } | |
12385 } | |
12386 break; | |
12387 | |
12388 default: | |
12389 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12390 if (frame_title_ptr) |
25012 | 12391 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
|
12392 else |
25012 | 12393 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
12394 precision - n, 0, 0); | |
12395 return n; | |
12396 } | |
12397 | |
12398 /* Pad to FIELD_WIDTH. */ | |
12399 if (field_width > 0 && n < field_width) | |
12400 { | |
12401 if (frame_title_ptr) | |
12402 n += store_frame_title ("", field_width - n, 0); | |
12403 else | |
12404 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
12405 0, 0, 0); | |
12406 } | |
12407 | |
12408 return n; | |
12409 } | |
12410 | |
12411 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12412 /* 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
|
12413 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
|
12414 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12415 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12416 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12417 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12418 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12419 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12420 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12421 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12422 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12423 if (d <= 0) |
25012 | 12424 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12425 else |
25012 | 12426 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12427 while (d > 0) |
25012 | 12428 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12429 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12430 d /= 10; |
25012 | 12431 } |
12432 } | |
12433 | |
12434 for (width -= (int) (p - buf); width > 0; --width) | |
12435 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12436 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12437 while (p > buf) |
25012 | 12438 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12439 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12440 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12441 *p-- = d; |
25012 | 12442 } |
12443 } | |
12444 | |
12445 /* 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
|
12446 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
|
12447 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
|
12448 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
12449 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
|
12450 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12451 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12452 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
|
12453 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12454 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12455 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12456 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12457 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12458 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
|
12459 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12460 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12461 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12462 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
|
12463 |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12464 val = Fget (coding_system, Qcoding_system); |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12465 |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12466 if (!VECTORP (val)) /* Not yet decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12467 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12468 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12469 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
12470 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12471 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
|
12472 /* 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
|
12473 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12474 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12475 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12476 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12477 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12478 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
|
12479 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12480 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12481 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12482 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12483 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12484 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12485 /* 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
|
12486 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12487 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
|
12488 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
|
12489 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
|
12490 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
|
12491 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
|
12492 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
|
12493 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12494 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12495 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12496 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12497 } |
25012 | 12498 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12499 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12500 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12501 /* 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
|
12502 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12503 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12504 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12505 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12506 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12507 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12508 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12509 { |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12510 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
|
12511 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
|
12512 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12513 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12514 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12515 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12516 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
|
12517 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12518 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
|
12519 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12520 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12521 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12522 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12523 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12524 |
277 | 12525 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 12526 generated by character C. PRECISION >= 0 means don't return a |
12527 string longer than that value. FIELD_WIDTH > 0 means pad the | |
12528 string returned with spaces to that value. */ | |
277 | 12529 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
12530 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
|
12531 |
277 | 12532 static char * |
25012 | 12533 decode_mode_spec (w, c, field_width, precision) |
277 | 12534 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
|
12535 register int c; |
25012 | 12536 int field_width, precision; |
277 | 12537 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12538 Lisp_Object obj; |
25012 | 12539 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12540 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
|
12541 struct buffer *b = XBUFFER (w->buffer); |
277 | 12542 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12543 obj = Qnil; |
277 | 12544 |
12545 switch (c) | |
12546 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12547 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12548 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
|
12549 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12550 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
|
12551 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12552 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12553 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12554 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12555 /* 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
|
12556 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
|
12557 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12558 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
|
12559 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12560 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12561 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12562 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12563 /* 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
|
12564 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
|
12565 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12566 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12567 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12568 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12569 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12570 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12571 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12572 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12573 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12574 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12575 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12576 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
|
12577 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12578 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
|
12579 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
|
12580 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12581 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12582 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
|
12583 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12584 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12585 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12586 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12587 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12588 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12589 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12590 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
|
12591 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12592 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
|
12593 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
|
12594 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12595 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12596 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
|
12597 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12598 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12599 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12600 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12601 register int i; |
25012 | 12602 |
12603 /* Let lots_of_dashes be a string of infinite length. */ | |
12604 if (field_width <= 0 | |
12605 || field_width > sizeof (lots_of_dashes)) | |
12606 { | |
12607 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
12608 decode_mode_spec_buf[i] = '-'; | |
12609 decode_mode_spec_buf[i] = '\0'; | |
12610 return decode_mode_spec_buf; | |
12611 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12612 else |
25012 | 12613 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
|
12614 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12615 |
277 | 12616 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12617 obj = b->name; |
277 | 12618 break; |
12619 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12620 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12621 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12622 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
|
12623 XSETFASTINT (w->column_number_displayed, col); |
25012 | 12624 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
|
12625 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
|
12626 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12627 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12628 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12629 /* %F displays the frame name. */ |
25012 | 12630 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
|
12631 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
12632 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
|
12633 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
|
12634 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
|
12635 |
277 | 12636 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12637 obj = b->filename; |
277 | 12638 break; |
12639 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12640 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12641 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12642 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12643 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12644 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12645 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12646 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12647 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12648 /* 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
|
12649 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12650 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
|
12651 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
12652 /* 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
|
12653 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
|
12654 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12655 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12656 /* 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
|
12657 if (INTEGERP (Vline_number_display_limit) |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
12658 && 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
|
12659 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12660 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12661 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12662 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12663 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12664 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12665 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12666 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12667 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12668 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12669 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12670 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12671 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
|
12672 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12673 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12674 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12675 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12676 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12677 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12678 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12679 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12680 /* 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
|
12681 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12682 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12683 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12684 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12685 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12686 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12687 /* 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
|
12688 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
|
12689 "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
|
12690 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
|
12691 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12692 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12693 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
|
12694 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
|
12695 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12696 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
|
12697 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12698 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12699 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12700 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12701 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12702 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
|
12703 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12704 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12705 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12706 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12707 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12708 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12709 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12710 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12711 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12712 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12713 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12714 /* 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
|
12715 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
|
12716 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
|
12717 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12718 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12719 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12720 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12721 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12722 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12723 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12724 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12725 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
|
12726 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12727 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12728 /* 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
|
12729 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12730 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12731 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12732 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12733 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12734 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12735 /* Make the string to show. */ |
25012 | 12736 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
|
12737 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12738 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12739 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12740 char* p = decode_mode_spec_buf; |
25012 | 12741 int pad = field_width - 2; |
12742 while (pad-- > 0) | |
12743 *p++ = ' '; | |
12744 *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
|
12745 *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
|
12746 *p = '\0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12747 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12748 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12749 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12750 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12751 |
277 | 12752 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12753 obj = b->mode_name; |
277 | 12754 break; |
12755 | |
12756 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12757 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 12758 return " Narrow"; |
12759 break; | |
12760 | |
12761 case 'p': | |
12762 { | |
12763 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
|
12764 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
|
12765 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12766 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 12767 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12768 if (pos <= BUF_BEGV (b)) |
277 | 12769 return "All"; |
12770 else | |
12771 return "Bottom"; | |
12772 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12773 else if (pos <= BUF_BEGV (b)) |
277 | 12774 return "Top"; |
12775 else | |
12776 { | |
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
|
12777 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
|
12778 /* 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
|
12779 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
|
12780 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
|
12781 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 12782 /* We can't normally display a 3-digit number, |
12783 so get us a 2-digit number that is close. */ | |
12784 if (total == 100) | |
12785 total = 99; | |
12786 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
12787 return decode_mode_spec_buf; | |
12788 } | |
12789 } | |
12790 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12791 /* 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
|
12792 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12793 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12794 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
|
12795 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
|
12796 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
|
12797 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12798 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12799 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12800 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12801 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12802 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12803 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12804 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12805 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12806 { |
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
|
12807 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
|
12808 /* 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
|
12809 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
|
12810 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
|
12811 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
|
12812 /* 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
|
12813 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
|
12814 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12815 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12816 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12817 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12818 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12819 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12820 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12821 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12822 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12823 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12824 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12825 /* 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
|
12826 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
|
12827 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
|
12828 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
|
12829 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12830 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
|
12831 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12832 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12833 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12834 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
|
12835 #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
|
12836 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
|
12837 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12838 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12839 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12840 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12841 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12842 /* 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
|
12843 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12844 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12845 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12846 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
|
12847 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12848 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
12849 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12850 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12851 /* 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
|
12852 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12853 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
|
12854 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
|
12855 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12856 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
|
12857 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12858 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12859 #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
|
12860 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12861 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12862 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12863 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12864 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
|
12865 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12866 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
|
12867 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12868 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12869 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12870 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12871 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12872 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12873 } |
277 | 12874 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12875 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12876 if (STRINGP (obj)) |
277 | 12877 return (char *) XSTRING (obj)->data; |
12878 else | |
12879 return ""; | |
12880 } | |
25012 | 12881 |
12882 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12883 /* 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
|
12884 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12885 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
|
12886 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12887 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
|
12888 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12889 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12890 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
|
12891 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12892 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12893 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12894 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12895 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12896 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12897 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12898 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12899 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12900 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12901 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12902 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12903 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12904 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12905 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12906 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12907 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12908 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12909 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12910 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12911 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12912 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12913 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12914 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12915 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12916 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12917 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12918 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12919 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12920 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12921 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12922 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12923 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12924 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12925 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12926 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12927 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12928 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12929 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12930 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12931 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12932 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12933 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12934 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12935 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12936 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12937 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12938 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12939 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12940 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12941 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12942 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12943 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12944 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12945 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12946 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12947 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12948 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
|
12949 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12950 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12951 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12952 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12953 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12954 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12955 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12956 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12957 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12958 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12959 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12960 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12961 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12962 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12963 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12964 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12965 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12966 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
|
12967 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12968 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12969 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12970 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12971 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12972 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12973 /* 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
|
12974 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
|
12975 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12976 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12977 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12978 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12979 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12980 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12981 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12982 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12983 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12984 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12985 } |
25012 | 12986 |
12987 | |
277 | 12988 |
25012 | 12989 /*********************************************************************** |
12990 Displaying strings | |
12991 ***********************************************************************/ | |
12992 | |
12993 /* Display a NUL-terminated string, starting with index START. | |
12994 | |
12995 If STRING is non-null, display that C string. Otherwise, the Lisp | |
12996 string LISP_STRING is displayed. | |
12997 | |
12998 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
12999 FACE_STRING. Display STRING or LISP_STRING with the face at | |
13000 FACE_STRING_POS in FACE_STRING: | |
13001 | |
13002 Display the string in the environment given by IT, but use the | |
13003 standard display table, temporarily. | |
13004 | |
13005 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
13006 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
13007 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
13008 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
13009 | |
13010 PRECISION is the maximum number of characters to output from | |
13011 STRING. PRECISION < 0 means don't truncate the string. | |
13012 | |
13013 This is roughly equivalent to printf format specifiers: | |
13014 | |
13015 FIELD_WIDTH PRECISION PRINTF | |
13016 ---------------------------------------- | |
13017 -1 -1 %s | |
13018 -1 10 %.10s | |
13019 10 -1 %10s | |
13020 20 10 %20.10s | |
13021 | |
13022 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
13023 display them, and < 0 means obey the current buffer's value of | |
13024 enable_multibyte_characters. | |
13025 | |
13026 Value is the number of glyphs produced. */ | |
277 | 13027 |
13028 static int | |
25012 | 13029 display_string (string, lisp_string, face_string, face_string_pos, |
13030 start, it, field_width, precision, max_x, multibyte) | |
277 | 13031 unsigned char *string; |
25012 | 13032 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
|
13033 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
|
13034 int face_string_pos; |
25012 | 13035 int start; |
13036 struct it *it; | |
13037 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
|
13038 int multibyte; |
277 | 13039 { |
25012 | 13040 int hpos_at_start = it->hpos; |
13041 int saved_face_id = it->face_id; | |
13042 struct glyph_row *row = it->glyph_row; | |
13043 | |
13044 /* Initialize the iterator IT for iteration over STRING beginning | |
13045 with index START. We assume that IT may be modified here (which | |
13046 means that display_line has to do something when displaying a | |
13047 mini-buffer prompt, which it does). */ | |
13048 reseat_to_string (it, string, lisp_string, start, | |
13049 precision, field_width, multibyte); | |
13050 | |
13051 /* If displaying STRING, set up the face of the iterator | |
13052 from LISP_STRING, if that's given. */ | |
13053 if (STRINGP (face_string)) | |
13054 { | |
13055 int endptr; | |
13056 struct face *face; | |
13057 | |
13058 it->face_id | |
13059 = face_at_string_position (it->w, face_string, face_string_pos, | |
13060 0, it->region_beg_charpos, | |
13061 it->region_end_charpos, | |
13062 &endptr, it->base_face_id); | |
13063 face = FACE_FROM_ID (it->f, it->face_id); | |
13064 it->face_box_p = face->box != FACE_NO_BOX; | |
13065 } | |
13066 | |
13067 /* Set max_x to the maximum allowed X position. Don't let it go | |
13068 beyond the right edge of the window. */ | |
13069 if (max_x <= 0) | |
13070 max_x = it->last_visible_x; | |
13071 else | |
13072 max_x = min (max_x, it->last_visible_x); | |
13073 | |
13074 /* Skip over display elements that are not visible. because IT->w is | |
13075 hscrolled. */ | |
13076 if (it->current_x < it->first_visible_x) | |
13077 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
13078 MOVE_TO_POS | MOVE_TO_X); | |
13079 | |
13080 row->ascent = it->max_ascent; | |
13081 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
|
13082 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
|
13083 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 13084 |
13085 /* This condition is for the case that we are called with current_x | |
13086 past last_visible_x. */ | |
13087 while (it->current_x < max_x) | |
13088 { | |
13089 int x_before, x, n_glyphs_before, i, nglyphs; | |
13090 | |
13091 /* Get the next display element. */ | |
13092 if (!get_next_display_element (it)) | |
13093 break; | |
13094 | |
13095 /* Produce glyphs. */ | |
13096 x_before = it->current_x; | |
13097 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
13098 PRODUCE_GLYPHS (it); | |
13099 | |
13100 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
13101 i = 0; | |
13102 x = x_before; | |
13103 while (i < nglyphs) | |
13104 { | |
13105 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
13106 | |
13107 if (!it->truncate_lines_p | |
13108 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
13109 { |
25012 | 13110 /* End of continued line or max_x reached. */ |
13111 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
13112 it->current_x = x; | |
13113 break; | |
277 | 13114 } |
25012 | 13115 else if (x + glyph->pixel_width > it->first_visible_x) |
13116 { | |
13117 /* Glyph is at least partially visible. */ | |
13118 ++it->hpos; | |
13119 if (x < it->first_visible_x) | |
13120 it->glyph_row->x = x - it->first_visible_x; | |
13121 } | |
13122 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13123 { |
25012 | 13124 /* Glyph is off the left margin of the display area. |
13125 Should not happen. */ | |
13126 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13127 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
13128 |
25012 | 13129 row->ascent = max (row->ascent, it->max_ascent); |
13130 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
|
13131 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
|
13132 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
|
13133 it->max_phys_ascent + it->max_phys_descent); |
25012 | 13134 x += glyph->pixel_width; |
13135 ++i; | |
13136 } | |
13137 | |
13138 /* Stop if max_x reached. */ | |
13139 if (i < nglyphs) | |
13140 break; | |
13141 | |
13142 /* Stop at line ends. */ | |
13143 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
13144 { | |
13145 it->continuation_lines_width = 0; | |
13146 break; | |
13147 } | |
13148 | |
13149 set_iterator_to_next (it); | |
13150 | |
13151 /* Stop if truncating at the right edge. */ | |
13152 if (it->truncate_lines_p | |
13153 && it->current_x >= it->last_visible_x) | |
13154 { | |
13155 /* Add truncation mark, but don't do it if the line is | |
13156 truncated at a padding space. */ | |
13157 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
|
13158 { |
25012 | 13159 if (!FRAME_WINDOW_P (it->f)) |
13160 produce_special_glyphs (it, IT_TRUNCATION); | |
13161 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
|
13162 } |
25012 | 13163 break; |
13164 } | |
13165 } | |
13166 | |
13167 /* Maybe insert a truncation at the left. */ | |
13168 if (it->first_visible_x | |
13169 && IT_CHARPOS (*it) > 0) | |
13170 { | |
13171 if (!FRAME_WINDOW_P (it->f)) | |
13172 insert_left_trunc_glyphs (it); | |
13173 it->glyph_row->truncated_on_left_p = 1; | |
13174 } | |
13175 | |
13176 it->face_id = saved_face_id; | |
13177 | |
13178 /* Value is number of columns displayed. */ | |
13179 return it->hpos - hpos_at_start; | |
13180 } | |
13181 | |
13182 | |
277 | 13183 |
25012 | 13184 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
13185 appears as an element of LIST or as the car of an element of LIST. | |
13186 If PROPVAL is a list, compare each element against LIST in that | |
13187 way, and return 1 if any element of PROPVAL is found in LIST. | |
13188 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
|
13189 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13190 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13191 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13192 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13193 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13194 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13195 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13196 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
|
13197 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13198 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13199 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13200 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13201 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13202 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
|
13203 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13204 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13205 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13206 for (proptail = propval; CONSP (proptail); |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13207 proptail = XCDR (proptail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13208 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13209 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13210 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13211 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
|
13212 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13213 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13214 tem = XCAR (tail); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13215 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13216 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13217 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13218 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13219 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13220 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13221 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13222 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13223 |
25012 | 13224 |
13225 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
13226 the cdr of that element is non-nil. If PROPVAL is a list, check | |
13227 each element of PROPVAL in that way, and the first time some | |
13228 element is found, return 1 if the cdr of that element is non-nil. | |
13229 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
|
13230 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13231 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13232 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13233 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13234 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13235 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13236 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13237 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13238 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
|
13239 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13240 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13241 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13242 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13243 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13244 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13245 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13246 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13247 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
|
13248 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13249 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13250 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13251 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
|
13252 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13253 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13254 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13255 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13256 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13257 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13258 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13259 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13260 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13261 } |
25012 | 13262 |
13263 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13264 |
25012 | 13265 /*********************************************************************** |
13266 Initialization | |
13267 ***********************************************************************/ | |
13268 | |
277 | 13269 void |
13270 syms_of_xdisp () | |
13271 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13272 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
|
13273 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
|
13274 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13275 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13276 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13277 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13278 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13279 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13280 |
25012 | 13281 #if GLYPH_DEBUG |
13282 defsubr (&Sdump_glyph_matrix); | |
13283 defsubr (&Sdump_glyph_row); | |
25543 | 13284 defsubr (&Sdump_tool_bar_row); |
25012 | 13285 defsubr (&Strace_redisplay_toggle); |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
13286 defsubr (&Strace_to_stderr); |
25012 | 13287 #endif |
13288 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
13289 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
|
13290 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
|
13291 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
13292 staticpro (&Qoverriding_terminal_local_map); |
12267 | 13293 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
|
13294 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
13295 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
|
13296 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
|
13297 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13298 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13299 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
|
13300 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13301 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13302 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 13303 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13304 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13305 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
|
13306 |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13307 QCdata = intern (":data"); |
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13308 staticpro (&QCdata); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13309 Qdisplay = intern ("display"); |
25012 | 13310 staticpro (&Qdisplay); |
13311 Qspace_width = intern ("space-width"); | |
13312 staticpro (&Qspace_width); | |
13313 Qraise = intern ("raise"); | |
13314 staticpro (&Qraise); | |
13315 Qspace = intern ("space"); | |
13316 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13317 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13318 staticpro (&Qmargin); |
25012 | 13319 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13320 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13321 Qright_margin = intern ("right-margin"); |
25012 | 13322 staticpro (&Qright_margin); |
13323 Qalign_to = intern ("align-to"); | |
13324 staticpro (&Qalign_to); | |
13325 QCalign_to = intern (":align-to"); | |
13326 staticpro (&QCalign_to); | |
13327 Qrelative_width = intern ("relative-width"); | |
13328 staticpro (&Qrelative_width); | |
13329 QCrelative_width = intern (":relative-width"); | |
13330 staticpro (&QCrelative_width); | |
13331 QCrelative_height = intern (":relative-height"); | |
13332 staticpro (&QCrelative_height); | |
13333 QCeval = intern (":eval"); | |
13334 staticpro (&QCeval); | |
25614 | 13335 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13336 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13337 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13338 staticpro (&QCfile); |
25012 | 13339 Qfontified = intern ("fontified"); |
13340 staticpro (&Qfontified); | |
13341 Qfontification_functions = intern ("fontification-functions"); | |
13342 staticpro (&Qfontification_functions); | |
13343 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
13344 staticpro (&Qtrailing_whitespace); | |
13345 Qimage = intern ("image"); | |
13346 staticpro (&Qimage); | |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13347 Qmessage_truncate_lines = intern ("message-truncate-lines"); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13348 staticpro (&Qmessage_truncate_lines); |
25012 | 13349 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13350 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13351 last_arrow_string = Qnil; |
277 | 13352 staticpro (&last_arrow_position); |
13353 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
|
13354 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13355 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
|
13356 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13357 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13358 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13359 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
|
13360 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
|
13361 staticpro (&echo_area_buffer[1]); |
277 | 13362 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13363 Vmessages_buffer_name = build_string ("*Messages*"); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13364 staticpro (&Vmessages_buffer_name); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13365 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13366 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13367 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13368 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13369 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13370 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13371 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13372 "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
|
13373 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13374 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13375 |
277 | 13376 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
13377 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 13378 Vglobal_mode_string = Qnil; |
13379 | |
13380 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
13381 "Marker for where to display an arrow on top of the buffer text.\n\ | |
13382 This must be the beginning of a line in order to work.\n\ | |
13383 See also `overlay-arrow-string'."); | |
13384 Voverlay_arrow_position = Qnil; | |
13385 | |
13386 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
13387 "String to display as an arrow. See also `overlay-arrow-position'."); | |
13388 Voverlay_arrow_string = Qnil; | |
13389 | |
13390 DEFVAR_INT ("scroll-step", &scroll_step, | |
13391 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 13392 If that fails to bring point back on frame, point is centered instead.\n\ |
13393 If this is zero, point is always centered after it moves off frame."); | |
277 | 13394 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13395 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
|
13396 "*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
|
13397 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
|
13398 in the window."); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13399 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13400 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13401 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13402 "*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
|
13403 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
|
13404 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13405 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13406 |
25012 | 13407 #if GLYPH_DEBUG |
277 | 13408 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 13409 #endif |
277 | 13410 |
13411 DEFVAR_BOOL ("truncate-partial-width-windows", | |
13412 &truncate_partial_width_windows, | |
769 | 13413 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 13414 truncate_partial_width_windows = 1; |
13415 | |
13416 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
13417 "*Non-nil means use inverse video for the mode line."); | |
13418 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13419 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13420 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit, |
25012 | 13421 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 13422 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
|
13423 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
|
13424 Vline_number_display_limit = Qnil; |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13425 |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13426 DEFVAR_INT ("line-number-display-limit-width", |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13427 &line_number_display_limit_width, |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13428 "*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
|
13429 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
|
13430 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
|
13431 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13432 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
13433 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
|
13434 "*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
|
13435 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
|
13436 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13437 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
|
13438 "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
|
13439 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
|
13440 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
|
13441 `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
|
13442 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13443 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 13444 "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
|
13445 \(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
|
13446 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
|
13447 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
|
13448 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13449 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 13450 "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
|
13451 \(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
|
13452 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
|
13453 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
|
13454 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13455 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13456 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13457 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13458 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13459 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13460 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13461 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13462 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13463 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13464 Qnil))); |
10393 | 13465 |
13466 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
13467 "Maximum number of lines to keep in the message log buffer.\n\ | |
13468 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
13469 the buffer when it becomes large."); | |
13470 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13471 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13472 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
|
13473 "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
|
13474 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
|
13475 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
|
13476 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
|
13477 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
|
13478 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
|
13479 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13480 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 13481 "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
|
13482 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
|
13483 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
|
13484 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
|
13485 Vwindow_scroll_functions = Qnil; |
25012 | 13486 |
25543 | 13487 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
13488 "*Non-nil means automatically resize tool-bars.\n\ | |
13489 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
13490 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 13491 otherwise."); |
25543 | 13492 auto_resize_tool_bars_p = 1; |
13493 | |
13494 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
13495 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
13496 auto_raise_tool_bar_buttons_p = 1; | |
13497 | |
13498 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
13499 "*Margin around tool-bar buttons in pixels."); | |
13500 tool_bar_button_margin = 1; | |
13501 | |
13502 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
13503 "Relief thickness of tool-bar buttons."); | |
13504 tool_bar_button_relief = 3; | |
25012 | 13505 |
13506 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
13507 "List of functions to call to fontify regions of text.\n\ | |
13508 Each function is called with one argument POS. Functions must\n\ | |
13509 fontify a region starting at POS in the current buffer, and give\n\ | |
13510 fontified regions the property `fontified'.\n\ | |
13511 This variable automatically becomes buffer-local when set."); | |
13512 Vfontification_functions = Qnil; | |
13513 Fmake_local_variable (Qfontification_functions); | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13514 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13515 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 13516 &unibyte_display_via_language_environment, |
13517 "*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
|
13518 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
|
13519 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
|
13520 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
|
13521 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13522 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
|
13523 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13524 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
|
13525 "*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
|
13526 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
13527 If an integer, it specifies a number of lines.\n\ |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
13528 If nil, don't resize."); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13529 Vmax_mini_window_height = make_float (0.25); |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13530 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13531 DEFVAR_BOOL ("cursor-in-non-selected-windows", |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13532 &cursor_in_non_selected_windows, |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13533 "*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
|
13534 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
|
13535 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
|
13536 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
13537 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
|
13538 "*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
|
13539 automatic_hscrolling_p = 1; |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13540 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13541 DEFVAR_LISP ("image-types", &Vimage_types, |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13542 "List of supported image types.\n\ |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13543 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
|
13544 Vimage_types = Qnil; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13545 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13546 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
|
13547 "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
|
13548 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
|
13549 message_truncate_lines = 0; |
277 | 13550 } |
13551 | |
25012 | 13552 |
13553 /* Initialize this module when Emacs starts. */ | |
13554 | |
21514 | 13555 void |
277 | 13556 init_xdisp () |
13557 { | |
13558 Lisp_Object root_window; | |
25012 | 13559 struct window *mini_w; |
13560 | |
13561 CHARPOS (this_line_start_pos) = 0; | |
277 | 13562 |
13563 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
|
13564 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 13565 |
13566 if (!noninteractive) | |
13567 { | |
25012 | 13568 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
13569 int i; | |
13570 | |
13571 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
|
13572 set_window_height (root_window, |
25012 | 13573 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
|
13574 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13575 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 13576 set_window_height (minibuf_window, 1, 0); |
13577 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13578 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
|
13579 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 13580 |
13581 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
13582 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
13583 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
13584 | |
13585 /* The default ellipsis glyphs `...'. */ | |
13586 for (i = 0; i < 3; ++i) | |
13587 XSETFASTINT (default_invis_vector[i], '.'); | |
13588 } | |
13589 | |
13590 #ifdef HAVE_WINDOW_SYSTEM | |
13591 { | |
13592 /* Allocate the buffer for frame titles. */ | |
13593 int size = 100; | |
13594 frame_title_buf = (char *) xmalloc (size); | |
13595 frame_title_buf_end = frame_title_buf + size; | |
13596 frame_title_ptr = NULL; | |
13597 } | |
13598 #endif /* HAVE_WINDOW_SYSTEM */ | |
13599 } | |
13600 | |
13601 |