Mercurial > emacs
annotate src/xdisp.c @ 34773:664ee7cb8bf9
*** empty log message ***
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 21 Dec 2000 06:46:32 +0000 |
parents | e978a3fb2690 |
children | 7ebf09eda05e |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
30697
0b56d5da235e
(next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents:
30675
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000 |
25012 | 3 Free Software Foundation, Inc. |
277 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
277 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
277 | 21 |
25012 | 22 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>. |
23 | |
24 Redisplay. | |
25 | |
26 Emacs separates the task of updating the display from code | |
27 modifying global state, e.g. buffer text. This way functions | |
28 operating on buffers don't also have to be concerned with updating | |
29 the display. | |
30 | |
31 Updating the display is triggered by the Lisp interpreter when it | |
32 decides it's time to do it. This is done either automatically for | |
33 you as part of the interpreter's command loop or as the result of | |
34 calling Lisp functions like `sit-for'. The C function `redisplay' | |
35 in xdisp.c is the only entry into the inner redisplay code. (Or, | |
36 let's say almost---see the the description of direct update | |
37 operations, below.). | |
38 | |
39 The following diagram shows how redisplay code is invoked. As you | |
40 can see, Lisp calls redisplay and vice versa. Under window systems | |
41 like X, some portions of the redisplay code are also called | |
42 asynchronously during mouse movement or expose events. It is very | |
43 important that these code parts do NOT use the C library (malloc, | |
44 free) because many C libraries under Unix are not reentrant. They | |
45 may also NOT call functions of the Lisp interpreter which could | |
46 change the interpreter's state. If you don't follow these rules, | |
47 you will encounter bugs which are very hard to explain. | |
48 | |
49 (Direct functions, see below) | |
50 direct_output_for_insert, | |
51 direct_forward_char (dispnew.c) | |
52 +---------------------------------+ | |
53 | | | |
54 | V | |
55 +--------------+ redisplay() +----------------+ | |
56 | Lisp machine |---------------->| Redisplay code |<--+ | |
57 +--------------+ (xdisp.c) +----------------+ | | |
58 ^ | | | |
59 +----------------------------------+ | | |
60 Don't use this path when called | | |
61 asynchronously! | | |
62 | | |
63 expose_window (asynchronous) | | |
64 | | |
65 X expose events -----+ | |
66 | |
67 What does redisplay? Obviously, it has to figure out somehow what | |
68 has been changed since the last time the display has been updated, | |
69 and to make these changes visible. Preferably it would do that in | |
70 a moderately intelligent way, i.e. fast. | |
71 | |
72 Changes in buffer text can be deduced from window and buffer | |
73 structures, and from some global variables like `beg_unchanged' and | |
74 `end_unchanged'. The contents of the display are additionally | |
75 recorded in a `glyph matrix', a two-dimensional matrix of glyph | |
76 structures. Each row in such a matrix corresponds to a line on the | |
77 display, and each glyph in a row corresponds to a column displaying | |
78 a character, an image, or what else. This matrix is called the | |
79 `current glyph matrix' or `current matrix' in redisplay | |
80 terminology. | |
81 | |
82 For buffer parts that have been changed since the last update, a | |
83 second glyph matrix is constructed, the so called `desired glyph | |
84 matrix' or short `desired matrix'. Current and desired matrix are | |
85 then compared to find a cheap way to update the display, e.g. by | |
86 reusing part of the display by scrolling lines. | |
87 | |
88 | |
89 Direct operations. | |
90 | |
91 You will find a lot of of redisplay optimizations when you start | |
92 looking at the innards of redisplay. The overall goal of all these | |
93 optimizations is to make redisplay fast because it is done | |
94 frequently. | |
95 | |
96 Two optimizations are not found in xdisp.c. These are the direct | |
97 operations mentioned above. As the name suggests they follow a | |
98 different principle than the rest of redisplay. Instead of | |
99 building a desired matrix and then comparing it with the current | |
100 display, they perform their actions directly on the display and on | |
101 the current matrix. | |
102 | |
103 One direct operation updates the display after one character has | |
104 been entered. The other one moves the cursor by one position | |
105 forward or backward. You find these functions under the names | |
106 `direct_output_for_insert' and `direct_output_forward_char' in | |
107 dispnew.c. | |
108 | |
109 | |
110 Desired matrices. | |
111 | |
112 Desired matrices are always built per Emacs window. The function | |
113 `display_line' is the central function to look at if you are | |
114 interested. It constructs one row in a desired matrix given an | |
115 iterator structure containing both a buffer position and a | |
116 description of the environment in which the text is to be | |
117 displayed. But this is too early, read on. | |
118 | |
119 Characters and pixmaps displayed for a range of buffer text depend | |
120 on various settings of buffers and windows, on overlays and text | |
121 properties, on display tables, on selective display. The good news | |
122 is that all this hairy stuff is hidden behind a small set of | |
123 interface functions taking a iterator structure (struct it) | |
124 argument. | |
125 | |
126 Iteration over things to be be displayed is then simple. It is | |
127 started by initializing an iterator with a call to init_iterator | |
128 (or init_string_iterator for that matter). Calls to | |
129 get_next_display_element fill the iterator structure with relevant | |
130 information about the next thing to display. Calls to | |
131 set_iterator_to_next move the iterator to the next thing. | |
132 | |
133 Besides this, an iterator also contains information about the | |
134 display environment in which glyphs for display elements are to be | |
135 produced. It has fields for the width and height of the display, | |
136 the information whether long lines are truncated or continued, a | |
137 current X and Y position, and lots of other stuff you can better | |
138 see in dispextern.h. | |
139 | |
140 Glyphs in a desired matrix are normally constructed in a loop | |
141 calling get_next_display_element and then produce_glyphs. The call | |
142 to produce_glyphs will fill the iterator structure with pixel | |
143 information about the element being displayed and at the same time | |
144 produce glyphs for it. If the display element fits on the line | |
145 being displayed, set_iterator_to_next is called next, otherwise the | |
146 glyphs produced are discarded. | |
147 | |
148 | |
149 Frame matrices. | |
150 | |
151 That just couldn't be all, could it? What about terminal types not | |
152 supporting operations on sub-windows of the screen? To update the | |
153 display on such a terminal, window-based glyph matrices are not | |
154 well suited. To be able to reuse part of the display (scrolling | |
155 lines up and down), we must instead have a view of the whole | |
156 screen. This is what `frame matrices' are for. They are a trick. | |
157 | |
158 Frames on terminals like above have a glyph pool. Windows on such | |
159 a frame sub-allocate their glyph memory from their frame's glyph | |
160 pool. The frame itself is given its own glyph matrices. By | |
161 coincidence---or maybe something else---rows in window glyph | |
162 matrices are slices of corresponding rows in frame matrices. Thus | |
163 writing to window matrices implicitly updates a frame matrix which | |
164 provides us with the view of the whole screen that we originally | |
165 wanted to have without having to move many bytes around. To be | |
166 honest, there is a little bit more done, but not much more. If you | |
167 plan to extend that code, take a look at dispnew.c. The function | |
168 build_frame_matrix is a good starting point. */ | |
277 | 169 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
170 #include <config.h> |
277 | 171 #include <stdio.h> |
172 #include "lisp.h" | |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
173 #include "keyboard.h" |
769 | 174 #include "frame.h" |
277 | 175 #include "window.h" |
176 #include "termchar.h" | |
177 #include "dispextern.h" | |
178 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
179 #include "charset.h" |
277 | 180 #include "indent.h" |
181 #include "commands.h" | |
182 #include "macros.h" | |
183 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
184 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
185 #include "intervals.h" |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
186 #include "coding.h" |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
187 #include "process.h" |
21514 | 188 #include "region-cache.h" |
29433 | 189 #include "fontset.h" |
21514 | 190 |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
191 #ifdef HAVE_X_WINDOWS |
21514 | 192 #include "xterm.h" |
193 #endif | |
27634
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
194 #ifdef WINDOWSNT |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
195 #include "w32term.h" |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
196 #endif |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
197 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
198 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
199 #endif |
277 | 200 |
25012 | 201 #define min(a, b) ((a) < (b) ? (a) : (b)) |
202 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
203 | |
204 #define INFINITY 10000000 | |
205 | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
206 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
207 extern void set_frame_menubar P_ ((struct frame *f, int, int)); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
208 extern int pending_menu_activation; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
209 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
210 |
277 | 211 extern int interrupt_input; |
212 extern int command_loop_level; | |
213 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
214 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
215 |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
216 extern Lisp_Object Qface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
217 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
218 extern Lisp_Object Voverriding_local_map; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
219 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 220 extern Lisp_Object Qmenu_item; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
221 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
222 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
223 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
224 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
225 Lisp_Object Qinhibit_point_motion_hooks; |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
226 Lisp_Object QCeval, Qwhen, QCfile, QCdata; |
25012 | 227 Lisp_Object Qfontified; |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
228 Lisp_Object Qgrow_only; |
25012 | 229 |
230 /* Functions called to fontify regions of text. */ | |
231 | |
232 Lisp_Object Vfontification_functions; | |
233 Lisp_Object Qfontification_functions; | |
234 | |
25543 | 235 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 236 over them. */ |
237 | |
25543 | 238 int auto_raise_tool_bar_buttons_p; |
239 | |
240 /* Margin around tool bar buttons in pixels. */ | |
241 | |
242 int tool_bar_button_margin; | |
243 | |
244 /* Thickness of shadow to draw around tool bar buttons. */ | |
245 | |
246 int tool_bar_button_relief; | |
247 | |
248 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 249 items are visible, and no blank lines remain. */ |
250 | |
25543 | 251 int auto_resize_tool_bars_p; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
252 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
253 /* Non-nil means don't actually do any redisplay. */ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
254 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
255 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
256 |
25012 | 257 /* Names of text properties relevant for redisplay. */ |
258 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
259 Lisp_Object Qdisplay, Qrelative_width, Qalign_to; |
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
260 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 261 |
262 /* Symbols used in text property values. */ | |
263 | |
264 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
265 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
266 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
267 extern Lisp_Object Qheight; |
25012 | 268 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
269 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
270 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
271 Lisp_Object Vshow_trailing_whitespace; |
25012 | 272 |
273 /* Name of the face used to highlight trailing whitespace. */ | |
274 | |
275 Lisp_Object Qtrailing_whitespace; | |
276 | |
277 /* The symbol `image' which is the car of the lists used to represent | |
278 images in Lisp. */ | |
279 | |
280 Lisp_Object Qimage; | |
281 | |
282 /* Non-zero means print newline to stdout before next mini-buffer | |
283 message. */ | |
277 | 284 |
285 int noninteractive_need_newline; | |
286 | |
25012 | 287 /* Non-zero means print newline to message log before next message. */ |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
288 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
289 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
290 |
25012 | 291 |
292 /* The buffer position of the first character appearing entirely or | |
293 partially on the line of the selected window which contains the | |
294 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
295 redisplay optimization in redisplay_internal. */ | |
296 | |
297 static struct text_pos this_line_start_pos; | |
298 | |
299 /* Number of characters past the end of the line above, including the | |
300 terminating newline. */ | |
301 | |
302 static struct text_pos this_line_end_pos; | |
303 | |
304 /* The vertical positions and the height of this line. */ | |
305 | |
277 | 306 static int this_line_vpos; |
25012 | 307 static int this_line_y; |
308 static int this_line_pixel_height; | |
309 | |
310 /* X position at which this display line starts. Usually zero; | |
311 negative if first character is partially visible. */ | |
312 | |
313 static int this_line_start_x; | |
314 | |
315 /* Buffer that this_line_.* variables are referring to. */ | |
316 | |
277 | 317 static struct buffer *this_line_buffer; |
318 | |
25012 | 319 /* Nonzero means truncate lines in all windows less wide than the |
320 frame. */ | |
321 | |
277 | 322 int truncate_partial_width_windows; |
323 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
324 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 325 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
326 int unibyte_display_via_language_environment; |
25012 | 327 |
328 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
329 Not guaranteed to be accurate except while parsing | |
330 frame-title-format. */ | |
331 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
332 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
333 |
277 | 334 Lisp_Object Vglobal_mode_string; |
335 | |
336 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 337 |
277 | 338 Lisp_Object Voverlay_arrow_position; |
339 | |
25012 | 340 /* String to display for the arrow. Only used on terminal frames. */ |
341 | |
277 | 342 Lisp_Object Voverlay_arrow_string; |
343 | |
25012 | 344 /* Values of those variables at last redisplay. However, if |
345 Voverlay_arrow_position is a marker, last_arrow_position is its | |
346 numerical position. */ | |
347 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
348 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
349 |
25012 | 350 /* Like mode-line-format, but for the title bar on a visible frame. */ |
351 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
352 Lisp_Object Vframe_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
353 |
25012 | 354 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
355 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
356 Lisp_Object Vicon_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
357 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
358 /* List of functions to call when a window's size changes. These |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
359 functions get one arg, a frame on which one or more windows' sizes |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
360 have changed. */ |
25012 | 361 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
362 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
363 |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
364 Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook; |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
365 |
277 | 366 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 367 |
277 | 368 static int overlay_arrow_seen; |
369 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
370 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 371 |
372 int highlight_nonselected_windows; | |
373 | |
374 /* If cursor motion alone moves point off frame, try scrolling this | |
375 many lines up or down if that will bring it back. */ | |
376 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
377 static int scroll_step; |
277 | 378 |
25012 | 379 /* Non-0 means scroll just far enough to bring point back on the |
380 screen, when appropriate. */ | |
381 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
382 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
383 |
25012 | 384 /* Recenter the window whenever point gets within this many lines of |
385 the top or bottom of the window. This value is translated into a | |
386 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
387 there is really a fixed pixel height scroll margin. */ | |
388 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
389 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
390 |
25012 | 391 /* Number of windows showing the buffer of the selected window (or |
392 another buffer with the same base buffer). keyboard.c refers to | |
393 this. */ | |
394 | |
277 | 395 int buffer_shared; |
396 | |
25012 | 397 /* Vector containing glyphs for an ellipsis `...'. */ |
398 | |
399 static Lisp_Object default_invis_vector[3]; | |
400 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
401 /* Zero means display the mode-line/header-line/menu-bar in the default face |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
402 (this slightly odd definition is for compatibility with previous versions |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
403 of emacs), non-zero means display them using their respective faces. |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
404 |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
405 This variable is deprecated. */ |
25012 | 406 |
277 | 407 int mode_line_inverse_video; |
408 | |
25012 | 409 /* Prompt to display in front of the mini-buffer contents. */ |
410 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
411 Lisp_Object minibuf_prompt; |
277 | 412 |
25012 | 413 /* Width of current mini-buffer prompt. Only set after display_line |
414 of the line that contains the prompt. */ | |
415 | |
277 | 416 int minibuf_prompt_width; |
25012 | 417 int minibuf_prompt_pixel_width; |
418 | |
419 /* This is the window where the echo area message was displayed. It | |
420 is always a mini-buffer window, but it may not be the same window | |
421 currently active as a mini-buffer. */ | |
422 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
423 Lisp_Object echo_area_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
424 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
425 /* List of pairs (MESSAGE . MULTIBYTE). The function save_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
426 pushes the current message and the value of |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
427 message_enable_multibyte on the stack, the function restore_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
428 pops the stack and displays MESSAGE again. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
429 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
430 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
431 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
432 /* Nonzero means multibyte characters were enabled when the echo area |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
433 message was specified. */ |
25012 | 434 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
435 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
436 |
25012 | 437 /* True if we should redraw the mode lines on the next redisplay. */ |
438 | |
277 | 439 int update_mode_lines; |
440 | |
25012 | 441 /* Nonzero if window sizes or contents have changed since last |
442 redisplay that finished */ | |
443 | |
277 | 444 int windows_or_buffers_changed; |
445 | |
25012 | 446 /* Nonzero after display_mode_line if %l was used and it displayed a |
447 line number. */ | |
448 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
449 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
450 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
451 /* Maximum buffer size for which to display line numbers. */ |
25012 | 452 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
453 Lisp_Object Vline_number_display_limit; |
10393 | 454 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
455 /* line width to consider when repostioning for line number display */ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
456 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
457 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
458 |
25012 | 459 /* Number of lines to keep in the message log buffer. t means |
460 infinite. nil means don't log at all. */ | |
461 | |
10393 | 462 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
463 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
464 /* The name of the *Messages* buffer, a string. */ |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
465 |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
466 static Lisp_Object Vmessages_buffer_name; |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
467 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 /* Current, index 0, and last displayed echo area message. Either |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
469 buffers from echo_buffers, or nil to indicate no message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 Lisp_Object echo_area_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 /* The buffers referenced from echo_area_buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
474 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
475 static Lisp_Object echo_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
476 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
477 /* A vector saved used in with_area_buffer to reduce consing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
478 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
479 static Lisp_Object Vwith_echo_area_save_vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
480 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
481 /* Non-zero means display_echo_area should display the last echo area |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
482 message again. Set by redisplay_preserve_echo_area. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
483 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
484 static int display_last_displayed_message_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
485 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
486 /* Nonzero if echo area is being used by print; zero if being used by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
487 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
488 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
489 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
490 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
491 /* Maximum height for resizing mini-windows. Either a float |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
492 specifying a fraction of the available height, or an integer |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
493 specifying a number of lines. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
494 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
495 Lisp_Object Vmax_mini_window_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
496 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
497 /* Non-zero means messages should be displayed with truncated |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
498 lines instead of being continued. */ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
499 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
500 int message_truncate_lines; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
501 Lisp_Object Qmessage_truncate_lines; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
502 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
503 /* Non-zero means we want a hollow cursor in windows that are not |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
504 selected. Zero means there's no cursor in such windows. */ |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
505 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
506 int cursor_in_non_selected_windows; |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
507 |
25012 | 508 /* A scratch glyph row with contents used for generating truncation |
509 glyphs. Also used in direct_output_for_insert. */ | |
510 | |
511 #define MAX_SCRATCH_GLYPHS 100 | |
512 struct glyph_row scratch_glyph_row; | |
513 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
514 | |
515 /* Ascent and height of the last line processed by move_it_to. */ | |
516 | |
517 static int last_max_ascent, last_height; | |
518 | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
519 /* Non-zero if there's a help-echo in the echo area. */ |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
520 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
521 int help_echo_showing_p; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
522 |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
523 /* If >= 0, computed, exact values of mode-line and header-line height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
524 to use in the macros CURRENT_MODE_LINE_HEIGHT and |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
525 CURRENT_HEADER_LINE_HEIGHT. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
526 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
527 int current_mode_line_height, current_header_line_height; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
528 |
25012 | 529 /* The maximum distance to look ahead for text properties. Values |
530 that are too small let us call compute_char_face and similar | |
531 functions too often which is expensive. Values that are too large | |
532 let us call compute_char_face and alike too often because we | |
533 might not be interested in text properties that far away. */ | |
534 | |
535 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
536 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
537 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
538 |
25012 | 539 /* Non-zero means print traces of redisplay if compiled with |
540 GLYPH_DEBUG != 0. */ | |
541 | |
542 int trace_redisplay_p; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
543 |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
544 #endif /* GLYPH_DEBUG */ |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
545 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
546 #ifdef DEBUG_TRACE_MOVE |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
547 /* Non-zero means trace with TRACE_MOVE to stderr. */ |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
548 int trace_move; |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
549 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
550 #define TRACE_MOVE(x) if (trace_move) fprintf x; else (void) 0 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
551 #else |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
552 #define TRACE_MOVE(x) (void) 0 |
25012 | 553 #endif |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
554 |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
555 /* Non-zero means automatically scroll windows horizontally to make |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
556 point visible. */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
557 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
558 int automatic_hscrolling_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
559 |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
560 /* A list of symbols, one for each supported image type. */ |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
561 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
562 Lisp_Object Vimage_types; |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
563 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
564 /* The variable `resize-mini-windows'. If nil, don't resize |
33453 | 565 mini-windows. If t, always resize them to fit the text they |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
566 display. If `grow-only', let mini-windows grow only until they |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
567 become empty. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
568 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
569 Lisp_Object Vresize_mini_windows; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
570 |
25012 | 571 /* Value returned from text property handlers (see below). */ |
572 | |
573 enum prop_handled | |
574 { | |
575 HANDLED_NORMALLY, | |
576 HANDLED_RECOMPUTE_PROPS, | |
577 HANDLED_OVERLAY_STRING_CONSUMED, | |
578 HANDLED_RETURN | |
579 }; | |
580 | |
581 /* A description of text properties that redisplay is interested | |
582 in. */ | |
583 | |
584 struct props | |
585 { | |
586 /* The name of the property. */ | |
587 Lisp_Object *name; | |
588 | |
589 /* A unique index for the property. */ | |
590 enum prop_idx idx; | |
591 | |
592 /* A handler function called to set up iterator IT from the property | |
593 at IT's current position. Value is used to steer handle_stop. */ | |
594 enum prop_handled (*handler) P_ ((struct it *it)); | |
595 }; | |
596 | |
597 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
598 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
599 static enum prop_handled handle_display_prop P_ ((struct it *)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
600 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 601 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
602 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
603 | |
604 /* Properties handled by iterators. */ | |
605 | |
606 static struct props it_props[] = | |
607 { | |
608 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
609 /* Handle `face' before `display' because some sub-properties of | |
610 `display' need to know the face. */ | |
611 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
612 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
613 {&Qinvisible, INVISIBLE_PROP_IDX, handle_invisible_prop}, | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
614 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 615 {NULL, 0, NULL} |
616 }; | |
617 | |
618 /* Value is the position described by X. If X is a marker, value is | |
619 the marker_position of X. Otherwise, value is X. */ | |
620 | |
621 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
622 | |
623 /* Enumeration returned by some move_it_.* functions internally. */ | |
624 | |
625 enum move_it_result | |
626 { | |
627 /* Not used. Undefined value. */ | |
628 MOVE_UNDEFINED, | |
629 | |
630 /* Move ended at the requested buffer position or ZV. */ | |
631 MOVE_POS_MATCH_OR_ZV, | |
632 | |
633 /* Move ended at the requested X pixel position. */ | |
634 MOVE_X_REACHED, | |
635 | |
636 /* Move within a line ended at the end of a line that must be | |
637 continued. */ | |
638 MOVE_LINE_CONTINUED, | |
639 | |
640 /* Move within a line ended at the end of a line that would | |
641 be displayed truncated. */ | |
642 MOVE_LINE_TRUNCATED, | |
643 | |
644 /* Move within a line ended at a line end. */ | |
645 MOVE_NEWLINE_OR_CR | |
646 }; | |
647 | |
648 | |
649 | |
650 /* Function prototypes. */ | |
651 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
652 static int cursor_row_p P_ ((struct window *, struct glyph_row *)); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
653 static int redisplay_mode_lines P_ ((Lisp_Object, int)); |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
654 static char *decode_mode_spec_coding P_ ((Lisp_Object, char *, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
655 static int invisible_text_between_p P_ ((struct it *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
656 static int next_element_from_ellipsis P_ ((struct it *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
657 static void pint2str P_ ((char *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
658 static struct text_pos run_window_scroll_functions P_ ((Lisp_Object, |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
659 struct text_pos)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
660 static void reconsider_clip_changes P_ ((struct window *, struct buffer *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
661 static int text_outside_line_unchanged_p P_ ((struct window *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
662 static void store_frame_title_char P_ ((char)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
663 static int store_frame_title P_ ((unsigned char *, int, int)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
664 static void x_consider_frame_title P_ ((Lisp_Object)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
665 static void handle_stop P_ ((struct it *)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
666 static int tool_bar_lines_needed P_ ((struct frame *)); |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
667 static int single_display_prop_intangible_p P_ ((Lisp_Object)); |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
668 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 669 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
670 struct glyph_row *, | |
671 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
672 static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
673 static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *)); |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
674 static int with_echo_area_buffer P_ ((struct window *, int, |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
675 int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT), |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
676 EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
677 static void clear_garbaged_frames P_ ((void)); |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
678 static int current_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
679 static int truncate_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
680 static int set_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
681 static int display_echo_area P_ ((struct window *)); |
30675
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
682 static int display_echo_area_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
8a516a1f76a7
(message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents:
30652
diff
changeset
|
683 static int resize_mini_window_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
684 static Lisp_Object unwind_redisplay P_ ((Lisp_Object)); |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
685 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 686 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
687 struct text_pos)); | |
688 static int compute_window_start_on_continuation_line P_ ((struct window *)); | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
689 static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); |
25012 | 690 static void insert_left_trunc_glyphs P_ ((struct it *)); |
691 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
692 static void extend_face_to_end_of_line P_ ((struct it *)); | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
693 static int append_space P_ ((struct it *, int)); |
25012 | 694 static void make_cursor_line_fully_visible P_ ((struct window *)); |
695 static int try_scrolling P_ ((Lisp_Object, int, int, int, int)); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
696 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); |
25012 | 697 static int trailing_whitespace_p P_ ((int)); |
698 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
699 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
700 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
701 static void push_it P_ ((struct it *)); | |
702 static void pop_it P_ ((struct it *)); | |
703 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
704 static void redisplay_internal P_ ((int)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
705 static int echo_area_display P_ ((int)); |
25012 | 706 static void redisplay_windows P_ ((Lisp_Object)); |
707 static void redisplay_window P_ ((Lisp_Object, int)); | |
708 static void update_menu_bar P_ ((struct frame *, int)); | |
709 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
710 static int try_window_id P_ ((struct window *)); | |
711 static int display_line P_ ((struct it *)); | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
712 static int display_mode_lines P_ ((struct window *)); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
713 static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object)); |
25012 | 714 static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object)); |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26018
diff
changeset
|
715 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 716 static void display_menu_bar P_ ((struct window *)); |
717 static int display_count_lines P_ ((int, int, int, int, int *)); | |
718 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
719 int, int, struct it *, int, int, int, int)); | |
720 static void compute_line_metrics P_ ((struct it *)); | |
721 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
722 static int get_overlay_strings P_ ((struct it *)); | |
723 static void next_overlay_string P_ ((struct it *)); | |
724 static void reseat P_ ((struct it *, struct text_pos, int)); | |
725 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
726 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
727 static void reseat_at_previous_visible_line_start P_ ((struct it *)); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
728 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 729 static int next_element_from_display_vector P_ ((struct it *)); |
730 static int next_element_from_string P_ ((struct it *)); | |
731 static int next_element_from_c_string P_ ((struct it *)); | |
732 static int next_element_from_buffer P_ ((struct it *)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
733 static int next_element_from_composition P_ ((struct it *)); |
25012 | 734 static int next_element_from_image P_ ((struct it *)); |
735 static int next_element_from_stretch P_ ((struct it *)); | |
736 static void load_overlay_strings P_ ((struct it *)); | |
737 static void init_from_display_pos P_ ((struct it *, struct window *, | |
738 struct display_pos *)); | |
739 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
740 Lisp_Object, int, int, int, int)); | |
741 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
742 int, int, int)); | |
743 void move_it_vertically_backward P_ ((struct it *, int)); | |
744 static void init_to_row_start P_ ((struct it *, struct window *, | |
745 struct glyph_row *)); | |
746 static void init_to_row_end P_ ((struct it *, struct window *, | |
747 struct glyph_row *)); | |
748 static void back_to_previous_line_start P_ ((struct it *)); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
749 static int forward_to_next_line_start P_ ((struct it *, int *)); |
25012 | 750 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, |
751 Lisp_Object, int)); | |
752 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
753 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
754 static int number_of_chars P_ ((unsigned char *, int)); | |
755 static void compute_stop_pos P_ ((struct it *)); | |
756 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
757 Lisp_Object)); | |
758 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
759 static int next_overlay_change P_ ((int)); | |
760 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
761 Lisp_Object, struct text_pos *)); | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
762 static int underlying_face_id P_ ((struct it *)); |
25012 | 763 |
764 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
765 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
766 | |
767 #ifdef HAVE_WINDOW_SYSTEM | |
768 | |
25543 | 769 static void update_tool_bar P_ ((struct frame *, int)); |
770 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
771 static int redisplay_tool_bar P_ ((struct frame *)); | |
772 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 773 |
774 #endif /* HAVE_WINDOW_SYSTEM */ | |
775 | |
776 | |
777 /*********************************************************************** | |
778 Window display dimensions | |
779 ***********************************************************************/ | |
780 | |
781 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
782 text in window W. This is the height of W minus the height of a | |
783 mode line, if any. */ | |
784 | |
785 INLINE int | |
786 window_text_bottom_y (w) | |
787 struct window *w; | |
788 { | |
789 struct frame *f = XFRAME (w->frame); | |
790 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
791 |
25012 | 792 if (WINDOW_WANTS_MODELINE_P (w)) |
793 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
794 return height; | |
795 } | |
796 | |
797 | |
798 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
799 means return the total width of W, not including bitmap areas to | |
800 the left and right of the window. */ | |
801 | |
802 INLINE int | |
803 window_box_width (w, area) | |
804 struct window *w; | |
805 int area; | |
806 { | |
807 struct frame *f = XFRAME (w->frame); | |
808 int width = XFASTINT (w->width); | |
809 | |
810 if (!w->pseudo_window_p) | |
811 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
812 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 813 |
814 if (area == TEXT_AREA) | |
815 { | |
816 if (INTEGERP (w->left_margin_width)) | |
817 width -= XFASTINT (w->left_margin_width); | |
818 if (INTEGERP (w->right_margin_width)) | |
819 width -= XFASTINT (w->right_margin_width); | |
820 } | |
821 else if (area == LEFT_MARGIN_AREA) | |
822 width = (INTEGERP (w->left_margin_width) | |
823 ? XFASTINT (w->left_margin_width) : 0); | |
824 else if (area == RIGHT_MARGIN_AREA) | |
825 width = (INTEGERP (w->right_margin_width) | |
826 ? XFASTINT (w->right_margin_width) : 0); | |
827 } | |
828 | |
829 return width * CANON_X_UNIT (f); | |
830 } | |
831 | |
832 | |
833 /* Return the pixel height of the display area of window W, not | |
834 including mode lines of W, if any.. */ | |
835 | |
836 INLINE int | |
837 window_box_height (w) | |
838 struct window *w; | |
839 { | |
840 struct frame *f = XFRAME (w->frame); | |
841 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
31931
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
842 |
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
843 xassert (height >= 0); |
25012 | 844 |
34582
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
845 /* Note: the code below that determines the mode-line/header-line |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
846 height is essentially the same as that contained in the macro |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
847 CURRENT_{MODE,HEADER}_LINE_HEIGHT, except that it checks whether |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
848 the appropriate glyph row has its `mode_line_p' flag set, |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
849 and if it doesn't, uses estimate_mode_line_height instead. */ |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
850 |
25012 | 851 if (WINDOW_WANTS_MODELINE_P (w)) |
34578
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
852 { |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
853 struct glyph_row *ml_row |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
854 = (w->current_matrix && w->current_matrix->rows |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
855 ? MATRIX_MODE_LINE_ROW (w->current_matrix) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
856 : 0); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
857 if (ml_row && ml_row->mode_line_p) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
858 height -= ml_row->height; |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
859 else |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
860 height -= estimate_mode_line_height (f, MODE_LINE_FACE_ID); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
861 } |
25012 | 862 |
25546 | 863 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
34578
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
864 { |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
865 struct glyph_row *hl_row |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
866 = (w->current_matrix && w->current_matrix->rows |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
867 ? MATRIX_HEADER_LINE_ROW (w->current_matrix) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
868 : 0); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
869 if (hl_row && hl_row->mode_line_p) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
870 height -= hl_row->height; |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
871 else |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
872 height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
873 } |
25012 | 874 |
875 return height; | |
876 } | |
877 | |
878 | |
879 /* Return the frame-relative coordinate of the left edge of display | |
880 area AREA of window W. AREA < 0 means return the left edge of the | |
881 whole window, to the right of any bitmap area at the left side of | |
882 W. */ | |
883 | |
884 INLINE int | |
885 window_box_left (w, area) | |
886 struct window *w; | |
887 int area; | |
888 { | |
889 struct frame *f = XFRAME (w->frame); | |
890 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
891 | |
892 if (!w->pseudo_window_p) | |
893 { | |
894 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
|
895 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 896 |
897 if (area == TEXT_AREA) | |
898 x += window_box_width (w, LEFT_MARGIN_AREA); | |
899 else if (area == RIGHT_MARGIN_AREA) | |
900 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
901 + window_box_width (w, TEXT_AREA)); | |
902 } | |
903 | |
904 return x; | |
905 } | |
906 | |
907 | |
908 /* Return the frame-relative coordinate of the right edge of display | |
909 area AREA of window W. AREA < 0 means return the left edge of the | |
910 whole window, to the left of any bitmap area at the right side of | |
911 W. */ | |
912 | |
913 INLINE int | |
914 window_box_right (w, area) | |
915 struct window *w; | |
916 int area; | |
917 { | |
918 return window_box_left (w, area) + window_box_width (w, area); | |
919 } | |
920 | |
921 | |
922 /* Get the bounding box of the display area AREA of window W, without | |
923 mode lines, in frame-relative coordinates. AREA < 0 means the | |
924 whole window, not including bitmap areas to the left and right of | |
925 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
926 coordinates of the upper-left corner of the box. Return in | |
927 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
928 | |
929 INLINE void | |
930 window_box (w, area, box_x, box_y, box_width, box_height) | |
931 struct window *w; | |
932 int area; | |
933 int *box_x, *box_y, *box_width, *box_height; | |
934 { | |
935 struct frame *f = XFRAME (w->frame); | |
936 | |
937 *box_width = window_box_width (w, area); | |
938 *box_height = window_box_height (w); | |
939 *box_x = window_box_left (w, area); | |
940 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
941 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 942 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
943 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 944 } |
945 | |
946 | |
947 /* Get the bounding box of the display area AREA of window W, without | |
948 mode lines. AREA < 0 means the whole window, not including bitmap | |
949 areas to the left and right of the window. Return in *TOP_LEFT_X | |
950 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
951 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
952 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
953 box. */ | |
954 | |
955 INLINE void | |
956 window_box_edges (w, area, top_left_x, top_left_y, | |
957 bottom_right_x, bottom_right_y) | |
958 struct window *w; | |
959 int area; | |
960 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
961 { | |
962 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
963 bottom_right_y); | |
964 *bottom_right_x += *top_left_x; | |
965 *bottom_right_y += *top_left_y; | |
966 } | |
967 | |
968 | |
969 | |
970 /*********************************************************************** | |
971 Utilities | |
972 ***********************************************************************/ | |
973 | |
33510
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
974 /* Return 1 if position CHARPOS is visible in window W. Set *FULLY to |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
975 1 if POS is visible and the line containing POS is fully visible. |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
976 EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
977 and header-lines heights. */ |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
978 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
979 int |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
980 pos_visible_p (w, charpos, fully, exact_mode_line_heights_p) |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
981 struct window *w; |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
982 int charpos, *fully, exact_mode_line_heights_p; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
983 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
984 struct it it; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
985 struct text_pos top; |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
986 int visible_p; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
987 struct buffer *old_buffer = NULL; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
988 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
989 if (XBUFFER (w->buffer) != current_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
990 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
991 old_buffer = current_buffer; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
992 set_buffer_internal_1 (XBUFFER (w->buffer)); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
993 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
994 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
995 *fully = visible_p = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
996 SET_TEXT_POS_FROM_MARKER (top, w->start); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
997 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
998 /* Compute exact mode line heights, if requested. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
999 if (exact_mode_line_heights_p) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1000 { |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1001 if (WINDOW_WANTS_MODELINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1002 current_mode_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1003 = display_mode_line (w, MODE_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1004 current_buffer->mode_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1005 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1006 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1007 current_header_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1008 = display_mode_line (w, HEADER_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1009 current_buffer->header_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1010 } |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1011 |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1012 start_display (&it, w, top); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1013 move_it_to (&it, charpos, 0, it.last_visible_y, -1, |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1014 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1015 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1016 if (IT_CHARPOS (it) == charpos) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1017 { |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1018 int line_height, line_bottom_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1019 int line_top_y = it.current_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1020 int window_top_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1021 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1022 line_height = it.max_ascent + it.max_descent; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1023 if (line_height == 0) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1024 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1025 if (last_height) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1026 line_height = last_height; |
33531
de985bc39ea3
(pos_visible_p): Handle case that we reach ZV without
Gerd Moellmann <gerd@gnu.org>
parents:
33510
diff
changeset
|
1027 else if (charpos < ZV) |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1028 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1029 move_it_by_lines (&it, 1, 1); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1030 line_height = (it.max_ascent || it.max_descent |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1031 ? it.max_ascent + it.max_descent |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1032 : last_height); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1033 } |
33568
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1034 else |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1035 { |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1036 /* Use the default character height. */ |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1037 it.what = IT_CHARACTER; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1038 it.c = ' '; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1039 it.len = 1; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1040 PRODUCE_GLYPHS (&it); |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1041 line_height = it.ascent + it.descent; |
ea6ead04f574
(pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents:
33531
diff
changeset
|
1042 } |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1043 } |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1044 line_bottom_y = line_top_y + line_height; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1045 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1046 if (line_top_y < window_top_y) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1047 visible_p = line_bottom_y > window_top_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1048 else if (line_top_y < it.last_visible_y) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1049 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1050 visible_p = 1; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1051 *fully = line_bottom_y <= it.last_visible_y; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1052 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1053 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1054 else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1055 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1056 move_it_by_lines (&it, 1, 0); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1057 if (charpos < IT_CHARPOS (it)) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1058 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1059 visible_p = 1; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1060 *fully = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1061 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1062 } |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1063 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1064 if (old_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1065 set_buffer_internal_1 (old_buffer); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1066 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1067 current_header_line_height = current_mode_line_height = -1; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1068 return visible_p; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1069 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1070 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1071 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1072 /* 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
|
1073 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
|
1074 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
|
1075 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
|
1076 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1077 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1078 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1079 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
|
1080 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1081 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1082 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1083 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1084 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1085 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
|
1086 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1087 /* 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
|
1088 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
|
1089 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1090 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1091 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1092 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1093 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1094 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1095 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1096 |
25012 | 1097 /* Given a position POS containing a valid character and byte position |
1098 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
1099 | |
1100 static struct text_pos | |
1101 string_pos_nchars_ahead (pos, string, nchars) | |
1102 struct text_pos pos; | |
1103 Lisp_Object string; | |
1104 int nchars; | |
1105 { | |
1106 xassert (STRINGP (string) && nchars >= 0); | |
1107 | |
1108 if (STRING_MULTIBYTE (string)) | |
1109 { | |
1110 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
1111 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
1112 int len; | |
1113 | |
1114 while (nchars--) | |
1115 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1116 string_char_and_length (p, rest, &len); |
25012 | 1117 p += len, rest -= len; |
1118 xassert (rest >= 0); | |
1119 CHARPOS (pos) += 1; | |
1120 BYTEPOS (pos) += len; | |
1121 } | |
1122 } | |
1123 else | |
1124 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
1125 | |
1126 return pos; | |
1127 } | |
1128 | |
1129 | |
1130 /* Value is the text position, i.e. character and byte position, | |
1131 for character position CHARPOS in STRING. */ | |
1132 | |
1133 static INLINE struct text_pos | |
1134 string_pos (charpos, string) | |
1135 int charpos; | |
1136 Lisp_Object string; | |
1137 { | |
1138 struct text_pos pos; | |
1139 xassert (STRINGP (string)); | |
1140 xassert (charpos >= 0); | |
1141 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
1142 return pos; | |
1143 } | |
1144 | |
1145 | |
1146 /* Value is a text position, i.e. character and byte position, for | |
1147 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
1148 means recognize multibyte characters. */ | |
1149 | |
1150 static struct text_pos | |
1151 c_string_pos (charpos, s, multibyte_p) | |
1152 int charpos; | |
1153 unsigned char *s; | |
1154 int multibyte_p; | |
1155 { | |
1156 struct text_pos pos; | |
1157 | |
1158 xassert (s != NULL); | |
1159 xassert (charpos >= 0); | |
1160 | |
1161 if (multibyte_p) | |
1162 { | |
1163 int rest = strlen (s), len; | |
1164 | |
1165 SET_TEXT_POS (pos, 0, 0); | |
1166 while (charpos--) | |
1167 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1168 string_char_and_length (s, rest, &len); |
25012 | 1169 s += len, rest -= len; |
1170 xassert (rest >= 0); | |
1171 CHARPOS (pos) += 1; | |
1172 BYTEPOS (pos) += len; | |
1173 } | |
1174 } | |
1175 else | |
1176 SET_TEXT_POS (pos, charpos, charpos); | |
1177 | |
1178 return pos; | |
1179 } | |
1180 | |
1181 | |
1182 /* Value is the number of characters in C string S. MULTIBYTE_P | |
1183 non-zero means recognize multibyte characters. */ | |
1184 | |
1185 static int | |
1186 number_of_chars (s, multibyte_p) | |
1187 unsigned char *s; | |
1188 int multibyte_p; | |
1189 { | |
1190 int nchars; | |
1191 | |
1192 if (multibyte_p) | |
1193 { | |
1194 int rest = strlen (s), len; | |
1195 unsigned char *p = (unsigned char *) s; | |
1196 | |
1197 for (nchars = 0; rest > 0; ++nchars) | |
1198 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1199 string_char_and_length (p, rest, &len); |
25012 | 1200 rest -= len, p += len; |
1201 } | |
1202 } | |
1203 else | |
1204 nchars = strlen (s); | |
1205 | |
1206 return nchars; | |
1207 } | |
1208 | |
1209 | |
1210 /* Compute byte position NEWPOS->bytepos corresponding to | |
1211 NEWPOS->charpos. POS is a known position in string STRING. | |
1212 NEWPOS->charpos must be >= POS.charpos. */ | |
1213 | |
1214 static void | |
1215 compute_string_pos (newpos, pos, string) | |
1216 struct text_pos *newpos, pos; | |
1217 Lisp_Object string; | |
1218 { | |
1219 xassert (STRINGP (string)); | |
1220 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1221 | |
1222 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
|
1223 *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
|
1224 CHARPOS (*newpos) - CHARPOS (pos)); |
25012 | 1225 else |
1226 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1227 } | |
1228 | |
1229 | |
1230 | |
1231 /*********************************************************************** | |
1232 Lisp form evaluation | |
1233 ***********************************************************************/ | |
1234 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1235 /* Error handler for safe_eval and safe_call. */ |
25012 | 1236 |
1237 static Lisp_Object | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1238 safe_eval_handler (arg) |
25012 | 1239 Lisp_Object arg; |
1240 { | |
33072
176f2eb7a645
(safe_eval_handler): Call add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents:
33068
diff
changeset
|
1241 add_to_log ("Error during redisplay: %s", arg, Qnil); |
25012 | 1242 return Qnil; |
1243 } | |
1244 | |
1245 | |
1246 /* Evaluate SEXPR and return the result, or nil if something went | |
1247 wrong. */ | |
1248 | |
30202
bade676e0950
(eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
30159
diff
changeset
|
1249 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1250 safe_eval (sexpr) |
25012 | 1251 Lisp_Object sexpr; |
1252 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1253 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1254 struct gcpro gcpro1; |
25012 | 1255 Lisp_Object val; |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1256 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1257 GCPRO1 (sexpr); |
25012 | 1258 specbind (Qinhibit_redisplay, Qt); |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1259 val = internal_condition_case_1 (Feval, sexpr, Qerror, safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1260 UNGCPRO; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1261 return unbind_to (count, val); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1262 } |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1263 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1264 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1265 /* 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
|
1266 Return the result, or nil if something went wrong. */ |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1267 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1268 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1269 safe_call (nargs, args) |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1270 int nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1271 Lisp_Object *args; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1272 { |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1273 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1274 Lisp_Object val; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1275 struct gcpro gcpro1; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1276 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1277 GCPRO1 (args[0]); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1278 gcpro1.nvars = nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1279 specbind (Qinhibit_redisplay, Qt); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1280 val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror, |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1281 safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1282 UNGCPRO; |
25012 | 1283 return unbind_to (count, val); |
1284 } | |
1285 | |
1286 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1287 /* Call function FN with one argument ARG. |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1288 Return the result, or nil if something went wrong. */ |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1289 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1290 Lisp_Object |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1291 safe_call1 (fn, arg) |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1292 Lisp_Object fn, arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1293 { |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1294 Lisp_Object args[2]; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1295 args[0] = fn; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1296 args[1] = arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1297 return safe_call (2, args); |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1298 } |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1299 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1300 |
25012 | 1301 |
1302 /*********************************************************************** | |
1303 Debugging | |
1304 ***********************************************************************/ | |
1305 | |
1306 #if 0 | |
1307 | |
1308 /* Define CHECK_IT to perform sanity checks on iterators. | |
1309 This is for debugging. It is too slow to do unconditionally. */ | |
1310 | |
1311 static void | |
1312 check_it (it) | |
1313 struct it *it; | |
1314 { | |
1315 if (it->method == next_element_from_string) | |
1316 { | |
1317 xassert (STRINGP (it->string)); | |
1318 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1319 } | |
1320 else if (it->method == next_element_from_buffer) | |
1321 { | |
1322 /* Check that character and byte positions agree. */ | |
1323 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1324 } | |
1325 | |
1326 if (it->dpvec) | |
1327 xassert (it->current.dpvec_index >= 0); | |
1328 else | |
1329 xassert (it->current.dpvec_index < 0); | |
1330 } | |
1331 | |
1332 #define CHECK_IT(IT) check_it ((IT)) | |
1333 | |
1334 #else /* not 0 */ | |
1335 | |
1336 #define CHECK_IT(IT) (void) 0 | |
1337 | |
1338 #endif /* not 0 */ | |
1339 | |
1340 | |
1341 #if GLYPH_DEBUG | |
1342 | |
1343 /* Check that the window end of window W is what we expect it | |
1344 to be---the last row in the current matrix displaying text. */ | |
1345 | |
1346 static void | |
1347 check_window_end (w) | |
1348 struct window *w; | |
1349 { | |
1350 if (!MINI_WINDOW_P (w) | |
1351 && !NILP (w->window_end_valid)) | |
1352 { | |
1353 struct glyph_row *row; | |
1354 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1355 XFASTINT (w->window_end_vpos)), | |
1356 !row->enabled_p | |
1357 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1358 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1359 } | |
1360 } | |
1361 | |
1362 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1363 | |
1364 #else /* not GLYPH_DEBUG */ | |
1365 | |
1366 #define CHECK_WINDOW_END(W) (void) 0 | |
1367 | |
1368 #endif /* not GLYPH_DEBUG */ | |
1369 | |
1370 | |
1371 | |
1372 /*********************************************************************** | |
1373 Iterator initialization | |
1374 ***********************************************************************/ | |
1375 | |
1376 /* Initialize IT for displaying current_buffer in window W, starting | |
1377 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1378 position is specified which is useful when the iterator is assigned | |
1379 a position later. BYTEPOS is the byte position corresponding to | |
1380 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1381 | |
1382 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1383 will produce glyphs in that row. | |
1384 | |
1385 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1386 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1387 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1388 displaying the tool-bar. |
25012 | 1389 |
1390 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1391 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1392 corresponding mode line glyph row of the desired matrix of W. */ |
1393 | |
1394 void | |
1395 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1396 struct it *it; | |
1397 struct window *w; | |
1398 int charpos, bytepos; | |
1399 struct glyph_row *row; | |
1400 enum face_id base_face_id; | |
1401 { | |
1402 int highlight_region_p; | |
1403 | |
1404 /* Some precondition checks. */ | |
1405 xassert (w != NULL && it != NULL); | |
1406 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1407 | |
1408 /* If face attributes have been changed since the last redisplay, | |
1409 free realized faces now because they depend on face definitions | |
1410 that might have changed. */ | |
1411 if (face_change_count) | |
1412 { | |
1413 face_change_count = 0; | |
1414 free_all_realized_faces (Qnil); | |
1415 } | |
1416 | |
1417 /* Use one of the mode line rows of W's desired matrix if | |
1418 appropriate. */ | |
1419 if (row == NULL) | |
1420 { | |
1421 if (base_face_id == MODE_LINE_FACE_ID) | |
1422 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1423 else if (base_face_id == HEADER_LINE_FACE_ID) |
1424 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1425 } |
1426 | |
1427 /* Clear IT. */ | |
1428 bzero (it, sizeof *it); | |
1429 it->current.overlay_string_index = -1; | |
1430 it->current.dpvec_index = -1; | |
1431 it->base_face_id = base_face_id; | |
1432 | |
1433 /* The window in which we iterate over current_buffer: */ | |
1434 XSETWINDOW (it->window, w); | |
1435 it->w = w; | |
1436 it->f = XFRAME (w->frame); | |
1437 | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1438 /* 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
|
1439 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
|
1440 && FRAME_WINDOW_P (it->f)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1441 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1442 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
|
1443 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
|
1444 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
|
1445 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
|
1446 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1447 |
25012 | 1448 /* If realized faces have been removed, e.g. because of face |
34664
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1449 attribute changes of named faces, recompute them. When running |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1450 in batch mode, the face cache of Vterminal_frame is null. If |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1451 we happen to get called, make a dummy face cache. */ |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1452 if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL) |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1453 init_frame_faces (it->f); |
25012 | 1454 if (FRAME_FACE_CACHE (it->f)->used == 0) |
1455 recompute_basic_faces (it->f); | |
1456 | |
1457 /* Current value of the `space-width', and 'height' properties. */ | |
1458 it->space_width = Qnil; | |
1459 it->font_height = Qnil; | |
1460 | |
1461 /* Are control characters displayed as `^C'? */ | |
1462 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1463 | |
1464 /* -1 means everything between a CR and the following line end | |
1465 is invisible. >0 means lines indented more than this value are | |
1466 invisible. */ | |
1467 it->selective = (INTEGERP (current_buffer->selective_display) | |
1468 ? XFASTINT (current_buffer->selective_display) | |
1469 : (!NILP (current_buffer->selective_display) | |
1470 ? -1 : 0)); | |
1471 it->selective_display_ellipsis_p | |
1472 = !NILP (current_buffer->selective_display_ellipses); | |
1473 | |
1474 /* Display table to use. */ | |
1475 it->dp = window_display_table (w); | |
1476 | |
1477 /* Are multibyte characters enabled in current_buffer? */ | |
1478 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1479 | |
1480 /* Non-zero if we should highlight the region. */ | |
1481 highlight_region_p | |
1482 = (!NILP (Vtransient_mark_mode) | |
1483 && !NILP (current_buffer->mark_active) | |
1484 && XMARKER (current_buffer->mark)->buffer != 0); | |
1485 | |
1486 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1487 start and end of a visible region in window IT->w. Set both to | |
1488 -1 to indicate no region. */ | |
1489 if (highlight_region_p | |
1490 /* Maybe highlight only in selected window. */ | |
1491 && (/* Either show region everywhere. */ | |
1492 highlight_nonselected_windows | |
1493 /* Or show region in the selected window. */ | |
1494 || w == XWINDOW (selected_window) | |
1495 /* Or show the region if we are in the mini-buffer and W is | |
1496 the window the mini-buffer refers to. */ | |
1497 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1498 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1499 { | |
1500 int charpos = marker_position (current_buffer->mark); | |
1501 it->region_beg_charpos = min (PT, charpos); | |
1502 it->region_end_charpos = max (PT, charpos); | |
1503 } | |
1504 else | |
1505 it->region_beg_charpos = it->region_end_charpos = -1; | |
1506 | |
1507 /* Get the position at which the redisplay_end_trigger hook should | |
1508 be run, if it is to be run at all. */ | |
1509 if (MARKERP (w->redisplay_end_trigger) | |
1510 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1511 it->redisplay_end_trigger_charpos | |
1512 = marker_position (w->redisplay_end_trigger); | |
1513 else if (INTEGERP (w->redisplay_end_trigger)) | |
1514 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1515 | |
1516 /* Correct bogus values of tab_width. */ | |
1517 it->tab_width = XINT (current_buffer->tab_width); | |
1518 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1519 it->tab_width = 8; | |
1520 | |
1521 /* Are lines in the display truncated? */ | |
1522 it->truncate_lines_p | |
1523 = (base_face_id != DEFAULT_FACE_ID | |
1524 || XINT (it->w->hscroll) | |
1525 || (truncate_partial_width_windows | |
1526 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1527 || !NILP (current_buffer->truncate_lines)); | |
1528 | |
1529 /* Get dimensions of truncation and continuation glyphs. These are | |
1530 displayed as bitmaps under X, so we don't need them for such | |
1531 frames. */ | |
1532 if (!FRAME_WINDOW_P (it->f)) | |
1533 { | |
1534 if (it->truncate_lines_p) | |
1535 { | |
1536 /* We will need the truncation glyph. */ | |
1537 xassert (it->glyph_row == NULL); | |
1538 produce_special_glyphs (it, IT_TRUNCATION); | |
1539 it->truncation_pixel_width = it->pixel_width; | |
1540 } | |
1541 else | |
1542 { | |
1543 /* We will need the continuation glyph. */ | |
1544 xassert (it->glyph_row == NULL); | |
1545 produce_special_glyphs (it, IT_CONTINUATION); | |
1546 it->continuation_pixel_width = it->pixel_width; | |
1547 } | |
1548 | |
1549 /* Reset these values to zero becaue the produce_special_glyphs | |
1550 above has changed them. */ | |
1551 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
|
1552 it->phys_ascent = it->phys_descent = 0; |
25012 | 1553 } |
1554 | |
1555 /* Set this after getting the dimensions of truncation and | |
1556 continuation glyphs, so that we don't produce glyphs when calling | |
1557 produce_special_glyphs, above. */ | |
1558 it->glyph_row = row; | |
1559 it->area = TEXT_AREA; | |
1560 | |
1561 /* Get the dimensions of the display area. The display area | |
1562 consists of the visible window area plus a horizontally scrolled | |
1563 part to the left of the window. All x-values are relative to the | |
1564 start of this total display area. */ | |
1565 if (base_face_id != DEFAULT_FACE_ID) | |
1566 { | |
1567 /* Mode lines, menu bar in terminal frames. */ | |
1568 it->first_visible_x = 0; | |
1569 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1570 } | |
1571 else | |
1572 { | |
1573 it->first_visible_x | |
1574 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1575 it->last_visible_x = (it->first_visible_x | |
1576 + window_box_width (w, TEXT_AREA)); | |
1577 | |
1578 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1579 the right margin. Otherwise, leave room for the continuation | |
1580 glyph(s). Truncation and continuation glyphs are not inserted | |
1581 for window-based redisplay. */ | |
1582 if (!FRAME_WINDOW_P (it->f)) | |
1583 { | |
1584 if (it->truncate_lines_p) | |
1585 it->last_visible_x -= it->truncation_pixel_width; | |
1586 else | |
1587 it->last_visible_x -= it->continuation_pixel_width; | |
1588 } | |
1589 | |
25546 | 1590 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1591 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1592 } |
1593 | |
1594 /* Leave room for a border glyph. */ | |
1595 if (!FRAME_WINDOW_P (it->f) | |
1596 && !WINDOW_RIGHTMOST_P (it->w)) | |
1597 it->last_visible_x -= 1; | |
1598 | |
1599 it->last_visible_y = window_text_bottom_y (w); | |
1600 | |
1601 /* For mode lines and alike, arrange for the first glyph having a | |
1602 left box line if the face specifies a box. */ | |
1603 if (base_face_id != DEFAULT_FACE_ID) | |
1604 { | |
1605 struct face *face; | |
1606 | |
1607 it->face_id = base_face_id; | |
1608 | |
1609 /* If we have a boxed mode line, make the first character appear | |
1610 with a left box line. */ | |
1611 face = FACE_FROM_ID (it->f, base_face_id); | |
1612 if (face->box != FACE_NO_BOX) | |
1613 it->start_of_box_run_p = 1; | |
1614 } | |
1615 | |
1616 /* If a buffer position was specified, set the iterator there, | |
1617 getting overlays and face properties from that position. */ | |
1618 if (charpos > 0) | |
1619 { | |
1620 it->end_charpos = ZV; | |
1621 it->face_id = -1; | |
1622 IT_CHARPOS (*it) = charpos; | |
1623 | |
1624 /* Compute byte position if not specified. */ | |
1625 if (bytepos <= 0) | |
1626 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1627 else | |
1628 IT_BYTEPOS (*it) = bytepos; | |
1629 | |
1630 /* Compute faces etc. */ | |
1631 reseat (it, it->current.pos, 1); | |
1632 } | |
1633 | |
1634 CHECK_IT (it); | |
1635 } | |
1636 | |
1637 | |
1638 /* Initialize IT for the display of window W with window start POS. */ | |
1639 | |
1640 void | |
1641 start_display (it, w, pos) | |
1642 struct it *it; | |
1643 struct window *w; | |
1644 struct text_pos pos; | |
1645 { | |
1646 int start_at_line_beg_p; | |
1647 struct glyph_row *row; | |
25546 | 1648 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1649 int first_y; |
1650 | |
1651 row = w->desired_matrix->rows + first_vpos; | |
1652 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1653 first_y = it->current_y; | |
1654 | |
1655 /* If window start is not at a line start, move back to the line | |
1656 start. This makes sure that we take continuation lines into | |
1657 account. */ | |
1658 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1659 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1660 if (!start_at_line_beg_p) | |
1661 reseat_at_previous_visible_line_start (it); | |
1662 | |
1663 /* If window start is not at a line start, skip forward to POS to | |
1664 get the correct continuation_lines_width and current_x. */ | |
1665 if (!start_at_line_beg_p) | |
1666 { | |
1667 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1668 | |
1669 /* If lines are continued, this line may end in the middle of a | |
1670 multi-glyph character (e.g. a control character displayed as | |
1671 \003, or in the middle of an overlay string). In this case | |
1672 move_it_to above will not have taken us to the start of | |
1673 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
|
1674 if (!it->truncate_lines_p) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1675 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1676 if (it->current_x > 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1677 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1678 if (it->current.dpvec_index >= 0 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1679 || it->current.overlay_string_index >= 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1680 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1681 set_iterator_to_next (it, 1); |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1682 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
|
1683 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1684 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1685 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
|
1686 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1687 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1688 /* 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
|
1689 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
|
1690 fields in the iterator structure. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1691 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
|
1692 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 1693 } |
1694 | |
1695 it->current_y = first_y; | |
1696 it->vpos = 0; | |
1697 it->current_x = it->hpos = 0; | |
1698 } | |
1699 | |
1700 #if 0 /* Don't assert the following because start_display is sometimes | |
1701 called intentionally with a window start that is not at a | |
1702 line start. Please leave this code in as a comment. */ | |
1703 | |
1704 /* Window start should be on a line start, now. */ | |
1705 xassert (it->continuation_lines_width | |
1706 || IT_CHARPOS (it) == BEGV | |
1707 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1708 #endif /* 0 */ | |
1709 } | |
1710 | |
1711 | |
1712 /* Initialize IT for stepping through current_buffer in window W, | |
1713 starting at position POS that includes overlay string and display | |
1714 vector/ control character translation position information. */ | |
1715 | |
1716 static void | |
1717 init_from_display_pos (it, w, pos) | |
1718 struct it *it; | |
1719 struct window *w; | |
1720 struct display_pos *pos; | |
1721 { | |
1722 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1723 text, so we might end up at a position different from POS. This | |
1724 is only a problem when POS is a row start after a newline and an | |
1725 overlay starts there with an after-string, and the overlay has an | |
1726 invisible property. Since we don't skip invisible text in | |
1727 display_line and elsewhere immediately after consuming the | |
1728 newline before the row start, such a POS will not be in a string, | |
1729 but the call to init_iterator below will move us to the | |
1730 after-string. */ | |
1731 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1732 NULL, DEFAULT_FACE_ID); | |
1733 | |
1734 /* If position is within an overlay string, set up IT to | |
1735 the right overlay string. */ | |
1736 if (pos->overlay_string_index >= 0) | |
1737 { | |
1738 int relative_index; | |
1739 | |
1740 /* We already have the first chunk of overlay strings in | |
1741 IT->overlay_strings. Load more until the one for | |
1742 pos->overlay_string_index is in IT->overlay_strings. */ | |
1743 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1744 { | |
1745 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1746 it->current.overlay_string_index = 0; | |
1747 while (n--) | |
1748 { | |
1749 load_overlay_strings (it); | |
1750 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1751 } | |
1752 } | |
1753 | |
1754 it->current.overlay_string_index = pos->overlay_string_index; | |
1755 relative_index = (it->current.overlay_string_index | |
1756 % OVERLAY_STRING_CHUNK_SIZE); | |
1757 it->string = it->overlay_strings[relative_index]; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1758 xassert (STRINGP (it->string)); |
25012 | 1759 it->current.string_pos = pos->string_pos; |
1760 it->method = next_element_from_string; | |
1761 } | |
33863
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1762 else if (it->current.overlay_string_index >= 0) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1763 { |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1764 /* If POS says we're already after an overlay string ending at |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1765 POS, make sure to pop the iterator because it will be in |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1766 front of that overlay string. When POS is ZV, we've thereby |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1767 also ``processed'' overlay strings at ZV. */ |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1768 pop_it (it); |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1769 it->current.overlay_string_index = -1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1770 it->method = next_element_from_buffer; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1771 if (CHARPOS (pos->pos) == ZV) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1772 it->overlay_strings_at_end_processed_p = 1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1773 } |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1774 |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1775 if (CHARPOS (pos->string_pos) >= 0) |
25012 | 1776 { |
1777 /* Recorded position is not in an overlay string, but in another | |
1778 string. This can only be a string from a `display' property. | |
1779 IT should already be filled with that string. */ | |
1780 it->current.string_pos = pos->string_pos; | |
1781 xassert (STRINGP (it->string)); | |
1782 } | |
1783 | |
1784 /* Restore position in display vector translations or control | |
1785 character translations. */ | |
1786 if (pos->dpvec_index >= 0) | |
1787 { | |
1788 /* This fills IT->dpvec. */ | |
1789 get_next_display_element (it); | |
1790 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1791 it->current.dpvec_index = pos->dpvec_index; | |
1792 } | |
1793 | |
1794 CHECK_IT (it); | |
1795 } | |
1796 | |
1797 | |
1798 /* Initialize IT for stepping through current_buffer in window W | |
1799 starting at ROW->start. */ | |
1800 | |
1801 static void | |
1802 init_to_row_start (it, w, row) | |
1803 struct it *it; | |
1804 struct window *w; | |
1805 struct glyph_row *row; | |
1806 { | |
1807 init_from_display_pos (it, w, &row->start); | |
1808 it->continuation_lines_width = row->continuation_lines_width; | |
1809 CHECK_IT (it); | |
1810 } | |
1811 | |
1812 | |
1813 /* Initialize IT for stepping through current_buffer in window W | |
1814 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1815 | |
1816 static void | |
1817 init_to_row_end (it, w, row) | |
1818 struct it *it; | |
1819 struct window *w; | |
1820 struct glyph_row *row; | |
1821 { | |
1822 init_from_display_pos (it, w, &row->end); | |
1823 | |
1824 if (row->continued_p) | |
1825 it->continuation_lines_width = (row->continuation_lines_width | |
1826 + row->pixel_width); | |
1827 CHECK_IT (it); | |
1828 } | |
1829 | |
1830 | |
1831 | |
1832 | |
1833 /*********************************************************************** | |
1834 Text properties | |
1835 ***********************************************************************/ | |
1836 | |
1837 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1838 overlay changes. Set IT->stop_charpos to the next position where | |
1839 to stop. */ | |
1840 | |
1841 static void | |
1842 handle_stop (it) | |
1843 struct it *it; | |
1844 { | |
1845 enum prop_handled handled; | |
1846 int handle_overlay_change_p = 1; | |
1847 struct props *p; | |
1848 | |
1849 it->dpvec = NULL; | |
1850 it->current.dpvec_index = -1; | |
1851 | |
1852 do | |
1853 { | |
1854 handled = HANDLED_NORMALLY; | |
1855 | |
1856 /* Call text property handlers. */ | |
1857 for (p = it_props; p->handler; ++p) | |
1858 { | |
1859 handled = p->handler (it); | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1860 |
25012 | 1861 if (handled == HANDLED_RECOMPUTE_PROPS) |
1862 break; | |
1863 else if (handled == HANDLED_RETURN) | |
1864 return; | |
1865 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1866 handle_overlay_change_p = 0; | |
1867 } | |
1868 | |
1869 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1870 { | |
1871 /* Don't check for overlay strings below when set to deliver | |
1872 characters from a display vector. */ | |
1873 if (it->method == next_element_from_display_vector) | |
1874 handle_overlay_change_p = 0; | |
1875 | |
1876 /* Handle overlay changes. */ | |
1877 if (handle_overlay_change_p) | |
1878 handled = handle_overlay_change (it); | |
1879 | |
1880 /* Determine where to stop next. */ | |
1881 if (handled == HANDLED_NORMALLY) | |
1882 compute_stop_pos (it); | |
1883 } | |
1884 } | |
1885 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1886 } | |
1887 | |
1888 | |
1889 /* Compute IT->stop_charpos from text property and overlay change | |
1890 information for IT's current position. */ | |
1891 | |
1892 static void | |
1893 compute_stop_pos (it) | |
1894 struct it *it; | |
1895 { | |
1896 register INTERVAL iv, next_iv; | |
1897 Lisp_Object object, limit, position; | |
1898 | |
1899 /* If nowhere else, stop at the end. */ | |
1900 it->stop_charpos = it->end_charpos; | |
1901 | |
1902 if (STRINGP (it->string)) | |
1903 { | |
1904 /* Strings are usually short, so don't limit the search for | |
1905 properties. */ | |
1906 object = it->string; | |
1907 limit = Qnil; | |
1908 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1909 } | |
1910 else | |
1911 { | |
1912 int charpos; | |
1913 | |
1914 /* If next overlay change is in front of the current stop pos | |
1915 (which is IT->end_charpos), stop there. Note: value of | |
1916 next_overlay_change is point-max if no overlay change | |
1917 follows. */ | |
1918 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1919 if (charpos < it->stop_charpos) | |
1920 it->stop_charpos = charpos; | |
1921 | |
1922 /* If showing the region, we have to stop at the region | |
1923 start or end because the face might change there. */ | |
1924 if (it->region_beg_charpos > 0) | |
1925 { | |
1926 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1927 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1928 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1929 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1930 } | |
1931 | |
1932 /* Set up variables for computing the stop position from text | |
1933 property changes. */ | |
1934 XSETBUFFER (object, current_buffer); | |
1935 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1936 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1937 | |
1938 } | |
1939 | |
1940 /* Get the interval containing IT's position. Value is a null | |
1941 interval if there isn't such an interval. */ | |
1942 iv = validate_interval_range (object, &position, &position, 0); | |
1943 if (!NULL_INTERVAL_P (iv)) | |
1944 { | |
1945 Lisp_Object values_here[LAST_PROP_IDX]; | |
1946 struct props *p; | |
1947 | |
1948 /* Get properties here. */ | |
1949 for (p = it_props; p->handler; ++p) | |
1950 values_here[p->idx] = textget (iv->plist, *p->name); | |
1951 | |
1952 /* Look for an interval following iv that has different | |
1953 properties. */ | |
1954 for (next_iv = next_interval (iv); | |
1955 (!NULL_INTERVAL_P (next_iv) | |
1956 && (NILP (limit) | |
1957 || XFASTINT (limit) > next_iv->position)); | |
1958 next_iv = next_interval (next_iv)) | |
1959 { | |
1960 for (p = it_props; p->handler; ++p) | |
1961 { | |
1962 Lisp_Object new_value; | |
1963 | |
1964 new_value = textget (next_iv->plist, *p->name); | |
1965 if (!EQ (values_here[p->idx], new_value)) | |
1966 break; | |
1967 } | |
1968 | |
1969 if (p->handler) | |
1970 break; | |
1971 } | |
1972 | |
1973 if (!NULL_INTERVAL_P (next_iv)) | |
1974 { | |
1975 if (INTEGERP (limit) | |
1976 && next_iv->position >= XFASTINT (limit)) | |
1977 /* No text property change up to limit. */ | |
1978 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1979 else | |
1980 /* Text properties change in next_iv. */ | |
1981 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1982 } | |
1983 } | |
1984 | |
1985 xassert (STRINGP (it->string) | |
1986 || (it->stop_charpos >= BEGV | |
1987 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1988 } | |
1989 | |
1990 | |
1991 /* Return the position of the next overlay change after POS in | |
1992 current_buffer. Value is point-max if no overlay change | |
1993 follows. This is like `next-overlay-change' but doesn't use | |
1994 xmalloc. */ | |
1995 | |
1996 static int | |
1997 next_overlay_change (pos) | |
1998 int pos; | |
1999 { | |
2000 int noverlays; | |
2001 int endpos; | |
2002 Lisp_Object *overlays; | |
2003 int len; | |
2004 int i; | |
2005 | |
2006 /* Get all overlays at the given position. */ | |
2007 len = 10; | |
2008 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
|
2009 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 2010 if (noverlays > len) |
2011 { | |
2012 len = noverlays; | |
2013 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
|
2014 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 2015 } |
2016 | |
2017 /* If any of these overlays ends before endpos, | |
2018 use its ending point instead. */ | |
2019 for (i = 0; i < noverlays; ++i) | |
2020 { | |
2021 Lisp_Object oend; | |
2022 int oendpos; | |
2023 | |
2024 oend = OVERLAY_END (overlays[i]); | |
2025 oendpos = OVERLAY_POSITION (oend); | |
2026 endpos = min (endpos, oendpos); | |
2027 } | |
2028 | |
2029 return endpos; | |
2030 } | |
2031 | |
2032 | |
2033 | |
2034 /*********************************************************************** | |
2035 Fontification | |
2036 ***********************************************************************/ | |
2037 | |
2038 /* Handle changes in the `fontified' property of the current buffer by | |
2039 calling hook functions from Qfontification_functions to fontify | |
2040 regions of text. */ | |
2041 | |
2042 static enum prop_handled | |
2043 handle_fontified_prop (it) | |
2044 struct it *it; | |
2045 { | |
2046 Lisp_Object prop, pos; | |
2047 enum prop_handled handled = HANDLED_NORMALLY; | |
2048 | |
2049 /* Get the value of the `fontified' property at IT's current buffer | |
2050 position. (The `fontified' property doesn't have a special | |
2051 meaning in strings.) If the value is nil, call functions from | |
2052 Qfontification_functions. */ | |
2053 if (!STRINGP (it->string) | |
2054 && it->s == NULL | |
2055 && !NILP (Vfontification_functions) | |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2056 && !NILP (Vrun_hooks) |
25012 | 2057 && (pos = make_number (IT_CHARPOS (*it)), |
2058 prop = Fget_char_property (pos, Qfontified, Qnil), | |
2059 NILP (prop))) | |
2060 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2061 int count = BINDING_STACK_SIZE (); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2062 Lisp_Object val; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2063 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2064 val = Vfontification_functions; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2065 specbind (Qfontification_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2066 specbind (Qafter_change_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2067 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2068 if (!CONSP (val) || EQ (XCAR (val), Qlambda)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2069 safe_call1 (val, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2070 else |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2071 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2072 Lisp_Object globals, fn; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2073 struct gcpro gcpro1, gcpro2; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2074 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2075 globals = Qnil; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2076 GCPRO2 (val, globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2077 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2078 for (; CONSP (val); val = XCDR (val)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2079 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2080 fn = XCAR (val); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2081 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2082 if (EQ (fn, Qt)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2083 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2084 /* A value of t indicates this hook has a local |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2085 binding; it means to run the global binding too. |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2086 In a global value, t should not occur. If it |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2087 does, we must ignore it to avoid an endless |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2088 loop. */ |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2089 for (globals = Fdefault_value (Qfontification_functions); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2090 CONSP (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2091 globals = XCDR (globals)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2092 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2093 fn = XCAR (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2094 if (!EQ (fn, Qt)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2095 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2096 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2097 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2098 else |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2099 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2100 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2101 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2102 UNGCPRO; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2103 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2104 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2105 unbind_to (count, Qnil); |
25012 | 2106 |
2107 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
2108 something. This avoids an endless loop if they failed to | |
2109 fontify the text for which reason ever. */ | |
2110 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
2111 handled = HANDLED_RECOMPUTE_PROPS; | |
2112 } | |
2113 | |
2114 return handled; | |
2115 } | |
2116 | |
2117 | |
2118 | |
2119 /*********************************************************************** | |
2120 Faces | |
2121 ***********************************************************************/ | |
2122 | |
2123 /* Set up iterator IT from face properties at its current position. | |
2124 Called from handle_stop. */ | |
2125 | |
2126 static enum prop_handled | |
2127 handle_face_prop (it) | |
2128 struct it *it; | |
2129 { | |
2130 int new_face_id, next_stop; | |
2131 | |
2132 if (!STRINGP (it->string)) | |
2133 { | |
2134 new_face_id | |
2135 = face_at_buffer_position (it->w, | |
2136 IT_CHARPOS (*it), | |
2137 it->region_beg_charpos, | |
2138 it->region_end_charpos, | |
2139 &next_stop, | |
2140 (IT_CHARPOS (*it) | |
2141 + TEXT_PROP_DISTANCE_LIMIT), | |
2142 0); | |
2143 | |
2144 /* Is this a start of a run of characters with box face? | |
2145 Caveat: this can be called for a freshly initialized | |
2146 iterator; face_id is -1 is this case. We know that the new | |
2147 face will not change until limit, i.e. if the new face has a | |
2148 box, all characters up to limit will have one. But, as | |
2149 usual, we don't know whether limit is really the end. */ | |
2150 if (new_face_id != it->face_id) | |
2151 { | |
2152 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2153 | |
2154 /* If new face has a box but old face has not, this is | |
2155 the start of a run of characters with box, i.e. it has | |
2156 a shadow on the left side. The value of face_id of the | |
2157 iterator will be -1 if this is the initial call that gets | |
2158 the face. In this case, we have to look in front of IT's | |
2159 position and see whether there is a face != new_face_id. */ | |
2160 it->start_of_box_run_p | |
2161 = (new_face->box != FACE_NO_BOX | |
2162 && (it->face_id >= 0 | |
2163 || IT_CHARPOS (*it) == BEG | |
2164 || new_face_id != face_before_it_pos (it))); | |
2165 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2166 } | |
2167 } | |
2168 else | |
2169 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2170 int base_face_id, bufpos; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2171 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2172 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2173 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2174 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2175 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2176 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2177 /* For strings from a buffer, i.e. overlay strings or strings |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2178 from a `display' property, use the face at IT's current |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2179 buffer position as the base face to merge with, so that |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2180 overlay strings appear in the same face as surrounding |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2181 text, unless they specify their own faces. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2182 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2183 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2184 new_face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2185 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2186 IT_STRING_CHARPOS (*it), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2187 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2188 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2189 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2190 &next_stop, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2191 base_face_id); |
25012 | 2192 |
2193 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
2194 /* If IT is used to display a mode line we would really like to | |
2195 use the mode line face instead of the frame's default face. */ | |
2196 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
2197 && new_face_id == DEFAULT_FACE_ID) | |
2198 new_face_id = MODE_LINE_FACE_ID; | |
2199 #endif | |
2200 | |
2201 /* Is this a start of a run of characters with box? Caveat: | |
2202 this can be called for a freshly allocated iterator; face_id | |
2203 is -1 is this case. We know that the new face will not | |
2204 change until the next check pos, i.e. if the new face has a | |
2205 box, all characters up to that position will have a | |
2206 box. But, as usual, we don't know whether that position | |
2207 is really the end. */ | |
2208 if (new_face_id != it->face_id) | |
2209 { | |
2210 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2211 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
2212 | |
2213 /* If new face has a box but old face hasn't, this is the | |
2214 start of a run of characters with box, i.e. it has a | |
2215 shadow on the left side. */ | |
2216 it->start_of_box_run_p | |
2217 = new_face->box && (old_face == NULL || !old_face->box); | |
2218 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2219 } | |
2220 } | |
2221 | |
2222 it->face_id = new_face_id; | |
2223 return HANDLED_NORMALLY; | |
2224 } | |
2225 | |
2226 | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2227 /* Return the ID of the face ``underlying'' IT's current position, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2228 which is in a string. If the iterator is associated with a |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2229 buffer, return the face at IT's current buffer position. |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2230 Otherwise, use the iterator's base_face_id. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2231 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2232 static int |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2233 underlying_face_id (it) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2234 struct it *it; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2235 { |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2236 int face_id = it->base_face_id, i; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2237 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2238 xassert (STRINGP (it->string)); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2239 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2240 for (i = it->sp - 1; i >= 0; --i) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2241 if (NILP (it->stack[i].string)) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2242 face_id = it->stack[i].face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2243 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2244 return face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2245 } |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2246 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2247 |
25012 | 2248 /* Compute the face one character before or after the current position |
2249 of IT. BEFORE_P non-zero means get the face in front of IT's | |
2250 position. Value is the id of the face. */ | |
2251 | |
2252 static int | |
2253 face_before_or_after_it_pos (it, before_p) | |
2254 struct it *it; | |
2255 int before_p; | |
2256 { | |
2257 int face_id, limit; | |
2258 int next_check_charpos; | |
2259 struct text_pos pos; | |
2260 | |
2261 xassert (it->s == NULL); | |
2262 | |
2263 if (STRINGP (it->string)) | |
2264 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2265 int bufpos, base_face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2266 |
25012 | 2267 /* No face change past the end of the string (for the case |
2268 we are padding with spaces). No face change before the | |
2269 string start. */ | |
2270 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
2271 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
2272 return it->face_id; | |
2273 | |
2274 /* Set pos to the position before or after IT's current position. */ | |
2275 if (before_p) | |
2276 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
2277 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2278 /* 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
|
2279 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2280 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2281 ? 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
|
2282 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 2283 |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2284 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2285 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2286 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2287 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2288 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2289 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2290 |
25012 | 2291 /* Get the face for ASCII, or unibyte. */ |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2292 face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2293 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2294 CHARPOS (pos), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2295 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2296 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2297 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2298 &next_check_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2299 base_face_id); |
25012 | 2300 |
2301 /* Correct the face for charsets different from ASCII. Do it | |
2302 for the multibyte case only. The face returned above is | |
2303 suitable for unibyte text if IT->string is unibyte. */ | |
2304 if (STRING_MULTIBYTE (it->string)) | |
2305 { | |
2306 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
2307 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
|
2308 int c, len; |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2309 struct face *face = FACE_FROM_ID (it->f, face_id); |
25012 | 2310 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
2311 c = string_char_and_length (p, rest, &len); |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2312 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2313 } |
2314 } | |
2315 else | |
2316 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2317 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
|
2318 || (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
|
2319 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2320 |
25012 | 2321 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
2322 pos = it->current.pos; | |
2323 | |
2324 if (before_p) | |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2325 DEC_TEXT_POS (pos, it->multibyte_p); |
25012 | 2326 else |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2327 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2328 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2329 /* 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
|
2330 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2331 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
|
2332 else |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2333 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
|
2334 } |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2335 |
25012 | 2336 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2337 face_id = face_at_buffer_position (it->w, | |
2338 CHARPOS (pos), | |
2339 it->region_beg_charpos, | |
2340 it->region_end_charpos, | |
2341 &next_check_charpos, | |
2342 limit, 0); | |
2343 | |
2344 /* Correct the face for charsets different from ASCII. Do it | |
2345 for the multibyte case only. The face returned above is | |
2346 suitable for unibyte text if current_buffer is unibyte. */ | |
2347 if (it->multibyte_p) | |
2348 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2349 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos)); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2350 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
|
2351 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2352 } |
2353 } | |
2354 | |
2355 return face_id; | |
2356 } | |
2357 | |
2358 | |
2359 | |
2360 /*********************************************************************** | |
2361 Invisible text | |
2362 ***********************************************************************/ | |
2363 | |
2364 /* Set up iterator IT from invisible properties at its current | |
2365 position. Called from handle_stop. */ | |
2366 | |
2367 static enum prop_handled | |
2368 handle_invisible_prop (it) | |
2369 struct it *it; | |
2370 { | |
2371 enum prop_handled handled = HANDLED_NORMALLY; | |
2372 | |
2373 if (STRINGP (it->string)) | |
2374 { | |
2375 extern Lisp_Object Qinvisible; | |
2376 Lisp_Object prop, end_charpos, limit, charpos; | |
2377 | |
2378 /* Get the value of the invisible text property at the | |
2379 current position. Value will be nil if there is no such | |
2380 property. */ | |
2381 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2382 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2383 | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2384 if (!NILP (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2385 && IT_STRING_CHARPOS (*it) < it->end_charpos) |
25012 | 2386 { |
2387 handled = HANDLED_RECOMPUTE_PROPS; | |
2388 | |
2389 /* Get the position at which the next change of the | |
2390 invisible text property can be found in IT->string. | |
2391 Value will be nil if the property value is the same for | |
2392 all the rest of IT->string. */ | |
2393 XSETINT (limit, XSTRING (it->string)->size); | |
2394 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2395 it->string, limit); | |
2396 | |
2397 /* Text at current position is invisible. The next | |
2398 change in the property is at position end_charpos. | |
2399 Move IT's current position to that position. */ | |
2400 if (INTEGERP (end_charpos) | |
2401 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2402 { | |
2403 struct text_pos old; | |
2404 old = it->current.string_pos; | |
2405 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2406 compute_string_pos (&it->current.string_pos, old, it->string); | |
2407 } | |
2408 else | |
2409 { | |
2410 /* The rest of the string is invisible. If this is an | |
2411 overlay string, proceed with the next overlay string | |
2412 or whatever comes and return a character from there. */ | |
2413 if (it->current.overlay_string_index >= 0) | |
2414 { | |
2415 next_overlay_string (it); | |
2416 /* Don't check for overlay strings when we just | |
2417 finished processing them. */ | |
2418 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2419 } | |
2420 else | |
2421 { | |
2422 struct Lisp_String *s = XSTRING (it->string); | |
2423 IT_STRING_CHARPOS (*it) = s->size; | |
2424 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2425 } | |
2426 } | |
2427 } | |
2428 } | |
2429 else | |
2430 { | |
2431 int visible_p, newpos, next_stop; | |
2432 Lisp_Object pos, prop; | |
2433 | |
2434 /* First of all, is there invisible text at this position? */ | |
2435 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2436 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2437 | |
2438 /* 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
|
2439 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
|
2440 && IT_CHARPOS (*it) < it->end_charpos) |
25012 | 2441 { |
2442 /* Record whether we have to display an ellipsis for the | |
2443 invisible text. */ | |
2444 int display_ellipsis_p | |
2445 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2446 | |
2447 handled = HANDLED_RECOMPUTE_PROPS; | |
2448 | |
2449 /* Loop skipping over invisible text. The loop is left at | |
2450 ZV or with IT on the first char being visible again. */ | |
2451 do | |
2452 { | |
2453 /* Try to skip some invisible text. Return value is the | |
2454 position reached which can be equal to IT's position | |
2455 if there is nothing invisible here. This skips both | |
2456 over invisible text properties and overlays with | |
2457 invisible property. */ | |
2458 newpos = skip_invisible (IT_CHARPOS (*it), | |
2459 &next_stop, ZV, it->window); | |
2460 | |
2461 /* If we skipped nothing at all we weren't at invisible | |
2462 text in the first place. If everything to the end of | |
2463 the buffer was skipped, end the loop. */ | |
2464 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2465 visible_p = 1; | |
2466 else | |
2467 { | |
2468 /* We skipped some characters but not necessarily | |
2469 all there are. Check if we ended up on visible | |
2470 text. Fget_char_property returns the property of | |
2471 the char before the given position, i.e. if we | |
2472 get visible_p = 1, this means that the char at | |
2473 newpos is visible. */ | |
2474 XSETFASTINT (pos, newpos); | |
2475 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2476 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2477 } | |
2478 | |
2479 /* If we ended up on invisible text, proceed to | |
2480 skip starting with next_stop. */ | |
2481 if (!visible_p) | |
2482 IT_CHARPOS (*it) = next_stop; | |
2483 } | |
2484 while (!visible_p); | |
2485 | |
2486 /* The position newpos is now either ZV or on visible text. */ | |
2487 IT_CHARPOS (*it) = newpos; | |
2488 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2489 | |
2490 /* Maybe return `...' next for the end of the invisible text. */ | |
2491 if (display_ellipsis_p) | |
2492 { | |
2493 if (it->dp | |
2494 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2495 { | |
2496 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2497 it->dpvec = v->contents; | |
2498 it->dpend = v->contents + v->size; | |
2499 } | |
2500 else | |
2501 { | |
2502 /* Default `...'. */ | |
2503 it->dpvec = default_invis_vector; | |
2504 it->dpend = default_invis_vector + 3; | |
2505 } | |
2506 | |
2507 /* The ellipsis display does not replace the display of | |
2508 the character at the new position. Indicate this by | |
2509 setting IT->dpvec_char_len to zero. */ | |
2510 it->dpvec_char_len = 0; | |
2511 | |
2512 it->current.dpvec_index = 0; | |
2513 it->method = next_element_from_display_vector; | |
2514 } | |
2515 } | |
2516 } | |
2517 | |
2518 return handled; | |
2519 } | |
2520 | |
2521 | |
277 | 2522 |
25012 | 2523 /*********************************************************************** |
2524 'display' property | |
2525 ***********************************************************************/ | |
2526 | |
2527 /* Set up iterator IT from `display' property at its current position. | |
2528 Called from handle_stop. */ | |
2529 | |
2530 static enum prop_handled | |
2531 handle_display_prop (it) | |
2532 struct it *it; | |
2533 { | |
2534 Lisp_Object prop, object; | |
2535 struct text_pos *position; | |
2536 int space_or_image_found_p; | |
2537 | |
2538 if (STRINGP (it->string)) | |
2539 { | |
2540 object = it->string; | |
2541 position = &it->current.string_pos; | |
2542 } | |
2543 else | |
2544 { | |
2545 object = Qnil; | |
2546 position = &it->current.pos; | |
2547 } | |
2548 | |
2549 /* Reset those iterator values set from display property values. */ | |
2550 it->font_height = Qnil; | |
2551 it->space_width = Qnil; | |
2552 it->voffset = 0; | |
2553 | |
2554 /* We don't support recursive `display' properties, i.e. string | |
2555 values that have a string `display' property, that have a string | |
2556 `display' property etc. */ | |
2557 if (!it->string_from_display_prop_p) | |
2558 it->area = TEXT_AREA; | |
2559 | |
2560 prop = Fget_char_property (make_number (position->charpos), | |
2561 Qdisplay, object); | |
2562 if (NILP (prop)) | |
2563 return HANDLED_NORMALLY; | |
2564 | |
2565 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
|
2566 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2567 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2568 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2569 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2570 /* A list of sub-properties. */ |
25012 | 2571 while (CONSP (prop)) |
2572 { | |
2573 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2574 space_or_image_found_p = 1; | |
2575 prop = XCDR (prop); | |
2576 } | |
2577 } | |
2578 else if (VECTORP (prop)) | |
2579 { | |
2580 int i; | |
2581 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2582 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2583 object, position)) | |
2584 space_or_image_found_p = 1; | |
2585 } | |
2586 else | |
2587 { | |
2588 if (handle_single_display_prop (it, prop, object, position)) | |
2589 space_or_image_found_p = 1; | |
2590 } | |
2591 | |
2592 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2593 } | |
2594 | |
2595 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2596 /* Value is the position of the end of the `display' property starting |
25012 | 2597 at START_POS in OBJECT. */ |
2598 | |
2599 static struct text_pos | |
2600 display_prop_end (it, object, start_pos) | |
2601 struct it *it; | |
2602 Lisp_Object object; | |
2603 struct text_pos start_pos; | |
2604 { | |
2605 Lisp_Object end; | |
2606 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2607 |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2608 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
|
2609 Qdisplay, object, Qnil); |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2610 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2611 if (STRINGP (object)) |
25012 | 2612 compute_string_pos (&end_pos, start_pos, it->string); |
2613 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2614 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2615 |
2616 return end_pos; | |
2617 } | |
2618 | |
2619 | |
2620 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2621 is the object in which the `display' property was found. *POSITION | |
2622 is the position at which it was found. | |
2623 | |
2624 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2625 end position of the `display' property. | |
2626 | |
2627 Value is non-zero if a `space' or `image' property value was found. */ | |
2628 | |
2629 static int | |
2630 handle_single_display_prop (it, prop, object, position) | |
2631 struct it *it; | |
2632 Lisp_Object prop; | |
2633 Lisp_Object object; | |
2634 struct text_pos *position; | |
2635 { | |
2636 Lisp_Object value; | |
2637 int space_or_image_found_p = 0; | |
2638 Lisp_Object form; | |
2639 | |
25614 | 2640 /* 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
|
2641 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2642 form = Qt; |
25614 | 2643 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2644 { |
2645 prop = XCDR (prop); | |
2646 if (!CONSP (prop)) | |
2647 return 0; | |
2648 form = XCAR (prop); | |
2649 prop = XCDR (prop); | |
2650 } | |
2651 | |
2652 if (!NILP (form) && !EQ (form, Qt)) | |
2653 { | |
2654 struct gcpro gcpro1; | |
2655 struct text_pos end_pos, pt; | |
2656 | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2657 GCPRO1 (form); |
25012 | 2658 end_pos = display_prop_end (it, object, *position); |
2659 | |
2660 /* Temporarily set point to the end position, and then evaluate | |
2661 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
|
2662 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2663 { |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2664 CHARPOS (pt) = PT; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2665 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
|
2666 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
|
2667 } |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2668 |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2669 form = safe_eval (form); |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2670 |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2671 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2672 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
25012 | 2673 UNGCPRO; |
2674 } | |
2675 | |
2676 if (NILP (form)) | |
2677 return 0; | |
2678 | |
2679 if (CONSP (prop) | |
2680 && EQ (XCAR (prop), Qheight) | |
2681 && CONSP (XCDR (prop))) | |
2682 { | |
2683 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2684 return 0; | |
2685 | |
2686 /* `(height HEIGHT)'. */ | |
2687 it->font_height = XCAR (XCDR (prop)); | |
2688 if (!NILP (it->font_height)) | |
2689 { | |
2690 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2691 int new_height = -1; | |
2692 | |
2693 if (CONSP (it->font_height) | |
2694 && (EQ (XCAR (it->font_height), Qplus) | |
2695 || EQ (XCAR (it->font_height), Qminus)) | |
2696 && CONSP (XCDR (it->font_height)) | |
2697 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2698 { | |
2699 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2700 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2701 if (EQ (XCAR (it->font_height), Qplus)) | |
2702 steps = - steps; | |
2703 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2704 } | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2705 else if (FUNCTIONP (it->font_height)) |
25012 | 2706 { |
2707 /* Call function with current height as argument. | |
2708 Value is the new height. */ | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2709 Lisp_Object height; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2710 height = safe_call1 (it->font_height, |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2711 face->lface[LFACE_HEIGHT_INDEX]); |
25012 | 2712 if (NUMBERP (height)) |
2713 new_height = XFLOATINT (height); | |
2714 } | |
2715 else if (NUMBERP (it->font_height)) | |
2716 { | |
2717 /* Value is a multiple of the canonical char height. */ | |
2718 struct face *face; | |
2719 | |
2720 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2721 new_height = (XFLOATINT (it->font_height) | |
2722 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2723 } | |
2724 else | |
2725 { | |
2726 /* Evaluate IT->font_height with `height' bound to the | |
2727 current specified height to get the new height. */ | |
2728 Lisp_Object value; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2729 int count = BINDING_STACK_SIZE (); |
25012 | 2730 |
2731 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2732 value = safe_eval (it->font_height); |
25012 | 2733 unbind_to (count, Qnil); |
2734 | |
2735 if (NUMBERP (value)) | |
2736 new_height = XFLOATINT (value); | |
2737 } | |
2738 | |
2739 if (new_height > 0) | |
2740 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2741 } | |
2742 } | |
2743 else if (CONSP (prop) | |
2744 && EQ (XCAR (prop), Qspace_width) | |
2745 && CONSP (XCDR (prop))) | |
2746 { | |
2747 /* `(space_width WIDTH)'. */ | |
2748 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2749 return 0; | |
2750 | |
2751 value = XCAR (XCDR (prop)); | |
2752 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2753 it->space_width = value; | |
2754 } | |
2755 else if (CONSP (prop) | |
2756 && EQ (XCAR (prop), Qraise) | |
2757 && CONSP (XCDR (prop))) | |
2758 { | |
2759 /* `(raise FACTOR)'. */ | |
2760 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2761 return 0; | |
2762 | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2763 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2764 value = XCAR (XCDR (prop)); |
2765 if (NUMBERP (value)) | |
2766 { | |
2767 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2768 it->voffset = - (XFLOATINT (value) | |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
2769 * (FONT_HEIGHT (face->font))); |
25012 | 2770 } |
2771 #endif /* HAVE_WINDOW_SYSTEM */ | |
2772 } | |
2773 else if (!it->string_from_display_prop_p) | |
2774 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2775 /* `((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
|
2776 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2777 Lisp_Object location, value; |
2778 struct text_pos start_pos; | |
2779 int valid_p; | |
2780 | |
2781 /* Characters having this form of property are not displayed, so | |
2782 we have to find the end of the property. */ | |
2783 start_pos = *position; | |
2784 *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
|
2785 value = Qnil; |
25012 | 2786 |
2787 /* Let's stop at the new position and assume that all | |
2788 text properties change there. */ | |
2789 it->stop_charpos = position->charpos; | |
2790 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2791 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2792 if (CONSP (prop) && CONSP (XCAR (prop))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2793 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2794 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2795 |
25012 | 2796 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2797 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2798 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2799 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2800 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2801 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2802 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2803 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2804 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2805 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2806 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2807 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2808 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2809 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2810 if (EQ (location, Qunbound)) |
25012 | 2811 { |
2812 location = Qnil; | |
2813 value = prop; | |
2814 } | |
2815 | |
2816 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2817 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2818 valid_p = STRINGP (value); |
2819 else | |
2820 valid_p = (STRINGP (value) | |
2821 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2822 || valid_image_p (value)); | |
2823 #else /* not HAVE_WINDOW_SYSTEM */ | |
2824 valid_p = STRINGP (value); | |
2825 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2826 | |
2827 if ((EQ (location, Qleft_margin) | |
2828 || EQ (location, Qright_margin) | |
2829 || NILP (location)) | |
2830 && valid_p) | |
2831 { | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2832 space_or_image_found_p = 1; |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2833 |
25012 | 2834 /* Save current settings of IT so that we can restore them |
2835 when we are finished with the glyph property value. */ | |
2836 push_it (it); | |
2837 | |
2838 if (NILP (location)) | |
2839 it->area = TEXT_AREA; | |
2840 else if (EQ (location, Qleft_margin)) | |
2841 it->area = LEFT_MARGIN_AREA; | |
2842 else | |
2843 it->area = RIGHT_MARGIN_AREA; | |
2844 | |
2845 if (STRINGP (value)) | |
2846 { | |
2847 it->string = value; | |
2848 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2849 it->current.overlay_string_index = -1; | |
2850 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2851 it->end_charpos = it->string_nchars | |
2852 = XSTRING (it->string)->size; | |
2853 it->method = next_element_from_string; | |
2854 it->stop_charpos = 0; | |
2855 it->string_from_display_prop_p = 1; | |
2856 } | |
2857 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2858 { | |
2859 it->method = next_element_from_stretch; | |
2860 it->object = value; | |
2861 it->current.pos = it->position = start_pos; | |
2862 } | |
2863 #ifdef HAVE_WINDOW_SYSTEM | |
2864 else | |
2865 { | |
2866 it->what = IT_IMAGE; | |
2867 it->image_id = lookup_image (it->f, value); | |
2868 it->position = start_pos; | |
2869 it->object = NILP (object) ? it->w->buffer : object; | |
2870 it->method = next_element_from_image; | |
2871 | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
2872 /* Say that we haven't consumed the characters with |
25012 | 2873 `display' property yet. The call to pop_it in |
2874 set_iterator_to_next will clean this up. */ | |
2875 *position = start_pos; | |
2876 } | |
2877 #endif /* HAVE_WINDOW_SYSTEM */ | |
2878 } | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2879 else |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2880 /* 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
|
2881 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
|
2882 *position = start_pos; |
25012 | 2883 } |
2884 | |
2885 return space_or_image_found_p; | |
2886 } | |
2887 | |
2888 | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2889 /* 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
|
2890 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2891 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2892 static int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2893 single_display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2894 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2895 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2896 /* Skip over `when FORM'. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2897 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2898 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2899 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2900 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2901 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2902 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2903 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2904 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2905 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2906 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2907 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2908 /* 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
|
2909 we don't need to treat text as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2910 if (EQ (XCAR (prop), Qmargin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2911 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2912 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2913 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2914 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2915 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2916 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2917 if (!CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2918 || EQ (XCAR (prop), Qleft_margin) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2919 || EQ (XCAR (prop), Qright_margin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2920 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2921 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2922 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2923 return CONSP (prop) && EQ (XCAR (prop), Qimage); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2924 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2925 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2926 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2927 /* 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
|
2928 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2929 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2930 int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2931 display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2932 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2933 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2934 if (CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2935 && CONSP (XCAR (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2936 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2937 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2938 /* A list of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2939 while (CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2940 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2941 if (single_display_prop_intangible_p (XCAR (prop))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2942 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2943 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2944 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2945 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2946 else if (VECTORP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2947 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2948 /* A vector of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2949 int i; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2950 for (i = 0; i < XVECTOR (prop)->size; ++i) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2951 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
|
2952 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2953 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2954 else |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2955 return single_display_prop_intangible_p (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2956 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2957 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2958 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2959 |
25012 | 2960 |
2961 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2962 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2963 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2964 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2965 /* 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
|
2966 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2967 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2968 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2969 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2970 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2971 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2972 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2973 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2974 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2975 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2976 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2977 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2978 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2979 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2980 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2981 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2982 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2983 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2984 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2985 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2986 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2987 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2988 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2989 /* 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
|
2990 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
|
2991 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
|
2992 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
|
2993 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2994 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2995 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2996 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
|
2997 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2998 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2999 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3000 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3001 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3002 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3003 /* 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
|
3004 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3005 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
|
3006 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3007 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3008 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3009 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3010 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3011 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3012 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3013 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3014 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3015 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3016 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3017 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3018 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3019 /*********************************************************************** |
25012 | 3020 Overlay strings |
3021 ***********************************************************************/ | |
3022 | |
3023 /* The following structure is used to record overlay strings for | |
3024 later sorting in load_overlay_strings. */ | |
3025 | |
3026 struct overlay_entry | |
3027 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3028 Lisp_Object overlay; |
25012 | 3029 Lisp_Object string; |
3030 int priority; | |
3031 int after_string_p; | |
3032 }; | |
3033 | |
3034 | |
3035 /* Set up iterator IT from overlay strings at its current position. | |
3036 Called from handle_stop. */ | |
3037 | |
3038 static enum prop_handled | |
3039 handle_overlay_change (it) | |
3040 struct it *it; | |
3041 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3042 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
|
3043 return HANDLED_RECOMPUTE_PROPS; |
25012 | 3044 else |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3045 return HANDLED_NORMALLY; |
25012 | 3046 } |
3047 | |
3048 | |
3049 /* Set up the next overlay string for delivery by IT, if there is an | |
3050 overlay string to deliver. Called by set_iterator_to_next when the | |
3051 end of the current overlay string is reached. If there are more | |
3052 overlay strings to display, IT->string and | |
3053 IT->current.overlay_string_index are set appropriately here. | |
3054 Otherwise IT->string is set to nil. */ | |
3055 | |
3056 static void | |
3057 next_overlay_string (it) | |
3058 struct it *it; | |
3059 { | |
3060 ++it->current.overlay_string_index; | |
3061 if (it->current.overlay_string_index == it->n_overlay_strings) | |
3062 { | |
3063 /* No more overlay strings. Restore IT's settings to what | |
3064 they were before overlay strings were processed, and | |
3065 continue to deliver from current_buffer. */ | |
3066 pop_it (it); | |
3067 xassert (it->stop_charpos >= BEGV | |
3068 && it->stop_charpos <= it->end_charpos); | |
3069 it->string = Qnil; | |
3070 it->current.overlay_string_index = -1; | |
3071 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
3072 it->n_overlay_strings = 0; | |
3073 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
|
3074 |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3075 /* 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
|
3076 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
|
3077 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
|
3078 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
|
3079 it->overlay_strings_at_end_processed_p = 1; |
25012 | 3080 } |
3081 else | |
3082 { | |
3083 /* There are more overlay strings to process. If | |
3084 IT->current.overlay_string_index has advanced to a position | |
3085 where we must load IT->overlay_strings with more strings, do | |
3086 it. */ | |
3087 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
3088 | |
3089 if (it->current.overlay_string_index && i == 0) | |
3090 load_overlay_strings (it); | |
3091 | |
3092 /* Initialize IT to deliver display elements from the overlay | |
3093 string. */ | |
3094 it->string = it->overlay_strings[i]; | |
3095 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3096 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
3097 it->method = next_element_from_string; | |
3098 it->stop_charpos = 0; | |
3099 } | |
3100 | |
3101 CHECK_IT (it); | |
3102 } | |
3103 | |
3104 | |
3105 /* Compare two overlay_entry structures E1 and E2. Used as a | |
3106 comparison function for qsort in load_overlay_strings. Overlay | |
3107 strings for the same position are sorted so that | |
3108 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3109 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
|
3110 when they come from the same overlay. |
25012 | 3111 |
3112 2. Within after-strings, strings are sorted so that overlay strings | |
3113 from overlays with higher priorities come first. | |
3114 | |
3115 2. Within before-strings, strings are sorted so that overlay | |
3116 strings from overlays with higher priorities come last. | |
3117 | |
3118 Value is analogous to strcmp. */ | |
3119 | |
3120 | |
3121 static int | |
3122 compare_overlay_entries (e1, e2) | |
3123 void *e1, *e2; | |
3124 { | |
3125 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
3126 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
3127 int result; | |
3128 | |
3129 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
|
3130 { |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3131 /* 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
|
3132 they come from different overlays. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3133 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
|
3134 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
|
3135 else |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3136 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
|
3137 } |
25012 | 3138 else if (entry1->after_string_p) |
3139 /* After-strings sorted in order of decreasing priority. */ | |
3140 result = entry2->priority - entry1->priority; | |
3141 else | |
3142 /* Before-strings sorted in order of increasing priority. */ | |
3143 result = entry1->priority - entry2->priority; | |
3144 | |
3145 return result; | |
3146 } | |
3147 | |
3148 | |
3149 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
3150 current buffer position. Set IT->n_overlays to the total number of | |
3151 overlay strings found. | |
3152 | |
3153 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
3154 a time. On entry into load_overlay_strings, | |
3155 IT->current.overlay_string_index gives the number of overlay | |
3156 strings that have already been loaded by previous calls to this | |
3157 function. | |
3158 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3159 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
|
3160 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
|
3161 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
|
3162 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
|
3163 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
|
3164 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
|
3165 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
|
3166 in this case. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3167 |
25012 | 3168 Overlay strings are sorted so that after-string strings come in |
3169 front of before-string strings. Within before and after-strings, | |
3170 strings are sorted by overlay priority. See also function | |
3171 compare_overlay_entries. */ | |
3172 | |
3173 static void | |
3174 load_overlay_strings (it) | |
3175 struct it *it; | |
3176 { | |
3177 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3178 Lisp_Object ov, overlay, window, str, invisible; |
25012 | 3179 int start, end; |
3180 int size = 20; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3181 int n = 0, i, j, invis_p; |
25012 | 3182 struct overlay_entry *entries |
3183 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3184 int charpos = IT_CHARPOS (*it); |
25012 | 3185 |
3186 /* Append the overlay string STRING of overlay OVERLAY to vector | |
3187 `entries' which has size `size' and currently contains `n' | |
3188 elements. AFTER_P non-zero means STRING is an after-string of | |
3189 OVERLAY. */ | |
3190 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
3191 do \ | |
3192 { \ | |
3193 Lisp_Object priority; \ | |
3194 \ | |
3195 if (n == size) \ | |
3196 { \ | |
3197 int new_size = 2 * size; \ | |
3198 struct overlay_entry *old = entries; \ | |
3199 entries = \ | |
3200 (struct overlay_entry *) alloca (new_size \ | |
3201 * sizeof *entries); \ | |
3202 bcopy (old, entries, size * sizeof *entries); \ | |
3203 size = new_size; \ | |
3204 } \ | |
3205 \ | |
3206 entries[n].string = (STRING); \ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3207 entries[n].overlay = (OVERLAY); \ |
25012 | 3208 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
|
3209 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \ |
25012 | 3210 entries[n].after_string_p = (AFTER_P); \ |
3211 ++n; \ | |
3212 } \ | |
3213 while (0) | |
3214 | |
3215 /* 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
|
3216 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
|
3217 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3218 overlay = XCAR (ov); |
25012 | 3219 xassert (OVERLAYP (overlay)); |
3220 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3221 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3222 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3223 if (end < charpos) |
25012 | 3224 break; |
3225 | |
3226 /* Skip this overlay if it doesn't start or end at IT's current | |
3227 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3228 if (end != charpos && start != charpos) |
25012 | 3229 continue; |
3230 | |
3231 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3232 window = Foverlay_get (overlay, Qwindow); | |
3233 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3234 continue; | |
3235 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3236 /* If the text ``under'' the overlay is invisible, both before- |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3237 and after-strings from this overlay are visible; start and |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3238 end position are indistinguishable. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3239 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3240 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3241 |
25012 | 3242 /* If overlay has a non-empty before-string, record it. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3243 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3244 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3245 && XSTRING (str)->size) | |
3246 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3247 | |
3248 /* If overlay has a non-empty after-string, record it. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3249 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3250 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3251 && XSTRING (str)->size) | |
3252 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3253 } | |
3254 | |
3255 /* 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
|
3256 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
|
3257 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3258 overlay = XCAR (ov); |
25012 | 3259 xassert (OVERLAYP (overlay)); |
3260 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3261 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3262 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3263 if (start > charpos) |
25012 | 3264 break; |
3265 | |
3266 /* Skip this overlay if it doesn't start or end at IT's current | |
3267 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3268 if (end != charpos && start != charpos) |
25012 | 3269 continue; |
3270 | |
3271 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3272 window = Foverlay_get (overlay, Qwindow); | |
3273 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3274 continue; | |
3275 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3276 /* If the text ``under'' the overlay is invisible, it has a zero |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3277 dimension, and both before- and after-strings apply. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3278 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3279 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3280 |
25012 | 3281 /* If overlay has a non-empty before-string, record it. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3282 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3283 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3284 && XSTRING (str)->size) | |
3285 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3286 | |
3287 /* If overlay has a non-empty after-string, record it. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3288 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3289 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3290 && XSTRING (str)->size) | |
3291 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3292 } | |
3293 | |
3294 #undef RECORD_OVERLAY_STRING | |
3295 | |
3296 /* Sort entries. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3297 if (n > 1) |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3298 qsort (entries, n, sizeof *entries, compare_overlay_entries); |
25012 | 3299 |
3300 /* Record the total number of strings to process. */ | |
3301 it->n_overlay_strings = n; | |
3302 | |
3303 /* IT->current.overlay_string_index is the number of overlay strings | |
3304 that have already been consumed by IT. Copy some of the | |
3305 remaining overlay strings to IT->overlay_strings. */ | |
3306 i = 0; | |
3307 j = it->current.overlay_string_index; | |
3308 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
3309 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
|
3310 |
25012 | 3311 CHECK_IT (it); |
3312 } | |
3313 | |
3314 | |
3315 /* Get the first chunk of overlay strings at IT's current buffer | |
3316 position. Value is non-zero if at least one overlay string was | |
3317 found. */ | |
3318 | |
3319 static int | |
3320 get_overlay_strings (it) | |
3321 struct it *it; | |
3322 { | |
3323 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
3324 process. This fills IT->overlay_strings with strings, and sets | |
3325 IT->n_overlay_strings to the total number of strings to process. | |
3326 IT->pos.overlay_string_index has to be set temporarily to zero | |
3327 because load_overlay_strings needs this; it must be set to -1 | |
3328 when no overlay strings are found because a zero value would | |
3329 indicate a position in the first overlay string. */ | |
3330 it->current.overlay_string_index = 0; | |
3331 load_overlay_strings (it); | |
3332 | |
3333 /* If we found overlay strings, set up IT to deliver display | |
3334 elements from the first one. Otherwise set up IT to deliver | |
3335 from current_buffer. */ | |
3336 if (it->n_overlay_strings) | |
3337 { | |
3338 /* Make sure we know settings in current_buffer, so that we can | |
3339 restore meaningful values when we're done with the overlay | |
3340 strings. */ | |
3341 compute_stop_pos (it); | |
3342 xassert (it->face_id >= 0); | |
3343 | |
3344 /* Save IT's settings. They are restored after all overlay | |
3345 strings have been processed. */ | |
3346 xassert (it->sp == 0); | |
3347 push_it (it); | |
3348 | |
3349 /* Set up IT to deliver display elements from the first overlay | |
3350 string. */ | |
3351 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
3352 it->stop_charpos = 0; | |
3353 it->string = it->overlay_strings[0]; | |
3354 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3355 xassert (STRINGP (it->string)); | |
3356 it->method = next_element_from_string; | |
3357 } | |
3358 else | |
3359 { | |
3360 it->string = Qnil; | |
3361 it->current.overlay_string_index = -1; | |
3362 it->method = next_element_from_buffer; | |
3363 } | |
3364 | |
3365 CHECK_IT (it); | |
3366 | |
3367 /* Value is non-zero if we found at least one overlay string. */ | |
3368 return STRINGP (it->string); | |
3369 } | |
3370 | |
3371 | |
3372 | |
3373 /*********************************************************************** | |
3374 Saving and restoring state | |
3375 ***********************************************************************/ | |
3376 | |
3377 /* Save current settings of IT on IT->stack. Called, for example, | |
3378 before setting up IT for an overlay string, to be able to restore | |
3379 IT's settings to what they were after the overlay string has been | |
3380 processed. */ | |
3381 | |
3382 static void | |
3383 push_it (it) | |
3384 struct it *it; | |
3385 { | |
3386 struct iterator_stack_entry *p; | |
3387 | |
3388 xassert (it->sp < 2); | |
3389 p = it->stack + it->sp; | |
3390 | |
3391 p->stop_charpos = it->stop_charpos; | |
3392 xassert (it->face_id >= 0); | |
3393 p->face_id = it->face_id; | |
3394 p->string = it->string; | |
3395 p->pos = it->current; | |
3396 p->end_charpos = it->end_charpos; | |
3397 p->string_nchars = it->string_nchars; | |
3398 p->area = it->area; | |
3399 p->multibyte_p = it->multibyte_p; | |
3400 p->space_width = it->space_width; | |
3401 p->font_height = it->font_height; | |
3402 p->voffset = it->voffset; | |
3403 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
3404 ++it->sp; | |
3405 } | |
3406 | |
3407 | |
3408 /* Restore IT's settings from IT->stack. Called, for example, when no | |
3409 more overlay strings must be processed, and we return to delivering | |
3410 display elements from a buffer, or when the end of a string from a | |
3411 `display' property is reached and we return to delivering display | |
3412 elements from an overlay string, or from a buffer. */ | |
3413 | |
3414 static void | |
3415 pop_it (it) | |
3416 struct it *it; | |
3417 { | |
3418 struct iterator_stack_entry *p; | |
3419 | |
3420 xassert (it->sp > 0); | |
3421 --it->sp; | |
3422 p = it->stack + it->sp; | |
3423 it->stop_charpos = p->stop_charpos; | |
3424 it->face_id = p->face_id; | |
3425 it->string = p->string; | |
3426 it->current = p->pos; | |
3427 it->end_charpos = p->end_charpos; | |
3428 it->string_nchars = p->string_nchars; | |
3429 it->area = p->area; | |
3430 it->multibyte_p = p->multibyte_p; | |
3431 it->space_width = p->space_width; | |
3432 it->font_height = p->font_height; | |
3433 it->voffset = p->voffset; | |
3434 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
3435 } | |
3436 | |
3437 | |
3438 | |
3439 /*********************************************************************** | |
3440 Moving over lines | |
3441 ***********************************************************************/ | |
3442 | |
3443 /* Set IT's current position to the previous line start. */ | |
3444 | |
3445 static void | |
3446 back_to_previous_line_start (it) | |
3447 struct it *it; | |
3448 { | |
3449 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3450 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3451 } | |
3452 | |
3453 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3454 /* Move IT to the next line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3455 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3456 Value is non-zero if a newline was found. Set *SKIPPED_P to 1 if |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3457 we skipped over part of the text (as opposed to moving the iterator |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3458 continuously over the text). Otherwise, don't change the value |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3459 of *SKIPPED_P. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3460 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3461 Newlines may come from buffer text, overlay strings, or strings |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3462 displayed via the `display' property. That's the reason we can't |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3463 simply use find_next_newline_no_quit. |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3464 |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3465 Note that this function may not skip over invisible text that is so |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3466 because of text properties and immediately follows a newline. If |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3467 it would, function reseat_at_next_visible_line_start, when called |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3468 from set_iterator_to_next, would effectively make invisible |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3469 characters following a newline part of the wrong glyph row, which |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3470 leads to wrong cursor motion. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3471 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3472 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3473 forward_to_next_line_start (it, skipped_p) |
25012 | 3474 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3475 int *skipped_p; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3476 { |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3477 int old_selective, newline_found_p, n; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3478 const int MAX_NEWLINE_DISTANCE = 500; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3479 |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3480 /* If already on a newline, just consume it to avoid unintended |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3481 skipping over invisible text below. */ |
33950
a036721cfe80
(forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents:
33916
diff
changeset
|
3482 if (it->what == IT_CHARACTER && it->c == '\n') |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3483 { |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3484 set_iterator_to_next (it, 0); |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3485 return 1; |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3486 } |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3487 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3488 /* Don't handle selective display in the following. It's (a) |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3489 unnecessary because it's done by the caller, and (b) leads to an |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3490 infinite recursion because next_element_from_ellipsis indirectly |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3491 calls this function. */ |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3492 old_selective = it->selective; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3493 it->selective = 0; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3494 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3495 /* Scan for a newline within MAX_NEWLINE_DISTANCE display elements |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3496 from buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3497 n = newline_found_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3498 while (n < MAX_NEWLINE_DISTANCE |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3499 && get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3500 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3501 { |
33950
a036721cfe80
(forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents:
33916
diff
changeset
|
3502 newline_found_p = it->what == IT_CHARACTER && it->c == '\n'; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3503 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3504 if (!STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3505 ++n; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3506 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3507 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3508 /* If we didn't find a newline near enough, see if we can use a |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3509 short-cut. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3510 if (!newline_found_p && n == MAX_NEWLINE_DISTANCE) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3511 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3512 int start = IT_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3513 int limit = find_next_newline_no_quit (start, 1); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3514 Lisp_Object pos; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3515 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3516 xassert (!STRINGP (it->string)); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3517 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3518 /* If there isn't any `display' property in sight, and no |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3519 overlays, we can just use the position of the newline in |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3520 buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3521 if (it->stop_charpos >= limit |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3522 || ((pos = Fnext_single_property_change (make_number (start), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3523 Qdisplay, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3524 Qnil, make_number (limit)), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3525 NILP (pos)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3526 && next_overlay_change (start) == ZV)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3527 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3528 IT_CHARPOS (*it) = limit; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3529 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3530 *skipped_p = newline_found_p = 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3531 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3532 else |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3533 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3534 while (get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3535 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3536 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3537 newline_found_p = ITERATOR_AT_END_OF_LINE_P (it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3538 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3539 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3540 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3541 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3542 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3543 it->selective = old_selective; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3544 return newline_found_p; |
25012 | 3545 } |
3546 | |
3547 | |
3548 /* Set IT's current position to the previous visible line start. Skip | |
3549 invisible text that is so either due to text properties or due to | |
3550 selective display. Caution: this does not change IT->current_x and | |
3551 IT->hpos. */ | |
3552 | |
3553 static void | |
3554 back_to_previous_visible_line_start (it) | |
3555 struct it *it; | |
3556 { | |
3557 int visible_p = 0; | |
3558 | |
3559 /* Go back one newline if not on BEGV already. */ | |
3560 if (IT_CHARPOS (*it) > BEGV) | |
3561 back_to_previous_line_start (it); | |
3562 | |
3563 /* Move over lines that are invisible because of selective display | |
3564 or text properties. */ | |
3565 while (IT_CHARPOS (*it) > BEGV | |
3566 && !visible_p) | |
3567 { | |
3568 visible_p = 1; | |
3569 | |
3570 /* If selective > 0, then lines indented more than that values | |
3571 are invisible. */ | |
3572 if (it->selective > 0 | |
3573 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3574 it->selective)) | |
3575 visible_p = 0; | |
3576 else | |
3577 { | |
3578 Lisp_Object prop; | |
3579 | |
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
|
3580 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
|
3581 Qinvisible, it->window); |
25012 | 3582 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
3583 visible_p = 0; | |
3584 } | |
3585 | |
3586 /* Back one more newline if the current one is invisible. */ | |
3587 if (!visible_p) | |
3588 back_to_previous_line_start (it); | |
3589 } | |
3590 | |
3591 xassert (IT_CHARPOS (*it) >= BEGV); | |
3592 xassert (IT_CHARPOS (*it) == BEGV | |
3593 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3594 CHECK_IT (it); | |
3595 } | |
3596 | |
3597 | |
3598 /* Reseat iterator IT at the previous visible line start. Skip | |
3599 invisible text that is so either due to text properties or due to | |
3600 selective display. At the end, update IT's overlay information, | |
3601 face information etc. */ | |
3602 | |
3603 static void | |
3604 reseat_at_previous_visible_line_start (it) | |
3605 struct it *it; | |
3606 { | |
3607 back_to_previous_visible_line_start (it); | |
3608 reseat (it, it->current.pos, 1); | |
3609 CHECK_IT (it); | |
3610 } | |
3611 | |
3612 | |
3613 /* 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
|
3614 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
|
3615 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
|
3616 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
|
3617 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
|
3618 is invisible because of text properties. */ |
25012 | 3619 |
3620 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3621 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3622 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3623 int on_newline_p; |
25012 | 3624 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3625 int newline_found_p, skipped_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3626 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3627 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3628 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3629 /* Skip over lines that are invisible because they are indented |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3630 more than the value of IT->selective. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3631 if (it->selective > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3632 while (IT_CHARPOS (*it) < ZV |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3633 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3634 it->selective)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3635 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3636 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3637 /* Position on the newline if that's what's requested. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3638 if (on_newline_p && newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3639 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3640 if (STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3641 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3642 if (IT_STRING_CHARPOS (*it) > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3643 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3644 --IT_STRING_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3645 --IT_STRING_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3646 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3647 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3648 else if (IT_CHARPOS (*it) > BEGV) |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3649 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3650 --IT_CHARPOS (*it); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3651 --IT_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3652 reseat (it, it->current.pos, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3653 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3654 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3655 else if (skipped_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3656 reseat (it, it->current.pos, 0); |
25012 | 3657 |
3658 CHECK_IT (it); | |
3659 } | |
3660 | |
3661 | |
3662 | |
3663 /*********************************************************************** | |
3664 Changing an iterator's position | |
3665 ***********************************************************************/ | |
3666 | |
3667 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3668 is non-zero, always check for text properties at the new position. | |
3669 Otherwise, text properties are only looked up if POS >= | |
3670 IT->check_charpos of a property. */ | |
3671 | |
3672 static void | |
3673 reseat (it, pos, force_p) | |
3674 struct it *it; | |
3675 struct text_pos pos; | |
3676 int force_p; | |
3677 { | |
3678 int original_pos = IT_CHARPOS (*it); | |
3679 | |
3680 reseat_1 (it, pos, 0); | |
3681 | |
3682 /* Determine where to check text properties. Avoid doing it | |
3683 where possible because text property lookup is very expensive. */ | |
3684 if (force_p | |
3685 || CHARPOS (pos) > it->stop_charpos | |
3686 || CHARPOS (pos) < original_pos) | |
3687 handle_stop (it); | |
3688 | |
3689 CHECK_IT (it); | |
3690 } | |
3691 | |
3692 | |
3693 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3694 IT->stop_pos to POS, also. */ | |
3695 | |
3696 static void | |
3697 reseat_1 (it, pos, set_stop_p) | |
3698 struct it *it; | |
3699 struct text_pos pos; | |
3700 int set_stop_p; | |
3701 { | |
3702 /* Don't call this function when scanning a C string. */ | |
3703 xassert (it->s == NULL); | |
3704 | |
3705 /* POS must be a reasonable value. */ | |
3706 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3707 | |
3708 it->current.pos = it->position = pos; | |
3709 XSETBUFFER (it->object, current_buffer); | |
3710 it->dpvec = NULL; | |
3711 it->current.dpvec_index = -1; | |
3712 it->current.overlay_string_index = -1; | |
3713 IT_STRING_CHARPOS (*it) = -1; | |
3714 IT_STRING_BYTEPOS (*it) = -1; | |
3715 it->string = Qnil; | |
3716 it->method = next_element_from_buffer; | |
3717 it->sp = 0; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
3718 it->face_before_selective_p = 0; |
25012 | 3719 |
3720 if (set_stop_p) | |
3721 it->stop_charpos = CHARPOS (pos); | |
3722 } | |
3723 | |
3724 | |
3725 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3726 If S is non-null, it is a C string to iterate over. Otherwise, | |
3727 STRING gives a Lisp string to iterate over. | |
3728 | |
3729 If PRECISION > 0, don't return more then PRECISION number of | |
3730 characters from the string. | |
3731 | |
3732 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3733 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3734 field width. | |
3735 | |
3736 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3737 MULTIBYTE > 0 means enable it, | |
3738 MULTIBYTE < 0 means use IT->multibyte_p. | |
3739 | |
3740 IT must be initialized via a prior call to init_iterator before | |
3741 calling this function. */ | |
3742 | |
3743 static void | |
3744 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3745 struct it *it; | |
3746 unsigned char *s; | |
3747 Lisp_Object string; | |
3748 int charpos; | |
3749 int precision, field_width, multibyte; | |
3750 { | |
3751 /* No region in strings. */ | |
3752 it->region_beg_charpos = it->region_end_charpos = -1; | |
3753 | |
3754 /* No text property checks performed by default, but see below. */ | |
3755 it->stop_charpos = -1; | |
3756 | |
3757 /* Set iterator position and end position. */ | |
3758 bzero (&it->current, sizeof it->current); | |
3759 it->current.overlay_string_index = -1; | |
3760 it->current.dpvec_index = -1; | |
3761 xassert (charpos >= 0); | |
3762 | |
3763 /* Use the setting of MULTIBYTE if specified. */ | |
3764 if (multibyte >= 0) | |
3765 it->multibyte_p = multibyte > 0; | |
3766 | |
3767 if (s == NULL) | |
3768 { | |
3769 xassert (STRINGP (string)); | |
3770 it->string = string; | |
3771 it->s = NULL; | |
3772 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3773 it->method = next_element_from_string; | |
3774 it->current.string_pos = string_pos (charpos, string); | |
3775 } | |
3776 else | |
3777 { | |
3778 it->s = s; | |
3779 it->string = Qnil; | |
3780 | |
3781 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3782 for displaying C strings. */ | |
3783 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3784 if (it->multibyte_p) | |
3785 { | |
3786 it->current.pos = c_string_pos (charpos, s, 1); | |
3787 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3788 } | |
3789 else | |
3790 { | |
3791 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3792 it->end_charpos = it->string_nchars = strlen (s); | |
3793 } | |
3794 | |
3795 it->method = next_element_from_c_string; | |
3796 } | |
3797 | |
3798 /* PRECISION > 0 means don't return more than PRECISION characters | |
3799 from the string. */ | |
3800 if (precision > 0 && it->end_charpos - charpos > precision) | |
3801 it->end_charpos = it->string_nchars = charpos + precision; | |
3802 | |
3803 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3804 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3805 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3806 padding with `-' at the end of a mode line. */ | |
3807 if (field_width < 0) | |
3808 field_width = INFINITY; | |
3809 if (field_width > it->end_charpos - charpos) | |
3810 it->end_charpos = charpos + field_width; | |
3811 | |
3812 /* Use the standard display table for displaying strings. */ | |
3813 if (DISP_TABLE_P (Vstandard_display_table)) | |
3814 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3815 | |
3816 it->stop_charpos = charpos; | |
3817 CHECK_IT (it); | |
3818 } | |
3819 | |
3820 | |
3821 | |
3822 /*********************************************************************** | |
3823 Iteration | |
3824 ***********************************************************************/ | |
3825 | |
3826 /* Load IT's display element fields with information about the next | |
3827 display element from the current position of IT. Value is zero if | |
3828 end of buffer (or C string) is reached. */ | |
3829 | |
3830 int | |
3831 get_next_display_element (it) | |
3832 struct it *it; | |
3833 { | |
3834 /* Non-zero means that we found an display element. Zero means that | |
3835 we hit the end of what we iterate over. Performance note: the | |
3836 function pointer `method' used here turns out to be faster than | |
3837 using a sequence of if-statements. */ | |
3838 int success_p = (*it->method) (it); | |
3839 | |
3840 if (it->what == IT_CHARACTER) | |
3841 { | |
3842 /* Map via display table or translate control characters. | |
3843 IT->c, IT->len etc. have been set to the next character by | |
3844 the function call above. If we have a display table, and it | |
3845 contains an entry for IT->c, translate it. Don't do this if | |
3846 IT->c itself comes from a display table, otherwise we could | |
3847 end up in an infinite recursion. (An alternative could be to | |
3848 count the recursion depth of this function and signal an | |
3849 error when a certain maximum depth is reached.) Is it worth | |
3850 it? */ | |
3851 if (success_p && it->dpvec == NULL) | |
3852 { | |
3853 Lisp_Object dv; | |
3854 | |
3855 if (it->dp | |
3856 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3857 VECTORP (dv))) | |
3858 { | |
3859 struct Lisp_Vector *v = XVECTOR (dv); | |
3860 | |
3861 /* Return the first character from the display table | |
3862 entry, if not empty. If empty, don't display the | |
3863 current character. */ | |
3864 if (v->size) | |
3865 { | |
3866 it->dpvec_char_len = it->len; | |
3867 it->dpvec = v->contents; | |
3868 it->dpend = v->contents + v->size; | |
3869 it->current.dpvec_index = 0; | |
3870 it->method = next_element_from_display_vector; | |
3871 } | |
3872 | |
3873 success_p = get_next_display_element (it); | |
3874 } | |
3875 | |
3876 /* Translate control characters into `\003' or `^C' form. | |
3877 Control characters coming from a display table entry are | |
3878 currently not translated because we use IT->dpvec to hold | |
3879 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
|
3880 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
|
3881 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3882 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3883 octal form. */ |
25012 | 3884 else if ((it->c < ' ' |
3885 && (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
|
3886 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3887 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3888 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3889 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3890 { |
3891 /* IT->c is a control character which must be displayed | |
3892 either as '\003' or as `^C' where the '\\' and '^' | |
3893 can be defined in the display table. Fill | |
3894 IT->ctl_chars with glyphs for what we have to | |
3895 display. Then, set IT->dpvec to these glyphs. */ | |
3896 GLYPH g; | |
3897 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3898 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3899 { |
3900 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3901 if (it->dp | |
3902 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3903 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3904 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3905 else | |
3906 g = FAST_MAKE_GLYPH ('^', 0); | |
3907 XSETINT (it->ctl_chars[0], g); | |
3908 | |
3909 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3910 XSETINT (it->ctl_chars[1], g); | |
3911 | |
3912 /* Set up IT->dpvec and return first character from it. */ | |
3913 it->dpvec_char_len = it->len; | |
3914 it->dpvec = it->ctl_chars; | |
3915 it->dpend = it->dpvec + 2; | |
3916 it->current.dpvec_index = 0; | |
3917 it->method = next_element_from_display_vector; | |
3918 get_next_display_element (it); | |
3919 } | |
3920 else | |
3921 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3922 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
|
3923 int len; |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3924 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3925 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3926 |
25012 | 3927 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3928 if (it->dp | |
3929 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3930 && 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
|
3931 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3932 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3933 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3934 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3935 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
|
3936 str[0] = it->c, len = 1; |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3937 else |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3938 len = CHAR_STRING (it->c, str); |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3939 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3940 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3941 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3942 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
|
3943 /* 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
|
3944 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3945 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
|
3946 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
|
3947 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
|
3948 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
|
3949 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
|
3950 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
|
3951 } |
25012 | 3952 |
3953 /* Set up IT->dpvec and return the first character | |
3954 from it. */ | |
3955 it->dpvec_char_len = it->len; | |
3956 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3957 it->dpend = it->dpvec + len * 4; |
25012 | 3958 it->current.dpvec_index = 0; |
3959 it->method = next_element_from_display_vector; | |
3960 get_next_display_element (it); | |
3961 } | |
3962 } | |
3963 } | |
3964 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3965 /* 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
|
3966 multibyte character in unibyte text. */ |
25012 | 3967 if (it->multibyte_p |
3968 && success_p | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3969 && FRAME_WINDOW_P (it->f)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3970 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3971 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
|
3972 it->face_id = FACE_FOR_CHAR (it->f, face, it->c); |
25012 | 3973 } |
3974 } | |
3975 | |
3976 /* Is this character the last one of a run of characters with | |
3977 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3978 if (it->face_box_p | |
3979 && it->s == NULL) | |
3980 { | |
3981 int face_id; | |
3982 struct face *face; | |
3983 | |
3984 it->end_of_box_run_p | |
3985 = ((face_id = face_after_it_pos (it), | |
3986 face_id != it->face_id) | |
3987 && (face = FACE_FROM_ID (it->f, face_id), | |
3988 face->box == FACE_NO_BOX)); | |
3989 } | |
3990 | |
3991 /* Value is 0 if end of buffer or string reached. */ | |
3992 return success_p; | |
3993 } | |
3994 | |
3995 | |
3996 /* Move IT to the next display element. | |
3997 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3998 RESEAT_P non-zero means if called on a newline in buffer text, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3999 skip to the next visible line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4000 |
25012 | 4001 Functions get_next_display_element and set_iterator_to_next are |
4002 separate because I find this arrangement easier to handle than a | |
4003 get_next_display_element function that also increments IT's | |
4004 position. The way it is we can first look at an iterator's current | |
4005 display element, decide whether it fits on a line, and if it does, | |
4006 increment the iterator position. The other way around we probably | |
4007 would either need a flag indicating whether the iterator has to be | |
4008 incremented the next time, or we would have to implement a | |
4009 decrement position function which would not be easy to write. */ | |
4010 | |
4011 void | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4012 set_iterator_to_next (it, reseat_p) |
25012 | 4013 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4014 int reseat_p; |
25012 | 4015 { |
32553
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4016 /* Reset flags indicating start and end of a sequence of characters |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4017 with box. Reset them at the start of this function because |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4018 moving the iterator to a new position might set them. */ |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4019 it->start_of_box_run_p = it->end_of_box_run_p = 0; |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4020 |
25012 | 4021 if (it->method == next_element_from_buffer) |
4022 { | |
4023 /* The current display element of IT is a character from | |
4024 current_buffer. Advance in the buffer, and maybe skip over | |
4025 invisible lines that are so because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4026 if (ITERATOR_AT_END_OF_LINE_P (it) && reseat_p) |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4027 reseat_at_next_visible_line_start (it, 0); |
25012 | 4028 else |
4029 { | |
4030 xassert (it->len != 0); | |
4031 IT_BYTEPOS (*it) += it->len; | |
4032 IT_CHARPOS (*it) += 1; | |
4033 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
4034 } | |
4035 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4036 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
|
4037 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4038 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
|
4039 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4040 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4041 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4042 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4043 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4044 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4045 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4046 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4047 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4048 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4049 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4050 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4051 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4052 } |
25012 | 4053 else if (it->method == next_element_from_c_string) |
4054 { | |
4055 /* Current display element of IT is from a C string. */ | |
4056 IT_BYTEPOS (*it) += it->len; | |
4057 IT_CHARPOS (*it) += 1; | |
4058 } | |
4059 else if (it->method == next_element_from_display_vector) | |
4060 { | |
4061 /* Current display element of IT is from a display table entry. | |
4062 Advance in the display table definition. Reset it to null if | |
4063 end reached, and continue with characters from buffers/ | |
4064 strings. */ | |
4065 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
4066 |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4067 /* 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
|
4068 display vector entry (these entries may contain faces). */ |
25012 | 4069 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
|
4070 |
25012 | 4071 if (it->dpvec + it->current.dpvec_index == it->dpend) |
4072 { | |
4073 if (it->s) | |
4074 it->method = next_element_from_c_string; | |
4075 else if (STRINGP (it->string)) | |
4076 it->method = next_element_from_string; | |
4077 else | |
4078 it->method = next_element_from_buffer; | |
4079 | |
4080 it->dpvec = NULL; | |
4081 it->current.dpvec_index = -1; | |
4082 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4083 /* 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
|
4084 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
|
4085 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
|
4086 else if (it->dpvec_char_len > 0) |
25012 | 4087 { |
4088 it->len = it->dpvec_char_len; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4089 set_iterator_to_next (it, reseat_p); |
25012 | 4090 } |
4091 } | |
4092 } | |
4093 else if (it->method == next_element_from_string) | |
4094 { | |
4095 /* Current display element is a character from a Lisp string. */ | |
4096 xassert (it->s == NULL && STRINGP (it->string)); | |
4097 IT_STRING_BYTEPOS (*it) += it->len; | |
4098 IT_STRING_CHARPOS (*it) += 1; | |
4099 | |
4100 consider_string_end: | |
4101 | |
4102 if (it->current.overlay_string_index >= 0) | |
4103 { | |
4104 /* IT->string is an overlay string. Advance to the | |
4105 next, if there is one. */ | |
4106 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4107 next_overlay_string (it); | |
4108 } | |
4109 else | |
4110 { | |
4111 /* IT->string is not an overlay string. If we reached | |
4112 its end, and there is something on IT->stack, proceed | |
4113 with what is on the stack. This can be either another | |
4114 string, this time an overlay string, or a buffer. */ | |
4115 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
4116 && it->sp > 0) | |
4117 { | |
4118 pop_it (it); | |
4119 if (!STRINGP (it->string)) | |
4120 it->method = next_element_from_buffer; | |
4121 } | |
4122 } | |
4123 } | |
4124 else if (it->method == next_element_from_image | |
4125 || it->method == next_element_from_stretch) | |
4126 { | |
4127 /* The position etc with which we have to proceed are on | |
4128 the stack. The position may be at the end of a string, | |
4129 if the `display' property takes up the whole string. */ | |
4130 pop_it (it); | |
4131 it->image_id = 0; | |
4132 if (STRINGP (it->string)) | |
4133 { | |
4134 it->method = next_element_from_string; | |
4135 goto consider_string_end; | |
4136 } | |
4137 else | |
4138 it->method = next_element_from_buffer; | |
4139 } | |
4140 else | |
4141 /* There are no other methods defined, so this should be a bug. */ | |
4142 abort (); | |
4143 | |
4144 xassert (it->method != next_element_from_string | |
4145 || (STRINGP (it->string) | |
4146 && IT_STRING_CHARPOS (*it) >= 0)); | |
4147 } | |
4148 | |
4149 | |
4150 /* Load IT's display element fields with information about the next | |
4151 display element which comes from a display table entry or from the | |
4152 result of translating a control character to one of the forms `^C' | |
4153 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
4154 | |
4155 static int | |
4156 next_element_from_display_vector (it) | |
4157 struct it *it; | |
4158 { | |
4159 /* Precondition. */ | |
4160 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
4161 | |
4162 /* Remember the current face id in case glyphs specify faces. | |
4163 IT's face is restored in set_iterator_to_next. */ | |
4164 it->saved_face_id = it->face_id; | |
4165 | |
4166 if (INTEGERP (*it->dpvec) | |
4167 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
4168 { | |
4169 int lface_id; | |
4170 GLYPH g; | |
4171 | |
4172 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
4173 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
|
4174 it->len = CHAR_BYTES (it->c); |
25012 | 4175 |
4176 /* The entry may contain a face id to use. Such a face id is | |
4177 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
|
4178 zero means no face is specified. */ |
25012 | 4179 lface_id = FAST_GLYPH_FACE (g); |
4180 if (lface_id) | |
4181 { | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4182 /* The function returns -1 if lface_id is invalid. */ |
25012 | 4183 int face_id = ascii_face_of_lisp_face (it->f, lface_id); |
4184 if (face_id >= 0) | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4185 it->face_id = face_id; |
25012 | 4186 } |
4187 } | |
4188 else | |
4189 /* Display table entry is invalid. Return a space. */ | |
4190 it->c = ' ', it->len = 1; | |
4191 | |
4192 /* Don't change position and object of the iterator here. They are | |
4193 still the values of the character that had this display table | |
4194 entry or was translated, and that's what we want. */ | |
4195 it->what = IT_CHARACTER; | |
4196 return 1; | |
4197 } | |
4198 | |
4199 | |
4200 /* Load IT with the next display element from Lisp string IT->string. | |
4201 IT->current.string_pos is the current position within the string. | |
4202 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
4203 overlay string. */ | |
4204 | |
4205 static int | |
4206 next_element_from_string (it) | |
4207 struct it *it; | |
4208 { | |
4209 struct text_pos position; | |
4210 | |
4211 xassert (STRINGP (it->string)); | |
4212 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
4213 position = it->current.string_pos; | |
4214 | |
4215 /* Time to check for invisible text? */ | |
4216 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
4217 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
4218 { | |
4219 handle_stop (it); | |
4220 | |
4221 /* Since a handler may have changed IT->method, we must | |
4222 recurse here. */ | |
4223 return get_next_display_element (it); | |
4224 } | |
4225 | |
4226 if (it->current.overlay_string_index >= 0) | |
4227 { | |
4228 /* Get the next character from an overlay string. In overlay | |
4229 strings, There is no field width or padding with spaces to | |
4230 do. */ | |
4231 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4232 { | |
4233 it->what = IT_EOB; | |
4234 return 0; | |
4235 } | |
4236 else if (STRING_MULTIBYTE (it->string)) | |
4237 { | |
4238 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
4239 - IT_STRING_BYTEPOS (*it)); | |
4240 unsigned char *s = (XSTRING (it->string)->data | |
4241 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4242 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 4243 } |
4244 else | |
4245 { | |
4246 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4247 it->len = 1; | |
4248 } | |
4249 } | |
4250 else | |
4251 { | |
4252 /* Get the next character from a Lisp string that is not an | |
4253 overlay string. Such strings come from the mode line, for | |
4254 example. We may have to pad with spaces, or truncate the | |
4255 string. See also next_element_from_c_string. */ | |
4256 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
4257 { | |
4258 it->what = IT_EOB; | |
4259 return 0; | |
4260 } | |
4261 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
4262 { | |
4263 /* Pad with spaces. */ | |
4264 it->c = ' ', it->len = 1; | |
4265 CHARPOS (position) = BYTEPOS (position) = -1; | |
4266 } | |
4267 else if (STRING_MULTIBYTE (it->string)) | |
4268 { | |
4269 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
4270 - IT_STRING_BYTEPOS (*it)); | |
4271 unsigned char *s = (XSTRING (it->string)->data | |
4272 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4273 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 4274 } |
4275 else | |
4276 { | |
4277 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4278 it->len = 1; | |
4279 } | |
4280 } | |
4281 | |
4282 /* Record what we have and where it came from. Note that we store a | |
4283 buffer position in IT->position although it could arguably be a | |
4284 string position. */ | |
4285 it->what = IT_CHARACTER; | |
4286 it->object = it->string; | |
4287 it->position = position; | |
4288 return 1; | |
4289 } | |
4290 | |
4291 | |
4292 /* Load IT with next display element from C string IT->s. | |
4293 IT->string_nchars is the maximum number of characters to return | |
4294 from the string. IT->end_charpos may be greater than | |
4295 IT->string_nchars when this function is called, in which case we | |
4296 may have to return padding spaces. Value is zero if end of string | |
4297 reached, including padding spaces. */ | |
4298 | |
4299 static int | |
4300 next_element_from_c_string (it) | |
4301 struct it *it; | |
4302 { | |
4303 int success_p = 1; | |
4304 | |
4305 xassert (it->s); | |
4306 it->what = IT_CHARACTER; | |
4307 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
4308 it->object = Qnil; | |
4309 | |
4310 /* IT's position can be greater IT->string_nchars in case a field | |
4311 width or precision has been specified when the iterator was | |
4312 initialized. */ | |
4313 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4314 { | |
4315 /* End of the game. */ | |
4316 it->what = IT_EOB; | |
4317 success_p = 0; | |
4318 } | |
4319 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
4320 { | |
4321 /* Pad with spaces. */ | |
4322 it->c = ' ', it->len = 1; | |
4323 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
4324 } | |
4325 else if (it->multibyte_p) | |
4326 { | |
4327 /* Implementation note: The calls to strlen apparently aren't a | |
4328 performance problem because there is no noticeable performance | |
4329 difference between Emacs running in unibyte or multibyte mode. */ | |
4330 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
|
4331 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
|
4332 maxlen, &it->len); |
25012 | 4333 } |
4334 else | |
4335 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
4336 | |
4337 return success_p; | |
4338 } | |
4339 | |
4340 | |
4341 /* Set up IT to return characters from an ellipsis, if appropriate. | |
4342 The definition of the ellipsis glyphs may come from a display table | |
4343 entry. This function Fills IT with the first glyph from the | |
4344 ellipsis if an ellipsis is to be displayed. */ | |
4345 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4346 static int |
25012 | 4347 next_element_from_ellipsis (it) |
4348 struct it *it; | |
4349 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4350 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4351 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4352 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
|
4353 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4354 /* 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
|
4355 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
|
4356 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
|
4357 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4358 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4359 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4360 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4361 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
|
4362 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4363 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4364 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4365 /* 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
|
4366 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4367 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4368 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4369 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4370 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
|
4371 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4372 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4373 else |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4374 { |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4375 /* The face at the current position may be different from the |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4376 face we find after the invisible text. Remember what it |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4377 was in IT->saved_face_id, and signal that it's there by |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4378 setting face_before_selective_p. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4379 it->saved_face_id = it->face_id; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4380 it->method = next_element_from_buffer; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4381 reseat_at_next_visible_line_start (it, 1); |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4382 it->face_before_selective_p = 1; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4383 } |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4384 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4385 return get_next_display_element (it); |
25012 | 4386 } |
4387 | |
4388 | |
4389 /* Deliver an image display element. The iterator IT is already | |
4390 filled with image information (done in handle_display_prop). Value | |
4391 is always 1. */ | |
4392 | |
4393 | |
4394 static int | |
4395 next_element_from_image (it) | |
4396 struct it *it; | |
4397 { | |
4398 it->what = IT_IMAGE; | |
4399 return 1; | |
4400 } | |
4401 | |
4402 | |
4403 /* Fill iterator IT with next display element from a stretch glyph | |
4404 property. IT->object is the value of the text property. Value is | |
4405 always 1. */ | |
4406 | |
4407 static int | |
4408 next_element_from_stretch (it) | |
4409 struct it *it; | |
4410 { | |
4411 it->what = IT_STRETCH; | |
4412 return 1; | |
4413 } | |
4414 | |
4415 | |
4416 /* Load IT with the next display element from current_buffer. Value | |
4417 is zero if end of buffer reached. IT->stop_charpos is the next | |
4418 position at which to stop and check for text properties or buffer | |
4419 end. */ | |
4420 | |
4421 static int | |
4422 next_element_from_buffer (it) | |
4423 struct it *it; | |
4424 { | |
4425 int success_p = 1; | |
4426 | |
4427 /* Check this assumption, otherwise, we would never enter the | |
4428 if-statement, below. */ | |
4429 xassert (IT_CHARPOS (*it) >= BEGV | |
4430 && IT_CHARPOS (*it) <= it->stop_charpos); | |
4431 | |
4432 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
4433 { | |
4434 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4435 { | |
4436 int overlay_strings_follow_p; | |
4437 | |
4438 /* End of the game, except when overlay strings follow that | |
4439 haven't been returned yet. */ | |
4440 if (it->overlay_strings_at_end_processed_p) | |
4441 overlay_strings_follow_p = 0; | |
4442 else | |
4443 { | |
4444 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
|
4445 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 4446 } |
4447 | |
4448 if (overlay_strings_follow_p) | |
4449 success_p = get_next_display_element (it); | |
4450 else | |
4451 { | |
4452 it->what = IT_EOB; | |
4453 it->position = it->current.pos; | |
4454 success_p = 0; | |
4455 } | |
4456 } | |
4457 else | |
4458 { | |
4459 handle_stop (it); | |
4460 return get_next_display_element (it); | |
4461 } | |
4462 } | |
4463 else | |
4464 { | |
4465 /* No face changes, overlays etc. in sight, so just return a | |
4466 character from current_buffer. */ | |
4467 unsigned char *p; | |
4468 | |
4469 /* Maybe run the redisplay end trigger hook. Performance note: | |
4470 This doesn't seem to cost measurable time. */ | |
4471 if (it->redisplay_end_trigger_charpos | |
4472 && it->glyph_row | |
4473 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
4474 run_redisplay_end_trigger_hook (it); | |
4475 | |
4476 /* Get the next character, maybe multibyte. */ | |
4477 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
|
4478 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 4479 { |
4480 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
4481 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4482 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 4483 } |
4484 else | |
4485 it->c = *p, it->len = 1; | |
4486 | |
4487 /* Record what we have and where it came from. */ | |
4488 it->what = IT_CHARACTER;; | |
4489 it->object = it->w->buffer; | |
4490 it->position = it->current.pos; | |
4491 | |
4492 /* Normally we return the character found above, except when we | |
4493 really want to return an ellipsis for selective display. */ | |
4494 if (it->selective) | |
4495 { | |
4496 if (it->c == '\n') | |
4497 { | |
4498 /* A value of selective > 0 means hide lines indented more | |
4499 than that number of columns. */ | |
4500 if (it->selective > 0 | |
4501 && IT_CHARPOS (*it) + 1 < ZV | |
4502 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
4503 IT_BYTEPOS (*it) + 1, | |
4504 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4505 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4506 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
|
4507 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4508 } |
25012 | 4509 } |
4510 else if (it->c == '\r' && it->selective == -1) | |
4511 { | |
4512 /* A value of selective == -1 means that everything from the | |
4513 CR to the end of the line is invisible, with maybe an | |
4514 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4515 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
|
4516 it->dpvec_char_len = -1; |
25012 | 4517 } |
4518 } | |
4519 } | |
4520 | |
4521 /* 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
|
4522 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4523 return success_p; |
4524 } | |
4525 | |
4526 | |
4527 /* Run the redisplay end trigger hook for IT. */ | |
4528 | |
4529 static void | |
4530 run_redisplay_end_trigger_hook (it) | |
4531 struct it *it; | |
4532 { | |
4533 Lisp_Object args[3]; | |
4534 | |
4535 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4536 displaying something, or otherwise we should not run the hook. */ | |
4537 xassert (it->glyph_row); | |
4538 | |
4539 /* Set up hook arguments. */ | |
4540 args[0] = Qredisplay_end_trigger_functions; | |
4541 args[1] = it->window; | |
4542 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4543 it->redisplay_end_trigger_charpos = 0; | |
4544 | |
4545 /* Since we are *trying* to run these functions, don't try to run | |
4546 them again, even if they get an error. */ | |
4547 it->w->redisplay_end_trigger = Qnil; | |
4548 Frun_hook_with_args (3, args); | |
4549 | |
4550 /* Notice if it changed the face of the character we are on. */ | |
4551 handle_face_prop (it); | |
4552 } | |
4553 | |
4554 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4555 /* 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
|
4556 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4557 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4558 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4559 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4560 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4561 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4562 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4563 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4564 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4565 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4566 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4567 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4568 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4569 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4570 |
25012 | 4571 |
4572 /*********************************************************************** | |
4573 Moving an iterator without producing glyphs | |
4574 ***********************************************************************/ | |
4575 | |
4576 /* Move iterator IT to a specified buffer or X position within one | |
4577 line on the display without producing glyphs. | |
4578 | |
4579 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4580 whichever is reached first. | |
4581 | |
4582 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4583 | |
4584 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4585 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4586 TO_X includes the amount by which a window is horizontally | |
4587 scrolled. | |
4588 | |
4589 Value is | |
4590 | |
4591 MOVE_POS_MATCH_OR_ZV | |
4592 - when TO_POS or ZV was reached. | |
4593 | |
4594 MOVE_X_REACHED | |
4595 -when TO_X was reached before TO_POS or ZV were reached. | |
4596 | |
4597 MOVE_LINE_CONTINUED | |
4598 - when we reached the end of the display area and the line must | |
4599 be continued. | |
4600 | |
4601 MOVE_LINE_TRUNCATED | |
4602 - when we reached the end of the display area and the line is | |
4603 truncated. | |
4604 | |
4605 MOVE_NEWLINE_OR_CR | |
4606 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4607 display is on. */ | |
4608 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4609 static enum move_it_result |
25012 | 4610 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4611 struct it *it; | |
4612 int to_charpos, to_x, op; | |
4613 { | |
4614 enum move_it_result result = MOVE_UNDEFINED; | |
4615 struct glyph_row *saved_glyph_row; | |
4616 | |
4617 /* Don't produce glyphs in produce_glyphs. */ | |
4618 saved_glyph_row = it->glyph_row; | |
4619 it->glyph_row = NULL; | |
4620 | |
4621 while (1) | |
4622 { | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
4623 int x, i, ascent = 0, descent = 0; |
25012 | 4624 |
4625 /* Stop when ZV or TO_CHARPOS reached. */ | |
4626 if (!get_next_display_element (it) | |
4627 || ((op & MOVE_TO_POS) != 0 | |
4628 && BUFFERP (it->object) | |
4629 && IT_CHARPOS (*it) >= to_charpos)) | |
4630 { | |
4631 result = MOVE_POS_MATCH_OR_ZV; | |
4632 break; | |
4633 } | |
4634 | |
4635 /* The call to produce_glyphs will get the metrics of the | |
4636 display element IT is loaded with. We record in x the | |
4637 x-position before this display element in case it does not | |
4638 fit on the line. */ | |
4639 x = it->current_x; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4640 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4641 /* 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
|
4642 fit on the line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4643 if (!it->truncate_lines_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4644 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4645 ascent = it->max_ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4646 descent = it->max_descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4647 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4648 |
25012 | 4649 PRODUCE_GLYPHS (it); |
4650 | |
4651 if (it->area != TEXT_AREA) | |
4652 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4653 set_iterator_to_next (it, 1); |
25012 | 4654 continue; |
4655 } | |
4656 | |
4657 /* The number of glyphs we get back in IT->nglyphs will normally | |
4658 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4659 character on a terminal frame, or (iii) a line end. For the | |
4660 second case, IT->nglyphs - 1 padding glyphs will be present | |
4661 (on X frames, there is only one glyph produced for a | |
4662 composite character. | |
4663 | |
4664 The behavior implemented below means, for continuation lines, | |
4665 that as many spaces of a TAB as fit on the current line are | |
4666 displayed there. For terminal frames, as many glyphs of a | |
4667 multi-glyph character are displayed in the current line, too. | |
4668 This is what the old redisplay code did, and we keep it that | |
4669 way. Under X, the whole shape of a complex character must | |
4670 fit on the line or it will be completely displayed in the | |
4671 next line. | |
4672 | |
4673 Note that both for tabs and padding glyphs, all glyphs have | |
4674 the same width. */ | |
4675 if (it->nglyphs) | |
4676 { | |
4677 /* More than one glyph or glyph doesn't fit on line. All | |
4678 glyphs have the same width. */ | |
4679 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4680 int new_x; | |
4681 | |
4682 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4683 { | |
4684 new_x = x + single_glyph_width; | |
4685 | |
4686 /* We want to leave anything reaching TO_X to the caller. */ | |
4687 if ((op & MOVE_TO_X) && new_x > to_x) | |
4688 { | |
4689 it->current_x = x; | |
4690 result = MOVE_X_REACHED; | |
4691 break; | |
4692 } | |
4693 else if (/* Lines are continued. */ | |
4694 !it->truncate_lines_p | |
4695 && (/* And glyph doesn't fit on the line. */ | |
4696 new_x > it->last_visible_x | |
4697 /* Or it fits exactly and we're on a window | |
4698 system frame. */ | |
4699 || (new_x == it->last_visible_x | |
4700 && FRAME_WINDOW_P (it->f)))) | |
4701 { | |
4702 if (/* IT->hpos == 0 means the very first glyph | |
4703 doesn't fit on the line, e.g. a wide image. */ | |
4704 it->hpos == 0 | |
4705 || (new_x == it->last_visible_x | |
4706 && FRAME_WINDOW_P (it->f))) | |
4707 { | |
4708 ++it->hpos; | |
4709 it->current_x = new_x; | |
4710 if (i == it->nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4711 set_iterator_to_next (it, 1); |
25012 | 4712 } |
4713 else | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4714 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4715 it->current_x = x; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4716 it->max_ascent = ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4717 it->max_descent = descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4718 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4719 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4720 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
|
4721 IT_CHARPOS (*it))); |
25012 | 4722 result = MOVE_LINE_CONTINUED; |
4723 break; | |
4724 } | |
4725 else if (new_x > it->first_visible_x) | |
4726 { | |
4727 /* Glyph is visible. Increment number of glyphs that | |
4728 would be displayed. */ | |
4729 ++it->hpos; | |
4730 } | |
4731 else | |
4732 { | |
4733 /* Glyph is completely off the left margin of the display | |
4734 area. Nothing to do. */ | |
4735 } | |
4736 } | |
4737 | |
4738 if (result != MOVE_UNDEFINED) | |
4739 break; | |
4740 } | |
4741 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4742 { | |
4743 /* Stop when TO_X specified and reached. This check is | |
4744 necessary here because of lines consisting of a line end, | |
4745 only. The line end will not produce any glyphs and we | |
4746 would never get MOVE_X_REACHED. */ | |
4747 xassert (it->nglyphs == 0); | |
4748 result = MOVE_X_REACHED; | |
4749 break; | |
4750 } | |
4751 | |
4752 /* Is this a line end? If yes, we're done. */ | |
4753 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4754 { | |
4755 result = MOVE_NEWLINE_OR_CR; | |
4756 break; | |
4757 } | |
4758 | |
4759 /* The current display element has been consumed. Advance | |
4760 to the next. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4761 set_iterator_to_next (it, 1); |
25012 | 4762 |
4763 /* Stop if lines are truncated and IT's current x-position is | |
4764 past the right edge of the window now. */ | |
4765 if (it->truncate_lines_p | |
4766 && it->current_x >= it->last_visible_x) | |
4767 { | |
4768 result = MOVE_LINE_TRUNCATED; | |
4769 break; | |
4770 } | |
4771 } | |
4772 | |
4773 /* Restore the iterator settings altered at the beginning of this | |
4774 function. */ | |
4775 it->glyph_row = saved_glyph_row; | |
4776 return result; | |
4777 } | |
4778 | |
4779 | |
4780 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4781 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4782 the description of enum move_operation_enum. | |
4783 | |
4784 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4785 screen line, this function will set IT to the next position > | |
4786 TO_CHARPOS. */ | |
4787 | |
4788 void | |
4789 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4790 struct it *it; | |
4791 int to_charpos, to_x, to_y, to_vpos; | |
4792 int op; | |
4793 { | |
4794 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4795 int line_height; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4796 int reached = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4797 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4798 for (;;) |
25012 | 4799 { |
4800 if (op & MOVE_TO_VPOS) | |
4801 { | |
4802 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4803 start of the line TO_VPOS. */ | |
4804 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4805 { | |
4806 if (it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4807 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4808 reached = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4809 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4810 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4811 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4812 skip = move_it_in_display_line_to (it, -1, -1, 0); |
25012 | 4813 } |
4814 else | |
4815 { | |
4816 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4817 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
|
4818 if (it->vpos == to_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4819 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4820 reached = 2; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4821 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4822 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4823 |
25012 | 4824 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); |
4825 | |
4826 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
|
4827 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4828 reached = 3; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4829 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4830 } |
25012 | 4831 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) |
4832 { | |
4833 /* We have reached TO_X but not in the line we want. */ | |
4834 skip = move_it_in_display_line_to (it, to_charpos, | |
4835 -1, MOVE_TO_POS); | |
4836 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4837 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4838 reached = 4; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4839 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4840 } |
25012 | 4841 } |
4842 } | |
4843 } | |
4844 else if (op & MOVE_TO_Y) | |
4845 { | |
4846 struct it it_backup; | |
4847 | |
4848 /* TO_Y specified means stop at TO_X in the line containing | |
4849 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4850 problem is that we can't really tell whether the line | |
4851 contains TO_Y before we have completely scanned it, and | |
4852 this may skip past TO_X. What we do is to first scan to | |
4853 TO_X. | |
4854 | |
4855 If TO_X is not specified, use a TO_X of zero. The reason | |
4856 is to make the outcome of this function more predictable. | |
4857 If we didn't use TO_X == 0, we would stop at the end of | |
4858 the line which is probably not what a caller would expect | |
4859 to happen. */ | |
4860 skip = move_it_in_display_line_to (it, to_charpos, | |
4861 ((op & MOVE_TO_X) | |
4862 ? to_x : 0), | |
4863 (MOVE_TO_X | |
4864 | (op & MOVE_TO_POS))); | |
4865 | |
4866 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4867 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4868 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4869 reached = 5; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4870 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4871 } |
25012 | 4872 |
4873 /* If TO_X was reached, we would like to know whether TO_Y | |
4874 is in the line. This can only be said if we know the | |
4875 total line height which requires us to scan the rest of | |
4876 the line. */ | |
4877 if (skip == MOVE_X_REACHED) | |
4878 { | |
4879 it_backup = *it; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4880 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it))); |
25012 | 4881 skip2 = move_it_in_display_line_to (it, to_charpos, -1, |
4882 op & MOVE_TO_POS); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4883 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it))); |
25012 | 4884 } |
4885 | |
4886 /* Now, decide whether TO_Y is in this line. */ | |
4887 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
|
4888 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height)); |
25012 | 4889 |
4890 if (to_y >= it->current_y | |
4891 && to_y < it->current_y + line_height) | |
4892 { | |
4893 if (skip == MOVE_X_REACHED) | |
4894 /* If TO_Y is in this line and TO_X was reached above, | |
4895 we scanned too far. We have to restore IT's settings | |
4896 to the ones before skipping. */ | |
4897 *it = it_backup; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4898 reached = 6; |
25012 | 4899 } |
4900 else if (skip == MOVE_X_REACHED) | |
4901 { | |
4902 skip = skip2; | |
4903 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4904 reached = 7; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4905 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4906 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4907 if (reached) |
25012 | 4908 break; |
4909 } | |
4910 else | |
4911 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4912 | |
4913 switch (skip) | |
4914 { | |
4915 case MOVE_POS_MATCH_OR_ZV: | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4916 reached = 8; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4917 goto out; |
25012 | 4918 |
4919 case MOVE_NEWLINE_OR_CR: | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4920 set_iterator_to_next (it, 1); |
25012 | 4921 it->continuation_lines_width = 0; |
4922 break; | |
4923 | |
4924 case MOVE_LINE_TRUNCATED: | |
4925 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
|
4926 reseat_at_next_visible_line_start (it, 0); |
25012 | 4927 if ((op & MOVE_TO_POS) != 0 |
4928 && IT_CHARPOS (*it) > to_charpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4929 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4930 reached = 9; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4931 goto out; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4932 } |
25012 | 4933 break; |
4934 | |
4935 case MOVE_LINE_CONTINUED: | |
4936 it->continuation_lines_width += it->current_x; | |
4937 break; | |
4938 | |
4939 default: | |
4940 abort (); | |
4941 } | |
4942 | |
4943 /* Reset/increment for the next run. */ | |
4944 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4945 it->current_x = it->hpos = 0; | |
4946 it->current_y += it->max_ascent + it->max_descent; | |
4947 ++it->vpos; | |
4948 last_height = it->max_ascent + it->max_descent; | |
4949 last_max_ascent = it->max_ascent; | |
4950 it->max_ascent = it->max_descent = 0; | |
4951 } | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4952 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4953 out: |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4954 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4955 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached)); |
25012 | 4956 } |
4957 | |
4958 | |
4959 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4960 | |
4961 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4962 means move IT backward to the preceding line start or BEGV. This | |
4963 function may move over more than DY pixels if IT->current_y - DY | |
4964 ends up in the middle of a line; in this case IT->current_y will be | |
4965 set to the top of the line moved to. */ | |
4966 | |
4967 void | |
4968 move_it_vertically_backward (it, dy) | |
4969 struct it *it; | |
4970 int dy; | |
4971 { | |
4972 int nlines, h, line_height; | |
4973 struct it it2; | |
4974 int start_pos = IT_CHARPOS (*it); | |
4975 | |
4976 xassert (dy >= 0); | |
4977 | |
4978 /* Estimate how many newlines we must move back. */ | |
4979 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4980 | |
4981 /* Set the iterator's position that many lines back. */ | |
4982 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4983 back_to_previous_visible_line_start (it); | |
4984 | |
4985 /* Reseat the iterator here. When moving backward, we don't want | |
4986 reseat to skip forward over invisible text, set up the iterator | |
4987 to deliver from overlay strings at the new position etc. So, | |
4988 use reseat_1 here. */ | |
4989 reseat_1 (it, it->current.pos, 1); | |
4990 | |
4991 /* We are now surely at a line start. */ | |
4992 it->current_x = it->hpos = 0; | |
4993 | |
4994 /* Move forward and see what y-distance we moved. First move to the | |
4995 start of the next line so that we get its height. We need this | |
4996 height to be able to tell whether we reached the specified | |
4997 y-distance. */ | |
4998 it2 = *it; | |
4999 it2.max_ascent = it2.max_descent = 0; | |
5000 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
5001 MOVE_TO_POS | MOVE_TO_VPOS); | |
5002 xassert (IT_CHARPOS (*it) >= BEGV); | |
5003 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
|
5004 |
25012 | 5005 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); |
5006 xassert (IT_CHARPOS (*it) >= BEGV); | |
5007 h = it2.current_y - it->current_y; | |
5008 nlines = it2.vpos - it->vpos; | |
5009 | |
5010 /* Correct IT's y and vpos position. */ | |
5011 it->vpos -= nlines; | |
5012 it->current_y -= h; | |
5013 | |
5014 if (dy == 0) | |
5015 { | |
5016 /* DY == 0 means move to the start of the screen line. The | |
5017 value of nlines is > 0 if continuation lines were involved. */ | |
5018 if (nlines > 0) | |
5019 move_it_by_lines (it, nlines, 1); | |
5020 xassert (IT_CHARPOS (*it) <= start_pos); | |
5021 } | |
5022 else if (nlines) | |
5023 { | |
5024 /* The y-position we try to reach. Note that h has been | |
5025 subtracted in front of the if-statement. */ | |
5026 int target_y = it->current_y + h - dy; | |
5027 | |
5028 /* If we did not reach target_y, try to move further backward if | |
5029 we can. If we moved too far backward, try to move forward. */ | |
5030 if (target_y < it->current_y | |
5031 && IT_CHARPOS (*it) > BEGV) | |
5032 { | |
5033 move_it_vertically (it, target_y - it->current_y); | |
5034 xassert (IT_CHARPOS (*it) >= BEGV); | |
5035 } | |
5036 else if (target_y >= it->current_y + line_height | |
5037 && IT_CHARPOS (*it) < ZV) | |
5038 { | |
5039 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
5040 xassert (IT_CHARPOS (*it) >= BEGV); | |
5041 } | |
5042 } | |
5043 } | |
5044 | |
5045 | |
5046 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
5047 move backwards. DY = 0 means move to start of screen line. At the | |
5048 end, IT will be on the start of a screen line. */ | |
5049 | |
5050 void | |
5051 move_it_vertically (it, dy) | |
5052 struct it *it; | |
5053 int dy; | |
5054 { | |
5055 if (dy <= 0) | |
5056 move_it_vertically_backward (it, -dy); | |
5057 else if (dy > 0) | |
5058 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5059 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy)); |
25012 | 5060 move_it_to (it, ZV, -1, it->current_y + dy, -1, |
5061 MOVE_TO_POS | MOVE_TO_Y); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5062 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it))); |
25012 | 5063 |
5064 /* If buffer ends in ZV without a newline, move to the start of | |
5065 the line to satisfy the post-condition. */ | |
5066 if (IT_CHARPOS (*it) == ZV | |
5067 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
5068 move_it_by_lines (it, 0, 0); | |
5069 } | |
5070 } | |
5071 | |
5072 | |
5073 /* Return non-zero if some text between buffer positions START_CHARPOS | |
5074 and END_CHARPOS is invisible. IT->window is the window for text | |
5075 property lookup. */ | |
5076 | |
5077 static int | |
5078 invisible_text_between_p (it, start_charpos, end_charpos) | |
5079 struct it *it; | |
5080 int start_charpos, end_charpos; | |
5081 { | |
5082 Lisp_Object prop, limit; | |
5083 int invisible_found_p; | |
5084 | |
5085 xassert (it != NULL && start_charpos <= end_charpos); | |
5086 | |
5087 /* Is text at START invisible? */ | |
5088 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
5089 it->window); | |
5090 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
5091 invisible_found_p = 1; | |
5092 else | |
5093 { | |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5094 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
|
5095 Qinvisible, Qnil, |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5096 make_number (end_charpos)); |
25012 | 5097 invisible_found_p = XFASTINT (limit) < end_charpos; |
5098 } | |
5099 | |
5100 return invisible_found_p; | |
5101 } | |
5102 | |
5103 | |
5104 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
5105 negative means move up. DVPOS == 0 means move to the start of the | |
5106 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
5107 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
5108 | |
5109 Further optimization ideas: If we would know that IT->f doesn't use | |
5110 a face with proportional font, we could be faster for | |
5111 truncate-lines nil. */ | |
5112 | |
5113 void | |
5114 move_it_by_lines (it, dvpos, need_y_p) | |
5115 struct it *it; | |
5116 int dvpos, need_y_p; | |
5117 { | |
5118 struct position pos; | |
5119 | |
5120 if (!FRAME_WINDOW_P (it->f)) | |
5121 { | |
5122 struct text_pos textpos; | |
5123 | |
5124 /* We can use vmotion on frames without proportional fonts. */ | |
5125 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
5126 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
5127 reseat (it, textpos, 1); | |
5128 it->vpos += pos.vpos; | |
5129 it->current_y += pos.vpos; | |
5130 } | |
5131 else if (dvpos == 0) | |
5132 { | |
5133 /* DVPOS == 0 means move to the start of the screen line. */ | |
5134 move_it_vertically_backward (it, 0); | |
5135 xassert (it->current_x == 0 && it->hpos == 0); | |
5136 } | |
5137 else if (dvpos > 0) | |
5138 { | |
5139 /* If there are no continuation lines, and if there is no | |
5140 selective display, try the simple method of moving forward | |
5141 DVPOS newlines, then see where we are. */ | |
5142 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
5143 { | |
5144 int shortage = 0, charpos; | |
5145 | |
34252
fb271e34071c
(move_it_by_lines): Fix paren typo.
Gerd Moellmann <gerd@gnu.org>
parents:
34225
diff
changeset
|
5146 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n') |
25012 | 5147 charpos = IT_CHARPOS (*it) + 1; |
5148 else | |
5149 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
5150 &shortage, 0); | |
5151 | |
5152 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
5153 { | |
5154 struct text_pos pos; | |
5155 CHARPOS (pos) = charpos; | |
5156 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
5157 reseat (it, pos, 1); | |
5158 it->vpos += dvpos - shortage; | |
5159 it->hpos = it->current_x = 0; | |
5160 return; | |
5161 } | |
5162 } | |
5163 | |
5164 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
5165 } | |
5166 else | |
5167 { | |
5168 struct it it2; | |
5169 int start_charpos, i; | |
5170 | |
5171 /* If there are no continuation lines, and if there is no | |
5172 selective display, try the simple method of moving backward | |
5173 -DVPOS newlines. */ | |
5174 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
5175 { | |
5176 int shortage; | |
5177 int charpos = IT_CHARPOS (*it); | |
5178 int bytepos = IT_BYTEPOS (*it); | |
5179 | |
5180 /* If in the middle of a line, go to its start. */ | |
5181 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
5182 { | |
5183 charpos = find_next_newline_no_quit (charpos, -1); | |
5184 bytepos = CHAR_TO_BYTE (charpos); | |
5185 } | |
5186 | |
5187 if (charpos == BEGV) | |
5188 { | |
5189 struct text_pos pos; | |
5190 CHARPOS (pos) = charpos; | |
5191 BYTEPOS (pos) = bytepos; | |
5192 reseat (it, pos, 1); | |
5193 it->hpos = it->current_x = 0; | |
5194 return; | |
5195 } | |
5196 else | |
5197 { | |
5198 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
5199 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
5200 { | |
5201 struct text_pos pos; | |
5202 CHARPOS (pos) = charpos; | |
5203 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
5204 reseat (it, pos, 1); | |
5205 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
5206 it->hpos = it->current_x = 0; | |
5207 return; | |
5208 } | |
5209 } | |
5210 } | |
5211 | |
5212 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
5213 start_charpos = IT_CHARPOS (*it); | |
5214 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
5215 back_to_previous_visible_line_start (it); | |
5216 reseat (it, it->current.pos, 1); | |
5217 it->current_x = it->hpos = 0; | |
5218 | |
5219 /* Above call may have moved too far if continuation lines | |
5220 are involved. Scan forward and see if it did. */ | |
5221 it2 = *it; | |
5222 it2.vpos = it2.current_y = 0; | |
5223 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
5224 it->vpos -= it2.vpos; | |
5225 it->current_y -= it2.current_y; | |
5226 it->current_x = it->hpos = 0; | |
5227 | |
5228 /* If we moved too far, move IT some lines forward. */ | |
5229 if (it2.vpos > -dvpos) | |
5230 { | |
5231 int delta = it2.vpos + dvpos; | |
5232 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
5233 } | |
5234 } | |
5235 } | |
5236 | |
5237 | |
5238 | |
5239 /*********************************************************************** | |
5240 Messages | |
5241 ***********************************************************************/ | |
5242 | |
5243 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5244 /* 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
|
5245 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5246 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5247 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5248 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
|
5249 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5250 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5251 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5252 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5253 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5254 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5255 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5256 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
|
5257 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5258 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5259 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5260 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5261 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
|
5262 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5263 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
|
5264 msg = Fformat (3, args); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5265 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5266 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
|
5267 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5268 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5269 |
28876
04cbb0510d7e
(add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents:
28869
diff
changeset
|
5270 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
|
5271 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5272 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5273 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5274 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5275 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5276 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5277 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5278 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5279 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5280 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5281 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
|
5282 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5283 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5284 |
25012 | 5285 /* Add a string M of length LEN to the message log, optionally |
5286 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
5287 nonzero, means interpret the contents of M as multibyte. This | |
5288 function calls low-level routines in order to bypass text property | |
5289 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
|
5290 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5291 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5292 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5293 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5294 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5295 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5296 if (!NILP (Vmessage_log_max)) |
10393 | 5297 { |
5298 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5299 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
|
5300 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
|
5301 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
|
5302 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
|
5303 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
|
5304 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
|
5305 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5306 old_deactivate_mark = Vdeactivate_mark; |
10393 | 5307 oldbuf = current_buffer; |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
5308 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
|
5309 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5310 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5311 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5312 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5313 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5314 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5315 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5316 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
|
5317 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5318 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
|
5319 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5320 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5321 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5322 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5323 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5324 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5325 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
|
5326 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5327 /* 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
|
5328 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
|
5329 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
|
5330 && 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
|
5331 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5332 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5333 unsigned char work[1]; |
25012 | 5334 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5335 /* 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
|
5336 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
|
5337 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
|
5338 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
5339 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
|
5340 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
|
5341 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5342 : 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
|
5343 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
|
5344 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5345 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5346 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
|
5347 && ! 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
|
5348 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5349 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
|
5350 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5351 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
|
5352 /* 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
|
5353 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
|
5354 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
|
5355 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5356 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
|
5357 nbytes = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5358 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
|
5359 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5360 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5361 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5362 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
|
5363 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5364 if (nlflag) |
10393 | 5365 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5366 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
|
5367 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5368 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5369 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
|
5370 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5371 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5372 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5373 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5374 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5375 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
|
5376 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5377 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5378 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
5379 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
|
5380 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5381 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5382 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5383 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5384 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5385 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5386 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5387 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5388 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5389 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5390 /* 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
|
5391 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5392 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5393 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5394 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
|
5395 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5396 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5397 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5398 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5399 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5400 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5401 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5402 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5403 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5404 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
|
5405 } |
10393 | 5406 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5407 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5408 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5409 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5410 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5411 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5412 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5413 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5414 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5415 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5416 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5417 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5418 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5419 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5420 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5421 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5422 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
|
5423 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5424 /* 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
|
5425 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5426 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
|
5427 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5428 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5429 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5430 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5431 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5432 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5433 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5434 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 5435 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5436 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5437 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
|
5438 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5439 Vdeactivate_mark = old_deactivate_mark; |
10393 | 5440 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5441 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5442 |
25012 | 5443 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5444 /* 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
|
5445 (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
|
5446 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
|
5447 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
|
5448 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
|
5449 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5450 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5451 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
|
5452 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5453 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5454 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5455 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
5456 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
|
5457 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5458 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
|
5459 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
|
5460 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5461 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5462 { |
33594
a4cd4c93196b
(message_log_check_duplicate): Let "..."-detection match
Miles Bader <miles@gnu.org>
parents:
33591
diff
changeset
|
5463 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.') |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5464 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5465 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5466 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5467 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5468 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5469 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5470 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5471 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5472 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5473 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5474 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5475 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5476 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5477 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5478 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5479 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5480 } |
25012 | 5481 |
5482 | |
5483 /* Display an echo area message M with a specified length of LEN | |
5484 chars. The string may include null characters. If M is 0, clear | |
5485 out any existing message, and let the mini-buffer text show through. | |
5486 | |
5487 The buffer M must continue to exist until after the echo area gets | |
5488 cleared or some other message gets displayed there. This means do | |
5489 not pass text that is stored in a Lisp string; do not pass text in | |
5490 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5491 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5492 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5493 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5494 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5495 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5496 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5497 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5498 /* 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
|
5499 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5500 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5501 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5502 message2_nolog (m, len, multibyte); |
10393 | 5503 } |
5504 | |
5505 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5506 /* The non-logging counterpart of message2. */ |
10393 | 5507 |
5508 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5509 message2_nolog (m, len, multibyte) |
10393 | 5510 char *m; |
5511 int len; | |
5512 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5513 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5514 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5515 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5516 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5517 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5518 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5519 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5520 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
|
5521 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
5522 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5523 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5524 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5525 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5526 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5527 /* 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
|
5528 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5529 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 5530 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5531 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5532 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5533 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5534 Lisp_Object mini_window; |
25012 | 5535 struct frame *f; |
5536 | |
5537 /* 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
|
5538 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5539 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
|
5540 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
|
5541 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5542 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5543 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
|
5544 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5545 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
|
5546 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5547 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5548 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5549 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5550 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5551 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5552 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5553 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5554 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5555 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5556 do_pending_window_change (0); |
25012 | 5557 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
|
5558 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
|
5559 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
|
5560 (*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
|
5561 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5562 } |
25012 | 5563 |
5564 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5565 /* 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
|
5566 bytes. The string may include null characters. If M is not a |
25012 | 5567 string, clear out any existing message, and let the mini-buffer |
5568 text show through. */ | |
5569 | |
5570 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5571 message3 (m, nbytes, multibyte) |
25012 | 5572 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5573 int nbytes; |
25012 | 5574 int multibyte; |
5575 { | |
5576 struct gcpro gcpro1; | |
5577 | |
5578 GCPRO1 (m); | |
5579 | |
5580 /* First flush out any partial line written with print. */ | |
5581 message_log_maybe_newline (); | |
5582 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5583 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
|
5584 message3_nolog (m, nbytes, multibyte); |
25012 | 5585 |
5586 UNGCPRO; | |
5587 } | |
5588 | |
5589 | |
5590 /* The non-logging version of message3. */ | |
5591 | |
5592 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5593 message3_nolog (m, nbytes, multibyte) |
25012 | 5594 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5595 int nbytes, multibyte; |
25012 | 5596 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5597 struct frame *sf = SELECTED_FRAME (); |
25012 | 5598 message_enable_multibyte = multibyte; |
5599 | |
5600 if (noninteractive) | |
5601 { | |
5602 if (noninteractive_need_newline) | |
5603 putc ('\n', stderr); | |
5604 noninteractive_need_newline = 0; | |
5605 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5606 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5607 if (cursor_in_echo_area == 0) |
5608 fprintf (stderr, "\n"); | |
5609 fflush (stderr); | |
5610 } | |
5611 /* A null message buffer means that the frame hasn't really been | |
5612 initialized yet. Error messages get reported properly by | |
5613 cmd_error, so this must be just an informative message; toss it. */ | |
5614 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5615 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5616 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5617 { |
5618 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
|
5619 Lisp_Object frame; |
25012 | 5620 struct frame *f; |
5621 | |
5622 /* Get the frame containing the mini-buffer | |
5623 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5624 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
|
5625 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
|
5626 f = XFRAME (frame); |
25012 | 5627 |
5628 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5629 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
|
5630 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5631 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5632 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5633 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
|
5634 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5635 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
|
5636 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5637 Fraise_frame (frame); |
25012 | 5638 } |
5639 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5640 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5641 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5642 do_pending_window_change (0); |
25012 | 5643 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
|
5644 do_pending_window_change (0); |
25012 | 5645 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5646 (*frame_up_to_date_hook) (f); | |
5647 } | |
5648 } | |
5649 | |
5650 | |
5651 /* Display a null-terminated echo area message M. If M is 0, clear | |
5652 out any existing message, and let the mini-buffer text show through. | |
5653 | |
5654 The buffer M must continue to exist until after the echo area gets | |
5655 cleared or some other message gets displayed there. Do not pass | |
5656 text that is stored in a Lisp string. Do not pass text in a buffer | |
5657 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
|
5658 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5659 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5660 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5661 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5662 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5663 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
|
5664 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5665 |
25012 | 5666 |
5667 /* The non-logging counterpart of message1. */ | |
5668 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5669 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5670 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5671 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5672 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5673 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
|
5674 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5675 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5676 /* 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
|
5677 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5678 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5679 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5680 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5681 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5682 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5683 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5684 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5685 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5686 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5687 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5688 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5689 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5690 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5691 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5692 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5693 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5694 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5695 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5696 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5697 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5698 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5699 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5700 /* 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
|
5701 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
|
5702 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
|
5703 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5704 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5705 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5706 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5707 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5708 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5709 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5710 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5711 /* 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
|
5712 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
|
5713 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
|
5714 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5715 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5716 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5717 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5718 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5719 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5720 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5721 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
|
5722 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5723 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5724 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5725 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5726 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5727 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5728 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5729 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5730 /* 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
|
5731 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5732 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5733 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5734 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5735 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5736 |
25012 | 5737 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5738 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5739 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
|
5740 |
277 | 5741 /* VARARGS 1 */ |
5742 void | |
5743 message (m, a1, a2, a3) | |
5744 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5745 EMACS_INT a1, a2, a3; |
277 | 5746 { |
5747 if (noninteractive) | |
5748 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5749 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5750 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5751 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
|
5752 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
|
5753 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
|
5754 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5755 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5756 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
|
5757 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5758 } |
277 | 5759 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5760 else if (INTERACTIVE) |
277 | 5761 { |
25012 | 5762 /* The frame whose mini-buffer we're going to display the message |
5763 on. It may be larger than the selected frame, so we need to | |
5764 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
|
5765 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5766 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5767 |
5768 /* 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
|
5769 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5770 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
|
5771 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5772 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5773 /* 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
|
5774 initialized yet. Error messages get reported properly by |
25012 | 5775 cmd_error, so this must be just an informative message; toss |
5776 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5777 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
|
5778 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5779 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5780 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5781 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
|
5782 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5783 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5784 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5785 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5786 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5787 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5788 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5789 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
|
5790 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5791 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5792 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
|
5793 (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
|
5794 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5795 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5796 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
|
5797 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5798 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5799 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5800 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5801 /* 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
|
5802 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
|
5803 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
|
5804 } |
277 | 5805 } |
5806 } | |
5807 | |
25012 | 5808 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5809 /* The non-logging version of message. */ |
25012 | 5810 |
11193 | 5811 void |
5812 message_nolog (m, a1, a2, a3) | |
5813 char *m; | |
5814 EMACS_INT a1, a2, a3; | |
5815 { | |
5816 Lisp_Object old_log_max; | |
5817 old_log_max = Vmessage_log_max; | |
5818 Vmessage_log_max = Qnil; | |
5819 message (m, a1, a2, a3); | |
5820 Vmessage_log_max = old_log_max; | |
5821 } | |
5822 | |
25012 | 5823 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5824 /* 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
|
5825 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
|
5826 critical. */ |
25012 | 5827 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5828 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5829 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5830 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5831 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
|
5832 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5833 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5834 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5835 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
|
5836 !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
|
5837 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5838 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5839 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5840 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5841 /* 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
|
5842 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5843 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5844 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5845 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5846 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5847 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5848 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5849 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5850 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5851 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5852 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5853 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
|
5854 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
|
5855 int j; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5856 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5857 old_buffer = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5858 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5859 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
|
5860 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
|
5861 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5862 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
|
5863 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
|
5864 echo_area_buffer[j] = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5865 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5866 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5867 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5868 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5869 /* 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
|
5870 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
|
5871 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5872 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
|
5873 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
|
5874 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
|
5875 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5876 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
|
5877 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
|
5878 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5879 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
|
5880 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
|
5881 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
|
5882 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5883 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
|
5884 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5885 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5886 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
|
5887 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5888 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
|
5889 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
|
5890 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
|
5891 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
|
5892 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
|
5893 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5894 Lisp_Object buffer; |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
5895 int this_one, the_other, clear_buffer_p, rc; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
5896 int count = BINDING_STACK_SIZE (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5897 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5898 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5899 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
|
5900 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5901 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5902 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5903 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5904 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
|
5905 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5906 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
|
5907 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5908 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5909 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
|
5910 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5911 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5912 /* 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
|
5913 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
|
5914 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
|
5915 && 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
|
5916 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
|
5917 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5918 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5919 /* 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
|
5920 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5921 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
|
5922 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5923 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
|
5924 = (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
|
5925 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5926 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5927 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5928 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5929 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5930 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
|
5931 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5932 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
|
5933 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
|
5934 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5935 /* 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
|
5936 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
|
5937 == 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
|
5938 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
|
5939 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
|
5940 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
|
5941 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5942 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
|
5943 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5944 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5945 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5946 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
|
5947 } |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5948 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5949 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
|
5950 current_buffer->read_only = Qnil; |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5951 specbind (Qinhibit_read_only, Qt); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5952 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5953 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
|
5954 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5955 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5956 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5957 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
|
5958 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5959 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
|
5960 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5961 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5962 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
|
5963 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5964 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5965 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5966 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5967 |
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 /* 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
|
5970 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
|
5971 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5972 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5973 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
|
5974 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5975 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5976 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5977 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5978 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5979 /* 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
|
5980 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
|
5981 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
|
5982 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
|
5983 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5984 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5985 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
|
5986 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5987 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
|
5988 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
|
5989 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
|
5990 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5991 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5992 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5993 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
|
5994 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
|
5995 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 = 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
|
5997 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5998 = 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
|
5999 } |
25012 | 6000 else |
25358
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 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6003 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6004 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
|
6005 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6006 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6007 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
|
6008 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6009 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6010 |
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 /* 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
|
6013 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
|
6014 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6015 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6016 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
|
6017 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6018 { |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6019 set_buffer_internal_1 (XBUFFER (AREF (vector, 0))); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6020 Vdeactivate_mark = AREF (vector, 1); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6021 windows_or_buffers_changed = XFASTINT (AREF (vector, 2)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6022 |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6023 if (WINDOWP (AREF (vector, 3))) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6024 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6025 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6026 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
|
6027 |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6028 w = XWINDOW (AREF (vector, 3)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6029 buffer = AREF (vector, 4); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6030 charpos = AREF (vector, 5); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6031 bytepos = AREF (vector, 6); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6032 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6033 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6034 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
|
6035 XFASTINT (charpos), XFASTINT (bytepos)); |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6038 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
|
6039 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6040 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6041 |
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 /* 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
|
6044 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
|
6045 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6046 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6047 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
|
6048 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6049 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6050 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6051 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6052 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6053 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6054 /* 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
|
6055 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
|
6056 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
|
6057 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
|
6058 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6059 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
|
6060 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6061 /* 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
|
6062 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6063 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6064 if (Z > BEG) |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6065 { |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6066 int count = BINDING_STACK_SIZE (); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6067 specbind (Qinhibit_read_only, Qt); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6068 del_range (BEG, Z); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6069 unbind_to (count, Qnil); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6070 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6071 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
|
6072 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6073 /* 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
|
6074 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6075 != !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
|
6076 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
|
6077 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6078 /* 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
|
6079 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6080 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6081 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
|
6082 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6083 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
|
6084 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
|
6085 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6086 |
29643
77f1e8db4147
(setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents:
29634
diff
changeset
|
6087 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
|
6088 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6089 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6090 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6091 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6092 if (NILP (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6093 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6094 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
|
6095 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
|
6096 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6097 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
|
6098 } |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6099 |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6100 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
|
6101 /* Someone switched buffers between print requests. */ |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6102 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
|
6103 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6104 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6105 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6106 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6107 /* 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
|
6108 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
|
6109 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
|
6110 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
|
6111 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6112 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6113 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6114 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6115 { |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6116 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
|
6117 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6118 /* 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
|
6119 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
|
6120 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
|
6121 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
|
6122 redisplay. */ |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6123 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
|
6124 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6125 /* 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
|
6126 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
|
6127 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
|
6128 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
|
6129 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
|
6130 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
|
6131 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6132 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6133 = 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
|
6134 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
|
6135 (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
|
6136 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6137 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6138 echo_area_buffer[i] = Qnil; |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6139 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6140 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
|
6141 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
|
6142 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6143 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6144 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6145 /* 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
|
6146 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
|
6147 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
|
6148 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
|
6149 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
|
6150 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6151 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6152 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
|
6153 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
|
6154 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
|
6155 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6156 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6157 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
|
6158 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6159 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6160 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
|
6161 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6162 /* 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
|
6163 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6164 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
|
6165 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6166 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6167 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
|
6168 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6169 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
|
6170 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6171 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6172 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
|
6173 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6174 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6175 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6176 /* 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
|
6177 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
|
6178 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6179 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6180 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6181 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6182 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6183 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6184 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6185 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
|
6186 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6187 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6188 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
|
6189 (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
|
6190 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6191 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6192 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6193 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6194 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6195 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6196 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6197 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6198 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6199 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6200 /* 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
|
6201 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
|
6202 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
|
6203 returns. */ |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6204 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6205 static int |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6206 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
|
6207 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
|
6208 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
|
6209 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6210 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6211 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
|
6212 } |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6213 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6214 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6215 /* 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
|
6216 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
|
6217 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
|
6218 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
|
6219 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6220 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6221 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
|
6222 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6223 int exact_p; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6224 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6225 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
|
6226 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
|
6227 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6228 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6229 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6230 /* Nil means don't try to resize. */ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6231 if (NILP (Vresize_mini_windows) |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
6232 || (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
|
6233 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6234 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6235 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
|
6236 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6237 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6238 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
|
6239 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
|
6240 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6241 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
|
6242 struct text_pos start; |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6243 struct buffer *old_current_buffer = NULL; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6244 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6245 if (current_buffer != XBUFFER (w->buffer)) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6246 { |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6247 old_current_buffer = current_buffer; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6248 set_buffer_internal (XBUFFER (w->buffer)); |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6249 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6250 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6251 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
|
6252 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6253 /* 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
|
6254 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
|
6255 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
|
6256 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
|
6257 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
|
6258 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6259 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
|
6260 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6261 /* 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
|
6262 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
|
6263 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
|
6264 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6265 /* 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
|
6266 if (it.truncate_lines_p) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6267 height = 1; |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
6268 else |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6269 { |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6270 last_height = 0; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6271 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
|
6272 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
|
6273 height = it.current_y + last_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6274 else |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6275 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
|
6276 height -= it.extra_line_spacing; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6277 height = (height + unit - 1) / unit; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6278 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6279 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6280 /* 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
|
6281 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6282 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6283 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6284 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
|
6285 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
|
6286 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6287 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6288 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6289 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
|
6290 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
|
6291 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6292 if (EQ (Vresize_mini_windows, Qgrow_only)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6293 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6294 /* Let it grow only, until we display an empty message, in which |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6295 case the window shrinks again. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6296 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6297 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6298 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6299 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6300 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6301 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6302 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6303 else if (height < XFASTINT (w->height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6304 && (exact_p || BEGV == ZV)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6305 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6306 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6307 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6308 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6309 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6310 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6311 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6312 else |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6313 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6314 /* Always resize to exact size needed. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6315 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6316 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6317 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6318 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6319 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6320 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6321 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6322 else if (height < XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6323 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6324 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6325 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6326 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6327 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6328 if (height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6329 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6330 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6331 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6332 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6333 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6334 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6335 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6336 } |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6337 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6338 if (old_current_buffer) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6339 set_buffer_internal (old_current_buffer); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6340 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6341 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6342 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
|
6343 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6344 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6345 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6346 /* 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
|
6347 current message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6348 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6349 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6350 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6351 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6352 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6353 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6354 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
|
6355 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6356 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6357 { |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6358 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
|
6359 (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
|
6360 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6361 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
|
6362 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6363 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6364 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6365 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6366 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6367 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6368 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6369 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
|
6370 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
|
6371 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
|
6372 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6373 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6374 Lisp_Object *msg = (Lisp_Object *) a1; |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6375 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6376 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6377 *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
|
6378 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6379 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6380 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6381 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6382 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6383 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6384 /* 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
|
6385 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
|
6386 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
|
6387 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6388 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6389 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6390 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6391 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6392 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6393 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6394 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
|
6395 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6396 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6397 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6398 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6399 /* 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
|
6400 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6401 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6402 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6403 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6404 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6405 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6406 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6407 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6408 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6409 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
|
6410 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6411 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
|
6412 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6413 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6414 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6415 /* 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
|
6416 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6417 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6418 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6419 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6420 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6421 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
|
6422 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6423 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6424 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6425 /* 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
|
6426 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
|
6427 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6428 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6429 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6430 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6431 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6432 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6433 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6434 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6435 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6436 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6437 /* 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
|
6438 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
|
6439 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6440 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6441 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6442 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6443 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6444 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6445 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
|
6446 /* 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
|
6447 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
|
6448 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
|
6449 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6450 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6451 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6452 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6453 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6454 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
|
6455 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
|
6456 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6457 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6458 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6459 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6460 /* 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
|
6461 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
|
6462 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6463 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6464 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
|
6465 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
|
6466 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
|
6467 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
|
6468 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6469 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6470 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
|
6471 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6472 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
|
6473 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6474 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6475 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6476 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6477 /* 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
|
6478 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6479 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
|
6480 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
|
6481 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
|
6482 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6483 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
|
6484 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
|
6485 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
|
6486 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6487 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6488 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
|
6489 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6490 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6491 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6492 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6493 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6494 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6495 || (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
|
6496 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6497 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
|
6498 (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
|
6499 message_buf_print = 0; |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
6500 help_echo_showing_p = 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6501 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6502 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6503 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6504 /* 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
|
6505 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
|
6506 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
|
6507 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6508 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6509 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6510 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
|
6511 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
|
6512 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
|
6513 EMACS_INT nbytes, multibyte_p; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6514 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6515 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
|
6516 Lisp_Object string = a2; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6517 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6518 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6519 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6520 /* 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
|
6521 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6522 != !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
|
6523 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
|
6524 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6525 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
|
6526 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6527 /* 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
|
6528 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
|
6529 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6530 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6531 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6532 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6533 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6534 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6535 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
|
6536 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
|
6537 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6538 /* 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
|
6539 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
|
6540 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
|
6541 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
|
6542 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6543 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6544 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6545 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6546 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6547 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6548 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
|
6549 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6550 /* 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
|
6551 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6552 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6553 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6554 /* 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
|
6555 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
|
6556 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6557 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
|
6558 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
|
6559 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6560 : 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
|
6561 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
|
6562 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6563 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6564 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6565 && !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
|
6566 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6567 /* 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
|
6568 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6569 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6570 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
|
6571 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6572 /* 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
|
6573 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
|
6574 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6575 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
|
6576 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6577 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
|
6578 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6579 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6580 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6581 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
|
6582 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6583 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6584 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6585 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6586 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6587 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6588 /* 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
|
6589 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
|
6590 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6591 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6592 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6593 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
|
6594 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
|
6595 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6596 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6597 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
|
6598 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6599 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6600 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
|
6601 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6602 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6603 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6604 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6605 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6606 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6607 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
|
6608 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
|
6609 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
|
6610 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
|
6611 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
|
6612 and ensure a complete redisplay of all windows. */ |
25012 | 6613 |
277 | 6614 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6615 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6616 { |
769 | 6617 if (frame_garbaged) |
277 | 6618 { |
25012 | 6619 Lisp_Object tail, frame; |
6620 | |
6621 FOR_EACH_FRAME (tail, frame) | |
6622 { | |
6623 struct frame *f = XFRAME (frame); | |
6624 | |
6625 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
6626 { | |
6627 clear_current_matrices (f); | |
6628 f->garbaged = 0; | |
6629 } | |
6630 } | |
6631 | |
769 | 6632 frame_garbaged = 0; |
25012 | 6633 ++windows_or_buffers_changed; |
6634 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6635 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6636 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6637 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6638 /* 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
|
6639 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
|
6640 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
|
6641 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6642 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6643 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
|
6644 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6645 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6646 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6647 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6648 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6649 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6650 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6651 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6652 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
|
6653 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6654 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
|
6655 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6656 /* 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
|
6657 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
|
6658 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6659 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6660 /* The terminal frame is used as the first Emacs frame on the Mac OS. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6661 #ifndef macintosh |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6662 #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
|
6663 /* 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
|
6664 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
|
6665 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
|
6666 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
|
6667 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6668 return 0; |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6669 #endif /* HAVE_WINDOW_SYSTEM */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6670 #endif |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6671 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6672 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6673 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6674 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6675 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6676 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
|
6677 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6678 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
|
6679 window_height_changed_p = display_echo_area (w); |
25012 | 6680 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
|
6681 |
33068
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6682 /* Update the display, unless called from redisplay_internal. |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6683 Also don't update the screen during redisplay itself. The |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6684 update will happen at the end of redisplay, and an update |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6685 here could cause confusion. */ |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6686 if (update_frame_p && !redisplaying_p) |
25012 | 6687 { |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6688 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6689 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6690 /* If the display update has been interrupted by pending |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6691 input, update mode lines in the frame. Due to the |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6692 pending input, it might have been that redisplay hasn't |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6693 been called, so that mode lines above the echo area are |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6694 garbaged. This looks odd, so we prevent it here. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6695 if (!display_completed) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6696 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6697 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6698 if (window_height_changed_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6699 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6700 /* Must update other windows. */ |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6701 windows_or_buffers_changed = 1; |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6702 redisplay_internal (0); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6703 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6704 else if (FRAME_WINDOW_P (f) && n == 0) |
25012 | 6705 { |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6706 /* Window configuration is the same as before. |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6707 Can do with a display update of the echo area, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6708 unless we displayed some mode lines. */ |
25012 | 6709 update_single_window (w, 1); |
6710 rif->flush_display (f); | |
6711 } | |
6712 else | |
6713 update_frame (f, 1, 1); | |
34068
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6714 |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6715 /* If cursor is in the echo area, make sure that the next |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6716 redisplay displays the minibuffer, so that the cursor will |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6717 be replaced with what the minibuffer wants. */ |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6718 if (cursor_in_echo_area) |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6719 ++windows_or_buffers_changed; |
25012 | 6720 } |
277 | 6721 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6722 else if (!EQ (mini_window, selected_window)) |
277 | 6723 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
|
6724 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6725 /* 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
|
6726 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
|
6727 |
25012 | 6728 /* Prevent redisplay optimization in redisplay_internal by resetting |
6729 this_line_start_pos. This is done because the mini-buffer now | |
6730 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
|
6731 if (EQ (mini_window, selected_window)) |
25012 | 6732 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
|
6733 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6734 return window_height_changed_p; |
25012 | 6735 } |
6736 | |
6737 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6738 |
25012 | 6739 /*********************************************************************** |
6740 Frame Titles | |
6741 ***********************************************************************/ | |
6742 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6743 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6744 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6745 |
6746 /* A buffer for constructing frame titles in it; allocated from the | |
6747 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6748 | |
6749 static char *frame_title_buf; | |
6750 | |
6751 /* The buffer's end, and a current output position in it. */ | |
6752 | |
6753 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
|
6754 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
|
6755 |
25012 | 6756 |
6757 /* Store a single character C for the frame title in frame_title_buf. | |
6758 Re-allocate frame_title_buf if necessary. */ | |
6759 | |
6760 static void | |
6761 store_frame_title_char (c) | |
6762 char c; | |
6763 { | |
6764 /* If output position has reached the end of the allocated buffer, | |
6765 double the buffer's size. */ | |
6766 if (frame_title_ptr == frame_title_buf_end) | |
6767 { | |
6768 int len = frame_title_ptr - frame_title_buf; | |
6769 int new_size = 2 * len * sizeof *frame_title_buf; | |
6770 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6771 frame_title_buf_end = frame_title_buf + new_size; | |
6772 frame_title_ptr = frame_title_buf + len; | |
6773 } | |
6774 | |
6775 *frame_title_ptr++ = c; | |
6776 } | |
6777 | |
6778 | |
6779 /* Store part of a frame title in frame_title_buf, beginning at | |
6780 frame_title_ptr. STR is the string to store. Do not copy more | |
6781 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
6782 the whole string. Pad with spaces until FIELD_WIDTH number of | |
6783 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
6784 Called from display_mode_element when it is used to build a frame | |
6785 title. */ | |
6786 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6787 static int |
25012 | 6788 store_frame_title (str, field_width, precision) |
6789 unsigned char *str; | |
6790 int field_width, precision; | |
6791 { | |
6792 int n = 0; | |
6793 | |
6794 /* Copy at most PRECISION chars from STR. */ | |
6795 while ((precision <= 0 || n < precision) | |
6796 && *str) | |
6797 { | |
6798 store_frame_title_char (*str++); | |
6799 ++n; | |
6800 } | |
6801 | |
6802 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6803 while (field_width > 0 | |
6804 && n < field_width) | |
6805 { | |
6806 store_frame_title_char (' '); | |
6807 ++n; | |
6808 } | |
6809 | |
6810 return n; | |
6811 } | |
6812 | |
6813 | |
6814 /* Set the title of FRAME, if it has changed. The title format is | |
6815 Vicon_title_format if FRAME is iconified, otherwise it is | |
6816 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6817 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6818 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6819 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
|
6820 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6821 { |
25012 | 6822 struct frame *f = XFRAME (frame); |
6823 | |
6824 if (FRAME_WINDOW_P (f) | |
6825 || FRAME_MINIBUF_ONLY_P (f) | |
6826 || f->explicit_name) | |
6827 { | |
6828 /* Do we have more than one visible frame on this X display? */ | |
6829 Lisp_Object tail; | |
6830 Lisp_Object fmt; | |
6831 struct buffer *obuf; | |
6832 int len; | |
6833 struct it it; | |
6834 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6835 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
|
6836 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6837 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6838 |
6839 if (tf != f | |
6840 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6841 && !FRAME_MINIBUF_ONLY_P (tf) | |
6842 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6843 break; | |
6844 } | |
6845 | |
6846 /* Set global variable indicating that multiple frames exist. */ | |
6847 multiple_frames = CONSP (tail); | |
6848 | |
6849 /* Switch to the buffer of selected window of the frame. Set up | |
6850 frame_title_ptr so that display_mode_element will output into it; | |
6851 then display the title. */ | |
6852 obuf = current_buffer; | |
6853 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6854 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6855 frame_title_ptr = frame_title_buf; | |
6856 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6857 NULL, DEFAULT_FACE_ID); | |
6858 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6859 frame_title_ptr = NULL; | |
6860 set_buffer_internal (obuf); | |
6861 | |
6862 /* Set the title only if it's changed. This avoids consing in | |
6863 the common case where it hasn't. (If it turns out that we've | |
6864 already wasted too much time by walking through the list with | |
6865 display_mode_element, then we might need to optimize at a | |
6866 higher level than this.) */ | |
6867 if (! STRINGP (f->name) | |
6868 || STRING_BYTES (XSTRING (f->name)) != len | |
6869 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6870 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6871 } | |
6872 } | |
6873 | |
6874 #else /* not HAVE_WINDOW_SYSTEM */ | |
6875 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6876 #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
|
6877 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6878 |
6879 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6880 | |
6881 | |
6882 | |
277 | 6883 |
25012 | 6884 /*********************************************************************** |
6885 Menu Bars | |
6886 ***********************************************************************/ | |
6887 | |
6888 | |
6889 /* Prepare for redisplay by updating menu-bar item lists when | |
6890 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6891 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6892 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6893 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6894 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6895 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6896 struct gcpro gcpro1, gcpro2; |
25012 | 6897 struct frame *f; |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6898 Lisp_Object tooltip_frame; |
25012 | 6899 |
6900 #ifdef HAVE_X_WINDOWS | |
6901 tooltip_frame = tip_frame; | |
6902 #else | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6903 tooltip_frame = Qnil; |
25012 | 6904 #endif |
6905 | |
6906 /* Update all frame titles based on their buffer names, etc. We do | |
6907 this before the menu bars so that the buffer-menu will show the | |
6908 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6909 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6910 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
|
6911 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6912 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6913 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6914 FOR_EACH_FRAME (tail, frame) |
25012 | 6915 { |
6916 f = XFRAME (frame); | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6917 if (!EQ (frame, tooltip_frame) |
25012 | 6918 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) |
6919 x_consider_frame_title (frame); | |
6920 } | |
6921 } | |
6922 #endif /* HAVE_WINDOW_SYSTEM */ | |
6923 | |
6924 /* Update the menu bar item lists, if appropriate. This has to be | |
6925 done before any actual redisplay or generation of display lines. */ | |
6926 all_windows = (update_mode_lines | |
6927 || buffer_shared > 1 | |
6928 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6929 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6930 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6931 Lisp_Object tail, frame; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
6932 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6933 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6934 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
|
6935 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6936 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6937 { |
25012 | 6938 f = XFRAME (frame); |
6939 | |
6940 /* Ignore tooltip frame. */ | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6941 if (EQ (frame, tooltip_frame)) |
25012 | 6942 continue; |
6943 | |
6944 /* If a window on this frame changed size, report that to | |
6945 the user and clear the size-change flag. */ | |
6946 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6947 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6948 Lisp_Object functions; |
25012 | 6949 |
6950 /* Clear flag first in case we get an error below. */ | |
6951 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6952 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6953 GCPRO2 (tail, functions); |
25012 | 6954 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6955 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6956 { |
25012 | 6957 call1 (XCAR (functions), frame); |
6958 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6959 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6960 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6961 } |
25012 | 6962 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6963 GCPRO1 (tail); |
25012 | 6964 update_menu_bar (f, 0); |
6965 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6966 update_tool_bar (f, 0); |
25012 | 6967 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6968 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6969 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6970 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6971 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6972 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6973 else |
25012 | 6974 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6975 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6976 update_menu_bar (sf, 1); |
25012 | 6977 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6978 update_tool_bar (sf, 1); |
25012 | 6979 #endif |
6980 } | |
6981 | |
6982 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6983 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6984 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6985 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6986 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6987 } |
25012 | 6988 |
6989 | |
6990 /* Update the menu bar item list for frame F. This has to be done | |
6991 before we start to fill in any display lines, because it can call | |
6992 eval. | |
6993 | |
6994 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
|
6995 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6996 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6997 update_menu_bar (f, save_match_data) |
25012 | 6998 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6999 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7000 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7001 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7002 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
|
7003 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7004 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7005 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7006 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7007 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7008 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7009 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
7010 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
|
7011 ? |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7012 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
7013 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
|
7014 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
7015 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
|
7016 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
7017 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7018 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7019 /* 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
|
7020 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
|
7021 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
|
7022 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
|
7023 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
|
7024 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
|
7025 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7026 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
|
7027 || !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
|
7028 || ((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
|
7029 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7030 != !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
|
7031 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
7032 && !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
|
7033 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7034 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7035 struct buffer *prev = current_buffer; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7036 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7037 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
7038 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
|
7039 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
7040 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
|
7041 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7042 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7043 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7044 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7045 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7046 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7047 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7048 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 7049 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7050 /* If it has changed current-menubar from previous value, |
25012 | 7051 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
|
7052 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7053 call0 (Qrecompute_lucid_menubar); |
25012 | 7054 |
14299 | 7055 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
|
7056 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 7057 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7058 /* Redisplay the menu bar in case we changed it. */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7059 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7060 if (FRAME_WINDOW_P (f) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7061 #if defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7062 /* All frames on Mac OS share the same menubar. So only the |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7063 selected frame should be allowed to set it. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7064 && f == SELECTED_FRAME () |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7065 #endif |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7066 ) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
7067 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
|
7068 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7069 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 7070 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
|
7071 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7072 #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
|
7073 /* 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
|
7074 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
|
7075 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7076 #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
|
7077 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7078 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
|
7079 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7080 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7081 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7082 } |
25012 | 7083 |
7084 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7085 |
25012 | 7086 /*********************************************************************** |
25543 | 7087 Tool-bars |
25012 | 7088 ***********************************************************************/ |
7089 | |
7090 #ifdef HAVE_WINDOW_SYSTEM | |
7091 | |
25543 | 7092 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 7093 before we start to fill in any display lines. Called from |
7094 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
7095 and restore it here. */ | |
7096 | |
7097 static void | |
25543 | 7098 update_tool_bar (f, save_match_data) |
25012 | 7099 struct frame *f; |
7100 int save_match_data; | |
7101 { | |
25543 | 7102 if (WINDOWP (f->tool_bar_window) |
7103 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 7104 { |
7105 Lisp_Object window; | |
7106 struct window *w; | |
7107 | |
7108 window = FRAME_SELECTED_WINDOW (f); | |
7109 w = XWINDOW (window); | |
7110 | |
7111 /* If the user has switched buffers or windows, we need to | |
7112 recompute to reflect the new bindings. But we'll | |
7113 recompute when update_mode_lines is set too; that means | |
7114 that people can use force-mode-line-update to request | |
7115 that the menu bar be recomputed. The adverse effect on | |
7116 the rest of the redisplay algorithm is about the same as | |
7117 windows_or_buffers_changed anyway. */ | |
7118 if (windows_or_buffers_changed | |
7119 || !NILP (w->update_mode_line) | |
7120 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
7121 < BUF_MODIFF (XBUFFER (w->buffer))) | |
7122 != !NILP (w->last_had_star)) | |
7123 || ((!NILP (Vtransient_mark_mode) | |
7124 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7125 != !NILP (w->region_showing))) | |
7126 { | |
7127 struct buffer *prev = current_buffer; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7128 int count = BINDING_STACK_SIZE (); |
25012 | 7129 |
7130 /* Set current_buffer to the buffer of the selected | |
7131 window of the frame, so that we get the right local | |
7132 keymaps. */ | |
7133 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
7134 | |
7135 /* Save match data, if we must. */ | |
7136 if (save_match_data) | |
7137 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
7138 | |
7139 /* Make sure that we don't accidentally use bogus keymaps. */ | |
7140 if (NILP (Voverriding_local_map_menu_flag)) | |
7141 { | |
7142 specbind (Qoverriding_terminal_local_map, Qnil); | |
7143 specbind (Qoverriding_local_map, Qnil); | |
7144 } | |
7145 | |
25543 | 7146 /* Build desired tool-bar items from keymaps. */ |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7147 f->tool_bar_items |
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7148 = tool_bar_items (f->tool_bar_items, &f->n_tool_bar_items); |
25012 | 7149 |
25543 | 7150 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 7151 w->update_mode_line = Qt; |
7152 | |
7153 unbind_to (count, Qnil); | |
7154 set_buffer_internal_1 (prev); | |
7155 } | |
7156 } | |
7157 } | |
7158 | |
7159 | |
25543 | 7160 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7161 F's desired tool-bar contents. F->tool_bar_items must have |
25012 | 7162 been set up previously by calling prepare_menu_bars. */ |
7163 | |
7164 static void | |
25543 | 7165 build_desired_tool_bar_string (f) |
25012 | 7166 struct frame *f; |
7167 { | |
7168 int i, size, size_needed, string_idx; | |
7169 struct gcpro gcpro1, gcpro2, gcpro3; | |
7170 Lisp_Object image, plist, props; | |
7171 | |
7172 image = plist = props = Qnil; | |
7173 GCPRO3 (image, plist, props); | |
7174 | |
25543 | 7175 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 7176 Otherwise, make a new string. */ |
7177 | |
7178 /* The size of the string we might be able to reuse. */ | |
25543 | 7179 size = (STRINGP (f->desired_tool_bar_string) |
7180 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 7181 : 0); |
7182 | |
7183 /* Each image in the string we build is preceded by a space, | |
7184 and there is a space at the end. */ | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7185 size_needed = f->n_tool_bar_items + 1; |
25543 | 7186 |
7187 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 7188 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
|
7189 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
|
7190 make_number (' ')); |
25012 | 7191 else |
7192 { | |
7193 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
7194 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 7195 props, f->desired_tool_bar_string); |
25012 | 7196 } |
7197 | |
7198 /* Put a `display' property on the string for the images to display, | |
25543 | 7199 put a `menu_item' property on tool-bar items with a value that |
7200 is the index of the item in F's tool-bar item vector. */ | |
25012 | 7201 for (i = 0, string_idx = 0; |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7202 i < f->n_tool_bar_items; |
25012 | 7203 ++i, string_idx += 1) |
7204 { | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7205 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) |
25543 | 7206 |
7207 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
7208 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7209 int margin, relief, idx; |
25012 | 7210 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; |
7211 extern Lisp_Object Qlaplace; | |
7212 | |
7213 /* If image is a vector, choose the image according to the | |
7214 button state. */ | |
25543 | 7215 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 7216 if (VECTORP (image)) |
7217 { | |
7218 if (enabled_p) | |
7219 idx = (selected_p | |
25543 | 7220 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
7221 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 7222 else |
7223 idx = (selected_p | |
25543 | 7224 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
7225 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 7226 |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7227 xassert (ASIZE (image) >= idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7228 image = AREF (image, idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7229 } |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7230 else |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7231 idx = -1; |
25012 | 7232 |
7233 /* Ignore invalid image specifications. */ | |
7234 if (!valid_image_p (image)) | |
7235 continue; | |
7236 | |
25543 | 7237 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 7238 plist = Fcopy_sequence (XCDR (image)); |
7239 | |
7240 /* Compute margin and relief to draw. */ | |
25543 | 7241 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
7242 margin = relief + max (0, tool_bar_button_margin); | |
7243 | |
7244 if (auto_raise_tool_bar_buttons_p) | |
25012 | 7245 { |
7246 /* Add a `:relief' property to the image spec if the item is | |
7247 selected. */ | |
7248 if (selected_p) | |
7249 { | |
7250 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
7251 margin -= relief; | |
7252 } | |
7253 } | |
7254 else | |
7255 { | |
7256 /* If image is selected, display it pressed, i.e. with a | |
7257 negative relief. If it's not selected, display it with a | |
7258 raised relief. */ | |
7259 plist = Fplist_put (plist, QCrelief, | |
7260 (selected_p | |
7261 ? make_number (-relief) | |
7262 : make_number (relief))); | |
7263 margin -= relief; | |
7264 } | |
7265 | |
7266 /* Put a margin around the image. */ | |
7267 if (margin) | |
7268 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
7269 | |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7270 /* If button is not enabled, and we don't have special images |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7271 for the disabled state, make the image appear disabled by |
25012 | 7272 applying an appropriate algorithm to it. */ |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7273 if (!enabled_p && idx < 0) |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7274 plist = Fplist_put (plist, QCalgorithm, Qdisabled); |
25012 | 7275 |
7276 /* Put a `display' text property on the string for the image to | |
7277 display. Put a `menu-item' property on the string that gives | |
25543 | 7278 the start of this item's properties in the tool-bar items |
25012 | 7279 vector. */ |
7280 image = Fcons (Qimage, plist); | |
7281 props = list4 (Qdisplay, image, | |
25543 | 7282 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 7283 Fadd_text_properties (make_number (string_idx), |
7284 make_number (string_idx + 1), | |
25543 | 7285 props, f->desired_tool_bar_string); |
25012 | 7286 #undef PROP |
7287 } | |
7288 | |
7289 UNGCPRO; | |
7290 } | |
7291 | |
7292 | |
25543 | 7293 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 7294 |
7295 static void | |
25543 | 7296 display_tool_bar_line (it) |
25012 | 7297 struct it *it; |
7298 { | |
7299 struct glyph_row *row = it->glyph_row; | |
7300 int max_x = it->last_visible_x; | |
7301 struct glyph *last; | |
7302 | |
7303 prepare_desired_row (row); | |
7304 row->y = it->current_y; | |
34500
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7305 |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7306 /* Note that this isn't made use of if the face hasn't a box, |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7307 so there's no need to check the face here. */ |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7308 it->start_of_box_run_p = 1; |
25012 | 7309 |
7310 while (it->current_x < max_x) | |
7311 { | |
7312 int x_before, x, n_glyphs_before, i, nglyphs; | |
7313 | |
7314 /* Get the next display element. */ | |
7315 if (!get_next_display_element (it)) | |
7316 break; | |
7317 | |
7318 /* Produce glyphs. */ | |
7319 x_before = it->current_x; | |
7320 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
7321 PRODUCE_GLYPHS (it); | |
7322 | |
7323 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
7324 i = 0; | |
7325 x = x_before; | |
7326 while (i < nglyphs) | |
7327 { | |
7328 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
7329 | |
7330 if (x + glyph->pixel_width > max_x) | |
7331 { | |
7332 /* Glyph doesn't fit on line. */ | |
7333 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
7334 it->current_x = x; | |
7335 goto out; | |
7336 } | |
7337 | |
7338 ++it->hpos; | |
7339 x += glyph->pixel_width; | |
7340 ++i; | |
7341 } | |
7342 | |
7343 /* Stop at line ends. */ | |
7344 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
7345 break; | |
7346 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
7347 set_iterator_to_next (it, 1); |
25012 | 7348 } |
7349 | |
7350 out:; | |
7351 | |
7352 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
7353 extend_face_to_end_of_line (it); | |
7354 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
7355 last->right_box_line_p = 1; | |
34500
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7356 if (last == row->glyphs[TEXT_AREA]) |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7357 last->left_box_line_p = 1; |
25012 | 7358 compute_line_metrics (it); |
7359 | |
25543 | 7360 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 7361 if (!row->displays_text_p) |
7362 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
7363 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
|
7364 row->ascent = row->phys_ascent = 0; |
25012 | 7365 } |
7366 | |
7367 row->full_width_p = 1; | |
7368 row->continued_p = 0; | |
7369 row->truncated_on_left_p = 0; | |
7370 row->truncated_on_right_p = 0; | |
7371 | |
7372 it->current_x = it->hpos = 0; | |
7373 it->current_y += row->height; | |
7374 ++it->vpos; | |
7375 ++it->glyph_row; | |
7376 } | |
7377 | |
7378 | |
25543 | 7379 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 7380 items of frame F visible. */ |
7381 | |
7382 static int | |
25543 | 7383 tool_bar_lines_needed (f) |
25012 | 7384 struct frame *f; |
7385 { | |
25543 | 7386 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 7387 struct it it; |
7388 | |
25543 | 7389 /* Initialize an iterator for iteration over |
7390 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
7391 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7392 it.first_visible_x = 0; |
7393 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 7394 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 7395 |
7396 while (!ITERATOR_AT_END_P (&it)) | |
7397 { | |
7398 it.glyph_row = w->desired_matrix->rows; | |
7399 clear_glyph_row (it.glyph_row); | |
25543 | 7400 display_tool_bar_line (&it); |
25012 | 7401 } |
7402 | |
7403 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
7404 } | |
7405 | |
7406 | |
25543 | 7407 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 7408 height should be changed. */ |
7409 | |
7410 static int | |
25543 | 7411 redisplay_tool_bar (f) |
25012 | 7412 struct frame *f; |
7413 { | |
7414 struct window *w; | |
7415 struct it it; | |
7416 struct glyph_row *row; | |
7417 int change_height_p = 0; | |
7418 | |
25543 | 7419 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
7420 do anything. This means you must start with tool-bar-lines | |
25012 | 7421 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 7422 can turn off tool-bars by specifying tool-bar-lines zero. */ |
7423 if (!WINDOWP (f->tool_bar_window) | |
7424 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 7425 XFASTINT (w->height) == 0)) |
7426 return 0; | |
7427 | |
25543 | 7428 /* Set up an iterator for the tool-bar window. */ |
7429 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7430 it.first_visible_x = 0; |
7431 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
7432 row = it.glyph_row; | |
7433 | |
25543 | 7434 /* Build a string that represents the contents of the tool-bar. */ |
7435 build_desired_tool_bar_string (f); | |
7436 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
7437 | |
7438 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 7439 while (it.current_y < it.last_visible_y) |
25543 | 7440 display_tool_bar_line (&it); |
7441 | |
7442 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 7443 window, so don't do it. */ |
7444 w->desired_matrix->no_scrolling_p = 1; | |
7445 w->must_be_updated_p = 1; | |
7446 | |
25543 | 7447 if (auto_resize_tool_bars_p) |
25012 | 7448 { |
7449 int nlines; | |
7450 | |
7451 /* If there are blank lines at the end, except for a partially | |
7452 visible blank line at the end that is smaller than | |
25543 | 7453 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 7454 row = it.glyph_row - 1; |
7455 if (!row->displays_text_p | |
7456 && row->height >= CANON_Y_UNIT (f)) | |
7457 change_height_p = 1; | |
7458 | |
25543 | 7459 /* If row displays tool-bar items, but is partially visible, |
7460 change the tool-bar's height. */ | |
25012 | 7461 if (row->displays_text_p |
7462 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
7463 change_height_p = 1; | |
7464 | |
25543 | 7465 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 7466 frame parameter. */ |
7467 if (change_height_p | |
25543 | 7468 && (nlines = tool_bar_lines_needed (f), |
25012 | 7469 nlines != XFASTINT (w->height))) |
7470 { | |
25543 | 7471 extern Lisp_Object Qtool_bar_lines; |
25012 | 7472 Lisp_Object frame; |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7473 int old_height = XFASTINT (w->height); |
25012 | 7474 |
7475 XSETFRAME (frame, f); | |
7476 clear_glyph_matrix (w->desired_matrix); | |
7477 Fmodify_frame_parameters (frame, | |
25543 | 7478 Fcons (Fcons (Qtool_bar_lines, |
25012 | 7479 make_number (nlines)), |
7480 Qnil)); | |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7481 if (XFASTINT (w->height) != old_height) |
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7482 fonts_changed_p = 1; |
25012 | 7483 } |
7484 } | |
7485 | |
7486 return change_height_p; | |
7487 } | |
7488 | |
7489 | |
25543 | 7490 /* Get information about the tool-bar item which is displayed in GLYPH |
7491 on frame F. Return in *PROP_IDX the index where tool-bar item | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7492 properties start in F->tool_bar_items. Value is zero if |
25543 | 7493 GLYPH doesn't display a tool-bar item. */ |
25012 | 7494 |
7495 int | |
25543 | 7496 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 7497 struct frame *f; |
7498 struct glyph *glyph; | |
7499 int *prop_idx; | |
7500 { | |
7501 Lisp_Object prop; | |
7502 int success_p; | |
7503 | |
7504 /* Get the text property `menu-item' at pos. The value of that | |
7505 property is the start index of this item's properties in | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7506 F->tool_bar_items. */ |
25012 | 7507 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 7508 Qmenu_item, f->current_tool_bar_string); |
25012 | 7509 if (INTEGERP (prop)) |
7510 { | |
7511 *prop_idx = XINT (prop); | |
7512 success_p = 1; | |
7513 } | |
7514 else | |
7515 success_p = 0; | |
7516 | |
7517 return success_p; | |
7518 } | |
7519 | |
7520 #endif /* HAVE_WINDOW_SYSTEM */ | |
7521 | |
7522 | |
7523 | |
7524 /************************************************************************ | |
7525 Horizontal scrolling | |
7526 ************************************************************************/ | |
7527 | |
7528 static int hscroll_window_tree P_ ((Lisp_Object)); | |
7529 static int hscroll_windows P_ ((Lisp_Object)); | |
7530 | |
7531 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
7532 hscroll value so that PT is (i) visible in the window, and (ii) so | |
7533 that it is not within a certain margin at the window's left and | |
7534 right border. Value is non-zero if any window's hscroll has been | |
7535 changed. */ | |
7536 | |
7537 static int | |
7538 hscroll_window_tree (window) | |
7539 Lisp_Object window; | |
7540 { | |
7541 int hscrolled_p = 0; | |
7542 | |
7543 while (WINDOWP (window)) | |
7544 { | |
7545 struct window *w = XWINDOW (window); | |
7546 | |
7547 if (WINDOWP (w->hchild)) | |
7548 hscrolled_p |= hscroll_window_tree (w->hchild); | |
7549 else if (WINDOWP (w->vchild)) | |
7550 hscrolled_p |= hscroll_window_tree (w->vchild); | |
7551 else if (w->cursor.vpos >= 0) | |
7552 { | |
7553 int hscroll_margin, text_area_x, text_area_y; | |
7554 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
|
7555 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7556 = 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
|
7557 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7558 = 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
|
7559 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7560 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7561 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7562 : current_cursor_row); |
25012 | 7563 |
7564 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
7565 &text_area_width, &text_area_height); | |
7566 | |
7567 /* Scroll when cursor is inside this scroll margin. */ | |
7568 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
7569 | |
7570 if ((XFASTINT (w->hscroll) | |
7571 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7572 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7573 && cursor_row->truncated_on_right_p |
25012 | 7574 && (w->cursor.x > text_area_width - hscroll_margin))) |
7575 { | |
7576 struct it it; | |
7577 int hscroll; | |
7578 struct buffer *saved_current_buffer; | |
7579 int pt; | |
7580 | |
7581 /* Find point in a display of infinite width. */ | |
7582 saved_current_buffer = current_buffer; | |
7583 current_buffer = XBUFFER (w->buffer); | |
7584 | |
7585 if (w == XWINDOW (selected_window)) | |
7586 pt = BUF_PT (current_buffer); | |
7587 else | |
7588 { | |
7589 pt = marker_position (w->pointm); | |
7590 pt = max (BEGV, pt); | |
7591 pt = min (ZV, pt); | |
7592 } | |
7593 | |
7594 /* Move iterator to pt starting at cursor_row->start in | |
7595 a line with infinite width. */ | |
7596 init_to_row_start (&it, w, cursor_row); | |
7597 it.last_visible_x = INFINITY; | |
7598 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
7599 current_buffer = saved_current_buffer; | |
7600 | |
7601 /* Center cursor in window. */ | |
7602 hscroll = (max (0, it.current_x - text_area_width / 2) | |
7603 / CANON_X_UNIT (it.f)); | |
34748
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7604 hscroll = max (hscroll, XFASTINT (w->min_hscroll)); |
25012 | 7605 |
7606 /* Don't call Fset_window_hscroll if value hasn't | |
7607 changed because it will prevent redisplay | |
7608 optimizations. */ | |
7609 if (XFASTINT (w->hscroll) != hscroll) | |
7610 { | |
34748
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7611 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7612 w->hscroll = make_number (hscroll); |
25012 | 7613 hscrolled_p = 1; |
7614 } | |
7615 } | |
7616 } | |
7617 | |
7618 window = w->next; | |
7619 } | |
7620 | |
7621 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
7622 return hscrolled_p; | |
7623 } | |
7624 | |
7625 | |
7626 /* Set hscroll so that cursor is visible and not inside horizontal | |
7627 scroll margins for all windows in the tree rooted at WINDOW. See | |
7628 also hscroll_window_tree above. Value is non-zero if any window's | |
7629 hscroll has been changed. If it has, desired matrices on the frame | |
7630 of WINDOW are cleared. */ | |
7631 | |
7632 static int | |
7633 hscroll_windows (window) | |
7634 Lisp_Object window; | |
7635 { | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7636 int hscrolled_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7637 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7638 if (automatic_hscrolling_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7639 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7640 hscrolled_p = hscroll_window_tree (window); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7641 if (hscrolled_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7642 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
|
7643 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7644 else |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7645 hscrolled_p = 0; |
25012 | 7646 return hscrolled_p; |
7647 } | |
7648 | |
7649 | |
7650 | |
7651 /************************************************************************ | |
7652 Redisplay | |
7653 ************************************************************************/ | |
7654 | |
7655 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
7656 to a non-zero value. This is sometimes handy to have in a debugger | |
7657 session. */ | |
7658 | |
7659 #if GLYPH_DEBUG | |
7660 | |
7661 /* First and last unchanged row for try_window_id. */ | |
7662 | |
7663 int debug_first_unchanged_at_end_vpos; | |
7664 int debug_last_unchanged_at_beg_vpos; | |
7665 | |
7666 /* Delta vpos and y. */ | |
7667 | |
7668 int debug_dvpos, debug_dy; | |
7669 | |
7670 /* Delta in characters and bytes for try_window_id. */ | |
7671 | |
7672 int debug_delta, debug_delta_bytes; | |
7673 | |
7674 /* Values of window_end_pos and window_end_vpos at the end of | |
7675 try_window_id. */ | |
7676 | |
7677 int debug_end_pos, debug_end_vpos; | |
7678 | |
7679 /* Append a string to W->desired_matrix->method. FMT is a printf | |
7680 format string. A1...A9 are a supplement for a variable-length | |
7681 argument list. If trace_redisplay_p is non-zero also printf the | |
7682 resulting string to stderr. */ | |
7683 | |
7684 static void | |
7685 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
7686 struct window *w; | |
7687 char *fmt; | |
7688 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
7689 { | |
7690 char buffer[512]; | |
7691 char *method = w->desired_matrix->method; | |
7692 int len = strlen (method); | |
7693 int size = sizeof w->desired_matrix->method; | |
7694 int remaining = size - len - 1; | |
7695 | |
7696 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
7697 if (len && remaining) | |
7698 { | |
7699 method[len] = '|'; | |
7700 --remaining, ++len; | |
7701 } | |
7702 | |
7703 strncpy (method + len, buffer, remaining); | |
7704 | |
7705 if (trace_redisplay_p) | |
7706 fprintf (stderr, "%p (%s): %s\n", | |
7707 w, | |
7708 ((BUFFERP (w->buffer) | |
7709 && STRINGP (XBUFFER (w->buffer)->name)) | |
7710 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
7711 : "no buffer"), | |
7712 buffer); | |
7713 } | |
7714 | |
7715 #endif /* GLYPH_DEBUG */ | |
7716 | |
7717 | |
7718 /* This counter is used to clear the face cache every once in a while | |
7719 in redisplay_internal. It is incremented for each redisplay. | |
7720 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7721 cleared. */ | |
7722 | |
7723 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7724 static int clear_face_cache_count; | |
7725 | |
7726 /* Record the previous terminal frame we displayed. */ | |
7727 | |
7728 static struct frame *previous_terminal_frame; | |
7729 | |
7730 /* Non-zero while redisplay_internal is in progress. */ | |
7731 | |
7732 int redisplaying_p; | |
7733 | |
7734 | |
7735 /* Value is non-zero if all changes in window W, which displays | |
7736 current_buffer, are in the text between START and END. START is a | |
7737 buffer position, END is given as a distance from Z. Used in | |
7738 redisplay_internal for display optimization. */ | |
7739 | |
7740 static INLINE int | |
7741 text_outside_line_unchanged_p (w, start, end) | |
7742 struct window *w; | |
7743 int start, end; | |
7744 { | |
7745 int unchanged_p = 1; | |
7746 | |
7747 /* If text or overlays have changed, see where. */ | |
7748 if (XFASTINT (w->last_modified) < MODIFF | |
7749 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7750 { | |
7751 /* Gap in the line? */ | |
7752 if (GPT < start || Z - GPT < end) | |
7753 unchanged_p = 0; | |
7754 | |
7755 /* Changes start in front of the line, or end after it? */ | |
7756 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7757 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7758 || END_UNCHANGED < end)) |
25012 | 7759 unchanged_p = 0; |
7760 | |
7761 /* If selective display, can't optimize if changes start at the | |
7762 beginning of the line. */ | |
7763 if (unchanged_p | |
7764 && INTEGERP (current_buffer->selective_display) | |
7765 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7766 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7767 unchanged_p = 0; |
7768 } | |
7769 | |
7770 return unchanged_p; | |
7771 } | |
7772 | |
7773 | |
7774 /* Do a frame update, taking possible shortcuts into account. This is | |
7775 the main external entry point for redisplay. | |
7776 | |
7777 If the last redisplay displayed an echo area message and that message | |
7778 is no longer requested, we clear the echo area or bring back the | |
7779 mini-buffer if that is in use. */ | |
7780 | |
7781 void | |
7782 redisplay () | |
7783 { | |
7784 redisplay_internal (0); | |
7785 } | |
7786 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7787 /* 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
|
7788 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
|
7789 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
|
7790 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7791 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7792 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
|
7793 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7794 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7795 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7796 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7797 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7798 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7799 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7800 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7801 /* 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
|
7802 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7803 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7804 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7805 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7806 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7807 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7808 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7809 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
|
7810 && 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
|
7811 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7812 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7813 /* 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
|
7814 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7815 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7816 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7817 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7818 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7819 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
|
7820 && 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
|
7821 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7822 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7823 } |
25012 | 7824 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7825 /* 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
|
7826 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7827 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7828 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7829 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7830 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7831 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7832 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7833 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7834 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7835 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7836 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7837 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7838 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7839 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7840 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7841 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7842 /* 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
|
7843 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
|
7844 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
|
7845 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
|
7846 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7847 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7848 && 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
|
7849 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7850 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7851 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7852 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7853 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7854 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7855 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7856 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7857 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
|
7858 || pt != XINT (w->last_point)) |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7859 && 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
|
7860 XINT (w->last_point), |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7861 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7862 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7863 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7864 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7865 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7866 |
25012 | 7867 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7868 response to any user action; therefore, we should preserve the echo | |
7869 area. (Actually, our caller does that job.) Perhaps in the future | |
7870 avoid recentering windows if it is not necessary; currently that | |
7871 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7872 |
277 | 7873 static void |
25012 | 7874 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7875 int preserve_echo_area; |
277 | 7876 { |
25012 | 7877 struct window *w = XWINDOW (selected_window); |
7878 struct frame *f = XFRAME (w->frame); | |
7879 int pause; | |
7880 int must_finish = 0; | |
7881 struct text_pos tlbufpos, tlendpos; | |
7882 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7883 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7884 struct frame *sf = SELECTED_FRAME (); |
25012 | 7885 |
7886 /* Non-zero means redisplay has to consider all windows on all | |
7887 frames. Zero means, only selected_window is considered. */ | |
7888 int consider_all_windows_p; | |
7889 | |
7890 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7891 | |
7892 /* No redisplay if running in batch mode or frame is not yet fully | |
7893 initialized, or redisplay is explicitly turned off by setting | |
7894 Vinhibit_redisplay. */ | |
7895 if (noninteractive | |
7896 || !NILP (Vinhibit_redisplay) | |
7897 || !f->glyphs_initialized_p) | |
7898 return; | |
7899 | |
7900 /* The flag redisplay_performed_directly_p is set by | |
7901 direct_output_for_insert when it already did the whole screen | |
7902 update necessary. */ | |
7903 if (redisplay_performed_directly_p) | |
7904 { | |
7905 redisplay_performed_directly_p = 0; | |
7906 if (!hscroll_windows (selected_window)) | |
7907 return; | |
7908 } | |
7909 | |
7910 #ifdef USE_X_TOOLKIT | |
7911 if (popup_activated ()) | |
7912 return; | |
7913 #endif | |
7914 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7915 /* I don't think this happens but let's be paranoid. */ |
25012 | 7916 if (redisplaying_p) |
7917 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7918 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7919 /* 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
|
7920 when we leave this function. */ |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7921 count = BINDING_STACK_SIZE (); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7922 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7923 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7924 |
25012 | 7925 retry: |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
7926 pause = 0; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7927 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7928 |
25012 | 7929 /* If new fonts have been loaded that make a glyph matrix adjustment |
7930 necessary, do it. */ | |
7931 if (fonts_changed_p) | |
7932 { | |
7933 adjust_glyphs (NULL); | |
7934 ++windows_or_buffers_changed; | |
7935 fonts_changed_p = 0; | |
7936 } | |
7937 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7938 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7939 && previous_terminal_frame != sf) |
25012 | 7940 { |
7941 /* Since frames on an ASCII terminal share the same display | |
7942 area, displaying a different frame means redisplay the whole | |
7943 thing. */ | |
7944 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7945 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7946 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7947 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7948 previous_terminal_frame = sf; |
25012 | 7949 |
7950 /* Set the visible flags for all frames. Do this before checking | |
7951 for resized or garbaged frames; they want to know if their frames | |
7952 are visible. See the comment in frame.h for | |
7953 FRAME_SAMPLE_VISIBILITY. */ | |
7954 { | |
7955 Lisp_Object tail, frame; | |
7956 | |
7957 number_of_visible_frames = 0; | |
7958 | |
7959 FOR_EACH_FRAME (tail, frame) | |
7960 { | |
7961 struct frame *f = XFRAME (frame); | |
7962 | |
7963 FRAME_SAMPLE_VISIBILITY (f); | |
7964 if (FRAME_VISIBLE_P (f)) | |
7965 ++number_of_visible_frames; | |
7966 clear_desired_matrices (f); | |
7967 } | |
7968 } | |
7969 | |
7970 /* 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
|
7971 do_pending_window_change (1); |
25012 | 7972 |
7973 /* Clear frames marked as garbaged. */ | |
7974 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7975 clear_garbaged_frames (); |
25012 | 7976 |
25543 | 7977 /* Build menubar and tool-bar items. */ |
25012 | 7978 prepare_menu_bars (); |
7979 | |
7980 if (windows_or_buffers_changed) | |
7981 update_mode_lines++; | |
7982 | |
7983 /* Detect case that we need to write or remove a star in the mode line. */ | |
7984 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7985 { | |
7986 w->update_mode_line = Qt; | |
7987 if (buffer_shared > 1) | |
7988 update_mode_lines++; | |
7989 } | |
7990 | |
7991 /* If %c is in the mode line, update it if needed. */ | |
7992 if (!NILP (w->column_number_displayed) | |
7993 /* This alternative quickly identifies a common case | |
7994 where no change is needed. */ | |
7995 && !(PT == XFASTINT (w->last_point) | |
7996 && XFASTINT (w->last_modified) >= MODIFF | |
7997 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7998 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7999 w->update_mode_line = Qt; | |
8000 | |
8001 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
8002 | |
8003 /* The variable buffer_shared is set in redisplay_window and | |
8004 indicates that we redisplay a buffer in different windows. See | |
8005 there. */ | |
8006 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
8007 | |
8008 /* If specs for an arrow have changed, do thorough redisplay | |
8009 to ensure we remove any arrow that should no longer exist. */ | |
8010 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
8011 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
8012 consider_all_windows_p = windows_or_buffers_changed = 1; | |
8013 | |
8014 /* Normally the message* functions will have already displayed and | |
8015 updated the echo area, but the frame may have been trashed, or | |
8016 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
|
8017 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
|
8018 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
|
8019 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
|
8020 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8021 int window_height_changed_p = echo_area_display (0); |
25012 | 8022 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8023 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8024 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8025 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8026 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
|
8027 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8028 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
|
8029 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8030 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8031 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8032 /* 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
|
8033 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8034 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8035 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8036 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8037 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8038 } |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8039 else if (EQ (selected_window, minibuf_window) |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8040 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8041 || 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
|
8042 || 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
|
8043 && 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
|
8044 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8045 /* 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
|
8046 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
|
8047 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8048 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
|
8049 ++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
|
8050 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8051 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8052 /* 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
|
8053 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8054 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8055 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8056 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8057 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8058 |
25012 | 8059 |
8060 /* If showing the region, and mark has changed, we must redisplay | |
8061 the whole window. The assignment to this_line_start_pos prevents | |
8062 the optimization directly below this if-statement. */ | |
8063 if (((!NILP (Vtransient_mark_mode) | |
8064 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
8065 != !NILP (w->region_showing)) | |
8066 || (!NILP (w->region_showing) | |
8067 && !EQ (w->region_showing, | |
8068 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
8069 CHARPOS (this_line_start_pos) = 0; | |
8070 | |
8071 /* Optimize the case that only the line containing the cursor in the | |
8072 selected window has changed. Variables starting with this_ are | |
8073 set in display_line and record information about the line | |
8074 containing the cursor. */ | |
8075 tlbufpos = this_line_start_pos; | |
8076 tlendpos = this_line_end_pos; | |
8077 if (!consider_all_windows_p | |
8078 && CHARPOS (tlbufpos) > 0 | |
8079 && NILP (w->update_mode_line) | |
8080 && !current_buffer->clip_changed | |
8081 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
8082 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
8083 /* Make sure recorded data applies to current buffer, etc. */ | |
8084 && this_line_buffer == current_buffer | |
8085 && current_buffer == XBUFFER (w->buffer) | |
8086 && NILP (w->force_start) | |
8087 /* Point must be on the line that we have info recorded about. */ | |
8088 && PT >= CHARPOS (tlbufpos) | |
8089 && PT <= Z - CHARPOS (tlendpos) | |
8090 /* All text outside that line, including its final newline, | |
8091 must be unchanged */ | |
8092 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
8093 CHARPOS (tlendpos))) | |
8094 { | |
8095 if (CHARPOS (tlbufpos) > BEGV | |
8096 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
8097 && (CHARPOS (tlbufpos) == ZV | |
8098 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
8099 /* Former continuation line has disappeared by becoming empty */ | |
8100 goto cancel; | |
8101 else if (XFASTINT (w->last_modified) < MODIFF | |
8102 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
8103 || MINI_WINDOW_P (w)) | |
8104 { | |
8105 /* We have to handle the case of continuation around a | |
8106 wide-column character (See the comment in indent.c around | |
8107 line 885). | |
8108 | |
8109 For instance, in the following case: | |
8110 | |
8111 -------- Insert -------- | |
8112 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
8113 J_I_ ==> J_I_ `^^' are cursors. | |
8114 ^^ ^^ | |
8115 -------- -------- | |
8116 | |
8117 As we have to redraw the line above, we should goto cancel. */ | |
8118 | |
8119 struct it it; | |
8120 int line_height_before = this_line_pixel_height; | |
8121 | |
8122 /* Note that start_display will handle the case that the | |
8123 line starting at tlbufpos is a continuation lines. */ | |
8124 start_display (&it, w, tlbufpos); | |
8125 | |
8126 /* Implementation note: It this still necessary? */ | |
8127 if (it.current_x != this_line_start_x) | |
8128 goto cancel; | |
8129 | |
8130 TRACE ((stderr, "trying display optimization 1\n")); | |
8131 w->cursor.vpos = -1; | |
8132 overlay_arrow_seen = 0; | |
8133 it.vpos = this_line_vpos; | |
8134 it.current_y = this_line_y; | |
8135 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
8136 display_line (&it); | |
8137 | |
8138 /* If line contains point, is not continued, | |
8139 and ends at same distance from eob as before, we win */ | |
8140 if (w->cursor.vpos >= 0 | |
8141 /* Line is not continued, otherwise this_line_start_pos | |
8142 would have been set to 0 in display_line. */ | |
8143 && CHARPOS (this_line_start_pos) | |
8144 /* Line ends as before. */ | |
8145 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
8146 /* Line has same height as before. Otherwise other lines | |
8147 would have to be shifted up or down. */ | |
8148 && this_line_pixel_height == line_height_before) | |
8149 { | |
8150 /* If this is not the window's last line, we must adjust | |
8151 the charstarts of the lines below. */ | |
8152 if (it.current_y < it.last_visible_y) | |
8153 { | |
8154 struct glyph_row *row | |
8155 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
8156 int delta, delta_bytes; | |
8157 | |
8158 if (Z - CHARPOS (tlendpos) == ZV) | |
8159 { | |
8160 /* This line ends at end of (accessible part of) | |
8161 buffer. There is no newline to count. */ | |
8162 delta = (Z | |
8163 - CHARPOS (tlendpos) | |
8164 - MATRIX_ROW_START_CHARPOS (row)); | |
8165 delta_bytes = (Z_BYTE | |
8166 - BYTEPOS (tlendpos) | |
8167 - MATRIX_ROW_START_BYTEPOS (row)); | |
8168 } | |
8169 else | |
8170 { | |
8171 /* This line ends in a newline. Must take | |
8172 account of the newline and the rest of the | |
8173 text that follows. */ | |
8174 delta = (Z | |
8175 - CHARPOS (tlendpos) | |
8176 - MATRIX_ROW_START_CHARPOS (row)); | |
8177 delta_bytes = (Z_BYTE | |
8178 - BYTEPOS (tlendpos) | |
8179 - MATRIX_ROW_START_BYTEPOS (row)); | |
8180 } | |
8181 | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8182 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
|
8183 this_line_vpos + 1, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8184 w->current_matrix->nrows, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8185 delta, delta_bytes); |
25012 | 8186 } |
8187 | |
8188 /* If this row displays text now but previously didn't, | |
8189 or vice versa, w->window_end_vpos may have to be | |
8190 adjusted. */ | |
8191 if ((it.glyph_row - 1)->displays_text_p) | |
8192 { | |
8193 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
8194 XSETINT (w->window_end_vpos, this_line_vpos); | |
8195 } | |
8196 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
8197 && this_line_vpos > 0) | |
8198 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
8199 w->window_end_valid = Qnil; | |
8200 | |
8201 /* Update hint: No need to try to scroll in update_window. */ | |
8202 w->desired_matrix->no_scrolling_p = 1; | |
8203 | |
8204 #if GLYPH_DEBUG | |
8205 *w->desired_matrix->method = 0; | |
8206 debug_method_add (w, "optimization 1"); | |
8207 #endif | |
8208 goto update; | |
8209 } | |
8210 else | |
8211 goto cancel; | |
8212 } | |
8213 else if (/* Cursor position hasn't changed. */ | |
8214 PT == XFASTINT (w->last_point) | |
8215 /* Make sure the cursor was last displayed | |
8216 in this window. Otherwise we have to reposition it. */ | |
8217 && 0 <= w->cursor.vpos | |
8218 && XINT (w->height) > w->cursor.vpos) | |
8219 { | |
8220 if (!must_finish) | |
8221 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8222 do_pending_window_change (1); |
25012 | 8223 |
8224 /* We used to always goto end_of_redisplay here, but this | |
8225 isn't enough if we have a blinking cursor. */ | |
8226 if (w->cursor_off_p == w->last_cursor_off_p) | |
8227 goto end_of_redisplay; | |
8228 } | |
8229 goto update; | |
8230 } | |
8231 /* If highlighting the region, or if the cursor is in the echo area, | |
8232 then we can't just move the cursor. */ | |
8233 else if (! (!NILP (Vtransient_mark_mode) | |
8234 && !NILP (current_buffer->mark_active)) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8235 && (EQ (selected_window, current_buffer->last_selected_window) |
25012 | 8236 || highlight_nonselected_windows) |
8237 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8238 && NILP (Vshow_trailing_whitespace) |
25012 | 8239 && !cursor_in_echo_area) |
8240 { | |
8241 struct it it; | |
8242 struct glyph_row *row; | |
8243 | |
8244 /* Skip from tlbufpos to PT and see where it is. Note that | |
8245 PT may be in invisible text. If so, we will end at the | |
8246 next visible position. */ | |
8247 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
8248 NULL, DEFAULT_FACE_ID); | |
8249 it.current_x = this_line_start_x; | |
8250 it.current_y = this_line_y; | |
8251 it.vpos = this_line_vpos; | |
8252 | |
8253 /* The call to move_it_to stops in front of PT, but | |
8254 moves over before-strings. */ | |
8255 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
8256 | |
8257 if (it.vpos == this_line_vpos | |
8258 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
8259 row->enabled_p)) | |
8260 { | |
8261 xassert (this_line_vpos == it.vpos); | |
8262 xassert (this_line_y == it.current_y); | |
8263 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8264 goto update; | |
8265 } | |
8266 else | |
8267 goto cancel; | |
8268 } | |
8269 | |
8270 cancel: | |
8271 /* Text changed drastically or point moved off of line. */ | |
8272 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
8273 } | |
8274 | |
8275 CHARPOS (this_line_start_pos) = 0; | |
8276 consider_all_windows_p |= buffer_shared > 1; | |
8277 ++clear_face_cache_count; | |
8278 | |
8279 | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8280 /* Build desired matrices, and update the display. If |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8281 consider_all_windows_p is non-zero, do it for all windows on all |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8282 frames. Otherwise do it for selected_window, only. */ |
25012 | 8283 |
8284 if (consider_all_windows_p) | |
8285 { | |
8286 Lisp_Object tail, frame; | |
8287 | |
8288 /* Clear the face cache eventually. */ | |
8289 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
8290 { | |
8291 clear_face_cache (0); | |
8292 clear_face_cache_count = 0; | |
8293 } | |
8294 | |
8295 /* Recompute # windows showing selected buffer. This will be | |
8296 incremented each time such a window is displayed. */ | |
8297 buffer_shared = 0; | |
8298 | |
8299 FOR_EACH_FRAME (tail, frame) | |
8300 { | |
8301 struct frame *f = XFRAME (frame); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8302 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8303 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 8304 { |
8305 /* Mark all the scroll bars to be removed; we'll redeem | |
8306 the ones we want when we redisplay their windows. */ | |
8307 if (condemn_scroll_bars_hook) | |
8308 (*condemn_scroll_bars_hook) (f); | |
8309 | |
8310 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
8311 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
8312 | |
8313 /* Any scroll bars which redisplay_windows should have | |
8314 nuked should now go away. */ | |
8315 if (judge_scroll_bars_hook) | |
8316 (*judge_scroll_bars_hook) (f); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8317 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8318 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8319 if (fonts_changed_p) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8320 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8321 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8322 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8323 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8324 /* See if we have to hscroll. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8325 if (hscroll_windows (f->root_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8326 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8327 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8328 /* Prevent various kinds of signals during display |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8329 update. stdio is not robust about handling |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8330 signals, which can cause an apparent I/O |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8331 error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8332 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8333 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8334 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8335 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8336 /* Update the display. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8337 set_window_update_flags (XWINDOW (f->root_window), 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8338 pause |= update_frame (f, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8339 if (pause) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8340 break; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8341 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8342 mark_window_display_accurate (f->root_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8343 if (frame_up_to_date_hook) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8344 frame_up_to_date_hook (f); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8345 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8346 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8347 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8348 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8349 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8350 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8351 Lisp_Object mini_window; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8352 struct frame *mini_frame; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8353 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8354 redisplay_window (selected_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8355 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8356 /* Compare desired and current matrices, perform output. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8357 update: |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8358 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8359 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8360 if (fonts_changed_p) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8361 goto retry; |
25012 | 8362 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8363 /* Prevent various kinds of signals during display update. |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8364 stdio is not robust about handling signals, |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8365 which can cause an apparent I/O error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8366 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8367 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8368 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8369 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8370 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
25012 | 8371 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8372 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8373 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8374 |
25012 | 8375 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
|
8376 pause = update_frame (sf, 0, 0); |
25012 | 8377 } |
8378 | |
8379 /* We may have called echo_area_display at the top of this | |
8380 function. If the echo area is on another frame, that may | |
8381 have put text on a frame other than the selected one, so the | |
8382 above call to update_frame would not have caught it. Catch | |
8383 it here. */ | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8384 mini_window = FRAME_MINIBUF_WINDOW (sf); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8385 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
25012 | 8386 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8387 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8388 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8389 XWINDOW (mini_window)->must_be_updated_p = 1; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8390 pause |= update_frame (mini_frame, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8391 if (!pause && hscroll_windows (mini_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8392 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8393 } |
25012 | 8394 } |
8395 | |
8396 /* If display was paused because of pending input, make sure we do a | |
8397 thorough update the next time. */ | |
8398 if (pause) | |
8399 { | |
8400 /* Prevent the optimization at the beginning of | |
8401 redisplay_internal that tries a single-line update of the | |
8402 line containing the cursor in the selected window. */ | |
8403 CHARPOS (this_line_start_pos) = 0; | |
8404 | |
8405 /* Let the overlay arrow be updated the next time. */ | |
8406 if (!NILP (last_arrow_position)) | |
8407 { | |
8408 last_arrow_position = Qt; | |
8409 last_arrow_string = Qt; | |
8410 } | |
8411 | |
8412 /* If we pause after scrolling, some rows in the current | |
8413 matrices of some windows are not valid. */ | |
8414 if (!WINDOW_FULL_WIDTH_P (w) | |
8415 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
8416 update_mode_lines = 1; | |
8417 } | |
8418 | |
8419 /* Now text on frame agrees with windows, so put info into the | |
8420 windows for partial redisplay to follow. */ | |
8421 if (!pause) | |
8422 { | |
8423 register struct buffer *b = XBUFFER (w->buffer); | |
8424 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8425 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8426 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
|
8427 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
|
8428 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 8429 |
8430 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8431 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 8432 else |
8433 { | |
8434 XSETFASTINT (w->last_point, BUF_PT (b)); | |
8435 w->last_cursor = w->cursor; | |
8436 w->last_cursor_off_p = w->cursor_off_p; | |
8437 | |
8438 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8439 b->prevent_redisplay_optimizations_p = 0; |
25012 | 8440 w->update_mode_line = Qnil; |
8441 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
8442 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
8443 w->last_had_star | |
8444 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
8445 ? Qt : Qnil); | |
8446 | |
8447 /* Record if we are showing a region, so can make sure to | |
8448 update it fully at next redisplay. */ | |
8449 w->region_showing = (!NILP (Vtransient_mark_mode) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8450 && (EQ (selected_window, |
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8451 current_buffer->last_selected_window) |
25012 | 8452 || highlight_nonselected_windows) |
8453 && !NILP (XBUFFER (w->buffer)->mark_active) | |
8454 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
8455 : Qnil); | |
8456 | |
8457 w->window_end_valid = w->buffer; | |
8458 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8459 last_arrow_string = Voverlay_arrow_string; | |
8460 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8461 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8462 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8463 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8464 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8465 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8466 } |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
8467 |
25012 | 8468 update_mode_lines = 0; |
8469 windows_or_buffers_changed = 0; | |
8470 } | |
8471 | |
8472 /* Start SIGIO interrupts coming again. Having them off during the | |
8473 code above makes it less likely one will discard output, but not | |
8474 impossible, since there might be stuff in the system buffer here. | |
8475 But it is much hairier to try to do anything about that. */ | |
8476 if (interrupt_input) | |
8477 request_sigio (); | |
8478 start_polling (); | |
8479 | |
8480 /* If a frame has become visible which was not before, redisplay | |
8481 again, so that we display it. Expose events for such a frame | |
8482 (which it gets when becoming visible) don't call the parts of | |
8483 redisplay constructing glyphs, so simply exposing a frame won't | |
8484 display anything in this case. So, we have to display these | |
8485 frames here explicitly. */ | |
8486 if (!pause) | |
8487 { | |
8488 Lisp_Object tail, frame; | |
8489 int new_count = 0; | |
8490 | |
8491 FOR_EACH_FRAME (tail, frame) | |
8492 { | |
8493 int this_is_visible = 0; | |
8494 | |
8495 if (XFRAME (frame)->visible) | |
8496 this_is_visible = 1; | |
8497 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
8498 if (XFRAME (frame)->visible) | |
8499 this_is_visible = 1; | |
8500 | |
8501 if (this_is_visible) | |
8502 new_count++; | |
8503 } | |
8504 | |
8505 if (new_count != number_of_visible_frames) | |
8506 windows_or_buffers_changed++; | |
8507 } | |
8508 | |
8509 /* 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
|
8510 do_pending_window_change (1); |
25012 | 8511 |
8512 /* If we just did a pending size change, or have additional | |
8513 visible frames, redisplay again. */ | |
8514 if (windows_or_buffers_changed && !pause) | |
8515 goto retry; | |
8516 | |
8517 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8518 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8519 unbind_to (count, Qnil); |
25012 | 8520 } |
8521 | |
8522 | |
8523 /* Redisplay, but leave alone any recent echo area message unless | |
8524 another message has been requested in its place. | |
8525 | |
8526 This is useful in situations where you need to redisplay but no | |
8527 user action has occurred, making it inappropriate for the message | |
8528 area to be cleared. See tracking_off and | |
8529 wait_reading_process_input for examples of these situations. */ | |
8530 | |
8531 void | |
8532 redisplay_preserve_echo_area () | |
8533 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8534 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
|
8535 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8536 /* 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
|
8537 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
|
8538 display_last_displayed_message_p = 1; |
25012 | 8539 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8540 display_last_displayed_message_p = 0; |
25012 | 8541 } |
8542 else | |
8543 redisplay_internal (1); | |
8544 } | |
8545 | |
8546 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8547 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8548 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
|
8549 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8550 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8551 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8552 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8553 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8554 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8555 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
|
8556 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8557 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8558 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8559 |
25012 | 8560 /* Mark the display of windows in the window tree rooted at WINDOW as |
8561 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
8562 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
8563 the next time redisplay_internal is called. */ | |
8564 | |
8565 void | |
8566 mark_window_display_accurate (window, accurate_p) | |
8567 Lisp_Object window; | |
8568 int accurate_p; | |
8569 { | |
8570 struct window *w; | |
8571 | |
8572 for (; !NILP (window); window = w->next) | |
8573 { | |
8574 w = XWINDOW (window); | |
8575 | |
8576 if (BUFFERP (w->buffer)) | |
8577 { | |
8578 struct buffer *b = XBUFFER (w->buffer); | |
8579 | |
8580 XSETFASTINT (w->last_modified, | |
8581 accurate_p ? BUF_MODIFF (b) : 0); | |
8582 XSETFASTINT (w->last_overlay_modified, | |
8583 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
8584 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
8585 ? Qt : Qnil); | |
8586 | |
8587 #if 0 /* I don't think this is necessary because display_line does it. | |
8588 Let's check it. */ | |
8589 /* Record if we are showing a region, so can make sure to | |
8590 update it fully at next redisplay. */ | |
8591 w->region_showing | |
8592 = (!NILP (Vtransient_mark_mode) | |
8593 && (w == XWINDOW (current_buffer->last_selected_window) | |
8594 || highlight_nonselected_windows) | |
8595 && (!NILP (b->mark_active) | |
8596 ? Fmarker_position (b->mark) | |
8597 : Qnil)); | |
8598 #endif | |
8599 | |
8600 if (accurate_p) | |
8601 { | |
8602 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8603 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8604 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8605 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8606 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8607 w->last_cursor = w->cursor; |
8608 w->last_cursor_off_p = w->cursor_off_p; | |
8609 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
|
8610 w->last_point = make_number (BUF_PT (b)); |
25012 | 8611 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
|
8612 w->last_point = make_number (XMARKER (w->pointm)->charpos); |
25012 | 8613 } |
8614 } | |
8615 | |
8616 w->window_end_valid = w->buffer; | |
8617 w->update_mode_line = Qnil; | |
8618 | |
8619 if (!NILP (w->vchild)) | |
8620 mark_window_display_accurate (w->vchild, accurate_p); | |
8621 if (!NILP (w->hchild)) | |
8622 mark_window_display_accurate (w->hchild, accurate_p); | |
8623 } | |
8624 | |
8625 if (accurate_p) | |
8626 { | |
8627 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8628 last_arrow_string = Voverlay_arrow_string; | |
8629 } | |
8630 else | |
8631 { | |
8632 /* Force a thorough redisplay the next time by setting | |
8633 last_arrow_position and last_arrow_string to t, which is | |
8634 unequal to any useful value of Voverlay_arrow_... */ | |
8635 last_arrow_position = Qt; | |
8636 last_arrow_string = Qt; | |
8637 } | |
8638 } | |
8639 | |
277 | 8640 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8641 /* 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
|
8642 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
|
8643 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
|
8644 macro DISP_CHAR_VECTOR. */ |
25012 | 8645 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8646 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8647 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
|
8648 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
|
8649 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8650 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8651 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8652 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8653 |
25012 | 8654 if (SINGLE_BYTE_CHAR_P (c)) |
8655 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
|
8656 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
8657 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
|
8658 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8659 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8660 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8661 code[2] = -1; |
25012 | 8662 |
8663 /* Here, the possible range of code[0] (== charset ID) is | |
8664 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
|
8665 for multibyte characters after 256th element, we must increment |
25012 | 8666 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
|
8667 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8668 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8669 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8670 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
|
8671 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8672 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
|
8673 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
|
8674 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
|
8675 } |
25012 | 8676 |
8677 /* Here, val is a sub char table. We return the default value of | |
8678 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8679 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8680 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8681 |
25012 | 8682 |
8683 | |
8684 /*********************************************************************** | |
8685 Window Redisplay | |
8686 ***********************************************************************/ | |
8687 | |
8688 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
8689 | |
8690 static void | |
8691 redisplay_windows (window) | |
8692 Lisp_Object window; | |
8693 { | |
8694 while (!NILP (window)) | |
8695 { | |
8696 struct window *w = XWINDOW (window); | |
8697 | |
8698 if (!NILP (w->hchild)) | |
8699 redisplay_windows (w->hchild); | |
8700 else if (!NILP (w->vchild)) | |
8701 redisplay_windows (w->vchild); | |
8702 else | |
8703 redisplay_window (window, 0); | |
8704 | |
8705 window = w->next; | |
8706 } | |
8707 } | |
8708 | |
8709 | |
8710 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8711 DELTA is the number of bytes by which positions recorded in ROW | |
8712 differ from current buffer positions. */ | |
8713 | |
8714 void | |
8715 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8716 struct window *w; | |
8717 struct glyph_row *row; | |
8718 struct glyph_matrix *matrix; | |
8719 int delta, delta_bytes, dy, dvpos; | |
8720 { | |
8721 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8722 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8723 int x = row->x; | |
8724 int pt_old = PT - delta; | |
8725 | |
8726 /* Skip over glyphs not having an object at the start of the row. | |
8727 These are special glyphs like truncation marks on terminal | |
8728 frames. */ | |
8729 if (row->displays_text_p) | |
8730 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
|
8731 && INTEGERP (glyph->object) |
25012 | 8732 && glyph->charpos < 0) |
8733 { | |
8734 x += glyph->pixel_width; | |
8735 ++glyph; | |
8736 } | |
8737 | |
8738 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
|
8739 && !INTEGERP (glyph->object) |
25012 | 8740 && (!BUFFERP (glyph->object) |
8741 || glyph->charpos < pt_old)) | |
8742 { | |
8743 x += glyph->pixel_width; | |
8744 ++glyph; | |
8745 } | |
8746 | |
8747 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8748 w->cursor.x = x; | |
8749 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8750 w->cursor.y = row->y + dy; | |
8751 | |
8752 if (w == XWINDOW (selected_window)) | |
8753 { | |
8754 if (!row->continued_p | |
8755 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8756 && row->x == 0) | |
8757 { | |
8758 this_line_buffer = XBUFFER (w->buffer); | |
8759 | |
8760 CHARPOS (this_line_start_pos) | |
8761 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8762 BYTEPOS (this_line_start_pos) | |
8763 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8764 | |
8765 CHARPOS (this_line_end_pos) | |
8766 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8767 BYTEPOS (this_line_end_pos) | |
8768 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8769 | |
8770 this_line_y = w->cursor.y; | |
8771 this_line_pixel_height = row->height; | |
8772 this_line_vpos = w->cursor.vpos; | |
8773 this_line_start_x = row->x; | |
8774 } | |
8775 else | |
8776 CHARPOS (this_line_start_pos) = 0; | |
8777 } | |
8778 } | |
8779 | |
8780 | |
8781 /* 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
|
8782 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
|
8783 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8784 We assume that the window's buffer is really current. */ |
25012 | 8785 |
8786 static INLINE struct text_pos | |
8787 run_window_scroll_functions (window, startp) | |
8788 Lisp_Object window; | |
8789 struct text_pos startp; | |
8790 { | |
8791 struct window *w = XWINDOW (window); | |
8792 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
|
8793 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8794 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
|
8795 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8796 |
25012 | 8797 if (!NILP (Vwindow_scroll_functions)) |
8798 { | |
8799 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8800 make_number (CHARPOS (startp))); | |
8801 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
|
8802 /* 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
|
8803 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
|
8804 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8805 } |
8806 | |
8807 return startp; | |
8808 } | |
8809 | |
8810 | |
8811 /* Modify the desired matrix of window W and W->vscroll so that the | |
8812 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8813 |
277 | 8814 static void |
25012 | 8815 make_cursor_line_fully_visible (w) |
8816 struct window *w; | |
8817 { | |
8818 struct glyph_matrix *matrix; | |
8819 struct glyph_row *row; | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8820 int window_height, header_line_height; |
25012 | 8821 |
8822 /* It's not always possible to find the cursor, e.g, when a window | |
8823 is full of overlay strings. Don't do anything in that case. */ | |
8824 if (w->cursor.vpos < 0) | |
8825 return; | |
8826 | |
8827 matrix = w->desired_matrix; | |
8828 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8829 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8830 /* 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
|
8831 to do. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8832 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
|
8833 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8834 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8835 /* 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
|
8836 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
|
8837 window_height = window_box_height (w); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8838 if (row->height >= window_height) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8839 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8840 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8841 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) |
25012 | 8842 { |
8843 int dy = row->height - row->visible_height; | |
8844 w->vscroll = 0; | |
8845 w->cursor.y += dy; | |
8846 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8847 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8848 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */ |
25012 | 8849 { |
8850 int dy = - (row->height - row->visible_height); | |
8851 w->vscroll = dy; | |
8852 w->cursor.y += dy; | |
8853 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8854 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8855 |
25012 | 8856 /* When we change the cursor y-position of the selected window, |
8857 change this_line_y as well so that the display optimization for | |
8858 the cursor line of the selected window in redisplay_internal uses | |
8859 the correct y-position. */ | |
8860 if (w == XWINDOW (selected_window)) | |
8861 this_line_y = w->cursor.y; | |
8862 } | |
8863 | |
8864 | |
8865 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8866 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8867 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8868 in redisplay_window to bring a partially visible line into view in | |
8869 the case that only the cursor has moved. | |
8870 | |
8871 Value is | |
8872 | |
8873 1 if scrolling succeeded | |
8874 | |
8875 0 if scrolling didn't find point. | |
8876 | |
8877 -1 if new fonts have been loaded so that we must interrupt | |
8878 redisplay, adjust glyph matrices, and try again. */ | |
8879 | |
8880 static int | |
8881 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8882 scroll_step, temp_scroll_step) | |
277 | 8883 Lisp_Object window; |
25012 | 8884 int just_this_one_p; |
8885 int scroll_conservatively, scroll_step; | |
8886 int temp_scroll_step; | |
8887 { | |
8888 struct window *w = XWINDOW (window); | |
8889 struct frame *f = XFRAME (w->frame); | |
8890 struct text_pos scroll_margin_pos; | |
8891 struct text_pos pos; | |
8892 struct text_pos startp; | |
8893 struct it it; | |
8894 Lisp_Object window_end; | |
8895 int this_scroll_margin; | |
8896 int dy = 0; | |
8897 int scroll_max; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8898 int rc; |
25012 | 8899 int amount_to_scroll = 0; |
8900 Lisp_Object aggressive; | |
277 | 8901 int height; |
25012 | 8902 |
8903 #if GLYPH_DEBUG | |
8904 debug_method_add (w, "try_scrolling"); | |
8905 #endif | |
8906 | |
8907 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8908 | |
8909 /* Compute scroll margin height in pixels. We scroll when point is | |
8910 within this distance from the top or bottom of the window. */ | |
8911 if (scroll_margin > 0) | |
8912 { | |
8913 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8914 this_scroll_margin *= CANON_Y_UNIT (f); | |
8915 } | |
8916 else | |
8917 this_scroll_margin = 0; | |
8918 | |
8919 /* Compute how much we should try to scroll maximally to bring point | |
8920 into view. */ | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8921 if (scroll_step || scroll_conservatively || temp_scroll_step) |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8922 scroll_max = max (scroll_step, |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8923 max (scroll_conservatively, temp_scroll_step)); |
25012 | 8924 else if (NUMBERP (current_buffer->scroll_down_aggressively) |
8925 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8926 /* We're trying to scroll because of aggressive scrolling | |
8927 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8928 there should be a variable for this. */ | |
8929 scroll_max = 10; | |
8930 else | |
8931 scroll_max = 0; | |
8932 scroll_max *= CANON_Y_UNIT (f); | |
8933 | |
8934 /* Decide whether we have to scroll down. Start at the window end | |
8935 and move this_scroll_margin up to find the position of the scroll | |
8936 margin. */ | |
8937 window_end = Fwindow_end (window, Qt); | |
8938 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8939 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8940 if (this_scroll_margin) | |
8941 { | |
8942 start_display (&it, w, scroll_margin_pos); | |
8943 move_it_vertically (&it, - this_scroll_margin); | |
8944 scroll_margin_pos = it.current.pos; | |
8945 } | |
8946 | |
8947 if (PT >= CHARPOS (scroll_margin_pos)) | |
8948 { | |
8949 int y0; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8950 #if 0 |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8951 int line_height; |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8952 #endif |
25012 | 8953 |
8954 /* Point is in the scroll margin at the bottom of the window, or | |
8955 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
|
8956 |
25012 | 8957 /* Compute the distance from the scroll margin to PT. |
8958 Give up if the distance is greater than scroll_max. */ | |
8959 start_display (&it, w, scroll_margin_pos); | |
8960 y0 = it.current_y; | |
8961 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8962 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8963 #if 0 /* Taking the line's height into account here looks wrong. */ |
25012 | 8964 line_height = (it.max_ascent + it.max_descent |
8965 ? it.max_ascent + it.max_descent | |
8966 : last_height); | |
8967 dy = it.current_y + line_height - y0; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8968 #else |
33074
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8969 /* With a scroll_margin of 0, scroll_margin_pos is at the window |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8970 end, which is one line below the window. The iterator's |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8971 current_y will be same as y0 in that case, but we have to |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8972 scroll a line to make PT visible. That's the reason why 1 is |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8973 added below. */ |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
8974 dy = 1 + it.current_y - y0; |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8975 #endif |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8976 |
25012 | 8977 if (dy > scroll_max) |
8978 return 0; | |
8979 | |
8980 /* Move the window start down. If scrolling conservatively, | |
8981 move it just enough down to make point visible. If | |
8982 scroll_step is set, move it down by scroll_step. */ | |
8983 start_display (&it, w, startp); | |
8984 | |
8985 if (scroll_conservatively) | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8986 amount_to_scroll = |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
8987 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 8988 else if (scroll_step || temp_scroll_step) |
8989 amount_to_scroll = scroll_max; | |
8990 else | |
8991 { | |
8992 aggressive = current_buffer->scroll_down_aggressively; | |
8993 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8994 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8995 if (NUMBERP (aggressive)) |
8996 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8997 } | |
8998 | |
8999 if (amount_to_scroll <= 0) | |
9000 return 0; | |
9001 | |
9002 move_it_vertically (&it, amount_to_scroll); | |
9003 startp = it.current.pos; | |
9004 } | |
9005 else | |
9006 { | |
9007 /* See if point is inside the scroll margin at the top of the | |
9008 window. */ | |
9009 scroll_margin_pos = startp; | |
9010 if (this_scroll_margin) | |
9011 { | |
9012 start_display (&it, w, startp); | |
9013 move_it_vertically (&it, this_scroll_margin); | |
9014 scroll_margin_pos = it.current.pos; | |
9015 } | |
9016 | |
9017 if (PT < CHARPOS (scroll_margin_pos)) | |
9018 { | |
9019 /* Point is in the scroll margin at the top of the window or | |
9020 above what is displayed in the window. */ | |
9021 int y0; | |
9022 | |
9023 /* Compute the vertical distance from PT to the scroll | |
9024 margin position. Give up if distance is greater than | |
9025 scroll_max. */ | |
9026 SET_TEXT_POS (pos, PT, PT_BYTE); | |
9027 start_display (&it, w, pos); | |
9028 y0 = it.current_y; | |
9029 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
9030 it.last_visible_y, -1, | |
9031 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9032 dy = it.current_y - y0; | |
9033 if (dy > scroll_max) | |
9034 return 0; | |
9035 | |
9036 /* Compute new window start. */ | |
9037 start_display (&it, w, startp); | |
9038 | |
9039 if (scroll_conservatively) | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9040 amount_to_scroll = |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9041 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 9042 else if (scroll_step || temp_scroll_step) |
9043 amount_to_scroll = scroll_max; | |
9044 else | |
9045 { | |
9046 aggressive = current_buffer->scroll_up_aggressively; | |
9047 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 9048 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 9049 if (NUMBERP (aggressive)) |
9050 amount_to_scroll = XFLOATINT (aggressive) * height; | |
9051 } | |
9052 | |
9053 if (amount_to_scroll <= 0) | |
9054 return 0; | |
9055 | |
9056 move_it_vertically (&it, - amount_to_scroll); | |
9057 startp = it.current.pos; | |
9058 } | |
9059 } | |
9060 | |
9061 /* Run window scroll functions. */ | |
9062 startp = run_window_scroll_functions (window, startp); | |
9063 | |
9064 /* Display the window. Give up if new fonts are loaded, or if point | |
9065 doesn't appear. */ | |
9066 if (!try_window (window, startp)) | |
9067 rc = -1; | |
9068 else if (w->cursor.vpos < 0) | |
9069 { | |
9070 clear_glyph_matrix (w->desired_matrix); | |
9071 rc = 0; | |
9072 } | |
9073 else | |
9074 { | |
9075 /* Maybe forget recorded base line for line number display. */ | |
9076 if (!just_this_one_p | |
9077 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9078 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 9079 w->base_line_number = Qnil; |
9080 | |
9081 /* If cursor ends up on a partially visible line, shift display | |
9082 lines up or down. */ | |
9083 make_cursor_line_fully_visible (w); | |
9084 rc = 1; | |
9085 } | |
9086 | |
9087 return rc; | |
9088 } | |
9089 | |
9090 | |
9091 /* Compute a suitable window start for window W if display of W starts | |
9092 on a continuation line. Value is non-zero if a new window start | |
9093 was computed. | |
9094 | |
9095 The new window start will be computed, based on W's width, starting | |
9096 from the start of the continued line. It is the start of the | |
9097 screen line with the minimum distance from the old start W->start. */ | |
9098 | |
9099 static int | |
9100 compute_window_start_on_continuation_line (w) | |
9101 struct window *w; | |
9102 { | |
9103 struct text_pos pos, start_pos; | |
9104 int window_start_changed_p = 0; | |
9105 | |
9106 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
9107 | |
9108 /* If window start is on a continuation line... Window start may be | |
9109 < BEGV in case there's invisible text at the start of the | |
9110 buffer (M-x rmail, for example). */ | |
9111 if (CHARPOS (start_pos) > BEGV | |
9112 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
9113 { | |
9114 struct it it; | |
9115 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9116 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9117 /* 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
|
9118 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9119 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
|
9120 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9121 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 9122 |
9123 /* Find the start of the continued line. This should be fast | |
9124 because scan_buffer is fast (newline cache). */ | |
25546 | 9125 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 9126 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
9127 row, DEFAULT_FACE_ID); | |
9128 reseat_at_previous_visible_line_start (&it); | |
9129 | |
9130 /* If the line start is "too far" away from the window start, | |
9131 say it takes too much time to compute a new window start. */ | |
9132 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
9133 < XFASTINT (w->height) * XFASTINT (w->width)) | |
9134 { | |
9135 int min_distance, distance; | |
9136 | |
9137 /* Move forward by display lines to find the new window | |
9138 start. If window width was enlarged, the new start can | |
9139 be expected to be > the old start. If window width was | |
9140 decreased, the new window start will be < the old start. | |
9141 So, we're looking for the display line start with the | |
9142 minimum distance from the old window start. */ | |
9143 pos = it.current.pos; | |
9144 min_distance = INFINITY; | |
9145 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
9146 distance < min_distance) | |
9147 { | |
9148 min_distance = distance; | |
9149 pos = it.current.pos; | |
9150 move_it_by_lines (&it, 1, 0); | |
9151 } | |
9152 | |
9153 /* Set the window start there. */ | |
9154 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
9155 window_start_changed_p = 1; | |
9156 } | |
9157 } | |
9158 | |
9159 return window_start_changed_p; | |
9160 } | |
9161 | |
9162 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9163 /* 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
|
9164 with window start STARTP. Value is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9165 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9166 1 if successful |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9167 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9168 0 if this method cannot be used |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9169 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9170 -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
|
9171 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
|
9172 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
|
9173 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9174 static int |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9175 try_cursor_movement (window, startp, scroll_step) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9176 Lisp_Object window; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9177 struct text_pos startp; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9178 int *scroll_step; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9179 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9180 struct window *w = XWINDOW (window); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9181 struct frame *f = XFRAME (w->frame); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9182 int rc = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9183 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9184 /* 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
|
9185 not moved off the frame. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9186 if (/* Point may be in this window. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9187 PT >= CHARPOS (startp) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9188 /* Selective display hasn't changed. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9189 && !current_buffer->clip_changed |
34440
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9190 /* Function force-mode-line-update is used to force a thorough |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9191 redisplay. It sets either windows_or_buffers_changed or |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9192 update_mode_lines. So don't take a shortcut here for these |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9193 cases. */ |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9194 && !update_mode_lines |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9195 && !windows_or_buffers_changed |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9196 /* 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
|
9197 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
|
9198 set the cursor. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9199 && !(!NILP (Vtransient_mark_mode) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9200 && !NILP (current_buffer->mark_active)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9201 && NILP (w->region_showing) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9202 && NILP (Vshow_trailing_whitespace) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9203 /* 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
|
9204 && INTEGERP (w->last_point) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9205 /* 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
|
9206 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
|
9207 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
|
9208 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
|
9209 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
|
9210 handles the same cases. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9211 && !EQ (window, minibuf_window) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9212 /* 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
|
9213 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
|
9214 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
|
9215 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
|
9216 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
|
9217 && INTEGERP (w->window_end_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9218 && 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
|
9219 && (FRAME_WINDOW_P (f) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9220 || !MARKERP (Voverlay_arrow_position) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9221 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9222 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9223 int this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9224 struct glyph_row *row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9225 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9226 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9227 debug_method_add (w, "cursor movement"); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9228 #endif |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9229 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9230 /* 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
|
9231 of the window. This is a pixel value. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9232 this_scroll_margin = max (0, scroll_margin); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9233 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
|
9234 this_scroll_margin *= CANON_Y_UNIT (f); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9235 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9236 /* 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
|
9237 not paused redisplay. Give up if that row is not valid. */ |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
9238 if (w->last_cursor.vpos < 0 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
9239 || w->last_cursor.vpos >= w->current_matrix->nrows) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9240 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9241 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9242 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9243 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
|
9244 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9245 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9246 if (!row->enabled_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9247 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9248 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9249 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9250 if (rc == 0) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9251 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9252 int scroll_p = 0; |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9253 int last_y = window_text_bottom_y (w) - this_scroll_margin; |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9254 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9255 if (PT > XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9256 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9257 /* Point has moved forward. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9258 while (MATRIX_ROW_END_CHARPOS (row) < PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9259 && MATRIX_ROW_BOTTOM_Y (row) < last_y) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9260 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9261 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9262 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9263 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9264 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9265 /* 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
|
9266 of the next row. If PT is there, we would rather |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9267 display it in the next line. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9268 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9269 && MATRIX_ROW_END_CHARPOS (row) == PT |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9270 && !cursor_row_p (w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9271 ++row; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9272 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9273 /* If within the scroll margin, scroll. Note that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9274 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
|
9275 the next line would be drawn, and that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9276 this_scroll_margin can be zero. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9277 if (MATRIX_ROW_BOTTOM_Y (row) > last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9278 || PT > MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9279 /* Line is completely visible last line in window |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9280 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
|
9281 || (MATRIX_ROW_BOTTOM_Y (row) == last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9282 && PT == MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9283 && !row->ends_at_zv_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9284 && !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
|
9285 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9286 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9287 else if (PT < XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9288 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9289 /* 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
|
9290 CHARPOS (startp) because of the outer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9291 if-statement. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9292 while (!row->mode_line_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9293 && (MATRIX_ROW_START_CHARPOS (row) > PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9294 || (MATRIX_ROW_START_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9295 && 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
|
9296 && (row->y > this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9297 || CHARPOS (startp) == BEGV)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9298 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9299 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9300 --row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9301 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9302 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9303 /* Consider the following case: Window starts at BEGV, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9304 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
|
9305 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
|
9306 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
|
9307 BEGV and START. Try to handle that case. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9308 if (row < w->current_matrix->rows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9309 || row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9310 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9311 row = w->current_matrix->rows; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9312 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9313 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9314 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9315 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9316 /* 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
|
9317 skip forward over overlay strings. */ |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9318 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9319 && MATRIX_ROW_END_CHARPOS (row) == PT |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9320 && !cursor_row_p (w, row)) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9321 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9322 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9323 /* If within the scroll margin, scroll. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9324 if (row->y < this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9325 && CHARPOS (startp) != BEGV) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9326 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9327 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9328 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9329 if (PT < MATRIX_ROW_START_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9330 || PT > MATRIX_ROW_END_CHARPOS (row)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9331 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9332 /* 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
|
9333 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9334 } |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9335 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
|
9336 { |
34743
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9337 if (PT == MATRIX_ROW_END_CHARPOS (row) |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9338 && !row->ends_at_zv_p |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9339 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
34737
84f309395a36
(try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents:
34664
diff
changeset
|
9340 rc = -1; |
84f309395a36
(try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents:
34664
diff
changeset
|
9341 else if (row->height > window_box_height (w)) |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9342 { |
34743
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9343 /* If we end up in a partially visible line, let's |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9344 make it fully visible, except when it's taller |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9345 than the window, in which case we can't do much |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9346 about it. */ |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9347 *scroll_step = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9348 rc = -1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9349 } |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9350 else |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9351 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9352 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
|
9353 try_window (window, startp); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9354 make_cursor_line_fully_visible (w); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9355 rc = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9356 } |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9357 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9358 else if (scroll_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9359 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9360 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9361 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9362 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
|
9363 rc = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9364 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9365 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9366 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9367 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9368 return rc; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9369 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9370 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9371 |
25012 | 9372 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only |
9373 selected_window is redisplayed. */ | |
9374 | |
9375 static void | |
9376 redisplay_window (window, just_this_one_p) | |
9377 Lisp_Object window; | |
9378 int just_this_one_p; | |
9379 { | |
9380 struct window *w = XWINDOW (window); | |
9381 struct frame *f = XFRAME (w->frame); | |
9382 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 9383 struct buffer *old = current_buffer; |
25012 | 9384 struct text_pos lpoint, opoint, startp; |
9385 int update_mode_line; | |
277 | 9386 int tem; |
25012 | 9387 struct it it; |
9388 /* Record it now because it's overwritten. */ | |
9389 int current_matrix_up_to_date_p = 0; | |
9390 int temp_scroll_step = 0; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
9391 int count = BINDING_STACK_SIZE (); |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9392 int rc; |
277 | 9393 |
25012 | 9394 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
9395 opoint = lpoint; | |
9396 | |
9397 /* W must be a leaf window here. */ | |
9398 xassert (!NILP (w->buffer)); | |
9399 #if GLYPH_DEBUG | |
9400 *w->desired_matrix->method = 0; | |
9401 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9402 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9403 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9404 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9405 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9406 |
25012 | 9407 /* Has the mode line to be updated? */ |
9408 update_mode_line = (!NILP (w->update_mode_line) | |
9409 || update_mode_lines | |
9410 || buffer->clip_changed); | |
433 | 9411 |
9412 if (MINI_WINDOW_P (w)) | |
9413 { | |
25012 | 9414 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
|
9415 && !NILP (echo_area_buffer[0])) |
25012 | 9416 { |
9417 if (update_mode_line) | |
9418 /* We may have to update a tty frame's menu bar or a | |
25543 | 9419 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 9420 goto finish_menu_bars; |
9421 else | |
9422 /* We've already displayed the echo area glyphs in this window. */ | |
9423 goto finish_scroll_bars; | |
9424 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
9425 else if (w != XWINDOW (minibuf_window)) |
433 | 9426 { |
25012 | 9427 /* W is a mini-buffer window, but it's not the currently |
9428 active one, so clear it. */ | |
9429 int yb = window_text_bottom_y (w); | |
9430 struct glyph_row *row; | |
9431 int y; | |
9432 | |
9433 for (y = 0, row = w->desired_matrix->rows; | |
9434 y < yb; | |
9435 y += row->height, ++row) | |
9436 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
|
9437 goto finish_scroll_bars; |
433 | 9438 } |
9439 } | |
277 | 9440 |
25012 | 9441 /* Otherwise set up data on this window; select its buffer and point |
9442 value. */ | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9443 /* 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
|
9444 variables. */ |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9445 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9446 SET_TEXT_POS (opoint, PT, PT_BYTE); |
9447 | |
9448 current_matrix_up_to_date_p | |
9449 = (!NILP (w->window_end_valid) | |
9450 && !current_buffer->clip_changed | |
9451 && XFASTINT (w->last_modified) >= MODIFF | |
9452 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
9453 | |
9454 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
9455 the window end being valid, so set it to nil there. */ | |
9456 if (windows_or_buffers_changed) | |
9457 { | |
9458 /* If window starts on a continuation line, maybe adjust the | |
9459 window start in case the window's width changed. */ | |
9460 if (XMARKER (w->start)->buffer == current_buffer) | |
9461 compute_window_start_on_continuation_line (w); | |
9462 | |
9463 w->window_end_valid = Qnil; | |
9464 } | |
9465 | |
9466 /* Some sanity checks. */ | |
9467 CHECK_WINDOW_END (w); | |
9468 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
|
9469 abort (); |
25012 | 9470 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9471 abort (); |
277 | 9472 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9473 /* 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
|
9474 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9475 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9476 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9477 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9478 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9479 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9480 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9481 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9482 |
25012 | 9483 /* Count number of windows showing the selected buffer. An indirect |
9484 buffer counts as its base buffer. */ | |
9485 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9486 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9487 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9488 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9489 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
|
9490 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9491 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9492 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9493 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9494 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9495 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9496 } |
277 | 9497 |
25012 | 9498 /* Point refers normally to the selected window. For any other |
9499 window, set up appropriate value. */ | |
277 | 9500 if (!EQ (window, selected_window)) |
9501 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9502 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9503 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
|
9504 if (new_pt < BEGV) |
277 | 9505 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9506 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9507 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9508 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 9509 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9510 else if (new_pt > (ZV - 1)) |
277 | 9511 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9512 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9513 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9514 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 9515 } |
25012 | 9516 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9517 /* 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
|
9518 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 9519 } |
9520 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9521 /* If any of the character widths specified in the display table |
25012 | 9522 have changed, invalidate the width run cache. It's true that |
9523 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
|
9524 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
|
9525 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
|
9526 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
|
9527 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
9528 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
|
9529 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9530 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
|
9531 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
|
9532 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9533 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
|
9534 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
|
9535 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9536 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
|
9537 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9538 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9539 |
277 | 9540 /* If window-start is screwed up, choose a new one. */ |
9541 if (XMARKER (w->start)->buffer != current_buffer) | |
9542 goto recenter; | |
9543 | |
25012 | 9544 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 9545 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9546 /* 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
|
9547 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9548 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9549 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9550 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9551 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9552 w->optional_new_start = Qnil; |
25012 | 9553 start_display (&it, w, startp); |
9554 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9555 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9556 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9557 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9558 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9559 |
433 | 9560 /* 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
|
9561 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
|
9562 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9563 || w->frozen_window_start_p) |
277 | 9564 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9565 w->force_start = Qnil; |
25012 | 9566 w->vscroll = 0; |
9567 w->window_end_valid = Qnil; | |
9568 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9569 /* Forget any recorded base line for line number display. */ |
25012 | 9570 if (!current_matrix_up_to_date_p |
9571 || current_buffer->clip_changed) | |
9572 w->base_line_number = Qnil; | |
9573 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9574 /* 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
|
9575 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
|
9576 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9577 /* 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
|
9578 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
|
9579 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
|
9580 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
|
9581 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9582 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9583 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9584 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9585 w->update_mode_line = Qt; |
25012 | 9586 startp = run_window_scroll_functions (window, startp); |
9587 } | |
9588 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9589 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9590 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9591 if (CHARPOS (startp) < BEGV) |
9592 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
9593 else if (CHARPOS (startp) > ZV) | |
9594 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
9595 | |
9596 /* Redisplay, then check if cursor has been set during the | |
9597 redisplay. Give up if new fonts were loaded. */ | |
9598 if (!try_window (window, startp)) | |
9599 { | |
9600 w->force_start = Qt; | |
9601 clear_glyph_matrix (w->desired_matrix); | |
9602 goto restore_buffers; | |
9603 } | |
9604 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9605 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 9606 { |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9607 /* 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
|
9608 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
|
9609 can use it here. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9610 int window_height; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9611 struct glyph_row *row; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9612 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9613 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
|
9614 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
|
9615 while (MATRIX_ROW_BOTTOM_Y (row) < window_height) |
25012 | 9616 ++row; |
9617 | |
9618 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
9619 MATRIX_ROW_START_BYTEPOS (row)); | |
9620 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
9621 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9622 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 9623 else if (current_buffer == old) |
9624 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
9625 | |
9626 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
9627 | |
9628 /* If we are highlighting the region, then we just changed | |
9629 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
|
9630 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
|
9631 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9632 { |
25012 | 9633 clear_glyph_matrix (w->desired_matrix); |
9634 if (!try_window (window, startp)) | |
9635 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9636 } |
277 | 9637 } |
25012 | 9638 |
9639 make_cursor_line_fully_visible (w); | |
9640 #if GLYPH_DEBUG | |
9641 debug_method_add (w, "forced window start"); | |
9642 #endif | |
277 | 9643 goto done; |
9644 } | |
9645 | |
25012 | 9646 /* Handle case where text has not changed, only point, and it has |
9647 not moved off the frame. */ | |
9648 if (current_matrix_up_to_date_p | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9649 && (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
|
9650 rc != 0)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9651 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9652 if (rc == -1) |
25012 | 9653 goto try_to_scroll; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9654 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9655 goto done; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9656 } |
277 | 9657 /* If current starting point was originally the beginning of a line |
9658 but no longer is, find a new starting point. */ | |
485 | 9659 else if (!NILP (w->start_at_line_beg) |
25012 | 9660 && !(CHARPOS (startp) <= BEGV |
9661 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
9662 { | |
9663 #if GLYPH_DEBUG | |
9664 debug_method_add (w, "recenter 1"); | |
9665 #endif | |
277 | 9666 goto recenter; |
9667 } | |
25012 | 9668 |
9669 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9670 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9671 !windows_or_buffers_changed |
25012 | 9672 /* Window must be either use window-based redisplay or |
9673 be full width. */ | |
9674 && (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
|
9675 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 9676 && !MINI_WINDOW_P (w) |
9677 /* Point is not known NOT to appear in window. */ | |
9678 && PT >= CHARPOS (startp) | |
277 | 9679 && XFASTINT (w->last_modified) |
25012 | 9680 /* Window is not hscrolled. */ |
9681 && XFASTINT (w->hscroll) == 0 | |
9682 /* Selective display has not changed. */ | |
9683 && !current_buffer->clip_changed | |
9684 /* Current matrix is up to date. */ | |
9685 && !NILP (w->window_end_valid) | |
9686 /* Can't use this case if highlighting a region because | |
9687 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
|
9688 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9689 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9690 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9691 && NILP (Vshow_trailing_whitespace) |
25012 | 9692 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
9693 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 9694 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 9695 /* Value is > 0 if update has been done, it is -1 if we |
9696 know that the same window start will not work. It is 0 | |
9697 if unsuccessful for some other reason. */ | |
9698 && (tem = try_window_id (w)) != 0) | |
9699 { | |
9700 #if GLYPH_DEBUG | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9701 debug_method_add (w, "try_window_id %d", tem); |
25012 | 9702 #endif |
9703 | |
9704 if (fonts_changed_p) | |
9705 goto restore_buffers; | |
277 | 9706 if (tem > 0) |
9707 goto done; | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9708 |
25012 | 9709 /* Otherwise try_window_id has returned -1 which means that we |
9710 don't want the alternative below this comment to execute. */ | |
9711 } | |
9712 else if (CHARPOS (startp) >= BEGV | |
9713 && CHARPOS (startp) <= ZV | |
9714 && PT >= CHARPOS (startp) | |
9715 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
9716 /* Avoid starting at end of buffer. */ |
25012 | 9717 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9718 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9719 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 9720 { |
25012 | 9721 #if GLYPH_DEBUG |
9722 debug_method_add (w, "same window start"); | |
9723 #endif | |
9724 | |
9725 /* Try to redisplay starting at same place as before. | |
9726 If point has not moved off frame, accept the results. */ | |
9727 if (!current_matrix_up_to_date_p | |
9728 /* 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
|
9729 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
|
9730 buffer. */ |
25012 | 9731 || !NILP (Vwindow_scroll_functions) |
9732 || MINI_WINDOW_P (w) | |
9733 || !try_window_reusing_current_matrix (w)) | |
9734 { | |
9735 IF_DEBUG (debug_method_add (w, "1")); | |
9736 try_window (window, startp); | |
9737 } | |
9738 | |
9739 if (fonts_changed_p) | |
9740 goto restore_buffers; | |
9741 | |
9742 if (w->cursor.vpos >= 0) | |
9743 { | |
9744 if (!just_this_one_p | |
9745 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9746 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9747 /* 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
|
9748 w->base_line_number = Qnil; |
25012 | 9749 |
9750 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9751 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9752 } |
277 | 9753 else |
25012 | 9754 clear_glyph_matrix (w->desired_matrix); |
9755 } | |
9756 | |
9757 try_to_scroll: | |
277 | 9758 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9759 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9760 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9761 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9762 /* 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
|
9763 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9764 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9765 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9766 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9767 } |
277 | 9768 |
25012 | 9769 /* Try to scroll by specified few lines. */ |
9770 if ((scroll_conservatively | |
9771 || scroll_step | |
9772 || temp_scroll_step | |
9773 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9774 || 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
|
9775 && !current_buffer->clip_changed |
25012 | 9776 && CHARPOS (startp) >= BEGV |
9777 && CHARPOS (startp) <= ZV) | |
9778 { | |
9779 /* The function returns -1 if new fonts were loaded, 1 if | |
9780 successful, 0 if not successful. */ | |
9781 int rc = try_scrolling (window, just_this_one_p, | |
9782 scroll_conservatively, | |
9783 scroll_step, | |
9784 temp_scroll_step); | |
9785 if (rc > 0) | |
9786 goto done; | |
9787 else if (rc < 0) | |
9788 goto restore_buffers; | |
9789 } | |
9790 | |
9791 /* Finally, just choose place to start which centers point */ | |
9792 | |
9793 recenter: | |
9794 | |
9795 #if GLYPH_DEBUG | |
9796 debug_method_add (w, "recenter"); | |
9797 #endif | |
9798 | |
9799 /* w->vscroll = 0; */ | |
9800 | |
9801 /* Forget any previously recorded base line for line number display. */ | |
9802 if (!current_matrix_up_to_date_p | |
9803 || current_buffer->clip_changed) | |
9804 w->base_line_number = Qnil; | |
9805 | |
9806 /* Move backward half the height of the window. */ | |
9807 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9808 it.current_y = it.last_visible_y; | |
9809 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9810 xassert (IT_CHARPOS (it) >= BEGV); | |
9811 | |
9812 /* The function move_it_vertically_backward may move over more | |
9813 than the specified y-distance. If it->w is small, e.g. a | |
9814 mini-buffer window, we may end up in front of the window's | |
9815 display area. Start displaying at the start of the line | |
9816 containing PT in this case. */ | |
9817 if (it.current_y <= 0) | |
9818 { | |
9819 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9820 move_it_vertically (&it, 0); | |
9821 xassert (IT_CHARPOS (it) <= PT); | |
9822 it.current_y = 0; | |
9823 } | |
9824 | |
9825 it.current_x = it.hpos = 0; | |
9826 | |
9827 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9828 in case the window-scroll-functions functions get errors. */ | |
9829 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9830 | |
9831 /* Run scroll hooks. */ | |
9832 startp = run_window_scroll_functions (window, it.current.pos); | |
9833 | |
9834 /* Redisplay the window. */ | |
9835 if (!current_matrix_up_to_date_p | |
9836 || windows_or_buffers_changed | |
9837 /* Don't use try_window_reusing_current_matrix in this case | |
9838 because it can have changed the buffer. */ | |
9839 || !NILP (Vwindow_scroll_functions) | |
9840 || !just_this_one_p | |
9841 || MINI_WINDOW_P (w) | |
9842 || !try_window_reusing_current_matrix (w)) | |
9843 try_window (window, startp); | |
9844 | |
9845 /* If new fonts have been loaded (due to fontsets), give up. We | |
9846 have to start a new redisplay since we need to re-adjust glyph | |
9847 matrices. */ | |
9848 if (fonts_changed_p) | |
9849 goto restore_buffers; | |
9850 | |
9851 /* If cursor did not appear assume that the middle of the window is | |
9852 in the first line of the window. Do it again with the next line. | |
9853 (Imagine a window of height 100, displaying two lines of height | |
9854 60. Moving back 50 from it->last_visible_y will end in the first | |
9855 line.) */ | |
9856 if (w->cursor.vpos < 0) | |
9857 { | |
9858 if (!NILP (w->window_end_valid) | |
9859 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9860 { | |
9861 clear_glyph_matrix (w->desired_matrix); | |
9862 move_it_by_lines (&it, 1, 0); | |
9863 try_window (window, it.current.pos); | |
9864 } | |
9865 else if (PT < IT_CHARPOS (it)) | |
9866 { | |
9867 clear_glyph_matrix (w->desired_matrix); | |
9868 move_it_by_lines (&it, -1, 0); | |
9869 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
|
9870 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9871 else |
25012 | 9872 { |
9873 /* Not much we can do about it. */ | |
9874 } | |
9875 } | |
9876 | |
9877 /* Consider the following case: Window starts at BEGV, there is | |
9878 invisible, intangible text at BEGV, so that display starts at | |
9879 some point START > BEGV. It can happen that we are called with | |
9880 PT somewhere between BEGV and START. Try to handle that case. */ | |
9881 if (w->cursor.vpos < 0) | |
9882 { | |
9883 struct glyph_row *row = w->current_matrix->rows; | |
9884 if (row->mode_line_p) | |
9885 ++row; | |
9886 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
9887 } | |
9888 | |
9889 make_cursor_line_fully_visible (w); | |
9890 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9891 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9892 |
25012 | 9893 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
9894 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
9895 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
9896 ? Qt : Qnil); | |
9897 | |
9898 /* 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
|
9899 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9900 /* If window not full width, must redo its mode line |
25012 | 9901 if (a) the window to its side is being redone and |
9902 (b) we do a frame-based redisplay. This is a consequence | |
9903 of how inverted lines are drawn in frame-based redisplay. */ | |
9904 || (!just_this_one_p | |
9905 && !FRAME_WINDOW_P (f) | |
9906 && !WINDOW_FULL_WIDTH_P (w)) | |
9907 /* 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
|
9908 || INTEGERP (w->base_line_pos) |
25012 | 9909 /* 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
|
9910 || (!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
|
9911 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 9912 /* This means that the window has a mode line. */ |
9913 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 9914 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 9915 { |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9916 Lisp_Object old_selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9917 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9918 old_selected_frame = selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9919 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9920 XSETFRAME (selected_frame, f); |
25012 | 9921 display_mode_lines (w); |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9922 selected_frame = old_selected_frame; |
25012 | 9923 |
9924 /* If mode line height has changed, arrange for a thorough | |
9925 immediate redisplay using the correct mode line height. */ | |
9926 if (WINDOW_WANTS_MODELINE_P (w) | |
9927 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
9928 { | |
9929 fonts_changed_p = 1; | |
9930 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
9931 = DESIRED_MODE_LINE_HEIGHT (w); | |
9932 } | |
9933 | |
9934 /* If top line height has changed, arrange for a thorough | |
9935 immediate redisplay using the correct mode line height. */ | |
25546 | 9936 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9937 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 9938 { |
9939 fonts_changed_p = 1; | |
25546 | 9940 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
9941 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9942 } |
9943 | |
9944 if (fonts_changed_p) | |
9945 goto restore_buffers; | |
9946 } | |
9947 | |
9948 if (!line_number_displayed | |
9949 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9950 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9951 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9952 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9953 } |
277 | 9954 |
25012 | 9955 finish_menu_bars: |
9956 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9957 /* 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
|
9958 if (update_mode_line |
25012 | 9959 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9960 { | |
9961 int redisplay_menu_p = 0; | |
9962 | |
9963 if (FRAME_WINDOW_P (f)) | |
9964 { | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
9965 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
25012 | 9966 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
|
9967 #else |
25012 | 9968 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
|
9969 #endif |
25012 | 9970 } |
9971 else | |
9972 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9973 | |
9974 if (redisplay_menu_p) | |
9975 display_menu_bar (w); | |
9976 | |
9977 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9978 if (WINDOWP (f->tool_bar_window) |
9979 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9980 || auto_resize_tool_bars_p)) | |
9981 redisplay_tool_bar (f); | |
25012 | 9982 #endif |
9983 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9984 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9985 finish_scroll_bars: |
25012 | 9986 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9987 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
|
9988 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9989 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9990 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9991 /* 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
|
9992 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
|
9993 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
|
9994 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
|
9995 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9996 |
25012 | 9997 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
|
9998 if (!MINI_WINDOW_P (w) |
25012 | 9999 || (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
|
10000 && 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
|
10001 { |
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
|
10002 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
10003 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
|
10004 /* 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
|
10005 moment, we'll pretend it is. */ |
25012 | 10006 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
10007 | |
10008 if (end < start) | |
10009 end = start; | |
10010 if (whole < (end - start)) | |
10011 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10012 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10013 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10014 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10015 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
10016 /* 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
|
10017 (*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
|
10018 |
25012 | 10019 /* Note that we actually used the scroll bar attached to this |
10020 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
|
10021 (*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
|
10022 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10023 |
25012 | 10024 restore_buffers: |
10025 | |
10026 /* Restore current_buffer and value of point in it. */ | |
10027 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
|
10028 set_buffer_internal_1 (old); |
25012 | 10029 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
|
10030 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
10031 unbind_to (count, Qnil); |
277 | 10032 } |
25012 | 10033 |
10034 | |
10035 /* Build the complete desired matrix of WINDOW with a window start | |
10036 buffer position POS. Value is non-zero if successful. It is zero | |
10037 if fonts were loaded during redisplay which makes re-adjusting | |
10038 glyph matrices necessary. */ | |
10039 | |
10040 int | |
277 | 10041 try_window (window, pos) |
10042 Lisp_Object window; | |
25012 | 10043 struct text_pos pos; |
10044 { | |
10045 struct window *w = XWINDOW (window); | |
10046 struct it it; | |
10047 struct glyph_row *last_text_row = NULL; | |
10048 | |
10049 /* Make POS the new window start. */ | |
10050 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
10051 | |
10052 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
10053 w->cursor.vpos = -1; | |
277 | 10054 overlay_arrow_seen = 0; |
25012 | 10055 |
10056 /* Initialize iterator and info to start at POS. */ | |
10057 start_display (&it, w, pos); | |
10058 | |
10059 /* Display all lines of W. */ | |
10060 while (it.current_y < it.last_visible_y) | |
10061 { | |
10062 if (display_line (&it)) | |
10063 last_text_row = it.glyph_row - 1; | |
10064 if (fonts_changed_p) | |
10065 return 0; | |
10066 } | |
10067 | |
10068 /* If bottom moved off end of frame, change mode line percentage. */ | |
10069 if (XFASTINT (w->window_end_pos) <= 0 | |
10070 && Z != IT_CHARPOS (it)) | |
277 | 10071 w->update_mode_line = Qt; |
10072 | |
25012 | 10073 /* Set window_end_pos to the offset of the last character displayed |
10074 on the window from the end of current_buffer. Set | |
10075 window_end_vpos to its row number. */ | |
10076 if (last_text_row) | |
10077 { | |
10078 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
10079 w->window_end_bytepos | |
10080 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10081 XSETFASTINT (w->window_end_pos, | |
10082 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10083 XSETFASTINT (w->window_end_vpos, | |
10084 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10085 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
10086 ->displays_text_p); | |
10087 } | |
10088 else | |
10089 { | |
10090 w->window_end_bytepos = 0; | |
10091 XSETFASTINT (w->window_end_pos, 0); | |
10092 XSETFASTINT (w->window_end_vpos, 0); | |
10093 } | |
10094 | |
277 | 10095 /* But that is not valid info until redisplay finishes. */ |
10096 w->window_end_valid = Qnil; | |
25012 | 10097 return 1; |
10098 } | |
10099 | |
10100 | |
277 | 10101 |
25012 | 10102 /************************************************************************ |
10103 Window redisplay reusing current matrix when buffer has not changed | |
10104 ************************************************************************/ | |
10105 | |
10106 /* Try redisplay of window W showing an unchanged buffer with a | |
10107 different window start than the last time it was displayed by | |
10108 reusing its current matrix. Value is non-zero if successful. | |
10109 W->start is the new window start. */ | |
10110 | |
10111 static int | |
10112 try_window_reusing_current_matrix (w) | |
10113 struct window *w; | |
10114 { | |
10115 struct frame *f = XFRAME (w->frame); | |
10116 struct glyph_row *row, *bottom_row; | |
10117 struct it it; | |
10118 struct run run; | |
10119 struct text_pos start, new_start; | |
10120 int nrows_scrolled, i; | |
10121 struct glyph_row *last_text_row; | |
10122 struct glyph_row *last_reused_text_row; | |
10123 struct glyph_row *start_row; | |
10124 int start_vpos, min_y, max_y; | |
29981
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10125 |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10126 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
|
10127 !FRAME_WINDOW_P (f) |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10128 /* 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
|
10129 or such. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10130 || windows_or_buffers_changed) |
25012 | 10131 return 0; |
10132 | |
10133 /* Can't do this if region may have changed. */ | |
10134 if ((!NILP (Vtransient_mark_mode) | |
10135 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10136 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10137 || !NILP (Vshow_trailing_whitespace)) |
25012 | 10138 return 0; |
10139 | |
10140 /* If top-line visibility has changed, give up. */ | |
25546 | 10141 if (WINDOW_WANTS_HEADER_LINE_P (w) |
10142 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 10143 return 0; |
10144 | |
10145 /* Give up if old or new display is scrolled vertically. We could | |
10146 make this function handle this, but right now it doesn't. */ | |
10147 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10148 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
10149 return 0; | |
10150 | |
10151 /* The variable new_start now holds the new window start. The old | |
10152 start `start' can be determined from the current matrix. */ | |
10153 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
10154 start = start_row->start.pos; | |
10155 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
10156 | |
10157 /* Clear the desired matrix for the display below. */ | |
10158 clear_glyph_matrix (w->desired_matrix); | |
10159 | |
10160 if (CHARPOS (new_start) <= CHARPOS (start)) | |
10161 { | |
10162 int first_row_y; | |
10163 | |
10164 IF_DEBUG (debug_method_add (w, "twu1")); | |
10165 | |
10166 /* Display up to a row that can be reused. The variable | |
10167 last_text_row is set to the last row displayed that displays | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10168 text. Note that it.vpos == 0 if or if not there is a |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10169 header-line; it's not the same as the MATRIX_ROW_VPOS! */ |
25012 | 10170 start_display (&it, w, new_start); |
10171 first_row_y = it.current_y; | |
10172 w->cursor.vpos = -1; | |
10173 last_text_row = last_reused_text_row = NULL; | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10174 |
25012 | 10175 while (it.current_y < it.last_visible_y |
10176 && IT_CHARPOS (it) < CHARPOS (start) | |
10177 && !fonts_changed_p) | |
10178 if (display_line (&it)) | |
10179 last_text_row = it.glyph_row - 1; | |
10180 | |
10181 /* A value of current_y < last_visible_y means that we stopped | |
10182 at the previous window start, which in turn means that we | |
10183 have at least one reusable row. */ | |
10184 if (it.current_y < it.last_visible_y) | |
10185 { | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10186 /* IT.vpos always starts from 0; it counts text lines. */ |
25012 | 10187 nrows_scrolled = it.vpos; |
10188 | |
10189 /* Find PT if not already found in the lines displayed. */ | |
10190 if (w->cursor.vpos < 0) | |
10191 { | |
10192 int dy = it.current_y - first_row_y; | |
10193 | |
10194 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10195 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10196 { | |
10197 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
10198 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10199 { | |
10200 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
10201 dy, nrows_scrolled); | |
10202 break; | |
10203 } | |
10204 | |
10205 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
10206 break; | |
10207 | |
10208 ++row; | |
10209 } | |
10210 | |
10211 /* Give up if point was not found. This shouldn't | |
10212 happen often; not more often than with try_window | |
10213 itself. */ | |
10214 if (w->cursor.vpos < 0) | |
10215 { | |
10216 clear_glyph_matrix (w->desired_matrix); | |
10217 return 0; | |
10218 } | |
10219 } | |
10220 | |
10221 /* Scroll the display. Do it before the current matrix is | |
10222 changed. The problem here is that update has not yet | |
10223 run, i.e. part of the current matrix is not up to date. | |
10224 scroll_run_hook will clear the cursor, and use the | |
10225 current matrix to get the height of the row the cursor is | |
10226 in. */ | |
10227 run.current_y = first_row_y; | |
10228 run.desired_y = it.current_y; | |
10229 run.height = it.last_visible_y - it.current_y; | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10230 |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10231 if (run.height > 0 && run.current_y != run.desired_y) |
25012 | 10232 { |
10233 update_begin (f); | |
10234 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
|
10235 rif->clear_mouse_face (w); |
25012 | 10236 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
|
10237 rif->update_window_end_hook (w, 0, 0); |
25012 | 10238 update_end (f); |
10239 } | |
10240 | |
10241 /* Shift current matrix down by nrows_scrolled lines. */ | |
10242 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
10243 rotate_matrix (w->current_matrix, | |
10244 start_vpos, | |
10245 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10246 nrows_scrolled); | |
10247 | |
10248 /* Disable lines not reused. */ | |
10249 for (i = 0; i < it.vpos; ++i) | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10250 (start_row + i)->enabled_p = 0; |
25012 | 10251 |
10252 /* Re-compute Y positions. */ | |
25546 | 10253 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10254 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10255 for (row = start_row + nrows_scrolled; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10256 row < bottom_row; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10257 ++row) |
25012 | 10258 { |
10259 row->y = it.current_y; | |
10260 | |
10261 if (row->y < min_y) | |
10262 row->visible_height = row->height - (min_y - row->y); | |
10263 else if (row->y + row->height > max_y) | |
10264 row->visible_height | |
10265 = row->height - (row->y + row->height - max_y); | |
10266 else | |
10267 row->visible_height = row->height; | |
10268 | |
10269 it.current_y += row->height; | |
10270 | |
10271 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10272 last_reused_text_row = row; | |
10273 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
10274 break; | |
10275 } | |
10276 } | |
10277 | |
10278 /* Update window_end_pos etc.; last_reused_text_row is the last | |
10279 reused row from the current matrix containing text, if any. | |
10280 The value of last_text_row is the last displayed line | |
10281 containing text. */ | |
10282 if (last_reused_text_row) | |
10283 { | |
10284 w->window_end_bytepos | |
10285 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
10286 XSETFASTINT (w->window_end_pos, | |
10287 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
10288 XSETFASTINT (w->window_end_vpos, | |
10289 MATRIX_ROW_VPOS (last_reused_text_row, | |
10290 w->current_matrix)); | |
10291 } | |
10292 else if (last_text_row) | |
10293 { | |
10294 w->window_end_bytepos | |
10295 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10296 XSETFASTINT (w->window_end_pos, | |
10297 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10298 XSETFASTINT (w->window_end_vpos, | |
10299 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10300 } | |
10301 else | |
10302 { | |
10303 /* This window must be completely empty. */ | |
10304 w->window_end_bytepos = 0; | |
10305 XSETFASTINT (w->window_end_pos, 0); | |
10306 XSETFASTINT (w->window_end_vpos, 0); | |
10307 } | |
10308 w->window_end_valid = Qnil; | |
10309 | |
10310 /* Update hint: don't try scrolling again in update_window. */ | |
10311 w->desired_matrix->no_scrolling_p = 1; | |
10312 | |
10313 #if GLYPH_DEBUG | |
10314 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
10315 #endif | |
10316 return 1; | |
10317 } | |
10318 else if (CHARPOS (new_start) > CHARPOS (start)) | |
10319 { | |
10320 struct glyph_row *pt_row, *row; | |
10321 struct glyph_row *first_reusable_row; | |
10322 struct glyph_row *first_row_to_display; | |
10323 int dy; | |
10324 int yb = window_text_bottom_y (w); | |
10325 | |
10326 IF_DEBUG (debug_method_add (w, "twu2")); | |
10327 | |
10328 /* Find the row starting at new_start, if there is one. Don't | |
10329 reuse a partially visible line at the end. */ | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10330 first_reusable_row = start_row; |
25012 | 10331 while (first_reusable_row->enabled_p |
10332 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
10333 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
10334 < CHARPOS (new_start))) | |
10335 ++first_reusable_row; | |
10336 | |
10337 /* Give up if there is no row to reuse. */ | |
10338 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
|
10339 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10340 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10341 != CHARPOS (new_start))) |
25012 | 10342 return 0; |
10343 | |
10344 /* We can reuse fully visible rows beginning with | |
10345 first_reusable_row to the end of the window. Set | |
10346 first_row_to_display to the first row that cannot be reused. | |
10347 Set pt_row to the row containing point, if there is any. */ | |
10348 first_row_to_display = first_reusable_row; | |
10349 pt_row = NULL; | |
10350 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
10351 { | |
10352 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
10353 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
10354 pt_row = first_row_to_display; | |
10355 | |
10356 ++first_row_to_display; | |
10357 } | |
10358 | |
10359 /* Start displaying at the start of first_row_to_display. */ | |
10360 xassert (first_row_to_display->y < yb); | |
10361 init_to_row_start (&it, w, first_row_to_display); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10362 nrows_scrolled = (MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix) |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10363 - start_vpos); |
25012 | 10364 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) |
10365 - nrows_scrolled); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10366 it.current_y = (first_row_to_display->y - first_reusable_row->y |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10367 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 10368 |
10369 /* Display lines beginning with first_row_to_display in the | |
10370 desired matrix. Set last_text_row to the last row displayed | |
10371 that displays text. */ | |
10372 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
10373 if (pt_row == NULL) | |
10374 w->cursor.vpos = -1; | |
10375 last_text_row = NULL; | |
10376 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
10377 if (display_line (&it)) | |
10378 last_text_row = it.glyph_row - 1; | |
10379 | |
10380 /* Give up If point isn't in a row displayed or reused. */ | |
10381 if (w->cursor.vpos < 0) | |
10382 { | |
10383 clear_glyph_matrix (w->desired_matrix); | |
10384 return 0; | |
10385 } | |
10386 | |
10387 /* If point is in a reused row, adjust y and vpos of the cursor | |
10388 position. */ | |
10389 if (pt_row) | |
10390 { | |
10391 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
10392 w->current_matrix); | |
10393 w->cursor.y -= first_reusable_row->y; | |
10394 } | |
10395 | |
10396 /* Scroll the display. */ | |
10397 run.current_y = first_reusable_row->y; | |
25546 | 10398 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10399 run.height = it.last_visible_y - run.current_y; |
31826
2c8c52a67b91
(try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents:
31650
diff
changeset
|
10400 dy = run.current_y - run.desired_y; |
2c8c52a67b91
(try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents:
31650
diff
changeset
|
10401 |
25012 | 10402 if (run.height) |
10403 { | |
10404 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10405 update_begin (f); | |
10406 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
|
10407 rif->clear_mouse_face (w); |
25012 | 10408 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
|
10409 rif->update_window_end_hook (w, 0, 0); |
25012 | 10410 update_end (f); |
10411 } | |
10412 | |
10413 /* Adjust Y positions of reused rows. */ | |
10414 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
25546 | 10415 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10416 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10417 for (row = first_reusable_row; row < first_row_to_display; ++row) |
25012 | 10418 { |
10419 row->y -= dy; | |
10420 if (row->y < min_y) | |
10421 row->visible_height = row->height - (min_y - row->y); | |
10422 else if (row->y + row->height > max_y) | |
10423 row->visible_height | |
10424 = row->height - (row->y + row->height - max_y); | |
10425 else | |
10426 row->visible_height = row->height; | |
10427 } | |
10428 | |
10429 /* Disable rows not reused. */ | |
10430 while (row < bottom_row) | |
10431 { | |
10432 row->enabled_p = 0; | |
10433 ++row; | |
10434 } | |
10435 | |
10436 /* Scroll the current matrix. */ | |
10437 xassert (nrows_scrolled > 0); | |
10438 rotate_matrix (w->current_matrix, | |
10439 start_vpos, | |
10440 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10441 -nrows_scrolled); | |
10442 | |
10443 /* Adjust window end. A null value of last_text_row means that | |
10444 the window end is in reused rows which in turn means that | |
10445 only its vpos can have changed. */ | |
10446 if (last_text_row) | |
10447 { | |
10448 w->window_end_bytepos | |
10449 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10450 XSETFASTINT (w->window_end_pos, | |
10451 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10452 XSETFASTINT (w->window_end_vpos, | |
10453 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10454 } | |
10455 else | |
10456 { | |
10457 XSETFASTINT (w->window_end_vpos, | |
10458 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
10459 } | |
10460 | |
10461 w->window_end_valid = Qnil; | |
10462 w->desired_matrix->no_scrolling_p = 1; | |
10463 | |
10464 #if GLYPH_DEBUG | |
10465 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
10466 #endif | |
10467 return 1; | |
10468 } | |
10469 | |
10470 return 0; | |
10471 } | |
10472 | |
10473 | |
10474 | |
10475 /************************************************************************ | |
10476 Window redisplay reusing current matrix when buffer has changed | |
10477 ************************************************************************/ | |
10478 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10479 static struct glyph_row *find_last_unchanged_at_beg_row P_ ((struct window *)); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10480 static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, |
25012 | 10481 int *, int *)); |
10482 static struct glyph_row * | |
10483 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
10484 struct glyph_row *)); | |
10485 | |
10486 | |
10487 /* Return the last row in MATRIX displaying text. If row START is | |
10488 non-null, start searching with that row. IT gives the dimensions | |
10489 of the display. Value is null if matrix is empty; otherwise it is | |
10490 a pointer to the row found. */ | |
10491 | |
10492 static struct glyph_row * | |
10493 find_last_row_displaying_text (matrix, it, start) | |
10494 struct glyph_matrix *matrix; | |
10495 struct it *it; | |
10496 struct glyph_row *start; | |
10497 { | |
10498 struct glyph_row *row, *row_found; | |
10499 | |
10500 /* Set row_found to the last row in IT->w's current matrix | |
10501 displaying text. The loop looks funny but think of partially | |
10502 visible lines. */ | |
10503 row_found = NULL; | |
10504 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
10505 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10506 { | |
10507 xassert (row->enabled_p); | |
10508 row_found = row; | |
10509 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
10510 break; | |
10511 ++row; | |
10512 } | |
10513 | |
10514 return row_found; | |
10515 } | |
10516 | |
10517 | |
10518 /* Return the last row in the current matrix of W that is not affected | |
10519 by changes at the start of current_buffer that occurred since the | |
10520 last time W was redisplayed. Value is null if no such row exists. | |
10521 | |
10522 The global variable beg_unchanged has to contain the number of | |
10523 bytes unchanged at the start of current_buffer. BEG + | |
10524 beg_unchanged is the buffer position of the first changed byte in | |
10525 current_buffer. Characters at positions < BEG + beg_unchanged are | |
10526 at the same buffer positions as they were when the current matrix | |
10527 was built. */ | |
10528 | |
10529 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10530 find_last_unchanged_at_beg_row (w) |
25012 | 10531 struct window *w; |
10532 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10533 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 10534 struct glyph_row *row; |
10535 struct glyph_row *row_found = NULL; | |
10536 int yb = window_text_bottom_y (w); | |
10537 | |
10538 /* Find the last row displaying unchanged text. */ | |
10539 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10540 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
10541 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
10542 { | |
10543 if (/* If row ends before first_changed_pos, it is unchanged, | |
10544 except in some case. */ | |
10545 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
10546 /* When row ends in ZV and we write at ZV it is not | |
10547 unchanged. */ | |
10548 && !row->ends_at_zv_p | |
10549 /* When first_changed_pos is the end of a continued line, | |
10550 row is not unchanged because it may be no longer | |
10551 continued. */ | |
10552 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
10553 && row->continued_p)) | |
10554 row_found = row; | |
10555 | |
10556 /* Stop if last visible row. */ | |
10557 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
10558 break; | |
10559 | |
10560 ++row; | |
10561 } | |
10562 | |
10563 return row_found; | |
10564 } | |
10565 | |
10566 | |
10567 /* Find the first glyph row in the current matrix of W that is not | |
10568 affected by changes at the end of current_buffer since the last | |
10569 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
|
10570 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
|
10571 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
|
10572 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
|
10573 exists, i.e. all rows are affected by changes. */ |
25012 | 10574 |
10575 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10576 find_first_unchanged_at_end_row (w, delta, delta_bytes) |
25012 | 10577 struct window *w; |
10578 int *delta, *delta_bytes; | |
10579 { | |
10580 struct glyph_row *row; | |
10581 struct glyph_row *row_found = NULL; | |
10582 | |
10583 *delta = *delta_bytes = 0; | |
10584 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10585 /* Display must not have been paused, otherwise the current matrix |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10586 is not up to date. */ |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10587 if (NILP (w->window_end_valid)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10588 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10589 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10590 /* A value of window_end_pos >= END_UNCHANGED means that the window |
25012 | 10591 end is in the range of changed text. If so, there is no |
10592 unchanged row at the end of W's current matrix. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10593 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 10594 return NULL; |
10595 | |
10596 /* Set row to the last row in W's current matrix displaying text. */ | |
10597 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10598 | |
10599 /* If matrix is entirely empty, no unchanged row exists. */ | |
10600 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10601 { | |
10602 /* The value of row is the last glyph row in the matrix having a | |
10603 meaningful buffer position in it. The end position of row | |
10604 corresponds to window_end_pos. This allows us to translate | |
10605 buffer positions in the current matrix to current buffer | |
10606 positions for characters not in changed text. */ | |
10607 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
10608 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
10609 int last_unchanged_pos, last_unchanged_pos_old; | |
10610 struct glyph_row *first_text_row | |
10611 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10612 | |
10613 *delta = Z - Z_old; | |
10614 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
10615 | |
10616 /* Set last_unchanged_pos to the buffer position of the last | |
10617 character in the buffer that has not been changed. Z is the | |
10618 index + 1 of the last byte in current_buffer, i.e. by | |
10619 subtracting end_unchanged we get the index of the last | |
10620 unchanged character, and we have to add BEG to get its buffer | |
10621 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10622 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 10623 last_unchanged_pos_old = last_unchanged_pos - *delta; |
10624 | |
10625 /* Search backward from ROW for a row displaying a line that | |
10626 starts at a minimum position >= last_unchanged_pos_old. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10627 for (; row > first_text_row; --row) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10628 { |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10629 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10630 abort (); |
25012 | 10631 |
10632 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
10633 row_found = row; | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10634 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10635 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10636 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10637 if (row_found && !MATRIX_ROW_DISPLAYS_TEXT_P (row_found)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10638 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10639 |
25012 | 10640 return row_found; |
10641 } | |
10642 | |
10643 | |
10644 /* Make sure that glyph rows in the current matrix of window W | |
10645 reference the same glyph memory as corresponding rows in the | |
10646 frame's frame matrix. This function is called after scrolling W's | |
10647 current matrix on a terminal frame in try_window_id and | |
10648 try_window_reusing_current_matrix. */ | |
10649 | |
10650 static void | |
10651 sync_frame_with_window_matrix_rows (w) | |
10652 struct window *w; | |
10653 { | |
10654 struct frame *f = XFRAME (w->frame); | |
10655 struct glyph_row *window_row, *window_row_end, *frame_row; | |
10656 | |
10657 /* Preconditions: W must be a leaf window and full-width. Its frame | |
10658 must have a frame matrix. */ | |
10659 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
10660 xassert (WINDOW_FULL_WIDTH_P (w)); | |
10661 xassert (!FRAME_WINDOW_P (f)); | |
10662 | |
10663 /* If W is a full-width window, glyph pointers in W's current matrix | |
10664 have, by definition, to be the same as glyph pointers in the | |
10665 corresponding frame matrix. */ | |
10666 window_row = w->current_matrix->rows; | |
10667 window_row_end = window_row + w->current_matrix->nrows; | |
10668 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
10669 while (window_row < window_row_end) | |
10670 { | |
10671 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10672 |
25012 | 10673 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
10674 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
|
10675 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10676 /* 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
|
10677 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
|
10678 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10679 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10680 |
25012 | 10681 ++window_row, ++frame_row; |
10682 } | |
10683 } | |
10684 | |
10685 | |
25543 | 10686 /* Find the glyph row in window W containing CHARPOS. Consider all |
10687 rows between START and END (not inclusive). END null means search | |
10688 all rows to the end of the display area of W. Value is the row | |
10689 containing CHARPOS or null. */ | |
10690 | |
10691 static struct glyph_row * | |
10692 row_containing_pos (w, charpos, start, end) | |
10693 struct window *w; | |
10694 int charpos; | |
10695 struct glyph_row *start, *end; | |
10696 { | |
10697 struct glyph_row *row = start; | |
10698 int last_y; | |
10699 | |
10700 /* If we happen to start on a header-line, skip that. */ | |
10701 if (row->mode_line_p) | |
10702 ++row; | |
10703 | |
10704 if ((end && row >= end) || !row->enabled_p) | |
10705 return NULL; | |
10706 | |
10707 last_y = window_text_bottom_y (w); | |
10708 | |
10709 while ((end == NULL || row < end) | |
10710 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
10711 /* The end position of a row equals the start | |
10712 position of the next row. If CHARPOS is there, we | |
10713 would rather display it in the next line, except | |
10714 when this line ends in ZV. */ | |
10715 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
10716 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
10717 || !row->ends_at_zv_p))) | |
10718 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
10719 ++row; | |
10720 | |
10721 /* Give up if CHARPOS not found. */ | |
10722 if ((end && row >= end) | |
10723 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
10724 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
10725 row = NULL; | |
10726 | |
10727 return row; | |
10728 } | |
10729 | |
10730 | |
25012 | 10731 /* Try to redisplay window W by reusing its existing display. W's |
10732 current matrix must be up to date when this function is called, | |
10733 i.e. window_end_valid must not be nil. | |
10734 | |
10735 Value is | |
10736 | |
10737 1 if display has been updated | |
10738 0 if otherwise unsuccessful | |
10739 -1 if redisplay with same window start is known not to succeed | |
10740 | |
10741 The following steps are performed: | |
10742 | |
10743 1. Find the last row in the current matrix of W that is not | |
10744 affected by changes at the start of current_buffer. If no such row | |
10745 is found, give up. | |
10746 | |
10747 2. Find the first row in W's current matrix that is not affected by | |
10748 changes at the end of current_buffer. Maybe there is no such row. | |
10749 | |
10750 3. Display lines beginning with the row + 1 found in step 1 to the | |
10751 row found in step 2 or, if step 2 didn't find a row, to the end of | |
10752 the window. | |
10753 | |
10754 4. If cursor is not known to appear on the window, give up. | |
10755 | |
10756 5. If display stopped at the row found in step 2, scroll the | |
10757 display and current matrix as needed. | |
10758 | |
10759 6. Maybe display some lines at the end of W, if we must. This can | |
10760 happen under various circumstances, like a partially visible line | |
10761 becoming fully visible, or because newly displayed lines are displayed | |
10762 in smaller font sizes. | |
10763 | |
10764 7. Update W's window end information. */ | |
10765 | |
10766 /* Check that window end is what we expect it to be. */ | |
277 | 10767 |
10768 static int | |
25012 | 10769 try_window_id (w) |
10770 struct window *w; | |
10771 { | |
10772 struct frame *f = XFRAME (w->frame); | |
10773 struct glyph_matrix *current_matrix = w->current_matrix; | |
10774 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10775 struct glyph_row *last_unchanged_at_beg_row; | |
10776 struct glyph_row *first_unchanged_at_end_row; | |
10777 struct glyph_row *row; | |
10778 struct glyph_row *bottom_row; | |
10779 int bottom_vpos; | |
10780 struct it it; | |
10781 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10782 struct text_pos start_pos; | |
10783 struct run run; | |
10784 int first_unchanged_at_end_vpos = 0; | |
10785 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10786 struct text_pos start; | |
10787 | |
10788 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10789 | |
10790 /* Check pre-conditions. Window end must be valid, otherwise | |
10791 the current matrix would not be up to date. */ | |
10792 xassert (!NILP (w->window_end_valid)); | |
10793 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10794 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10795 | |
10796 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10797 only if buffer has really changed. The reason is that the gap is | |
10798 initially at Z for freshly visited files. The code below would | |
10799 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
|
10800 if (MODIFF > SAVE_MODIFF |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10801 /* 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
|
10802 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) |
25012 | 10803 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10804 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10805 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10806 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10807 END_UNCHANGED = Z - GPT; |
25012 | 10808 } |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
10809 |
25012 | 10810 /* If window starts after a line end, and the last change is in |
10811 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
|
10812 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
|
10813 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
|
10814 be adjusted, of course. */ |
25012 | 10815 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); |
10816 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10817 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10818 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10819 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10820 { | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10821 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
|
10822 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
|
10823 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10824 if (delta) |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10825 { |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10826 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
|
10827 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
|
10828 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10829 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
|
10830 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
|
10831 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
|
10832 delta, delta_bytes); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10833 } |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10834 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10835 #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
|
10836 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
|
10837 changed. */ |
25012 | 10838 w->window_end_pos |
10839 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10840 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
|
10841 = 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
|
10842 #endif |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10843 |
34438
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10844 row = row_containing_pos (w, PT, r0, NULL); |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10845 if (row == NULL) |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10846 return 0; |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10847 |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10848 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 10849 return 1; |
10850 } | |
10851 | |
10852 /* Return quickly if changes are all below what is displayed in the | |
10853 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
|
10854 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10855 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10856 { | |
10857 /* We have to update window end positions because the buffer's | |
10858 size has changed. */ | |
10859 w->window_end_pos | |
10860 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10861 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
|
10862 = 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
|
10863 |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10864 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
|
10865 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
|
10866 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
|
10867 return 2; |
25012 | 10868 } |
10869 | |
10870 /* Check that window start agrees with the start of the first glyph | |
10871 row in its current matrix. Check this after we know the window | |
10872 start is not in changed text, otherwise positions would not be | |
10873 comparable. */ | |
10874 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10875 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10876 return 0; | |
10877 | |
10878 /* Compute the position at which we have to start displaying new | |
10879 lines. Some of the lines at the top of the window might be | |
10880 reusable because they are not displaying changed text. Find the | |
10881 last row in W's current matrix not affected by changes at the | |
10882 start of current_buffer. Value is null if changes start in the | |
10883 first line of window. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10884 last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); |
25012 | 10885 if (last_unchanged_at_beg_row) |
10886 { | |
33898
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10887 /* Avoid starting to display in the moddle of a character, a TAB |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10888 for instance. This is easier than to set up the iterator |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10889 exactly, and it's not a frequent case, so the additional |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10890 effort wouldn't really pay off. */ |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10891 while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10892 && last_unchanged_at_beg_row > w->current_matrix->rows) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10893 --last_unchanged_at_beg_row; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10894 |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10895 if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10896 return 0; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
10897 |
25012 | 10898 init_to_row_end (&it, w, last_unchanged_at_beg_row); |
10899 start_pos = it.current.pos; | |
10900 | |
10901 /* Start displaying new lines in the desired matrix at the same | |
10902 vpos we would use in the current matrix, i.e. below | |
10903 last_unchanged_at_beg_row. */ | |
10904 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
10905 current_matrix); | |
10906 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10907 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
10908 | |
10909 xassert (it.hpos == 0 && it.current_x == 0); | |
10910 } | |
277 | 10911 else |
25012 | 10912 { |
10913 /* There are no reusable lines at the start of the window. | |
10914 Start displaying in the first line. */ | |
10915 start_display (&it, w, start); | |
10916 start_pos = it.current.pos; | |
10917 } | |
10918 | |
10919 /* Find the first row that is not affected by changes at the end of | |
10920 the buffer. Value will be null if there is no unchanged row, in | |
10921 which case we must redisplay to the end of the window. delta | |
10922 will be set to the value by which buffer positions beginning with | |
10923 first_unchanged_at_end_row have to be adjusted due to text | |
10924 changes. */ | |
10925 first_unchanged_at_end_row | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10926 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes); |
25012 | 10927 IF_DEBUG (debug_delta = delta); |
10928 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
10929 | |
10930 /* Set stop_pos to the buffer position up to which we will have to | |
10931 display new lines. If first_unchanged_at_end_row != NULL, this | |
10932 is the buffer position of the start of the line displayed in that | |
10933 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
10934 that we don't stop at a buffer position. */ | |
10935 stop_pos = 0; | |
10936 if (first_unchanged_at_end_row) | |
10937 { | |
10938 xassert (last_unchanged_at_beg_row == NULL | |
10939 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
10940 | |
10941 /* If this is a continuation line, move forward to the next one | |
10942 that isn't. Changes in lines above affect this line. | |
10943 Caution: this may move first_unchanged_at_end_row to a row | |
10944 not displaying text. */ | |
10945 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
10946 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10947 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10948 < it.last_visible_y)) | |
10949 ++first_unchanged_at_end_row; | |
10950 | |
10951 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10952 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10953 >= it.last_visible_y)) | |
10954 first_unchanged_at_end_row = NULL; | |
10955 else | |
10956 { | |
10957 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
10958 + delta); | |
10959 first_unchanged_at_end_vpos | |
10960 = 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
|
10961 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 10962 } |
10963 } | |
10964 else if (last_unchanged_at_beg_row == NULL) | |
10965 return 0; | |
10966 | |
10967 | |
10968 #if GLYPH_DEBUG | |
10969 | |
10970 /* Either there is no unchanged row at the end, or the one we have | |
10971 now displays text. This is a necessary condition for the window | |
10972 end pos calculation at the end of this function. */ | |
10973 xassert (first_unchanged_at_end_row == NULL | |
10974 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
10975 | |
10976 debug_last_unchanged_at_beg_vpos | |
10977 = (last_unchanged_at_beg_row | |
10978 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
10979 : -1); | |
10980 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
10981 | |
10982 #endif /* GLYPH_DEBUG != 0 */ | |
10983 | |
10984 | |
10985 /* Display new lines. Set last_text_row to the last new line | |
10986 displayed which has text on it, i.e. might end up as being the | |
10987 line where the window_end_vpos is. */ | |
10988 w->cursor.vpos = -1; | |
10989 last_text_row = NULL; | |
277 | 10990 overlay_arrow_seen = 0; |
25012 | 10991 while (it.current_y < it.last_visible_y |
10992 && !fonts_changed_p | |
10993 && (first_unchanged_at_end_row == NULL | |
10994 || IT_CHARPOS (it) < stop_pos)) | |
10995 { | |
10996 if (display_line (&it)) | |
10997 last_text_row = it.glyph_row - 1; | |
10998 } | |
10999 | |
11000 if (fonts_changed_p) | |
11001 return -1; | |
11002 | |
11003 | |
11004 /* Compute differences in buffer positions, y-positions etc. for | |
11005 lines reused at the bottom of the window. Compute what we can | |
11006 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11007 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
|
11008 /* 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
|
11009 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11010 && it.current_y < it.last_visible_y) |
25012 | 11011 { |
11012 dvpos = (it.vpos | |
11013 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
11014 current_matrix)); | |
11015 dy = it.current_y - first_unchanged_at_end_row->y; | |
11016 run.current_y = first_unchanged_at_end_row->y; | |
11017 run.desired_y = run.current_y + dy; | |
11018 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
11019 } | |
11020 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11021 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11022 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
|
11023 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
|
11024 } |
25012 | 11025 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
11026 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
11027 |
25012 | 11028 /* Find the cursor if not already found. We have to decide whether |
11029 PT will appear on this window (it sometimes doesn't, but this is | |
11030 not a very frequent case.) This decision has to be made before | |
11031 the current matrix is altered. A value of cursor.vpos < 0 means | |
11032 that PT is either in one of the lines beginning at | |
11033 first_unchanged_at_end_row or below the window. Don't care for | |
11034 lines that might be displayed later at the window end; as | |
11035 mentioned, this is not a frequent case. */ | |
11036 if (w->cursor.vpos < 0) | |
11037 { | |
11038 /* Cursor in unchanged rows at the top? */ | |
11039 if (PT < CHARPOS (start_pos) | |
11040 && last_unchanged_at_beg_row) | |
11041 { | |
25543 | 11042 row = row_containing_pos (w, PT, |
11043 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
11044 last_unchanged_at_beg_row + 1); | |
31493
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
11045 if (row) |
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
11046 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 11047 } |
11048 | |
11049 /* Start from first_unchanged_at_end_row looking for PT. */ | |
11050 else if (first_unchanged_at_end_row) | |
11051 { | |
25543 | 11052 row = row_containing_pos (w, PT - delta, |
11053 first_unchanged_at_end_row, NULL); | |
11054 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
11055 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
|
11056 delta_bytes, dy, dvpos); |
25012 | 11057 } |
11058 | |
11059 /* Give up if cursor was not found. */ | |
11060 if (w->cursor.vpos < 0) | |
11061 { | |
11062 clear_glyph_matrix (w->desired_matrix); | |
11063 return -1; | |
11064 } | |
11065 } | |
11066 | |
11067 /* Don't let the cursor end in the scroll margins. */ | |
11068 { | |
11069 int this_scroll_margin, cursor_height; | |
11070 | |
11071 this_scroll_margin = max (0, scroll_margin); | |
11072 this_scroll_margin = min (this_scroll_margin, | |
11073 XFASTINT (w->height) / 4); | |
11074 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
11075 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
11076 | |
11077 if ((w->cursor.y < this_scroll_margin | |
11078 && CHARPOS (start) > BEGV) | |
11079 /* Don't take scroll margin into account at the bottom because | |
11080 old redisplay didn't do it either. */ | |
11081 || w->cursor.y + cursor_height > it.last_visible_y) | |
11082 { | |
11083 w->cursor.vpos = -1; | |
11084 clear_glyph_matrix (w->desired_matrix); | |
11085 return -1; | |
11086 } | |
11087 } | |
11088 | |
11089 /* Scroll the display. Do it before changing the current matrix so | |
11090 that xterm.c doesn't get confused about where the cursor glyph is | |
11091 found. */ | |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
11092 if (dy && run.height) |
25012 | 11093 { |
11094 update_begin (f); | |
11095 | |
11096 if (FRAME_WINDOW_P (f)) | |
11097 { | |
11098 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
|
11099 rif->clear_mouse_face (w); |
25012 | 11100 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
|
11101 rif->update_window_end_hook (w, 0, 0); |
25012 | 11102 } |
11103 else | |
11104 { | |
11105 /* Terminal frame. In this case, dvpos gives the number of | |
11106 lines to scroll by; dvpos < 0 means scroll up. */ | |
11107 int first_unchanged_at_end_vpos | |
11108 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
11109 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
11110 int end = XFASTINT (w->top) + window_internal_height (w); | |
11111 | |
11112 /* Perform the operation on the screen. */ | |
11113 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
11114 { |
25012 | 11115 /* Scroll last_unchanged_at_beg_row to the end of the |
11116 window down dvpos lines. */ | |
11117 set_terminal_window (end); | |
11118 | |
11119 /* On dumb terminals delete dvpos lines at the end | |
11120 before inserting dvpos empty lines. */ | |
11121 if (!scroll_region_ok) | |
11122 ins_del_lines (end - dvpos, -dvpos); | |
11123 | |
11124 /* Insert dvpos empty lines in front of | |
11125 last_unchanged_at_beg_row. */ | |
11126 ins_del_lines (from, dvpos); | |
11127 } | |
11128 else if (dvpos < 0) | |
11129 { | |
11130 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
11131 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
11132 set_terminal_window (end); | |
11133 | |
11134 /* Delete dvpos lines in front of | |
11135 last_unchanged_at_beg_vpos. ins_del_lines will set | |
11136 the cursor to the given vpos and emit |dvpos| delete | |
11137 line sequences. */ | |
11138 ins_del_lines (from + dvpos, dvpos); | |
11139 | |
11140 /* On a dumb terminal insert dvpos empty lines at the | |
11141 end. */ | |
11142 if (!scroll_region_ok) | |
11143 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
|
11144 } |
25012 | 11145 |
11146 set_terminal_window (0); | |
11147 } | |
11148 | |
11149 update_end (f); | |
11150 } | |
11151 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11152 /* 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
|
11153 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
|
11154 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11155 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
|
11156 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 11157 if (dvpos < 0) |
11158 { | |
11159 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
11160 bottom_vpos, dvpos); | |
11161 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
11162 bottom_vpos, 0); | |
11163 } | |
11164 else if (dvpos > 0) | |
11165 { | |
11166 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
11167 bottom_vpos, dvpos); | |
11168 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
11169 first_unchanged_at_end_vpos + dvpos, 0); | |
11170 } | |
11171 | |
11172 /* For frame-based redisplay, make sure that current frame and window | |
11173 matrix are in sync with respect to glyph memory. */ | |
11174 if (!FRAME_WINDOW_P (f)) | |
11175 sync_frame_with_window_matrix_rows (w); | |
11176 | |
11177 /* Adjust buffer positions in reused rows. */ | |
11178 if (delta) | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11179 increment_matrix_positions (current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11180 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
|
11181 bottom_vpos, delta, delta_bytes); |
25012 | 11182 |
11183 /* Adjust Y positions. */ | |
11184 if (dy) | |
11185 shift_glyph_matrix (w, current_matrix, | |
11186 first_unchanged_at_end_vpos + dvpos, | |
11187 bottom_vpos, dy); | |
11188 | |
11189 if (first_unchanged_at_end_row) | |
11190 first_unchanged_at_end_row += dvpos; | |
11191 | |
11192 /* If scrolling up, there may be some lines to display at the end of | |
11193 the window. */ | |
11194 last_text_row_at_end = NULL; | |
11195 if (dy < 0) | |
11196 { | |
11197 /* Set last_row to the glyph row in the current matrix where the | |
11198 window end line is found. It has been moved up or down in | |
11199 the matrix by dvpos. */ | |
11200 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
11201 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
11202 | |
11203 /* If last_row is the window end line, it should display text. */ | |
11204 xassert (last_row->displays_text_p); | |
11205 | |
11206 /* If window end line was partially visible before, begin | |
11207 displaying at that line. Otherwise begin displaying with the | |
11208 line following it. */ | |
11209 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
11210 { | |
11211 init_to_row_start (&it, w, last_row); | |
11212 it.vpos = last_vpos; | |
11213 it.current_y = last_row->y; | |
11214 } | |
11215 else | |
11216 { | |
11217 init_to_row_end (&it, w, last_row); | |
11218 it.vpos = 1 + last_vpos; | |
11219 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
11220 ++last_row; | |
11221 } | |
11222 | |
11223 /* We may start in a continuation line. If so, we have to get | |
11224 the right continuation_lines_width and current_x. */ | |
11225 it.continuation_lines_width = last_row->continuation_lines_width; | |
11226 it.hpos = it.current_x = 0; | |
11227 | |
11228 /* Display the rest of the lines at the window end. */ | |
11229 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
11230 while (it.current_y < it.last_visible_y | |
11231 && !fonts_changed_p) | |
11232 { | |
11233 /* Is it always sure that the display agrees with lines in | |
11234 the current matrix? I don't think so, so we mark rows | |
11235 displayed invalid in the current matrix by setting their | |
11236 enabled_p flag to zero. */ | |
11237 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
11238 if (display_line (&it)) | |
11239 last_text_row_at_end = it.glyph_row - 1; | |
11240 } | |
11241 } | |
11242 | |
11243 /* Update window_end_pos and window_end_vpos. */ | |
11244 if (first_unchanged_at_end_row | |
11245 && first_unchanged_at_end_row->y < it.last_visible_y | |
11246 && !last_text_row_at_end) | |
11247 { | |
11248 /* Window end line if one of the preserved rows from the current | |
11249 matrix. Set row to the last row displaying text in current | |
11250 matrix starting at first_unchanged_at_end_row, after | |
11251 scrolling. */ | |
11252 xassert (first_unchanged_at_end_row->displays_text_p); | |
11253 row = find_last_row_displaying_text (w->current_matrix, &it, | |
11254 first_unchanged_at_end_row); | |
11255 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
11256 | |
11257 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
11258 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
11259 XSETFASTINT (w->window_end_vpos, | |
11260 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
11261 } | |
11262 else if (last_text_row_at_end) | |
11263 { | |
11264 XSETFASTINT (w->window_end_pos, | |
11265 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
11266 w->window_end_bytepos | |
11267 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
11268 XSETFASTINT (w->window_end_vpos, | |
11269 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
11270 } | |
11271 else if (last_text_row) | |
11272 { | |
11273 /* We have displayed either to the end of the window or at the | |
11274 end of the window, i.e. the last row with text is to be found | |
11275 in the desired matrix. */ | |
11276 XSETFASTINT (w->window_end_pos, | |
11277 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
11278 w->window_end_bytepos | |
11279 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
11280 XSETFASTINT (w->window_end_vpos, | |
11281 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
11282 } | |
11283 else if (first_unchanged_at_end_row == NULL | |
11284 && last_text_row == NULL | |
11285 && last_text_row_at_end == NULL) | |
11286 { | |
11287 /* Displayed to end of window, but no line containing text was | |
11288 displayed. Lines were deleted at the end of the window. */ | |
11289 int vpos; | |
25546 | 11290 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 11291 |
11292 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 11293 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
11294 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
11295 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
11296 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 11297 break; |
11298 | |
11299 w->window_end_vpos = make_number (vpos); | |
11300 } | |
11301 else | |
11302 abort (); | |
11303 | |
11304 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
11305 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
11306 | |
11307 /* Record that display has not been completed. */ | |
277 | 11308 w->window_end_valid = Qnil; |
25012 | 11309 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
|
11310 return 3; |
277 | 11311 } |
25012 | 11312 |
11313 | |
11314 | |
11315 /*********************************************************************** | |
11316 More debugging support | |
11317 ***********************************************************************/ | |
11318 | |
11319 #if GLYPH_DEBUG | |
11320 | |
11321 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
11322 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
11323 | |
11324 | |
11325 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
11326 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
11327 | |
29748
1cd9b7a33ad1
(dump_glyph_matrix): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents:
29698
diff
changeset
|
11328 static void |
25012 | 11329 dump_glyph_matrix (matrix, with_glyphs_p) |
11330 struct glyph_matrix *matrix; | |
11331 int with_glyphs_p; | |
11332 { | |
11333 int i; | |
11334 for (i = 0; i < matrix->nrows; ++i) | |
11335 dump_glyph_row (matrix, i, with_glyphs_p); | |
11336 } | |
11337 | |
11338 | |
11339 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
11340 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
11341 | |
11342 void | |
11343 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
11344 struct glyph_matrix *matrix; | |
11345 int vpos, with_glyphs_p; | |
11346 { | |
11347 struct glyph_row *row; | |
11348 | |
11349 if (vpos < 0 || vpos >= matrix->nrows) | |
11350 return; | |
11351 | |
11352 row = MATRIX_ROW (matrix, vpos); | |
11353 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11354 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
|
11355 fprintf (stderr, "=======================================================================\n"); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11356 |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11357 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\ |
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11358 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
25012 | 11359 row - matrix->rows, |
11360 MATRIX_ROW_START_CHARPOS (row), | |
11361 MATRIX_ROW_END_CHARPOS (row), | |
11362 row->used[TEXT_AREA], | |
11363 row->contains_overlapping_glyphs_p, | |
11364 row->enabled_p, | |
11365 row->inverse_p, | |
11366 row->truncated_on_left_p, | |
11367 row->truncated_on_right_p, | |
11368 row->overlay_arrow_p, | |
11369 row->continued_p, | |
11370 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
11371 row->displays_text_p, | |
11372 row->ends_at_zv_p, | |
11373 row->fill_line_p, | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11374 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
|
11375 row->starts_in_middle_of_char_p, |
25012 | 11376 row->x, |
11377 row->y, | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11378 row->pixel_width, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11379 row->height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11380 row->visible_height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11381 row->ascent, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11382 row->phys_ascent); |
25012 | 11383 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, |
11384 row->end.overlay_string_index); | |
11385 fprintf (stderr, "%9d %5d\n", | |
11386 CHARPOS (row->start.string_pos), | |
11387 CHARPOS (row->end.string_pos)); | |
11388 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
11389 row->end.dpvec_index); | |
11390 | |
11391 if (with_glyphs_p) | |
11392 { | |
11393 struct glyph *glyph, *glyph_end; | |
11394 int prev_had_glyphs_p; | |
11395 | |
11396 glyph = row->glyphs[TEXT_AREA]; | |
11397 glyph_end = glyph + row->used[TEXT_AREA]; | |
11398 | |
11399 /* Glyph for a line end in text. */ | |
11400 if (glyph == glyph_end && glyph->charpos > 0) | |
11401 ++glyph_end; | |
11402 | |
11403 if (glyph < glyph_end) | |
11404 { | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11405 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n"); |
25012 | 11406 prev_had_glyphs_p = 1; |
11407 } | |
11408 else | |
11409 prev_had_glyphs_p = 0; | |
11410 | |
11411 while (glyph < glyph_end) | |
11412 { | |
11413 if (glyph->type == CHAR_GLYPH) | |
11414 { | |
11415 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11416 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11417 glyph - row->glyphs[TEXT_AREA], |
11418 'C', | |
11419 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11420 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11421 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11422 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11423 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11424 : '-')), |
25012 | 11425 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11426 glyph->u.ch, |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11427 (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
|
11428 ? glyph->u.ch |
25012 | 11429 : '.'), |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11430 glyph->face_id, |
25012 | 11431 glyph->left_box_line_p, |
11432 glyph->right_box_line_p); | |
11433 } | |
11434 else if (glyph->type == STRETCH_GLYPH) | |
11435 { | |
11436 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11437 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11438 glyph - row->glyphs[TEXT_AREA], |
11439 'S', | |
11440 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11441 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11442 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11443 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11444 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11445 : '-')), |
25012 | 11446 glyph->pixel_width, |
11447 0, | |
11448 '.', | |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11449 glyph->face_id, |
25012 | 11450 glyph->left_box_line_p, |
11451 glyph->right_box_line_p); | |
11452 } | |
11453 else if (glyph->type == IMAGE_GLYPH) | |
11454 { | |
11455 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11456 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11457 glyph - row->glyphs[TEXT_AREA], |
11458 'I', | |
11459 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11460 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11461 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11462 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11463 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11464 : '-')), |
25012 | 11465 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11466 glyph->u.img_id, |
25012 | 11467 '.', |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11468 glyph->face_id, |
25012 | 11469 glyph->left_box_line_p, |
11470 glyph->right_box_line_p); | |
11471 } | |
11472 ++glyph; | |
11473 } | |
11474 } | |
11475 } | |
11476 | |
11477 | |
11478 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
11479 Sdump_glyph_matrix, 0, 1, "p", | |
11480 "Dump the current matrix of the selected window to stderr.\n\ | |
11481 Shows contents of glyph row structures. With non-nil optional\n\ | |
11482 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
11483 (with_glyphs_p) | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
11484 Lisp_Object with_glyphs_p; |
25012 | 11485 { |
11486 struct window *w = XWINDOW (selected_window); | |
11487 struct buffer *buffer = XBUFFER (w->buffer); | |
11488 | |
11489 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
11490 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
11491 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
11492 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
11493 fprintf (stderr, "=============================================\n"); | |
11494 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
11495 return Qnil; | |
11496 } | |
11497 | |
11498 | |
11499 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
11500 "Dump glyph row ROW to stderr.") | |
11501 (row) | |
11502 Lisp_Object row; | |
11503 { | |
11504 CHECK_NUMBER (row, 0); | |
11505 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
11506 return Qnil; | |
11507 } | |
11508 | |
11509 | |
25543 | 11510 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 11511 0, 0, "", "") |
11512 () | |
11513 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11514 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11515 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 11516 ->current_matrix); |
11517 dump_glyph_row (m, 0, 1); | |
11518 return Qnil; | |
11519 } | |
11520 | |
11521 | |
11522 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
11523 Strace_redisplay_toggle, 0, 0, "", | |
11524 "Toggle tracing of redisplay.") | |
11525 () | |
11526 { | |
11527 trace_redisplay_p = !trace_redisplay_p; | |
11528 return Qnil; | |
11529 } | |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11530 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11531 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11532 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
|
11533 "Print STRING to stderr.") |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11534 (string) |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11535 Lisp_Object string; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11536 { |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11537 CHECK_STRING (string, 0); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11538 fprintf (stderr, "%s", XSTRING (string)->data); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11539 return Qnil; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11540 } |
25012 | 11541 |
11542 #endif /* GLYPH_DEBUG */ | |
11543 | |
11544 | |
277 | 11545 |
25012 | 11546 /*********************************************************************** |
11547 Building Desired Matrix Rows | |
11548 ***********************************************************************/ | |
11549 | |
11550 /* Return a temporary glyph row holding the glyphs of an overlay | |
11551 arrow. Only used for non-window-redisplay windows. */ | |
11552 | |
11553 static struct glyph_row * | |
11554 get_overlay_arrow_glyph_row (w) | |
11555 struct window *w; | |
11556 { | |
11557 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
11558 struct buffer *buffer = XBUFFER (w->buffer); | |
11559 struct buffer *old = current_buffer; | |
11560 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
11561 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
11562 unsigned char *arrow_end = arrow_string + arrow_len; | |
11563 unsigned char *p; | |
11564 struct it it; | |
11565 int multibyte_p; | |
11566 int n_glyphs_before; | |
11567 | |
11568 set_buffer_temp (buffer); | |
11569 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
11570 it.glyph_row->used[TEXT_AREA] = 0; | |
11571 SET_TEXT_POS (it.position, 0, 0); | |
11572 | |
11573 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
11574 p = arrow_string; | |
11575 while (p < arrow_end) | |
11576 { | |
11577 Lisp_Object face, ilisp; | |
11578 | |
11579 /* Get the next character. */ | |
11580 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
11581 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 11582 else |
11583 it.c = *p, it.len = 1; | |
11584 p += it.len; | |
11585 | |
11586 /* Get its face. */ | |
11587 XSETFASTINT (ilisp, p - arrow_string); | |
11588 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
11589 it.face_id = compute_char_face (f, it.c, face); | |
11590 | |
11591 /* Compute its width, get its glyphs. */ | |
11592 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
|
11593 SET_TEXT_POS (it.position, -1, -1); |
25012 | 11594 PRODUCE_GLYPHS (&it); |
11595 | |
11596 /* If this character doesn't fit any more in the line, we have | |
11597 to remove some glyphs. */ | |
11598 if (it.current_x > it.last_visible_x) | |
11599 { | |
11600 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
11601 break; | |
11602 } | |
11603 } | |
11604 | |
11605 set_buffer_temp (old); | |
11606 return it.glyph_row; | |
11607 } | |
11608 | |
11609 | |
11610 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
11611 glyphs are only inserted for terminal frames since we can't really | |
11612 win with truncation glyphs when partially visible glyphs are | |
11613 involved. Which glyphs to insert is determined by | |
11614 produce_special_glyphs. */ | |
11615 | |
11616 static void | |
11617 insert_left_trunc_glyphs (it) | |
11618 struct it *it; | |
11619 { | |
11620 struct it truncate_it; | |
11621 struct glyph *from, *end, *to, *toend; | |
11622 | |
11623 xassert (!FRAME_WINDOW_P (it->f)); | |
11624 | |
11625 /* Get the truncation glyphs. */ | |
11626 truncate_it = *it; | |
11627 truncate_it.current_x = 0; | |
11628 truncate_it.face_id = DEFAULT_FACE_ID; | |
11629 truncate_it.glyph_row = &scratch_glyph_row; | |
11630 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
11631 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
|
11632 truncate_it.object = make_number (0); |
25012 | 11633 produce_special_glyphs (&truncate_it, IT_TRUNCATION); |
11634 | |
11635 /* Overwrite glyphs from IT with truncation glyphs. */ | |
11636 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
11637 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
11638 to = it->glyph_row->glyphs[TEXT_AREA]; | |
11639 toend = to + it->glyph_row->used[TEXT_AREA]; | |
11640 | |
11641 while (from < end) | |
11642 *to++ = *from++; | |
11643 | |
11644 /* There may be padding glyphs left over. Remove them. */ | |
11645 from = to; | |
11646 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
11647 ++from; | |
11648 while (from < toend) | |
11649 *to++ = *from++; | |
11650 | |
11651 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
11652 } | |
11653 | |
11654 | |
11655 /* Compute the pixel height and width of IT->glyph_row. | |
11656 | |
11657 Most of the time, ascent and height of a display line will be equal | |
11658 to the max_ascent and max_height values of the display iterator | |
11659 structure. This is not the case if | |
11660 | |
11661 1. We hit ZV without displaying anything. In this case, max_ascent | |
11662 and max_height will be zero. | |
11663 | |
11664 2. We have some glyphs that don't contribute to the line height. | |
11665 (The glyph row flag contributes_to_line_height_p is for future | |
11666 pixmap extensions). | |
11667 | |
11668 The first case is easily covered by using default values because in | |
11669 these cases, the line height does not really matter, except that it | |
11670 must not be zero. */ | |
11671 | |
11672 static void | |
11673 compute_line_metrics (it) | |
11674 struct it *it; | |
11675 { | |
11676 struct glyph_row *row = it->glyph_row; | |
11677 int area, i; | |
11678 | |
11679 if (FRAME_WINDOW_P (it->f)) | |
11680 { | |
25546 | 11681 int i, header_line_height; |
25012 | 11682 |
11683 /* The line may consist of one space only, that was added to | |
11684 place the cursor on it. If so, the row's height hasn't been | |
11685 computed yet. */ | |
11686 if (row->height == 0) | |
11687 { | |
11688 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
|
11689 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 11690 row->ascent = it->max_ascent; |
11691 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
|
11692 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
|
11693 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11694 } |
11695 | |
11696 /* Compute the width of this line. */ | |
11697 row->pixel_width = row->x; | |
11698 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
11699 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
11700 | |
11701 xassert (row->pixel_width >= 0); | |
11702 xassert (row->ascent >= 0 && row->height > 0); | |
11703 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11704 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
|
11705 || 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
|
11706 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11707 /* 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
|
11708 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
|
11709 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
|
11710 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
|
11711 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11712 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11713 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
|
11714 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11715 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11716 |
25012 | 11717 /* Compute how much of the line is visible. */ |
11718 row->visible_height = row->height; | |
11719 | |
25546 | 11720 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
11721 if (row->y < header_line_height) | |
11722 row->visible_height -= header_line_height - row->y; | |
25012 | 11723 else |
11724 { | |
11725 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
11726 if (row->y + row->height > max_y) | |
11727 row->visible_height -= row->y + row->height - max_y; | |
11728 } | |
11729 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
11730 else |
25012 | 11731 { |
11732 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
|
11733 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
|
11734 row->height = row->phys_height = row->visible_height = 1; |
25012 | 11735 } |
11736 | |
11737 /* Compute a hash code for this row. */ | |
11738 row->hash = 0; | |
11739 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
11740 for (i = 0; i < row->used[area]; ++i) | |
11741 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
11742 + 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
|
11743 + 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
|
11744 + row->glyphs[area][i].padding_p |
25012 | 11745 + (row->glyphs[area][i].type << 2)); |
11746 | |
11747 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
|
11748 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 11749 } |
11750 | |
11751 | |
11752 /* Append one space to the glyph row of iterator IT if doing a | |
11753 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
11754 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
|
11755 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
|
11756 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11757 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
|
11758 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
|
11759 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
|
11760 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
|
11761 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11762 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
|
11763 end of the line if the row ends in italic text. */ |
25012 | 11764 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11765 static int |
25012 | 11766 append_space (it, default_face_p) |
11767 struct it *it; | |
11768 int default_face_p; | |
11769 { | |
11770 if (FRAME_WINDOW_P (it->f)) | |
11771 { | |
11772 int n = it->glyph_row->used[TEXT_AREA]; | |
11773 | |
11774 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
11775 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
11776 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11777 /* Save some values that must not be changed. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11778 Must save IT->c and IT->len because otherwise |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11779 ITERATOR_AT_END_P wouldn't work anymore after |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11780 append_space has been called. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11781 int saved_what = it->what; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11782 int saved_c = it->c, saved_len = it->len; |
25012 | 11783 int saved_x = it->current_x; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11784 int saved_face_id = it->face_id; |
25012 | 11785 struct text_pos saved_pos; |
11786 Lisp_Object saved_object; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11787 struct face *face; |
25012 | 11788 |
11789 saved_object = it->object; | |
11790 saved_pos = it->position; | |
11791 | |
11792 it->what = IT_CHARACTER; | |
11793 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
|
11794 it->object = make_number (0); |
25012 | 11795 it->c = ' '; |
11796 it->len = 1; | |
11797 | |
11798 if (default_face_p) | |
11799 it->face_id = DEFAULT_FACE_ID; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11800 else if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11801 it->face_id = it->saved_face_id; |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11802 face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11803 it->face_id = FACE_FOR_CHAR (it->f, face, 0); |
25012 | 11804 |
11805 PRODUCE_GLYPHS (it); | |
11806 | |
11807 it->current_x = saved_x; | |
11808 it->object = saved_object; | |
11809 it->position = saved_pos; | |
11810 it->what = saved_what; | |
11811 it->face_id = saved_face_id; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11812 it->len = saved_len; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11813 it->c = saved_c; |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11814 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11815 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11816 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11817 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11818 return 0; |
25012 | 11819 } |
11820 | |
11821 | |
11822 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
11823 to the end of the display line. Called from display_line. | |
11824 If the glyph row is empty, add a space glyph to it so that we | |
11825 know the face to draw. Set the glyph row flag fill_line_p. */ | |
11826 | |
11827 static void | |
11828 extend_face_to_end_of_line (it) | |
11829 struct it *it; | |
11830 { | |
11831 struct face *face; | |
11832 struct frame *f = it->f; | |
11833 | |
11834 /* If line is already filled, do nothing. */ | |
11835 if (it->current_x >= it->last_visible_x) | |
11836 return; | |
11837 | |
11838 /* Face extension extends the background and box of IT->face_id | |
11839 to the end of the line. If the background equals the background | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11840 of the frame, we don't have to do anything. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11841 if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11842 face = FACE_FROM_ID (it->f, it->saved_face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11843 else |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11844 face = FACE_FROM_ID (f, it->face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11845 |
25012 | 11846 if (FRAME_WINDOW_P (f) |
11847 && face->box == FACE_NO_BOX | |
11848 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
11849 && !face->stipple) | |
11850 return; | |
11851 | |
11852 /* Set the glyph row flag indicating that the face of the last glyph | |
11853 in the text area has to be drawn to the end of the text area. */ | |
11854 it->glyph_row->fill_line_p = 1; | |
11855 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11856 /* 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
|
11857 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
|
11858 get_next_display_element returns a multibyte character. Note |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11859 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
|
11860 if (!SINGLE_BYTE_CHAR_P (it->c)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11861 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11862 it->face_id = FACE_FOR_CHAR (f, face, 0); |
25012 | 11863 } |
11864 | |
11865 if (FRAME_WINDOW_P (f)) | |
11866 { | |
11867 /* If the row is empty, add a space with the current face of IT, | |
11868 so that we know which face to draw. */ | |
11869 if (it->glyph_row->used[TEXT_AREA] == 0) | |
11870 { | |
11871 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
|
11872 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 11873 it->glyph_row->used[TEXT_AREA] = 1; |
11874 } | |
11875 } | |
11876 else | |
11877 { | |
11878 /* Save some values that must not be changed. */ | |
11879 int saved_x = it->current_x; | |
11880 struct text_pos saved_pos; | |
11881 Lisp_Object saved_object; | |
11882 int saved_what = it->what; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11883 int saved_face_id = it->face_id; |
25012 | 11884 |
11885 saved_object = it->object; | |
11886 saved_pos = it->position; | |
11887 | |
11888 it->what = IT_CHARACTER; | |
11889 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
|
11890 it->object = make_number (0); |
25012 | 11891 it->c = ' '; |
11892 it->len = 1; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11893 it->face_id = face->id; |
25012 | 11894 |
11895 PRODUCE_GLYPHS (it); | |
11896 | |
11897 while (it->current_x <= it->last_visible_x) | |
11898 PRODUCE_GLYPHS (it); | |
11899 | |
11900 /* Don't count these blanks really. It would let us insert a left | |
11901 truncation glyph below and make us set the cursor on them, maybe. */ | |
11902 it->current_x = saved_x; | |
11903 it->object = saved_object; | |
11904 it->position = saved_pos; | |
11905 it->what = saved_what; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11906 it->face_id = saved_face_id; |
25012 | 11907 } |
11908 } | |
11909 | |
11910 | |
11911 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
11912 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11913 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11914 static int |
25012 | 11915 trailing_whitespace_p (charpos) |
11916 int charpos; | |
11917 { | |
11918 int bytepos = CHAR_TO_BYTE (charpos); | |
11919 int c = 0; | |
11920 | |
11921 while (bytepos < ZV_BYTE | |
11922 && (c = FETCH_CHAR (bytepos), | |
11923 c == ' ' || c == '\t')) | |
11924 ++bytepos; | |
11925 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11926 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11927 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11928 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11929 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11930 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11931 return 0; |
25012 | 11932 } |
11933 | |
11934 | |
11935 /* Highlight trailing whitespace, if any, in ROW. */ | |
11936 | |
11937 void | |
11938 highlight_trailing_whitespace (f, row) | |
11939 struct frame *f; | |
11940 struct glyph_row *row; | |
11941 { | |
11942 int used = row->used[TEXT_AREA]; | |
11943 | |
11944 if (used) | |
11945 { | |
11946 struct glyph *start = row->glyphs[TEXT_AREA]; | |
11947 struct glyph *glyph = start + used - 1; | |
11948 | |
11949 /* Skip over the space glyph inserted to display the | |
11950 cursor at the end of a line. */ | |
11951 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
|
11952 && 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
|
11953 && INTEGERP (glyph->object)) |
25012 | 11954 --glyph; |
11955 | |
11956 /* If last glyph is a space or stretch, and it's trailing | |
11957 whitespace, set the face of all trailing whitespace glyphs in | |
11958 IT->glyph_row to `trailing-whitespace'. */ | |
11959 if (glyph >= start | |
11960 && BUFFERP (glyph->object) | |
11961 && (glyph->type == STRETCH_GLYPH | |
11962 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11963 && glyph->u.ch == ' ')) |
25012 | 11964 && trailing_whitespace_p (glyph->charpos)) |
11965 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11966 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0); |
25012 | 11967 |
11968 while (glyph >= start | |
11969 && BUFFERP (glyph->object) | |
11970 && (glyph->type == STRETCH_GLYPH | |
11971 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11972 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11973 (glyph--)->face_id = face_id; |
25012 | 11974 } |
11975 } | |
11976 } | |
11977 | |
11978 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11979 /* Value is non-zero if glyph row ROW in window W should be |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
11980 used to hold the cursor. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11981 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11982 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11983 cursor_row_p (w, row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11984 struct window *w; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11985 struct glyph_row *row; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11986 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11987 int cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11988 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11989 if (PT == MATRIX_ROW_END_CHARPOS (row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11990 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11991 /* If the row ends with a newline from a string, we don't want |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11992 the cursor there (if the row is continued it doesn't end in a |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11993 newline). */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11994 if (CHARPOS (row->end.string_pos) >= 0 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11995 || MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11996 cursor_row_p = row->continued_p; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11997 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11998 /* If the row ends at ZV, display the cursor at the end of that |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
11999 row instead of at the start of the row below. */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12000 else if (row->ends_at_zv_p) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12001 cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12002 else |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12003 cursor_row_p = 0; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12004 } |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12005 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12006 return cursor_row_p; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12007 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12008 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12009 |
25012 | 12010 /* Construct the glyph row IT->glyph_row in the desired matrix of |
12011 IT->w from text at the current position of IT. See dispextern.h | |
12012 for an overview of struct it. Value is non-zero if | |
12013 IT->glyph_row displays text, as opposed to a line displaying ZV | |
12014 only. */ | |
12015 | |
12016 static int | |
12017 display_line (it) | |
12018 struct it *it; | |
12019 { | |
12020 struct glyph_row *row = it->glyph_row; | |
12021 | |
12022 /* We always start displaying at hpos zero even if hscrolled. */ | |
12023 xassert (it->hpos == 0 && it->current_x == 0); | |
12024 | |
12025 /* We must not display in a row that's not a text row. */ | |
12026 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
12027 < it->w->desired_matrix->nrows); | |
12028 | |
12029 /* Is IT->w showing the region? */ | |
12030 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
12031 | |
12032 /* Clear the result glyph row and enable it. */ | |
12033 prepare_desired_row (row); | |
12034 | |
12035 row->y = it->current_y; | |
12036 row->start = it->current; | |
12037 row->continuation_lines_width = it->continuation_lines_width; | |
12038 row->displays_text_p = 1; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12039 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
|
12040 it->starts_in_middle_of_char_p = 0; |
277 | 12041 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
12042 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 12043 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
|
12044 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
|
12045 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
|
12046 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 12047 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
12048 | |
12049 /* Move over display elements that are not visible because we are | |
12050 hscrolled. This may stop at an x-position < IT->first_visible_x | |
12051 if the first glyph is partially visible or if we hit a line end. */ | |
12052 if (it->current_x < it->first_visible_x) | |
12053 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
12054 MOVE_TO_POS | MOVE_TO_X); | |
12055 | |
12056 /* Get the initial row height. This is either the height of the | |
12057 text hscrolled, if there is any, or zero. */ | |
12058 row->ascent = it->max_ascent; | |
12059 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
|
12060 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
|
12061 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 12062 |
12063 /* Loop generating characters. The loop is left with IT on the next | |
12064 character to display. */ | |
12065 while (1) | |
12066 { | |
12067 int n_glyphs_before, hpos_before, x_before; | |
12068 int x, i, nglyphs; | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
12069 int ascent = 0, descent = 0, phys_ascent = 0, phys_descent = 0; |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
12070 |
25012 | 12071 /* Retrieve the next thing to display. Value is zero if end of |
12072 buffer reached. */ | |
12073 if (!get_next_display_element (it)) | |
12074 { | |
12075 /* 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
|
12076 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
|
12077 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
|
12078 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12079 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
|
12080 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12081 { |
25012 | 12082 row->glyphs[TEXT_AREA]->charpos = -1; |
12083 row->displays_text_p = 0; | |
12084 | |
12085 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
12086 row->indicate_empty_line_p = 1; | |
12087 } | |
12088 | |
12089 it->continuation_lines_width = 0; | |
12090 row->ends_at_zv_p = 1; | |
12091 break; | |
12092 } | |
12093 | |
12094 /* Now, get the metrics of what we want to display. This also | |
12095 generates glyphs in `row' (which is IT->glyph_row). */ | |
12096 n_glyphs_before = row->used[TEXT_AREA]; | |
12097 x = it->current_x; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12098 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12099 /* 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
|
12100 fit on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12101 if (!it->truncate_lines_p) |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12102 { |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12103 ascent = it->max_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12104 descent = it->max_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12105 phys_ascent = it->max_phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12106 phys_descent = it->max_phys_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12107 } |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12108 |
25012 | 12109 PRODUCE_GLYPHS (it); |
12110 | |
12111 /* If this display element was in marginal areas, continue with | |
12112 the next one. */ | |
12113 if (it->area != TEXT_AREA) | |
12114 { | |
12115 row->ascent = max (row->ascent, it->max_ascent); | |
12116 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
|
12117 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
|
12118 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
|
12119 it->max_phys_ascent + it->max_phys_descent); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12120 set_iterator_to_next (it, 1); |
25012 | 12121 continue; |
12122 } | |
12123 | |
12124 /* Does the display element fit on the line? If we truncate | |
12125 lines, we should draw past the right edge of the window. If | |
12126 we don't truncate, we want to stop so that we can display the | |
12127 continuation glyph before the right margin. If lines are | |
12128 continued, there are two possible strategies for characters | |
12129 resulting in more than 1 glyph (e.g. tabs): Display as many | |
12130 glyphs as possible in this line and leave the rest for the | |
12131 continuation line, or display the whole element in the next | |
12132 line. Original redisplay did the former, so we do it also. */ | |
12133 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
12134 hpos_before = it->hpos; | |
12135 x_before = x; | |
12136 | |
12137 if (nglyphs == 1 | |
12138 && it->current_x < it->last_visible_x) | |
12139 { | |
12140 ++it->hpos; | |
12141 row->ascent = max (row->ascent, it->max_ascent); | |
12142 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
|
12143 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
|
12144 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
|
12145 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12146 if (it->current_x - it->pixel_width < it->first_visible_x) |
12147 row->x = x - it->first_visible_x; | |
12148 } | |
12149 else | |
12150 { | |
12151 int new_x; | |
12152 struct glyph *glyph; | |
12153 | |
12154 for (i = 0; i < nglyphs; ++i, x = new_x) | |
12155 { | |
12156 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
12157 new_x = x + glyph->pixel_width; | |
12158 | |
12159 if (/* Lines are continued. */ | |
12160 !it->truncate_lines_p | |
12161 && (/* Glyph doesn't fit on the line. */ | |
12162 new_x > it->last_visible_x | |
12163 /* Or it fits exactly on a window system frame. */ | |
12164 || (new_x == it->last_visible_x | |
12165 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12166 { |
25012 | 12167 /* End of a continued line. */ |
12168 | |
12169 if (it->hpos == 0 | |
12170 || (new_x == it->last_visible_x | |
12171 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12172 { |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12173 /* 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
|
12174 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
|
12175 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
|
12176 after the glyph. */ |
25012 | 12177 row->continued_p = 1; |
12178 it->current_x = new_x; | |
12179 it->continuation_lines_width += new_x; | |
12180 ++it->hpos; | |
12181 if (i == nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12182 set_iterator_to_next (it, 1); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12183 } |
29461
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12184 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
|
12185 && !FRAME_WINDOW_P (it->f)) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12186 { |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12187 /* 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
|
12188 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
|
12189 on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12190 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
|
12191 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12192 /* 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
|
12193 glyphs like in 20.x. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12194 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
|
12195 < row->glyphs[1 + TEXT_AREA]) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12196 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
|
12197 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12198 row->continued_p = 1; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12199 it->current_x = x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12200 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
|
12201 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12202 /* 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
|
12203 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
|
12204 it->max_ascent = ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12205 it->max_descent = descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12206 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
|
12207 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
|
12208 } |
25012 | 12209 else |
12210 { | |
12211 /* Display element draws past the right edge of | |
12212 the window. Restore positions to values | |
12213 before the element. The next line starts | |
12214 with current_x before the glyph that could | |
12215 not be displayed, so that TAB works right. */ | |
12216 row->used[TEXT_AREA] = n_glyphs_before + i; | |
12217 | |
12218 /* Display continuation glyphs. */ | |
12219 if (!FRAME_WINDOW_P (it->f)) | |
12220 produce_special_glyphs (it, IT_CONTINUATION); | |
12221 row->continued_p = 1; | |
12222 | |
12223 it->current_x = x; | |
12224 it->continuation_lines_width += x; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12225 if (nglyphs > 1 && i > 0) |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12226 { |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12227 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
|
12228 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
|
12229 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12230 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12231 /* 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
|
12232 element not fitting on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12233 it->max_ascent = ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12234 it->max_descent = descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12235 it->max_phys_ascent = phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12236 it->max_phys_descent = phys_descent; |
25012 | 12237 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12238 |
25012 | 12239 break; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12240 } |
25012 | 12241 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
|
12242 { |
25012 | 12243 /* Increment number of glyphs actually displayed. */ |
12244 ++it->hpos; | |
12245 | |
12246 if (x < it->first_visible_x) | |
12247 /* Glyph is partially visible, i.e. row starts at | |
12248 negative X position. */ | |
12249 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
|
12250 } |
25012 | 12251 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12252 { |
25012 | 12253 /* Glyph is completely off the left margin of the |
12254 window. This should not happen because of the | |
12255 move_it_in_display_line at the start of | |
12256 this function. */ | |
12257 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12258 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12259 } |
25012 | 12260 |
12261 row->ascent = max (row->ascent, it->max_ascent); | |
12262 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
|
12263 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
|
12264 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
|
12265 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12266 |
12267 /* End of this display line if row is continued. */ | |
12268 if (row->continued_p) | |
12269 break; | |
12270 } | |
12271 | |
12272 /* Is this a line end? If yes, we're also done, after making | |
12273 sure that a non-default face is extended up to the right | |
12274 margin of the window. */ | |
12275 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
12276 { | |
12277 int used_before = row->used[TEXT_AREA]; | |
12278 | |
12279 /* Add a space at the end of the line that is used to | |
12280 display the cursor there. */ | |
12281 append_space (it, 0); | |
12282 | |
12283 /* Extend the face to the end of the line. */ | |
12284 extend_face_to_end_of_line (it); | |
12285 | |
12286 /* Make sure we have the position. */ | |
12287 if (used_before == 0) | |
12288 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
12289 | |
12290 /* Consume the line end. This skips over invisible lines. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12291 set_iterator_to_next (it, 1); |
25012 | 12292 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
|
12293 break; |
277 | 12294 } |
25012 | 12295 |
12296 /* Proceed with next display element. Note that this skips | |
12297 over lines invisible because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12298 set_iterator_to_next (it, 1); |
25012 | 12299 |
12300 /* If we truncate lines, we are done when the last displayed | |
12301 glyphs reach past the right margin of the window. */ | |
12302 if (it->truncate_lines_p | |
12303 && (FRAME_WINDOW_P (it->f) | |
12304 ? (it->current_x >= it->last_visible_x) | |
12305 : (it->current_x > it->last_visible_x))) | |
12306 { | |
12307 /* Maybe add truncation glyphs. */ | |
12308 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12309 { |
25012 | 12310 --it->glyph_row->used[TEXT_AREA]; |
12311 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 12312 } |
25012 | 12313 |
12314 row->truncated_on_right_p = 1; | |
12315 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
|
12316 reseat_at_next_visible_line_start (it, 0); |
25012 | 12317 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
12318 it->hpos = hpos_before; | |
12319 it->current_x = x_before; | |
12320 break; | |
12321 } | |
12322 } | |
12323 | |
12324 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
12325 at the left window margin. */ | |
12326 if (it->first_visible_x | |
12327 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
12328 { | |
12329 if (!FRAME_WINDOW_P (it->f)) | |
12330 insert_left_trunc_glyphs (it); | |
12331 row->truncated_on_left_p = 1; | |
12332 } | |
12333 | |
12334 /* If the start of this line is the overlay arrow-position, then | |
12335 mark this glyph row as the one containing the overlay arrow. | |
12336 This is clearly a mess with variable size fonts. It would be | |
12337 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
|
12338 if (MARKERP (Voverlay_arrow_position) |
277 | 12339 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 12340 && (MATRIX_ROW_START_CHARPOS (row) |
12341 == 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
|
12342 && STRINGP (Voverlay_arrow_string) |
277 | 12343 && ! overlay_arrow_seen) |
12344 { | |
25012 | 12345 /* Overlay arrow in window redisplay is a bitmap. */ |
12346 if (!FRAME_WINDOW_P (it->f)) | |
12347 { | |
12348 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
12349 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
12350 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
12351 struct glyph *p = row->glyphs[TEXT_AREA]; | |
12352 struct glyph *p2, *end; | |
12353 | |
12354 /* Copy the arrow glyphs. */ | |
12355 while (glyph < arrow_end) | |
12356 *p++ = *glyph++; | |
12357 | |
12358 /* Throw away padding glyphs. */ | |
12359 p2 = p; | |
12360 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
12361 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
12362 ++p2; | |
12363 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
|
12364 { |
25012 | 12365 while (p2 < end) |
12366 *p++ = *p2++; | |
12367 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
|
12368 } |
25012 | 12369 } |
12370 | |
277 | 12371 overlay_arrow_seen = 1; |
25012 | 12372 row->overlay_arrow_p = 1; |
12373 } | |
12374 | |
12375 /* Compute pixel dimensions of this line. */ | |
12376 compute_line_metrics (it); | |
12377 | |
12378 /* Remember the position at which this line ends. */ | |
12379 row->end = it->current; | |
12380 | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
12381 /* Maybe set the cursor. */ |
25012 | 12382 if (it->w->cursor.vpos < 0 |
12383 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12384 && PT <= MATRIX_ROW_END_CHARPOS (row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12385 && cursor_row_p (it->w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12386 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); |
25012 | 12387 |
12388 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12389 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 12390 highlight_trailing_whitespace (it->f, it->glyph_row); |
12391 | |
12392 /* Prepare for the next line. This line starts horizontally at (X | |
12393 HPOS) = (0 0). Vertical positions are incremented. As a | |
12394 convenience for the caller, IT->glyph_row is set to the next | |
12395 row to be used. */ | |
12396 it->current_x = it->hpos = 0; | |
12397 it->current_y += row->height; | |
12398 ++it->vpos; | |
12399 ++it->glyph_row; | |
12400 return row->displays_text_p; | |
12401 } | |
12402 | |
12403 | |
277 | 12404 |
25012 | 12405 /*********************************************************************** |
12406 Menu Bar | |
12407 ***********************************************************************/ | |
12408 | |
12409 /* Redisplay the menu bar in the frame for window W. | |
12410 | |
12411 The menu bar of X frames that don't have X toolkit support is | |
12412 displayed in a special window W->frame->menu_bar_window. | |
12413 | |
12414 The menu bar of terminal frames is treated specially as far as | |
12415 glyph matrices are concerned. Menu bar lines are not part of | |
12416 windows, so the update is done directly on the frame matrix rows | |
12417 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12418 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12419 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12420 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12421 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12422 { |
25012 | 12423 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12424 struct it it; | |
12425 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12426 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12427 |
25012 | 12428 /* 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
|
12429 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12430 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12431 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12432 #endif |
25012 | 12433 #ifdef USE_X_TOOLKIT |
12434 if (FRAME_X_P (f)) | |
12435 return; | |
12436 #endif | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12437 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12438 if (FRAME_MAC_P (f)) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12439 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12440 #endif |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12441 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12442 #ifdef USE_X_TOOLKIT |
25012 | 12443 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
|
12444 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 12445 it.first_visible_x = 0; |
12446 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12447 #else /* not USE_X_TOOLKIT */ | |
12448 if (FRAME_WINDOW_P (f)) | |
12449 { | |
12450 /* Menu bar lines are displayed in the desired matrix of the | |
12451 dummy window menu_bar_window. */ | |
12452 struct window *menu_w; | |
12453 xassert (WINDOWP (f->menu_bar_window)); | |
12454 menu_w = XWINDOW (f->menu_bar_window); | |
12455 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
|
12456 MENU_FACE_ID); |
25012 | 12457 it.first_visible_x = 0; |
12458 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12459 } | |
12460 else | |
12461 { | |
12462 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
12463 pixel x/y. */ | |
12464 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
|
12465 MENU_FACE_ID); |
25012 | 12466 it.first_visible_x = 0; |
12467 it.last_visible_x = FRAME_WIDTH (f); | |
12468 } | |
12469 #endif /* not USE_X_TOOLKIT */ | |
12470 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12471 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12472 /* Force the menu-bar to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12473 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12474 |
25012 | 12475 /* Clear all rows of the menu bar. */ |
12476 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
12477 { | |
12478 struct glyph_row *row = it.glyph_row + i; | |
12479 clear_glyph_row (row); | |
12480 row->enabled_p = 1; | |
12481 row->full_width_p = 1; | |
12482 } | |
12483 | |
12484 /* Display all items of the menu bar. */ | |
12485 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
|
12486 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
|
12487 { |
25012 | 12488 Lisp_Object string; |
12489 | |
12490 /* 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
|
12491 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
|
12492 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12493 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12494 |
25012 | 12495 /* Remember where item was displayed. */ |
12496 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
12497 | |
12498 /* Display the item, pad with one space. */ | |
12499 if (it.current_x < it.last_visible_x) | |
12500 display_string (NULL, string, Qnil, 0, 0, &it, | |
12501 XSTRING (string)->size + 1, 0, 0, -1); | |
12502 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12503 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12504 /* Fill out the line with spaces. */ |
25012 | 12505 if (it.current_x < it.last_visible_x) |
12506 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
12507 | |
12508 /* Compute the total height of the lines. */ | |
12509 compute_line_metrics (&it); | |
12510 } | |
12511 | |
12512 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12513 |
25012 | 12514 /*********************************************************************** |
12515 Mode Line | |
12516 ***********************************************************************/ | |
12517 | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12518 /* Redisplay mode lines in the window tree whose root is WINDOW. If |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12519 FORCE is non-zero, redisplay mode lines unconditionally. |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12520 Otherwise, redisplay only mode lines that are garbaged. Value is |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12521 the number of windows whose mode lines were redisplayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12522 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12523 static int |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12524 redisplay_mode_lines (window, force) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12525 Lisp_Object window; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12526 int force; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12527 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12528 int nwindows = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12529 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12530 while (!NILP (window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12531 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12532 struct window *w = XWINDOW (window); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12533 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12534 if (WINDOWP (w->hchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12535 nwindows += redisplay_mode_lines (w->hchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12536 else if (WINDOWP (w->vchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12537 nwindows += redisplay_mode_lines (w->vchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12538 else if (force |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12539 || FRAME_GARBAGED_P (XFRAME (w->frame)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12540 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12541 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12542 Lisp_Object old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12543 struct text_pos lpoint; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12544 struct buffer *old = current_buffer; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12545 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12546 /* Set the window's buffer for the mode line display. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12547 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12548 set_buffer_internal_1 (XBUFFER (w->buffer)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12549 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12550 /* Point refers normally to the selected window. For any |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12551 other window, set up appropriate value. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12552 if (!EQ (window, selected_window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12553 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12554 struct text_pos pt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12555 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12556 SET_TEXT_POS_FROM_MARKER (pt, w->pointm); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12557 if (CHARPOS (pt) < BEGV) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12558 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12559 else if (CHARPOS (pt) > (ZV - 1)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12560 TEMP_SET_PT_BOTH (ZV, ZV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12561 else |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12562 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12563 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12564 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12565 /* Temporarily set up the selected frame. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12566 old_selected_frame = selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12567 selected_frame = w->frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12568 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12569 /* Display mode lines. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12570 clear_glyph_matrix (w->desired_matrix); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12571 if (display_mode_lines (w)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12572 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12573 ++nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12574 w->must_be_updated_p = 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12575 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12576 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12577 /* Restore old settings. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12578 selected_frame = old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12579 set_buffer_internal_1 (old); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12580 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12581 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12582 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12583 window = w->next; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12584 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12585 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12586 return nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12587 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12588 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12589 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12590 /* Display the mode and/or top line of window W. Value is the number |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12591 of mode lines displayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12592 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12593 static int |
25012 | 12594 display_mode_lines (w) |
277 | 12595 struct window *w; |
12596 { | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12597 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12598 |
25012 | 12599 /* 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
|
12600 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
|
12601 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12602 |
25012 | 12603 if (WINDOW_WANTS_MODELINE_P (w)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12604 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12605 display_mode_line (w, MODE_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12606 current_buffer->mode_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12607 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12608 } |
25546 | 12609 |
12610 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12611 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12612 display_mode_line (w, HEADER_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12613 current_buffer->header_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12614 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12615 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12616 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12617 return n; |
25012 | 12618 } |
12619 | |
12620 | |
12621 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 12622 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12623 FORMAT is the mode line format to display. Value is the pixel |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12624 height of the mode line displayed. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12625 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12626 static int |
25012 | 12627 display_mode_line (w, face_id, format) |
12628 struct window *w; | |
12629 enum face_id face_id; | |
12630 Lisp_Object format; | |
12631 { | |
12632 struct it it; | |
12633 struct face *face; | |
12634 | |
12635 init_iterator (&it, w, -1, -1, NULL, face_id); | |
12636 prepare_desired_row (it.glyph_row); | |
12637 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12638 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12639 /* Force the mode-line to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12640 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12641 |
25012 | 12642 /* Temporarily make frame's keyboard the current kboard so that |
12643 kboard-local variables in the mode_line_format will get the right | |
12644 values. */ | |
12645 push_frame_kboard (it.f); | |
12646 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
|
12647 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
12648 |
25012 | 12649 /* Fill up with spaces. */ |
12650 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
12651 | |
12652 compute_line_metrics (&it); | |
12653 it.glyph_row->full_width_p = 1; | |
12654 it.glyph_row->mode_line_p = 1; | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12655 it.glyph_row->inverse_p = 0; |
25012 | 12656 it.glyph_row->continued_p = 0; |
12657 it.glyph_row->truncated_on_left_p = 0; | |
12658 it.glyph_row->truncated_on_right_p = 0; | |
12659 | |
12660 /* Make a 3D mode-line have a shadow at its right end. */ | |
12661 face = FACE_FROM_ID (it.f, face_id); | |
12662 extend_face_to_end_of_line (&it); | |
12663 if (face->box != FACE_NO_BOX) | |
12664 { | |
12665 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
12666 + it.glyph_row->used[TEXT_AREA] - 1); | |
12667 last->right_box_line_p = 1; | |
12668 } | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12669 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12670 return it.glyph_row->height; |
25012 | 12671 } |
12672 | |
12673 | |
12674 /* Contribute ELT to the mode line for window IT->w. How it | |
12675 translates into text depends on its data type. | |
12676 | |
12677 IT describes the display environment in which we display, as usual. | |
277 | 12678 |
12679 DEPTH is the depth in recursion. It is used to prevent | |
12680 infinite recursion here. | |
12681 | |
25012 | 12682 FIELD_WIDTH is the number of characters the display of ELT should |
12683 occupy in the mode line, and PRECISION is the maximum number of | |
12684 characters to display from ELT's representation. See | |
12685 display_string for details. * | |
12686 | |
12687 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 12688 |
12689 static int | |
25012 | 12690 display_mode_element (it, depth, field_width, precision, elt) |
12691 struct it *it; | |
277 | 12692 int depth; |
25012 | 12693 int field_width, precision; |
12694 Lisp_Object elt; | |
12695 { | |
12696 int n = 0, field, prec; | |
12697 | |
277 | 12698 tail_recurse: |
12699 if (depth > 10) | |
12700 goto invalid; | |
12701 | |
12702 depth++; | |
12703 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
12704 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 12705 { |
12706 case Lisp_String: | |
12707 { | |
12708 /* A string: output it and check for %-constructs within it. */ | |
25012 | 12709 unsigned char c; |
12710 unsigned char *this = XSTRING (elt)->data; | |
12711 unsigned char *lisp_string = this; | |
12712 | |
12713 while ((precision <= 0 || n < precision) | |
12714 && *this | |
12715 && (frame_title_ptr | |
12716 || it->current_x < it->last_visible_x)) | |
277 | 12717 { |
12718 unsigned char *last = this; | |
25012 | 12719 |
12720 /* Advance to end of string or next format specifier. */ | |
277 | 12721 while ((c = *this++) != '\0' && c != '%') |
12722 ; | |
25012 | 12723 |
277 | 12724 if (this - 1 != last) |
12725 { | |
25012 | 12726 /* Output to end of string or up to '%'. Field width |
12727 is length of string. Don't output more than | |
12728 PRECISION allows us. */ | |
12729 prec = --this - last; | |
12730 if (precision > 0 && prec > precision - n) | |
12731 prec = precision - n; | |
12732 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12733 if (frame_title_ptr) |
25012 | 12734 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
|
12735 else |
25012 | 12736 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
12737 it, 0, prec, 0, -1); | |
277 | 12738 } |
12739 else /* c == '%' */ | |
12740 { | |
25012 | 12741 unsigned char *percent_position = this; |
12742 | |
12743 /* Get the specified minimum width. Zero means | |
12744 don't pad. */ | |
12745 field = 0; | |
277 | 12746 while ((c = *this++) >= '0' && c <= '9') |
25012 | 12747 field = field * 10 + c - '0'; |
12748 | |
12749 /* Don't pad beyond the total padding allowed. */ | |
12750 if (field_width - n > 0 && field > field_width - n) | |
12751 field = field_width - n; | |
12752 | |
12753 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
12754 prec = precision - n; | |
12755 | |
277 | 12756 if (c == 'M') |
25012 | 12757 n += display_mode_element (it, depth, field, prec, |
12758 Vglobal_mode_string); | |
277 | 12759 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
|
12760 { |
25012 | 12761 unsigned char *spec |
12762 = decode_mode_spec (it->w, c, field, prec); | |
12763 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12764 if (frame_title_ptr) |
25012 | 12765 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
|
12766 else |
25012 | 12767 { |
12768 int nglyphs_before | |
12769 = it->glyph_row->used[TEXT_AREA]; | |
12770 int charpos | |
12771 = percent_position - XSTRING (elt)->data; | |
12772 int nwritten | |
12773 = display_string (spec, Qnil, elt, charpos, 0, it, | |
12774 field, prec, 0, -1); | |
12775 | |
12776 /* Assign to the glyphs written above the | |
12777 string where the `%x' came from, position | |
12778 of the `%'. */ | |
12779 if (nwritten > 0) | |
12780 { | |
12781 struct glyph *glyph | |
12782 = (it->glyph_row->glyphs[TEXT_AREA] | |
12783 + nglyphs_before); | |
12784 int i; | |
12785 | |
12786 for (i = 0; i < nwritten; ++i) | |
12787 { | |
12788 glyph[i].object = elt; | |
12789 glyph[i].charpos = charpos; | |
12790 } | |
12791 | |
12792 n += nwritten; | |
12793 } | |
12794 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12795 } |
277 | 12796 } |
12797 } | |
12798 } | |
12799 break; | |
12800 | |
12801 case Lisp_Symbol: | |
12802 /* A symbol: process the value of the symbol recursively | |
12803 as if it appeared here directly. Avoid error if symbol void. | |
12804 Special case: if value of symbol is a string, output the string | |
12805 literally. */ | |
12806 { | |
12807 register Lisp_Object tem; | |
12808 tem = Fboundp (elt); | |
485 | 12809 if (!NILP (tem)) |
277 | 12810 { |
12811 tem = Fsymbol_value (elt); | |
12812 /* If value is a string, output that string literally: | |
12813 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
|
12814 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12815 { |
25012 | 12816 prec = XSTRING (tem)->size; |
12817 if (precision > 0 && prec > precision - n) | |
12818 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12819 if (frame_title_ptr) |
25012 | 12820 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
|
12821 else |
25012 | 12822 n += display_string (NULL, tem, Qnil, 0, 0, it, |
12823 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
|
12824 } |
277 | 12825 else if (!EQ (tem, elt)) |
25012 | 12826 { |
12827 /* Give up right away for nil or t. */ | |
12828 elt = tem; | |
12829 goto tail_recurse; | |
12830 } | |
277 | 12831 } |
12832 } | |
12833 break; | |
12834 | |
12835 case Lisp_Cons: | |
12836 { | |
12837 register Lisp_Object car, tem; | |
12838 | |
12839 /* A cons cell: three distinct cases. | |
12840 If first element is a string or a cons, process all the elements | |
12841 and effectively concatenate them. | |
12842 If first element is a negative number, truncate displaying cdr to | |
12843 at most that many characters. If positive, pad (with spaces) | |
12844 to at least that many characters. | |
12845 If first element is a symbol, process the cadr or caddr recursively | |
12846 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
|
12847 car = XCAR (elt); |
25012 | 12848 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
12849 { | |
12850 /* An element of the form (:eval FORM) means evaluate FORM | |
12851 and use the result as mode line elements. */ | |
12852 struct gcpro gcpro1; | |
12853 Lisp_Object spec; | |
12854 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
12855 spec = safe_eval (XCAR (XCDR (elt))); |
25012 | 12856 GCPRO1 (spec); |
12857 n += display_mode_element (it, depth, field_width - n, | |
12858 precision - n, spec); | |
12859 UNGCPRO; | |
12860 } | |
12861 else if (SYMBOLP (car)) | |
277 | 12862 { |
12863 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12864 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
|
12865 if (!CONSP (elt)) |
277 | 12866 goto invalid; |
12867 /* elt is now the cdr, and we know it is a cons cell. | |
12868 Use its car if CAR has a non-nil value. */ | |
485 | 12869 if (!NILP (tem)) |
277 | 12870 { |
12871 tem = Fsymbol_value (car); | |
485 | 12872 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12873 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12874 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12875 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12876 } |
277 | 12877 } |
12878 /* Symbol's value is nil (or symbol is unbound) | |
12879 Get the cddr of the original list | |
12880 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
|
12881 elt = XCDR (elt); |
485 | 12882 if (NILP (elt)) |
277 | 12883 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12884 else if (!CONSP (elt)) |
277 | 12885 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12886 elt = XCAR (elt); |
277 | 12887 goto tail_recurse; |
12888 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12889 else if (INTEGERP (car)) |
277 | 12890 { |
12891 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12892 elt = XCDR (elt); |
277 | 12893 if (lim < 0) |
25012 | 12894 { |
12895 /* Negative int means reduce maximum width. */ | |
12896 if (precision <= 0) | |
12897 precision = -lim; | |
12898 else | |
12899 precision = min (precision, -lim); | |
12900 } | |
277 | 12901 else if (lim > 0) |
12902 { | |
12903 /* Padding specified. Don't let it be more than | |
12904 current maximum. */ | |
25012 | 12905 if (precision > 0) |
12906 lim = min (precision, lim); | |
12907 | |
277 | 12908 /* If that's more padding than already wanted, queue it. |
12909 But don't reduce padding already specified even if | |
12910 that is beyond the current truncation point. */ | |
25012 | 12911 field_width = max (lim, field_width); |
277 | 12912 } |
12913 goto tail_recurse; | |
12914 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12915 else if (STRINGP (car) || CONSP (car)) |
277 | 12916 { |
12917 register int limit = 50; | |
25012 | 12918 /* Limit is to protect against circular lists. */ |
12919 while (CONSP (elt) | |
12920 && --limit > 0 | |
12921 && (precision <= 0 || n < precision)) | |
277 | 12922 { |
25012 | 12923 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
|
12924 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12925 elt = XCDR (elt); |
277 | 12926 } |
12927 } | |
12928 } | |
12929 break; | |
12930 | |
12931 default: | |
12932 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12933 if (frame_title_ptr) |
25012 | 12934 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
|
12935 else |
25012 | 12936 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
12937 precision - n, 0, 0); | |
12938 return n; | |
12939 } | |
12940 | |
12941 /* Pad to FIELD_WIDTH. */ | |
12942 if (field_width > 0 && n < field_width) | |
12943 { | |
12944 if (frame_title_ptr) | |
12945 n += store_frame_title ("", field_width - n, 0); | |
12946 else | |
12947 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
12948 0, 0, 0); | |
12949 } | |
12950 | |
12951 return n; | |
12952 } | |
12953 | |
12954 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12955 /* 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
|
12956 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
|
12957 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12958 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12959 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12960 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12961 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12962 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12963 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12964 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12965 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12966 if (d <= 0) |
25012 | 12967 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12968 else |
25012 | 12969 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12970 while (d > 0) |
25012 | 12971 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12972 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12973 d /= 10; |
25012 | 12974 } |
12975 } | |
12976 | |
12977 for (width -= (int) (p - buf); width > 0; --width) | |
12978 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12979 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12980 while (p > buf) |
25012 | 12981 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12982 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12983 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12984 *p-- = d; |
25012 | 12985 } |
12986 } | |
12987 | |
12988 /* 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
|
12989 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
|
12990 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
|
12991 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
12992 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
|
12993 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12994 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12995 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
|
12996 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12997 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12998 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12999 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13000 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13001 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
|
13002 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13003 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13004 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13005 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
|
13006 |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13007 val = Fget (coding_system, Qcoding_system); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
13008 eoltype = Qnil; |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13009 |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13010 if (!VECTORP (val)) /* Not yet decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13011 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13012 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13013 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
13014 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13015 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
|
13016 /* 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
|
13017 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13018 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13019 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13020 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13021 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13022 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
|
13023 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13024 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13025 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13026 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13027 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13028 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13029 /* 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
|
13030 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13031 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
|
13032 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
|
13033 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
|
13034 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
|
13035 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
|
13036 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
|
13037 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13038 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13039 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13040 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13041 } |
25012 | 13042 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13043 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13044 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13045 /* 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
|
13046 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13047 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13048 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13049 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13050 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13051 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13052 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13053 { |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13054 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
|
13055 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
|
13056 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13057 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13058 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13059 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13060 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
|
13061 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13062 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
|
13063 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13064 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13065 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13066 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13067 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13068 |
277 | 13069 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 13070 generated by character C. PRECISION >= 0 means don't return a |
13071 string longer than that value. FIELD_WIDTH > 0 means pad the | |
13072 string returned with spaces to that value. */ | |
277 | 13073 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
13074 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
|
13075 |
277 | 13076 static char * |
25012 | 13077 decode_mode_spec (w, c, field_width, precision) |
277 | 13078 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
|
13079 register int c; |
25012 | 13080 int field_width, precision; |
277 | 13081 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13082 Lisp_Object obj; |
25012 | 13083 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
13084 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
|
13085 struct buffer *b = XBUFFER (w->buffer); |
277 | 13086 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13087 obj = Qnil; |
277 | 13088 |
13089 switch (c) | |
13090 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13091 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13092 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
|
13093 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13094 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
|
13095 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13096 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13097 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13098 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13099 /* 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
|
13100 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
|
13101 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13102 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
|
13103 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13104 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13105 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13106 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13107 /* 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
|
13108 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
|
13109 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13110 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13111 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13112 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13113 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13114 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13115 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13116 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13117 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13118 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13119 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13120 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
|
13121 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13122 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
|
13123 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
|
13124 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13125 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13126 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
|
13127 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13128 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13129 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13130 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13131 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13132 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13133 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13134 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
|
13135 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13136 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
|
13137 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
|
13138 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13139 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13140 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
|
13141 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13142 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13143 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13144 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13145 register int i; |
25012 | 13146 |
13147 /* Let lots_of_dashes be a string of infinite length. */ | |
13148 if (field_width <= 0 | |
13149 || field_width > sizeof (lots_of_dashes)) | |
13150 { | |
13151 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
13152 decode_mode_spec_buf[i] = '-'; | |
13153 decode_mode_spec_buf[i] = '\0'; | |
13154 return decode_mode_spec_buf; | |
13155 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13156 else |
25012 | 13157 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
|
13158 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13159 |
277 | 13160 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13161 obj = b->name; |
277 | 13162 break; |
13163 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13164 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13165 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13166 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
|
13167 XSETFASTINT (w->column_number_displayed, col); |
25012 | 13168 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
|
13169 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
|
13170 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13171 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13172 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13173 /* %F displays the frame name. */ |
25012 | 13174 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
|
13175 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
13176 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
|
13177 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
|
13178 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
|
13179 |
277 | 13180 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13181 obj = b->filename; |
277 | 13182 break; |
13183 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13184 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13185 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13186 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13187 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13188 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13189 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13190 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13191 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13192 /* 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
|
13193 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13194 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
|
13195 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
13196 /* 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
|
13197 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
|
13198 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13199 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13200 /* 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
|
13201 if (INTEGERP (Vline_number_display_limit) |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13202 && 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
|
13203 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13204 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13205 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13206 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13207 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13208 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13209 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13210 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13211 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13212 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13213 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13214 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13215 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
|
13216 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13217 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13218 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13219 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13220 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13221 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13222 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13223 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13224 /* 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
|
13225 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13226 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13227 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13228 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13229 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13230 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13231 /* 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
|
13232 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
|
13233 "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
|
13234 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
|
13235 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13236 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13237 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
|
13238 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
|
13239 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13240 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
|
13241 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13242 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13243 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13244 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13245 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13246 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
|
13247 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13248 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13249 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13250 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13251 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13252 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13253 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13254 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13255 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13256 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13257 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13258 /* 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
|
13259 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
|
13260 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
|
13261 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13262 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13263 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13264 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13265 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13266 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13267 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13268 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13269 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
|
13270 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13271 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13272 /* 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
|
13273 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13274 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13275 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13276 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13277 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13278 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13279 /* Make the string to show. */ |
25012 | 13280 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
|
13281 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13282 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13283 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13284 char* p = decode_mode_spec_buf; |
25012 | 13285 int pad = field_width - 2; |
13286 while (pad-- > 0) | |
13287 *p++ = ' '; | |
13288 *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
|
13289 *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
|
13290 *p = '\0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13291 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13292 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13293 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13294 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13295 |
277 | 13296 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13297 obj = b->mode_name; |
277 | 13298 break; |
13299 | |
13300 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13301 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 13302 return " Narrow"; |
13303 break; | |
13304 | |
13305 case 'p': | |
13306 { | |
13307 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
|
13308 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
|
13309 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13310 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 13311 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13312 if (pos <= BUF_BEGV (b)) |
277 | 13313 return "All"; |
13314 else | |
13315 return "Bottom"; | |
13316 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13317 else if (pos <= BUF_BEGV (b)) |
277 | 13318 return "Top"; |
13319 else | |
13320 { | |
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
|
13321 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
|
13322 /* 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
|
13323 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
|
13324 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
|
13325 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 13326 /* We can't normally display a 3-digit number, |
13327 so get us a 2-digit number that is close. */ | |
13328 if (total == 100) | |
13329 total = 99; | |
13330 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
13331 return decode_mode_spec_buf; | |
13332 } | |
13333 } | |
13334 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13335 /* 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
|
13336 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13337 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13338 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
|
13339 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
|
13340 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
|
13341 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13342 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13343 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13344 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13345 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13346 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13347 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13348 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13349 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13350 { |
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
|
13351 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
|
13352 /* 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
|
13353 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
|
13354 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
|
13355 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
|
13356 /* 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
|
13357 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
|
13358 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13359 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13360 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13361 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13362 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13363 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13364 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13365 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13366 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13367 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13368 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13369 /* 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
|
13370 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
|
13371 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
|
13372 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
|
13373 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13374 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
|
13375 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13376 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13377 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13378 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
|
13379 #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
|
13380 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
|
13381 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13382 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13383 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13384 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13385 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13386 /* 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
|
13387 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13388 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13389 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13390 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
|
13391 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13392 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
13393 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13394 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13395 /* 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
|
13396 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13397 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
|
13398 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
|
13399 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13400 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
|
13401 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13402 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13403 #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
|
13404 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13405 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13406 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13407 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13408 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
|
13409 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13410 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
|
13411 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13412 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13413 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13414 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13415 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13416 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13417 } |
277 | 13418 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13419 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13420 if (STRINGP (obj)) |
277 | 13421 return (char *) XSTRING (obj)->data; |
13422 else | |
13423 return ""; | |
13424 } | |
25012 | 13425 |
13426 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13427 /* 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
|
13428 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13429 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
|
13430 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13431 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
|
13432 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13433 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13434 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
|
13435 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13436 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13437 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13438 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13439 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13440 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13441 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13442 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13443 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13444 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13445 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13446 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13447 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13448 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13449 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13450 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13451 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13452 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13453 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13454 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13455 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13456 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13457 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13458 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13459 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13460 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13461 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13462 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13463 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13464 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13465 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13466 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13467 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13468 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13469 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13470 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13471 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13472 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13473 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13474 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13475 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13476 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13477 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13478 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13479 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13480 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13481 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13482 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13483 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13484 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13485 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13486 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13487 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13488 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13489 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13490 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13491 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13492 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
|
13493 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13494 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13495 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13496 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13497 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13498 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13499 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13500 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13501 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13502 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13503 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13504 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13505 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13506 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13507 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13508 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13509 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13510 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
|
13511 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13512 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13513 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13514 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13515 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13516 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13517 /* 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
|
13518 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
|
13519 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13520 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13521 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13522 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13523 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13524 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13525 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13526 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13527 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13528 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13529 } |
25012 | 13530 |
13531 | |
277 | 13532 |
25012 | 13533 /*********************************************************************** |
13534 Displaying strings | |
13535 ***********************************************************************/ | |
13536 | |
13537 /* Display a NUL-terminated string, starting with index START. | |
13538 | |
13539 If STRING is non-null, display that C string. Otherwise, the Lisp | |
13540 string LISP_STRING is displayed. | |
13541 | |
13542 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
13543 FACE_STRING. Display STRING or LISP_STRING with the face at | |
13544 FACE_STRING_POS in FACE_STRING: | |
13545 | |
13546 Display the string in the environment given by IT, but use the | |
13547 standard display table, temporarily. | |
13548 | |
13549 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
13550 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
13551 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
13552 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
13553 | |
13554 PRECISION is the maximum number of characters to output from | |
13555 STRING. PRECISION < 0 means don't truncate the string. | |
13556 | |
13557 This is roughly equivalent to printf format specifiers: | |
13558 | |
13559 FIELD_WIDTH PRECISION PRINTF | |
13560 ---------------------------------------- | |
13561 -1 -1 %s | |
13562 -1 10 %.10s | |
13563 10 -1 %10s | |
13564 20 10 %20.10s | |
13565 | |
13566 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
13567 display them, and < 0 means obey the current buffer's value of | |
13568 enable_multibyte_characters. | |
13569 | |
13570 Value is the number of glyphs produced. */ | |
277 | 13571 |
13572 static int | |
25012 | 13573 display_string (string, lisp_string, face_string, face_string_pos, |
13574 start, it, field_width, precision, max_x, multibyte) | |
277 | 13575 unsigned char *string; |
25012 | 13576 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
|
13577 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
|
13578 int face_string_pos; |
25012 | 13579 int start; |
13580 struct it *it; | |
13581 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
|
13582 int multibyte; |
277 | 13583 { |
25012 | 13584 int hpos_at_start = it->hpos; |
13585 int saved_face_id = it->face_id; | |
13586 struct glyph_row *row = it->glyph_row; | |
13587 | |
13588 /* Initialize the iterator IT for iteration over STRING beginning | |
13589 with index START. We assume that IT may be modified here (which | |
13590 means that display_line has to do something when displaying a | |
13591 mini-buffer prompt, which it does). */ | |
13592 reseat_to_string (it, string, lisp_string, start, | |
13593 precision, field_width, multibyte); | |
13594 | |
13595 /* If displaying STRING, set up the face of the iterator | |
13596 from LISP_STRING, if that's given. */ | |
13597 if (STRINGP (face_string)) | |
13598 { | |
13599 int endptr; | |
13600 struct face *face; | |
13601 | |
13602 it->face_id | |
13603 = face_at_string_position (it->w, face_string, face_string_pos, | |
13604 0, it->region_beg_charpos, | |
13605 it->region_end_charpos, | |
13606 &endptr, it->base_face_id); | |
13607 face = FACE_FROM_ID (it->f, it->face_id); | |
13608 it->face_box_p = face->box != FACE_NO_BOX; | |
13609 } | |
13610 | |
13611 /* Set max_x to the maximum allowed X position. Don't let it go | |
13612 beyond the right edge of the window. */ | |
13613 if (max_x <= 0) | |
13614 max_x = it->last_visible_x; | |
13615 else | |
13616 max_x = min (max_x, it->last_visible_x); | |
13617 | |
13618 /* Skip over display elements that are not visible. because IT->w is | |
13619 hscrolled. */ | |
13620 if (it->current_x < it->first_visible_x) | |
13621 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
13622 MOVE_TO_POS | MOVE_TO_X); | |
13623 | |
13624 row->ascent = it->max_ascent; | |
13625 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
|
13626 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
|
13627 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 13628 |
13629 /* This condition is for the case that we are called with current_x | |
13630 past last_visible_x. */ | |
13631 while (it->current_x < max_x) | |
13632 { | |
13633 int x_before, x, n_glyphs_before, i, nglyphs; | |
13634 | |
13635 /* Get the next display element. */ | |
13636 if (!get_next_display_element (it)) | |
13637 break; | |
13638 | |
13639 /* Produce glyphs. */ | |
13640 x_before = it->current_x; | |
13641 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
13642 PRODUCE_GLYPHS (it); | |
13643 | |
13644 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
13645 i = 0; | |
13646 x = x_before; | |
13647 while (i < nglyphs) | |
13648 { | |
13649 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
13650 | |
13651 if (!it->truncate_lines_p | |
13652 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
13653 { |
25012 | 13654 /* End of continued line or max_x reached. */ |
13655 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
13656 it->current_x = x; | |
13657 break; | |
277 | 13658 } |
25012 | 13659 else if (x + glyph->pixel_width > it->first_visible_x) |
13660 { | |
13661 /* Glyph is at least partially visible. */ | |
13662 ++it->hpos; | |
13663 if (x < it->first_visible_x) | |
13664 it->glyph_row->x = x - it->first_visible_x; | |
13665 } | |
13666 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13667 { |
25012 | 13668 /* Glyph is off the left margin of the display area. |
13669 Should not happen. */ | |
13670 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13671 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
13672 |
25012 | 13673 row->ascent = max (row->ascent, it->max_ascent); |
13674 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
|
13675 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
|
13676 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
|
13677 it->max_phys_ascent + it->max_phys_descent); |
25012 | 13678 x += glyph->pixel_width; |
13679 ++i; | |
13680 } | |
13681 | |
13682 /* Stop if max_x reached. */ | |
13683 if (i < nglyphs) | |
13684 break; | |
13685 | |
13686 /* Stop at line ends. */ | |
13687 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
13688 { | |
13689 it->continuation_lines_width = 0; | |
13690 break; | |
13691 } | |
13692 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
13693 set_iterator_to_next (it, 1); |
25012 | 13694 |
13695 /* Stop if truncating at the right edge. */ | |
13696 if (it->truncate_lines_p | |
13697 && it->current_x >= it->last_visible_x) | |
13698 { | |
13699 /* Add truncation mark, but don't do it if the line is | |
13700 truncated at a padding space. */ | |
13701 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
|
13702 { |
25012 | 13703 if (!FRAME_WINDOW_P (it->f)) |
13704 produce_special_glyphs (it, IT_TRUNCATION); | |
13705 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
|
13706 } |
25012 | 13707 break; |
13708 } | |
13709 } | |
13710 | |
13711 /* Maybe insert a truncation at the left. */ | |
13712 if (it->first_visible_x | |
13713 && IT_CHARPOS (*it) > 0) | |
13714 { | |
13715 if (!FRAME_WINDOW_P (it->f)) | |
13716 insert_left_trunc_glyphs (it); | |
13717 it->glyph_row->truncated_on_left_p = 1; | |
13718 } | |
13719 | |
13720 it->face_id = saved_face_id; | |
13721 | |
13722 /* Value is number of columns displayed. */ | |
13723 return it->hpos - hpos_at_start; | |
13724 } | |
13725 | |
13726 | |
277 | 13727 |
25012 | 13728 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
13729 appears as an element of LIST or as the car of an element of LIST. | |
13730 If PROPVAL is a list, compare each element against LIST in that | |
13731 way, and return 1 if any element of PROPVAL is found in LIST. | |
13732 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
|
13733 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13734 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13735 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13736 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13737 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13738 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13739 register Lisp_Object tail, proptail; |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13740 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13741 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
|
13742 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13743 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13744 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13745 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13746 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13747 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
|
13748 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13749 } |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13750 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13751 if (CONSP (propval)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13752 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13753 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13754 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13755 Lisp_Object propelt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13756 propelt = XCAR (proptail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13757 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13758 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13759 register Lisp_Object tem; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13760 tem = XCAR (tail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13761 if (EQ (propelt, tem)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13762 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13763 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13764 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13765 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13766 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13767 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13768 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13769 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13770 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13771 |
25012 | 13772 |
13773 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
13774 the cdr of that element is non-nil. If PROPVAL is a list, check | |
13775 each element of PROPVAL in that way, and the first time some | |
13776 element is found, return 1 if the cdr of that element is non-nil. | |
13777 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
|
13778 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13779 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13780 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13781 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13782 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13783 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13784 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13785 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13786 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
|
13787 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13788 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13789 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13790 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13791 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13792 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13793 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13794 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13795 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
|
13796 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13797 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13798 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13799 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
|
13800 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13801 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13802 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13803 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13804 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13805 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13806 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13807 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13808 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13809 } |
25012 | 13810 |
13811 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13812 |
25012 | 13813 /*********************************************************************** |
13814 Initialization | |
13815 ***********************************************************************/ | |
13816 | |
277 | 13817 void |
13818 syms_of_xdisp () | |
13819 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13820 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
|
13821 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
|
13822 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13823 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13824 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13825 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13826 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13827 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13828 |
25012 | 13829 #if GLYPH_DEBUG |
13830 defsubr (&Sdump_glyph_matrix); | |
13831 defsubr (&Sdump_glyph_row); | |
25543 | 13832 defsubr (&Sdump_tool_bar_row); |
25012 | 13833 defsubr (&Strace_redisplay_toggle); |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
13834 defsubr (&Strace_to_stderr); |
25012 | 13835 #endif |
13836 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
13837 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
|
13838 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
|
13839 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
13840 staticpro (&Qoverriding_terminal_local_map); |
12267 | 13841 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
|
13842 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
13843 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
|
13844 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
|
13845 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13846 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13847 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
|
13848 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13849 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13850 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 13851 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13852 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13853 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
|
13854 |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13855 QCdata = intern (":data"); |
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13856 staticpro (&QCdata); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13857 Qdisplay = intern ("display"); |
25012 | 13858 staticpro (&Qdisplay); |
13859 Qspace_width = intern ("space-width"); | |
13860 staticpro (&Qspace_width); | |
13861 Qraise = intern ("raise"); | |
13862 staticpro (&Qraise); | |
13863 Qspace = intern ("space"); | |
13864 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13865 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13866 staticpro (&Qmargin); |
25012 | 13867 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13868 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13869 Qright_margin = intern ("right-margin"); |
25012 | 13870 staticpro (&Qright_margin); |
13871 Qalign_to = intern ("align-to"); | |
13872 staticpro (&Qalign_to); | |
13873 QCalign_to = intern (":align-to"); | |
13874 staticpro (&QCalign_to); | |
13875 Qrelative_width = intern ("relative-width"); | |
13876 staticpro (&Qrelative_width); | |
13877 QCrelative_width = intern (":relative-width"); | |
13878 staticpro (&QCrelative_width); | |
13879 QCrelative_height = intern (":relative-height"); | |
13880 staticpro (&QCrelative_height); | |
13881 QCeval = intern (":eval"); | |
13882 staticpro (&QCeval); | |
25614 | 13883 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13884 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13885 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13886 staticpro (&QCfile); |
25012 | 13887 Qfontified = intern ("fontified"); |
13888 staticpro (&Qfontified); | |
13889 Qfontification_functions = intern ("fontification-functions"); | |
13890 staticpro (&Qfontification_functions); | |
13891 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
13892 staticpro (&Qtrailing_whitespace); | |
13893 Qimage = intern ("image"); | |
13894 staticpro (&Qimage); | |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13895 Qmessage_truncate_lines = intern ("message-truncate-lines"); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13896 staticpro (&Qmessage_truncate_lines); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
13897 Qgrow_only = intern ("grow-only"); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
13898 staticpro (&Qgrow_only); |
25012 | 13899 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13900 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13901 last_arrow_string = Qnil; |
277 | 13902 staticpro (&last_arrow_position); |
13903 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
|
13904 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13905 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
|
13906 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13907 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13908 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13909 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
|
13910 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
|
13911 staticpro (&echo_area_buffer[1]); |
277 | 13912 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13913 Vmessages_buffer_name = build_string ("*Messages*"); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13914 staticpro (&Vmessages_buffer_name); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13915 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13916 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13917 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13918 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13919 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13920 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13921 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13922 "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
|
13923 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13924 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13925 |
277 | 13926 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
13927 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 13928 Vglobal_mode_string = Qnil; |
13929 | |
13930 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
13931 "Marker for where to display an arrow on top of the buffer text.\n\ | |
13932 This must be the beginning of a line in order to work.\n\ | |
13933 See also `overlay-arrow-string'."); | |
13934 Voverlay_arrow_position = Qnil; | |
13935 | |
13936 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
13937 "String to display as an arrow. See also `overlay-arrow-position'."); | |
13938 Voverlay_arrow_string = Qnil; | |
13939 | |
13940 DEFVAR_INT ("scroll-step", &scroll_step, | |
13941 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 13942 If that fails to bring point back on frame, point is centered instead.\n\ |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13943 If this is zero, point is always centered after it moves off frame.\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13944 If you want scrolling to always be a line at a time, you should set\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
13945 `scroll-conservatively' to a large value rather than set this to 1."); |
277 | 13946 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13947 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
|
13948 "*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
|
13949 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
|
13950 in the window."); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13951 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13952 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13953 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13954 "*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
|
13955 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
|
13956 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13957 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13958 |
25012 | 13959 #if GLYPH_DEBUG |
277 | 13960 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 13961 #endif |
277 | 13962 |
13963 DEFVAR_BOOL ("truncate-partial-width-windows", | |
13964 &truncate_partial_width_windows, | |
769 | 13965 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 13966 truncate_partial_width_windows = 1; |
13967 | |
13968 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13969 "nil means display the mode-line/header-line/menu-bar in the default face.\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13970 Any other value means to use the appropriate face, `mode-line',\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13971 `header-line', or `menu' respectively.\n\ |
33721
c45f067779c1
(syms_of_xdisp): `mode-line-inverse-video' defualts to nil.
Miles Bader <miles@gnu.org>
parents:
33600
diff
changeset
|
13972 \n\ |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13973 This variable is deprecated; please change the above faces instead."); |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
13974 mode_line_inverse_video = 1; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13975 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13976 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit, |
25012 | 13977 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 13978 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
|
13979 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
|
13980 Vline_number_display_limit = Qnil; |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13981 |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13982 DEFVAR_INT ("line-number-display-limit-width", |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13983 &line_number_display_limit_width, |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13984 "*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
|
13985 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
|
13986 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
|
13987 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13988 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
13989 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
|
13990 "*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
|
13991 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
|
13992 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13993 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
|
13994 "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
|
13995 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
|
13996 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
|
13997 `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
|
13998 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13999 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 14000 "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
|
14001 \(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
|
14002 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
|
14003 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
|
14004 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14005 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 14006 "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
|
14007 \(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
|
14008 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
|
14009 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
|
14010 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14011 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14012 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14013 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14014 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14015 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14016 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14017 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14018 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14019 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14020 Qnil))); |
10393 | 14021 |
14022 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
14023 "Maximum number of lines to keep in the message log buffer.\n\ | |
14024 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
14025 the buffer when it becomes large."); | |
14026 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
14027 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
14028 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
|
14029 "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
|
14030 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
|
14031 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
|
14032 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
|
14033 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
|
14034 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
|
14035 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
14036 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 14037 "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
|
14038 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
|
14039 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
|
14040 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
|
14041 Vwindow_scroll_functions = Qnil; |
25012 | 14042 |
25543 | 14043 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
14044 "*Non-nil means automatically resize tool-bars.\n\ | |
14045 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
14046 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 14047 otherwise."); |
25543 | 14048 auto_resize_tool_bars_p = 1; |
14049 | |
14050 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
14051 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
14052 auto_raise_tool_bar_buttons_p = 1; | |
14053 | |
14054 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
14055 "*Margin around tool-bar buttons in pixels."); | |
14056 tool_bar_button_margin = 1; | |
14057 | |
14058 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
14059 "Relief thickness of tool-bar buttons."); | |
14060 tool_bar_button_relief = 3; | |
25012 | 14061 |
14062 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
14063 "List of functions to call to fontify regions of text.\n\ | |
14064 Each function is called with one argument POS. Functions must\n\ | |
14065 fontify a region starting at POS in the current buffer, and give\n\ | |
14066 fontified regions the property `fontified'.\n\ | |
14067 This variable automatically becomes buffer-local when set."); | |
14068 Vfontification_functions = Qnil; | |
33824
09db0c6cb714
(syms_of_xdisp): Make fontification-functions buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33762
diff
changeset
|
14069 Fmake_variable_buffer_local (Qfontification_functions); |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14070 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14071 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 14072 &unibyte_display_via_language_environment, |
14073 "*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
|
14074 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
|
14075 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
|
14076 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
|
14077 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14078 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
|
14079 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14080 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
|
14081 "*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
|
14082 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14083 If an integer, it specifies a number of lines."); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14084 Vmax_mini_window_height = make_float (0.25); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14085 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14086 DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows, |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14087 "*How to resize the mini-window.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14088 A value of nil means don't automatically resize mini-windows.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14089 A value of t means resize it to fit the text displayed in it.\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14090 A value of `grow-only', the default, means let mini-windows grow\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14091 only, until the its display becomes empty, at which point the mini-window\n\ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14092 goes back to its normal size."); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14093 Vresize_mini_windows = Qgrow_only; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14094 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14095 DEFVAR_BOOL ("cursor-in-non-selected-windows", |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14096 &cursor_in_non_selected_windows, |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14097 "*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
|
14098 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
|
14099 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
|
14100 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14101 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
|
14102 "*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
|
14103 automatic_hscrolling_p = 1; |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14104 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14105 DEFVAR_LISP ("image-types", &Vimage_types, |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14106 "List of supported image types.\n\ |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14107 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
|
14108 Vimage_types = Qnil; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14109 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14110 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
|
14111 "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
|
14112 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
|
14113 message_truncate_lines = 0; |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14114 |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14115 DEFVAR_LISP ("menu-bar-update-hook", &Vmenu_bar_update_hook, |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14116 "Normal hook run for clicks on menu bar, before displaying a submenu.\n\ |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14117 Can be used to update submenus whose contents should vary."); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14118 Vmenu_bar_update_hook = Qnil; |
277 | 14119 } |
14120 | |
25012 | 14121 |
14122 /* Initialize this module when Emacs starts. */ | |
14123 | |
21514 | 14124 void |
277 | 14125 init_xdisp () |
14126 { | |
14127 Lisp_Object root_window; | |
25012 | 14128 struct window *mini_w; |
14129 | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14130 current_header_line_height = current_mode_line_height = -1; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14131 |
25012 | 14132 CHARPOS (this_line_start_pos) = 0; |
277 | 14133 |
14134 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
|
14135 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 14136 |
14137 if (!noninteractive) | |
14138 { | |
25012 | 14139 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
14140 int i; | |
14141 | |
14142 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
|
14143 set_window_height (root_window, |
25012 | 14144 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
|
14145 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14146 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 14147 set_window_height (minibuf_window, 1, 0); |
14148 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14149 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
|
14150 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 14151 |
14152 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
14153 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
14154 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
14155 | |
14156 /* The default ellipsis glyphs `...'. */ | |
14157 for (i = 0; i < 3; ++i) | |
14158 XSETFASTINT (default_invis_vector[i], '.'); | |
14159 } | |
14160 | |
14161 #ifdef HAVE_WINDOW_SYSTEM | |
14162 { | |
14163 /* Allocate the buffer for frame titles. */ | |
14164 int size = 100; | |
14165 frame_title_buf = (char *) xmalloc (size); | |
14166 frame_title_buf_end = frame_title_buf + size; | |
14167 frame_title_ptr = NULL; | |
14168 } | |
14169 #endif /* HAVE_WINDOW_SYSTEM */ | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14170 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14171 help_echo_showing_p = 0; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14172 } |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14173 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14174 |