Mercurial > emacs
annotate src/xdisp.c @ 32546:9672c4db6bed
(IT_set_face): Compare highlighted face with the default
face, and invert colors if these faces' colors are identical.
(Fmsdos_remember_default_colors): Don't swap foreground and
background colors in initial_colors[].
(IT_set_frame_parameters): Don't swap frame's foreground and
background pixels. If ALIST includes "(reverse . t)", swap
foreground-color and background-color properties in frame's
param_alist. If the original frame's param_alist doesn't specify
the colors, store unspecified-fg and unspecified-bg, reversed if
required.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 16 Oct 2000 19:16:20 +0000 |
parents | dd4c7d5e1599 |
children | 2bd19f54cd7a |
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 |
277 | 197 |
25012 | 198 #define min(a, b) ((a) < (b) ? (a) : (b)) |
199 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
200 | |
201 #define INFINITY 10000000 | |
202 | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
203 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
204 extern void set_frame_menubar P_ ((struct frame *f, int, int)); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
205 extern int pending_menu_activation; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
206 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
207 |
277 | 208 extern int interrupt_input; |
209 extern int command_loop_level; | |
210 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
211 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
212 |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
213 extern Lisp_Object Qface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
214 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
215 extern Lisp_Object Voverriding_local_map; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
216 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 217 extern Lisp_Object Qmenu_item; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
218 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
219 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
220 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
221 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
222 Lisp_Object Qinhibit_point_motion_hooks; |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
223 Lisp_Object QCeval, Qwhen, QCfile, QCdata; |
25012 | 224 Lisp_Object Qfontified; |
225 | |
226 /* Functions called to fontify regions of text. */ | |
227 | |
228 Lisp_Object Vfontification_functions; | |
229 Lisp_Object Qfontification_functions; | |
230 | |
25543 | 231 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 232 over them. */ |
233 | |
25543 | 234 int auto_raise_tool_bar_buttons_p; |
235 | |
236 /* Margin around tool bar buttons in pixels. */ | |
237 | |
238 int tool_bar_button_margin; | |
239 | |
240 /* Thickness of shadow to draw around tool bar buttons. */ | |
241 | |
242 int tool_bar_button_relief; | |
243 | |
244 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 245 items are visible, and no blank lines remain. */ |
246 | |
25543 | 247 int auto_resize_tool_bars_p; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
248 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
249 /* Non-nil means don't actually do any redisplay. */ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
250 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
251 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
252 |
25012 | 253 /* Names of text properties relevant for redisplay. */ |
254 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
255 Lisp_Object Qdisplay, Qrelative_width, Qalign_to; |
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
256 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 257 |
258 /* Symbols used in text property values. */ | |
259 | |
260 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
261 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
262 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
263 extern Lisp_Object Qheight; |
25012 | 264 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
265 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
266 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
267 Lisp_Object Vshow_trailing_whitespace; |
25012 | 268 |
269 /* Name of the face used to highlight trailing whitespace. */ | |
270 | |
271 Lisp_Object Qtrailing_whitespace; | |
272 | |
273 /* The symbol `image' which is the car of the lists used to represent | |
274 images in Lisp. */ | |
275 | |
276 Lisp_Object Qimage; | |
277 | |
278 /* Non-zero means print newline to stdout before next mini-buffer | |
279 message. */ | |
277 | 280 |
281 int noninteractive_need_newline; | |
282 | |
25012 | 283 /* Non-zero means print newline to message log before next message. */ |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
284 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
285 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
286 |
25012 | 287 |
288 /* The buffer position of the first character appearing entirely or | |
289 partially on the line of the selected window which contains the | |
290 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
291 redisplay optimization in redisplay_internal. */ | |
292 | |
293 static struct text_pos this_line_start_pos; | |
294 | |
295 /* Number of characters past the end of the line above, including the | |
296 terminating newline. */ | |
297 | |
298 static struct text_pos this_line_end_pos; | |
299 | |
300 /* The vertical positions and the height of this line. */ | |
301 | |
277 | 302 static int this_line_vpos; |
25012 | 303 static int this_line_y; |
304 static int this_line_pixel_height; | |
305 | |
306 /* X position at which this display line starts. Usually zero; | |
307 negative if first character is partially visible. */ | |
308 | |
309 static int this_line_start_x; | |
310 | |
311 /* Buffer that this_line_.* variables are referring to. */ | |
312 | |
277 | 313 static struct buffer *this_line_buffer; |
314 | |
25012 | 315 /* Nonzero means truncate lines in all windows less wide than the |
316 frame. */ | |
317 | |
277 | 318 int truncate_partial_width_windows; |
319 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
320 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 321 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
322 int unibyte_display_via_language_environment; |
25012 | 323 |
324 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
325 Not guaranteed to be accurate except while parsing | |
326 frame-title-format. */ | |
327 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
328 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
329 |
277 | 330 Lisp_Object Vglobal_mode_string; |
331 | |
332 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 333 |
277 | 334 Lisp_Object Voverlay_arrow_position; |
335 | |
25012 | 336 /* String to display for the arrow. Only used on terminal frames. */ |
337 | |
277 | 338 Lisp_Object Voverlay_arrow_string; |
339 | |
25012 | 340 /* Values of those variables at last redisplay. However, if |
341 Voverlay_arrow_position is a marker, last_arrow_position is its | |
342 numerical position. */ | |
343 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
344 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
345 |
25012 | 346 /* Like mode-line-format, but for the title bar on a visible frame. */ |
347 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
348 Lisp_Object Vframe_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
349 |
25012 | 350 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
351 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
352 Lisp_Object Vicon_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
353 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
354 /* List of functions to call when a window's size changes. These |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
355 functions get one arg, a frame on which one or more windows' sizes |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
356 have changed. */ |
25012 | 357 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
358 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
359 |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
360 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
|
361 |
277 | 362 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 363 |
277 | 364 static int overlay_arrow_seen; |
365 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
366 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 367 |
368 int highlight_nonselected_windows; | |
369 | |
370 /* If cursor motion alone moves point off frame, try scrolling this | |
371 many lines up or down if that will bring it back. */ | |
372 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
373 static int scroll_step; |
277 | 374 |
25012 | 375 /* Non-0 means scroll just far enough to bring point back on the |
376 screen, when appropriate. */ | |
377 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
378 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
379 |
25012 | 380 /* Recenter the window whenever point gets within this many lines of |
381 the top or bottom of the window. This value is translated into a | |
382 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
383 there is really a fixed pixel height scroll margin. */ | |
384 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
385 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
386 |
25012 | 387 /* Number of windows showing the buffer of the selected window (or |
388 another buffer with the same base buffer). keyboard.c refers to | |
389 this. */ | |
390 | |
277 | 391 int buffer_shared; |
392 | |
25012 | 393 /* Vector containing glyphs for an ellipsis `...'. */ |
394 | |
395 static Lisp_Object default_invis_vector[3]; | |
396 | |
397 /* Nonzero means display mode line highlighted. */ | |
398 | |
277 | 399 int mode_line_inverse_video; |
400 | |
25012 | 401 /* Prompt to display in front of the mini-buffer contents. */ |
402 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
403 Lisp_Object minibuf_prompt; |
277 | 404 |
25012 | 405 /* Width of current mini-buffer prompt. Only set after display_line |
406 of the line that contains the prompt. */ | |
407 | |
277 | 408 int minibuf_prompt_width; |
25012 | 409 int minibuf_prompt_pixel_width; |
410 | |
411 /* This is the window where the echo area message was displayed. It | |
412 is always a mini-buffer window, but it may not be the same window | |
413 currently active as a mini-buffer. */ | |
414 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
415 Lisp_Object echo_area_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
416 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
417 /* List of pairs (MESSAGE . MULTIBYTE). The function save_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
418 pushes the current message and the value of |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
419 message_enable_multibyte on the stack, the function restore_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
420 pops the stack and displays MESSAGE again. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
421 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
422 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
423 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
424 /* Nonzero means multibyte characters were enabled when the echo area |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
425 message was specified. */ |
25012 | 426 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
427 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
428 |
25012 | 429 /* True if we should redraw the mode lines on the next redisplay. */ |
430 | |
277 | 431 int update_mode_lines; |
432 | |
25012 | 433 /* Nonzero if window sizes or contents have changed since last |
434 redisplay that finished */ | |
435 | |
277 | 436 int windows_or_buffers_changed; |
437 | |
25012 | 438 /* Nonzero after display_mode_line if %l was used and it displayed a |
439 line number. */ | |
440 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
441 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
442 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
443 /* Maximum buffer size for which to display line numbers. */ |
25012 | 444 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
445 Lisp_Object Vline_number_display_limit; |
10393 | 446 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
447 /* line width to consider when repostioning for line number display */ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
448 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
449 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
450 |
25012 | 451 /* Number of lines to keep in the message log buffer. t means |
452 infinite. nil means don't log at all. */ | |
453 | |
10393 | 454 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
455 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
456 /* The name of the *Messages* buffer, a string. */ |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
457 |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
458 static Lisp_Object Vmessages_buffer_name; |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
459 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
460 /* Current, index 0, and last displayed echo area message. Either |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
461 buffers from echo_buffers, or nil to indicate no message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
462 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
463 Lisp_Object echo_area_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
464 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
465 /* The buffers referenced from echo_area_buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
466 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
467 static Lisp_Object echo_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
469 /* A vector saved used in with_area_buffer to reduce consing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 static Lisp_Object Vwith_echo_area_save_vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 /* Non-zero means display_echo_area should display the last echo area |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
474 message again. Set by redisplay_preserve_echo_area. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
475 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
476 static int display_last_displayed_message_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
477 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
478 /* Nonzero if echo area is being used by print; zero if being used by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
479 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
480 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
481 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
482 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
483 /* Maximum height for resizing mini-windows. Either a float |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
484 specifying a fraction of the available height, or an integer |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
485 specifying a number of lines. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
486 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
487 Lisp_Object Vmax_mini_window_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
488 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
489 /* Non-zero means messages should be displayed with truncated |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
490 lines instead of being continued. */ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
491 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
492 int message_truncate_lines; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
493 Lisp_Object Qmessage_truncate_lines; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
494 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
495 /* Non-zero means we want a hollow cursor in windows that are not |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
496 selected. Zero means there's no cursor in such windows. */ |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
497 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
498 int cursor_in_non_selected_windows; |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
499 |
25012 | 500 /* A scratch glyph row with contents used for generating truncation |
501 glyphs. Also used in direct_output_for_insert. */ | |
502 | |
503 #define MAX_SCRATCH_GLYPHS 100 | |
504 struct glyph_row scratch_glyph_row; | |
505 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
506 | |
507 /* Ascent and height of the last line processed by move_it_to. */ | |
508 | |
509 static int last_max_ascent, last_height; | |
510 | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
511 /* 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
|
512 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
513 int help_echo_showing_p; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
514 |
25012 | 515 /* The maximum distance to look ahead for text properties. Values |
516 that are too small let us call compute_char_face and similar | |
517 functions too often which is expensive. Values that are too large | |
518 let us call compute_char_face and alike too often because we | |
519 might not be interested in text properties that far away. */ | |
520 | |
521 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
522 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
523 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
524 |
25012 | 525 /* Non-zero means print traces of redisplay if compiled with |
526 GLYPH_DEBUG != 0. */ | |
527 | |
528 int trace_redisplay_p; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
529 |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
530 #endif /* GLYPH_DEBUG */ |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
531 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
532 #ifdef DEBUG_TRACE_MOVE |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
533 /* 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
|
534 int trace_move; |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
535 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
536 #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
|
537 #else |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
538 #define TRACE_MOVE(x) (void) 0 |
25012 | 539 #endif |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
540 |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
541 /* 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
|
542 point visible. */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
543 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
544 int automatic_hscrolling_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
545 |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
546 /* 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
|
547 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
548 Lisp_Object Vimage_types; |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
549 |
25012 | 550 /* Value returned from text property handlers (see below). */ |
551 | |
552 enum prop_handled | |
553 { | |
554 HANDLED_NORMALLY, | |
555 HANDLED_RECOMPUTE_PROPS, | |
556 HANDLED_OVERLAY_STRING_CONSUMED, | |
557 HANDLED_RETURN | |
558 }; | |
559 | |
560 /* A description of text properties that redisplay is interested | |
561 in. */ | |
562 | |
563 struct props | |
564 { | |
565 /* The name of the property. */ | |
566 Lisp_Object *name; | |
567 | |
568 /* A unique index for the property. */ | |
569 enum prop_idx idx; | |
570 | |
571 /* A handler function called to set up iterator IT from the property | |
572 at IT's current position. Value is used to steer handle_stop. */ | |
573 enum prop_handled (*handler) P_ ((struct it *it)); | |
574 }; | |
575 | |
576 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
577 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
578 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
|
579 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 580 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
581 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
582 | |
583 /* Properties handled by iterators. */ | |
584 | |
585 static struct props it_props[] = | |
586 { | |
587 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
588 /* Handle `face' before `display' because some sub-properties of | |
589 `display' need to know the face. */ | |
590 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
591 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
592 {&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
|
593 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 594 {NULL, 0, NULL} |
595 }; | |
596 | |
597 /* Value is the position described by X. If X is a marker, value is | |
598 the marker_position of X. Otherwise, value is X. */ | |
599 | |
600 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
601 | |
602 /* Enumeration returned by some move_it_.* functions internally. */ | |
603 | |
604 enum move_it_result | |
605 { | |
606 /* Not used. Undefined value. */ | |
607 MOVE_UNDEFINED, | |
608 | |
609 /* Move ended at the requested buffer position or ZV. */ | |
610 MOVE_POS_MATCH_OR_ZV, | |
611 | |
612 /* Move ended at the requested X pixel position. */ | |
613 MOVE_X_REACHED, | |
614 | |
615 /* Move within a line ended at the end of a line that must be | |
616 continued. */ | |
617 MOVE_LINE_CONTINUED, | |
618 | |
619 /* Move within a line ended at the end of a line that would | |
620 be displayed truncated. */ | |
621 MOVE_LINE_TRUNCATED, | |
622 | |
623 /* Move within a line ended at a line end. */ | |
624 MOVE_NEWLINE_OR_CR | |
625 }; | |
626 | |
627 | |
628 | |
629 /* Function prototypes. */ | |
630 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
631 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
|
632 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
|
633 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
|
634 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
|
635 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
|
636 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
|
637 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
|
638 struct text_pos)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
639 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
|
640 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
|
641 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
|
642 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
|
643 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
|
644 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
|
645 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
|
646 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
|
647 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 648 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
649 struct glyph_row *, | |
650 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
651 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
|
652 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
|
653 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
|
654 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
|
655 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
|
656 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
|
657 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
|
658 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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 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
|
664 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 665 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
666 struct text_pos)); | |
667 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
|
668 static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); |
25012 | 669 static void insert_left_trunc_glyphs P_ ((struct it *)); |
670 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
671 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
|
672 static int append_space P_ ((struct it *, int)); |
25012 | 673 static void make_cursor_line_fully_visible P_ ((struct window *)); |
674 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
|
675 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); |
25012 | 676 static int trailing_whitespace_p P_ ((int)); |
677 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
678 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
679 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
680 static void push_it P_ ((struct it *)); | |
681 static void pop_it P_ ((struct it *)); | |
682 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
683 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
|
684 static int echo_area_display P_ ((int)); |
25012 | 685 static void redisplay_windows P_ ((Lisp_Object)); |
686 static void redisplay_window P_ ((Lisp_Object, int)); | |
687 static void update_menu_bar P_ ((struct frame *, int)); | |
688 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
689 static int try_window_id P_ ((struct window *)); | |
690 static int display_line P_ ((struct it *)); | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
691 static int display_mode_lines P_ ((struct window *)); |
25012 | 692 static void display_mode_line P_ ((struct window *, enum face_id, |
693 Lisp_Object)); | |
694 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
|
695 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 696 static void display_menu_bar P_ ((struct window *)); |
697 static int display_count_lines P_ ((int, int, int, int, int *)); | |
698 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
699 int, int, struct it *, int, int, int, int)); | |
700 static void compute_line_metrics P_ ((struct it *)); | |
701 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
702 static int get_overlay_strings P_ ((struct it *)); | |
703 static void next_overlay_string P_ ((struct it *)); | |
704 static void reseat P_ ((struct it *, struct text_pos, int)); | |
705 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
706 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
707 static void reseat_at_previous_visible_line_start P_ ((struct it *)); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
708 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 709 static int next_element_from_display_vector P_ ((struct it *)); |
710 static int next_element_from_string P_ ((struct it *)); | |
711 static int next_element_from_c_string P_ ((struct it *)); | |
712 static int next_element_from_buffer P_ ((struct it *)); | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
713 static int next_element_from_composition P_ ((struct it *)); |
25012 | 714 static int next_element_from_image P_ ((struct it *)); |
715 static int next_element_from_stretch P_ ((struct it *)); | |
716 static void load_overlay_strings P_ ((struct it *)); | |
717 static void init_from_display_pos P_ ((struct it *, struct window *, | |
718 struct display_pos *)); | |
719 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
720 Lisp_Object, int, int, int, int)); | |
721 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
722 int, int, int)); | |
723 void move_it_vertically_backward P_ ((struct it *, int)); | |
724 static void init_to_row_start P_ ((struct it *, struct window *, | |
725 struct glyph_row *)); | |
726 static void init_to_row_end P_ ((struct it *, struct window *, | |
727 struct glyph_row *)); | |
728 static void back_to_previous_line_start P_ ((struct it *)); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
729 static int forward_to_next_line_start P_ ((struct it *, int *)); |
25012 | 730 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, |
731 Lisp_Object, int)); | |
732 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
733 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
734 static int number_of_chars P_ ((unsigned char *, int)); | |
735 static void compute_stop_pos P_ ((struct it *)); | |
736 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
737 Lisp_Object)); | |
738 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
739 static int next_overlay_change P_ ((int)); | |
740 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
741 Lisp_Object, struct text_pos *)); | |
742 | |
743 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
744 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
745 | |
746 #ifdef HAVE_WINDOW_SYSTEM | |
747 | |
25543 | 748 static void update_tool_bar P_ ((struct frame *, int)); |
749 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
750 static int redisplay_tool_bar P_ ((struct frame *)); | |
751 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 752 |
753 #endif /* HAVE_WINDOW_SYSTEM */ | |
754 | |
755 | |
756 /*********************************************************************** | |
757 Window display dimensions | |
758 ***********************************************************************/ | |
759 | |
760 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
761 text in window W. This is the height of W minus the height of a | |
762 mode line, if any. */ | |
763 | |
764 INLINE int | |
765 window_text_bottom_y (w) | |
766 struct window *w; | |
767 { | |
768 struct frame *f = XFRAME (w->frame); | |
769 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
770 | |
771 if (WINDOW_WANTS_MODELINE_P (w)) | |
772 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
773 return height; | |
774 } | |
775 | |
776 | |
777 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
778 means return the total width of W, not including bitmap areas to | |
779 the left and right of the window. */ | |
780 | |
781 INLINE int | |
782 window_box_width (w, area) | |
783 struct window *w; | |
784 int area; | |
785 { | |
786 struct frame *f = XFRAME (w->frame); | |
787 int width = XFASTINT (w->width); | |
788 | |
789 if (!w->pseudo_window_p) | |
790 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
791 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 792 |
793 if (area == TEXT_AREA) | |
794 { | |
795 if (INTEGERP (w->left_margin_width)) | |
796 width -= XFASTINT (w->left_margin_width); | |
797 if (INTEGERP (w->right_margin_width)) | |
798 width -= XFASTINT (w->right_margin_width); | |
799 } | |
800 else if (area == LEFT_MARGIN_AREA) | |
801 width = (INTEGERP (w->left_margin_width) | |
802 ? XFASTINT (w->left_margin_width) : 0); | |
803 else if (area == RIGHT_MARGIN_AREA) | |
804 width = (INTEGERP (w->right_margin_width) | |
805 ? XFASTINT (w->right_margin_width) : 0); | |
806 } | |
807 | |
808 return width * CANON_X_UNIT (f); | |
809 } | |
810 | |
811 | |
812 /* Return the pixel height of the display area of window W, not | |
813 including mode lines of W, if any.. */ | |
814 | |
815 INLINE int | |
816 window_box_height (w) | |
817 struct window *w; | |
818 { | |
819 struct frame *f = XFRAME (w->frame); | |
820 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
31931
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
821 |
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
822 xassert (height >= 0); |
25012 | 823 |
824 if (WINDOW_WANTS_MODELINE_P (w)) | |
825 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
826 | |
25546 | 827 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
828 height -= CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 829 |
830 return height; | |
831 } | |
832 | |
833 | |
834 /* Return the frame-relative coordinate of the left edge of display | |
835 area AREA of window W. AREA < 0 means return the left edge of the | |
836 whole window, to the right of any bitmap area at the left side of | |
837 W. */ | |
838 | |
839 INLINE int | |
840 window_box_left (w, area) | |
841 struct window *w; | |
842 int area; | |
843 { | |
844 struct frame *f = XFRAME (w->frame); | |
845 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
846 | |
847 if (!w->pseudo_window_p) | |
848 { | |
849 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
|
850 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 851 |
852 if (area == TEXT_AREA) | |
853 x += window_box_width (w, LEFT_MARGIN_AREA); | |
854 else if (area == RIGHT_MARGIN_AREA) | |
855 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
856 + window_box_width (w, TEXT_AREA)); | |
857 } | |
858 | |
859 return x; | |
860 } | |
861 | |
862 | |
863 /* Return the frame-relative coordinate of the right edge of display | |
864 area AREA of window W. AREA < 0 means return the left edge of the | |
865 whole window, to the left of any bitmap area at the right side of | |
866 W. */ | |
867 | |
868 INLINE int | |
869 window_box_right (w, area) | |
870 struct window *w; | |
871 int area; | |
872 { | |
873 return window_box_left (w, area) + window_box_width (w, area); | |
874 } | |
875 | |
876 | |
877 /* Get the bounding box of the display area AREA of window W, without | |
878 mode lines, in frame-relative coordinates. AREA < 0 means the | |
879 whole window, not including bitmap areas to the left and right of | |
880 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
881 coordinates of the upper-left corner of the box. Return in | |
882 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
883 | |
884 INLINE void | |
885 window_box (w, area, box_x, box_y, box_width, box_height) | |
886 struct window *w; | |
887 int area; | |
888 int *box_x, *box_y, *box_width, *box_height; | |
889 { | |
890 struct frame *f = XFRAME (w->frame); | |
891 | |
892 *box_width = window_box_width (w, area); | |
893 *box_height = window_box_height (w); | |
894 *box_x = window_box_left (w, area); | |
895 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
896 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 897 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
898 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 899 } |
900 | |
901 | |
902 /* Get the bounding box of the display area AREA of window W, without | |
903 mode lines. AREA < 0 means the whole window, not including bitmap | |
904 areas to the left and right of the window. Return in *TOP_LEFT_X | |
905 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
906 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
907 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
908 box. */ | |
909 | |
910 INLINE void | |
911 window_box_edges (w, area, top_left_x, top_left_y, | |
912 bottom_right_x, bottom_right_y) | |
913 struct window *w; | |
914 int area; | |
915 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
916 { | |
917 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
918 bottom_right_y); | |
919 *bottom_right_x += *top_left_x; | |
920 *bottom_right_y += *top_left_y; | |
921 } | |
922 | |
923 | |
924 | |
925 /*********************************************************************** | |
926 Utilities | |
927 ***********************************************************************/ | |
928 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
929 /* 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
|
930 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
|
931 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
|
932 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
|
933 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
934 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
935 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
936 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
|
937 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
938 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
939 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
940 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
941 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
942 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
|
943 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
944 /* 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
|
945 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
|
946 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
947 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
948 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
949 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
950 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
951 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
952 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
953 |
25012 | 954 /* Given a position POS containing a valid character and byte position |
955 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
956 | |
957 static struct text_pos | |
958 string_pos_nchars_ahead (pos, string, nchars) | |
959 struct text_pos pos; | |
960 Lisp_Object string; | |
961 int nchars; | |
962 { | |
963 xassert (STRINGP (string) && nchars >= 0); | |
964 | |
965 if (STRING_MULTIBYTE (string)) | |
966 { | |
967 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
968 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
969 int len; | |
970 | |
971 while (nchars--) | |
972 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
973 string_char_and_length (p, rest, &len); |
25012 | 974 p += len, rest -= len; |
975 xassert (rest >= 0); | |
976 CHARPOS (pos) += 1; | |
977 BYTEPOS (pos) += len; | |
978 } | |
979 } | |
980 else | |
981 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
982 | |
983 return pos; | |
984 } | |
985 | |
986 | |
987 /* Value is the text position, i.e. character and byte position, | |
988 for character position CHARPOS in STRING. */ | |
989 | |
990 static INLINE struct text_pos | |
991 string_pos (charpos, string) | |
992 int charpos; | |
993 Lisp_Object string; | |
994 { | |
995 struct text_pos pos; | |
996 xassert (STRINGP (string)); | |
997 xassert (charpos >= 0); | |
998 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
999 return pos; | |
1000 } | |
1001 | |
1002 | |
1003 /* Value is a text position, i.e. character and byte position, for | |
1004 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
1005 means recognize multibyte characters. */ | |
1006 | |
1007 static struct text_pos | |
1008 c_string_pos (charpos, s, multibyte_p) | |
1009 int charpos; | |
1010 unsigned char *s; | |
1011 int multibyte_p; | |
1012 { | |
1013 struct text_pos pos; | |
1014 | |
1015 xassert (s != NULL); | |
1016 xassert (charpos >= 0); | |
1017 | |
1018 if (multibyte_p) | |
1019 { | |
1020 int rest = strlen (s), len; | |
1021 | |
1022 SET_TEXT_POS (pos, 0, 0); | |
1023 while (charpos--) | |
1024 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1025 string_char_and_length (s, rest, &len); |
25012 | 1026 s += len, rest -= len; |
1027 xassert (rest >= 0); | |
1028 CHARPOS (pos) += 1; | |
1029 BYTEPOS (pos) += len; | |
1030 } | |
1031 } | |
1032 else | |
1033 SET_TEXT_POS (pos, charpos, charpos); | |
1034 | |
1035 return pos; | |
1036 } | |
1037 | |
1038 | |
1039 /* Value is the number of characters in C string S. MULTIBYTE_P | |
1040 non-zero means recognize multibyte characters. */ | |
1041 | |
1042 static int | |
1043 number_of_chars (s, multibyte_p) | |
1044 unsigned char *s; | |
1045 int multibyte_p; | |
1046 { | |
1047 int nchars; | |
1048 | |
1049 if (multibyte_p) | |
1050 { | |
1051 int rest = strlen (s), len; | |
1052 unsigned char *p = (unsigned char *) s; | |
1053 | |
1054 for (nchars = 0; rest > 0; ++nchars) | |
1055 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1056 string_char_and_length (p, rest, &len); |
25012 | 1057 rest -= len, p += len; |
1058 } | |
1059 } | |
1060 else | |
1061 nchars = strlen (s); | |
1062 | |
1063 return nchars; | |
1064 } | |
1065 | |
1066 | |
1067 /* Compute byte position NEWPOS->bytepos corresponding to | |
1068 NEWPOS->charpos. POS is a known position in string STRING. | |
1069 NEWPOS->charpos must be >= POS.charpos. */ | |
1070 | |
1071 static void | |
1072 compute_string_pos (newpos, pos, string) | |
1073 struct text_pos *newpos, pos; | |
1074 Lisp_Object string; | |
1075 { | |
1076 xassert (STRINGP (string)); | |
1077 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1078 | |
1079 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
|
1080 *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
|
1081 CHARPOS (*newpos) - CHARPOS (pos)); |
25012 | 1082 else |
1083 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1084 } | |
1085 | |
1086 | |
1087 | |
1088 /*********************************************************************** | |
1089 Lisp form evaluation | |
1090 ***********************************************************************/ | |
1091 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1092 /* Error handler for safe_eval and safe_call. */ |
25012 | 1093 |
1094 static Lisp_Object | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1095 safe_eval_handler (arg) |
25012 | 1096 Lisp_Object arg; |
1097 { | |
1098 return Qnil; | |
1099 } | |
1100 | |
1101 | |
1102 /* Evaluate SEXPR and return the result, or nil if something went | |
1103 wrong. */ | |
1104 | |
30202
bade676e0950
(eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
30159
diff
changeset
|
1105 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1106 safe_eval (sexpr) |
25012 | 1107 Lisp_Object sexpr; |
1108 { | |
1109 int count = specpdl_ptr - specpdl; | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1110 struct gcpro gcpro1; |
25012 | 1111 Lisp_Object val; |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1112 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1113 GCPRO1 (sexpr); |
25012 | 1114 specbind (Qinhibit_redisplay, Qt); |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1115 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
|
1116 UNGCPRO; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1117 return unbind_to (count, val); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1118 } |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1119 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1120 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1121 /* 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
|
1122 Return the result, or nil if something went wrong. */ |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1123 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1124 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1125 safe_call (nargs, args) |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1126 int nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1127 Lisp_Object *args; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1128 { |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1129 int count = specpdl_ptr - specpdl; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1130 Lisp_Object val; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1131 struct gcpro gcpro1; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1132 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1133 GCPRO1 (args[0]); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1134 gcpro1.nvars = nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1135 specbind (Qinhibit_redisplay, Qt); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1136 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
|
1137 safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1138 UNGCPRO; |
25012 | 1139 return unbind_to (count, val); |
1140 } | |
1141 | |
1142 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1143 /* Call function FN with one argument ARG. |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1144 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
|
1145 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1146 Lisp_Object |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1147 safe_call1 (fn, arg) |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1148 Lisp_Object fn, arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1149 { |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1150 Lisp_Object args[2]; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1151 args[0] = fn; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1152 args[1] = arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1153 return safe_call (2, args); |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1154 } |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1155 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1156 |
25012 | 1157 |
1158 /*********************************************************************** | |
1159 Debugging | |
1160 ***********************************************************************/ | |
1161 | |
1162 #if 0 | |
1163 | |
1164 /* Define CHECK_IT to perform sanity checks on iterators. | |
1165 This is for debugging. It is too slow to do unconditionally. */ | |
1166 | |
1167 static void | |
1168 check_it (it) | |
1169 struct it *it; | |
1170 { | |
1171 if (it->method == next_element_from_string) | |
1172 { | |
1173 xassert (STRINGP (it->string)); | |
1174 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1175 } | |
1176 else if (it->method == next_element_from_buffer) | |
1177 { | |
1178 /* Check that character and byte positions agree. */ | |
1179 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1180 } | |
1181 | |
1182 if (it->dpvec) | |
1183 xassert (it->current.dpvec_index >= 0); | |
1184 else | |
1185 xassert (it->current.dpvec_index < 0); | |
1186 } | |
1187 | |
1188 #define CHECK_IT(IT) check_it ((IT)) | |
1189 | |
1190 #else /* not 0 */ | |
1191 | |
1192 #define CHECK_IT(IT) (void) 0 | |
1193 | |
1194 #endif /* not 0 */ | |
1195 | |
1196 | |
1197 #if GLYPH_DEBUG | |
1198 | |
1199 /* Check that the window end of window W is what we expect it | |
1200 to be---the last row in the current matrix displaying text. */ | |
1201 | |
1202 static void | |
1203 check_window_end (w) | |
1204 struct window *w; | |
1205 { | |
1206 if (!MINI_WINDOW_P (w) | |
1207 && !NILP (w->window_end_valid)) | |
1208 { | |
1209 struct glyph_row *row; | |
1210 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1211 XFASTINT (w->window_end_vpos)), | |
1212 !row->enabled_p | |
1213 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1214 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1215 } | |
1216 } | |
1217 | |
1218 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1219 | |
1220 #else /* not GLYPH_DEBUG */ | |
1221 | |
1222 #define CHECK_WINDOW_END(W) (void) 0 | |
1223 | |
1224 #endif /* not GLYPH_DEBUG */ | |
1225 | |
1226 | |
1227 | |
1228 /*********************************************************************** | |
1229 Iterator initialization | |
1230 ***********************************************************************/ | |
1231 | |
1232 /* Initialize IT for displaying current_buffer in window W, starting | |
1233 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1234 position is specified which is useful when the iterator is assigned | |
1235 a position later. BYTEPOS is the byte position corresponding to | |
1236 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1237 | |
1238 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1239 will produce glyphs in that row. | |
1240 | |
1241 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1242 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1243 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1244 displaying the tool-bar. |
25012 | 1245 |
1246 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1247 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1248 corresponding mode line glyph row of the desired matrix of W. */ |
1249 | |
1250 void | |
1251 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1252 struct it *it; | |
1253 struct window *w; | |
1254 int charpos, bytepos; | |
1255 struct glyph_row *row; | |
1256 enum face_id base_face_id; | |
1257 { | |
1258 int highlight_region_p; | |
1259 | |
1260 /* Some precondition checks. */ | |
1261 xassert (w != NULL && it != NULL); | |
1262 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1263 | |
1264 /* If face attributes have been changed since the last redisplay, | |
1265 free realized faces now because they depend on face definitions | |
1266 that might have changed. */ | |
1267 if (face_change_count) | |
1268 { | |
1269 face_change_count = 0; | |
1270 free_all_realized_faces (Qnil); | |
1271 } | |
1272 | |
1273 /* Use one of the mode line rows of W's desired matrix if | |
1274 appropriate. */ | |
1275 if (row == NULL) | |
1276 { | |
1277 if (base_face_id == MODE_LINE_FACE_ID) | |
1278 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1279 else if (base_face_id == HEADER_LINE_FACE_ID) |
1280 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1281 } |
1282 | |
1283 /* Clear IT. */ | |
1284 bzero (it, sizeof *it); | |
1285 it->current.overlay_string_index = -1; | |
1286 it->current.dpvec_index = -1; | |
1287 it->base_face_id = base_face_id; | |
1288 | |
1289 /* The window in which we iterate over current_buffer: */ | |
1290 XSETWINDOW (it->window, w); | |
1291 it->w = w; | |
1292 it->f = XFRAME (w->frame); | |
1293 | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1294 /* 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
|
1295 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
|
1296 && FRAME_WINDOW_P (it->f)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1297 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1298 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
|
1299 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
|
1300 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
|
1301 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
|
1302 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1303 |
25012 | 1304 /* If realized faces have been removed, e.g. because of face |
1305 attribute changes of named faces, recompute them. */ | |
1306 if (FRAME_FACE_CACHE (it->f)->used == 0) | |
1307 recompute_basic_faces (it->f); | |
1308 | |
1309 /* Current value of the `space-width', and 'height' properties. */ | |
1310 it->space_width = Qnil; | |
1311 it->font_height = Qnil; | |
1312 | |
1313 /* Are control characters displayed as `^C'? */ | |
1314 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1315 | |
1316 /* -1 means everything between a CR and the following line end | |
1317 is invisible. >0 means lines indented more than this value are | |
1318 invisible. */ | |
1319 it->selective = (INTEGERP (current_buffer->selective_display) | |
1320 ? XFASTINT (current_buffer->selective_display) | |
1321 : (!NILP (current_buffer->selective_display) | |
1322 ? -1 : 0)); | |
1323 it->selective_display_ellipsis_p | |
1324 = !NILP (current_buffer->selective_display_ellipses); | |
1325 | |
1326 /* Display table to use. */ | |
1327 it->dp = window_display_table (w); | |
1328 | |
1329 /* Are multibyte characters enabled in current_buffer? */ | |
1330 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1331 | |
1332 /* Non-zero if we should highlight the region. */ | |
1333 highlight_region_p | |
1334 = (!NILP (Vtransient_mark_mode) | |
1335 && !NILP (current_buffer->mark_active) | |
1336 && XMARKER (current_buffer->mark)->buffer != 0); | |
1337 | |
1338 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1339 start and end of a visible region in window IT->w. Set both to | |
1340 -1 to indicate no region. */ | |
1341 if (highlight_region_p | |
1342 /* Maybe highlight only in selected window. */ | |
1343 && (/* Either show region everywhere. */ | |
1344 highlight_nonselected_windows | |
1345 /* Or show region in the selected window. */ | |
1346 || w == XWINDOW (selected_window) | |
1347 /* Or show the region if we are in the mini-buffer and W is | |
1348 the window the mini-buffer refers to. */ | |
1349 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1350 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1351 { | |
1352 int charpos = marker_position (current_buffer->mark); | |
1353 it->region_beg_charpos = min (PT, charpos); | |
1354 it->region_end_charpos = max (PT, charpos); | |
1355 } | |
1356 else | |
1357 it->region_beg_charpos = it->region_end_charpos = -1; | |
1358 | |
1359 /* Get the position at which the redisplay_end_trigger hook should | |
1360 be run, if it is to be run at all. */ | |
1361 if (MARKERP (w->redisplay_end_trigger) | |
1362 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1363 it->redisplay_end_trigger_charpos | |
1364 = marker_position (w->redisplay_end_trigger); | |
1365 else if (INTEGERP (w->redisplay_end_trigger)) | |
1366 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1367 | |
1368 /* Correct bogus values of tab_width. */ | |
1369 it->tab_width = XINT (current_buffer->tab_width); | |
1370 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1371 it->tab_width = 8; | |
1372 | |
1373 /* Are lines in the display truncated? */ | |
1374 it->truncate_lines_p | |
1375 = (base_face_id != DEFAULT_FACE_ID | |
1376 || XINT (it->w->hscroll) | |
1377 || (truncate_partial_width_windows | |
1378 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1379 || !NILP (current_buffer->truncate_lines)); | |
1380 | |
1381 /* Get dimensions of truncation and continuation glyphs. These are | |
1382 displayed as bitmaps under X, so we don't need them for such | |
1383 frames. */ | |
1384 if (!FRAME_WINDOW_P (it->f)) | |
1385 { | |
1386 if (it->truncate_lines_p) | |
1387 { | |
1388 /* We will need the truncation glyph. */ | |
1389 xassert (it->glyph_row == NULL); | |
1390 produce_special_glyphs (it, IT_TRUNCATION); | |
1391 it->truncation_pixel_width = it->pixel_width; | |
1392 } | |
1393 else | |
1394 { | |
1395 /* We will need the continuation glyph. */ | |
1396 xassert (it->glyph_row == NULL); | |
1397 produce_special_glyphs (it, IT_CONTINUATION); | |
1398 it->continuation_pixel_width = it->pixel_width; | |
1399 } | |
1400 | |
1401 /* Reset these values to zero becaue the produce_special_glyphs | |
1402 above has changed them. */ | |
1403 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
|
1404 it->phys_ascent = it->phys_descent = 0; |
25012 | 1405 } |
1406 | |
1407 /* Set this after getting the dimensions of truncation and | |
1408 continuation glyphs, so that we don't produce glyphs when calling | |
1409 produce_special_glyphs, above. */ | |
1410 it->glyph_row = row; | |
1411 it->area = TEXT_AREA; | |
1412 | |
1413 /* Get the dimensions of the display area. The display area | |
1414 consists of the visible window area plus a horizontally scrolled | |
1415 part to the left of the window. All x-values are relative to the | |
1416 start of this total display area. */ | |
1417 if (base_face_id != DEFAULT_FACE_ID) | |
1418 { | |
1419 /* Mode lines, menu bar in terminal frames. */ | |
1420 it->first_visible_x = 0; | |
1421 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1422 } | |
1423 else | |
1424 { | |
1425 it->first_visible_x | |
1426 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1427 it->last_visible_x = (it->first_visible_x | |
1428 + window_box_width (w, TEXT_AREA)); | |
1429 | |
1430 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1431 the right margin. Otherwise, leave room for the continuation | |
1432 glyph(s). Truncation and continuation glyphs are not inserted | |
1433 for window-based redisplay. */ | |
1434 if (!FRAME_WINDOW_P (it->f)) | |
1435 { | |
1436 if (it->truncate_lines_p) | |
1437 it->last_visible_x -= it->truncation_pixel_width; | |
1438 else | |
1439 it->last_visible_x -= it->continuation_pixel_width; | |
1440 } | |
1441 | |
25546 | 1442 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1443 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1444 } |
1445 | |
1446 /* Leave room for a border glyph. */ | |
1447 if (!FRAME_WINDOW_P (it->f) | |
1448 && !WINDOW_RIGHTMOST_P (it->w)) | |
1449 it->last_visible_x -= 1; | |
1450 | |
1451 it->last_visible_y = window_text_bottom_y (w); | |
1452 | |
1453 /* For mode lines and alike, arrange for the first glyph having a | |
1454 left box line if the face specifies a box. */ | |
1455 if (base_face_id != DEFAULT_FACE_ID) | |
1456 { | |
1457 struct face *face; | |
1458 | |
1459 it->face_id = base_face_id; | |
1460 | |
1461 /* If we have a boxed mode line, make the first character appear | |
1462 with a left box line. */ | |
1463 face = FACE_FROM_ID (it->f, base_face_id); | |
1464 if (face->box != FACE_NO_BOX) | |
1465 it->start_of_box_run_p = 1; | |
1466 } | |
1467 | |
1468 /* If a buffer position was specified, set the iterator there, | |
1469 getting overlays and face properties from that position. */ | |
1470 if (charpos > 0) | |
1471 { | |
1472 it->end_charpos = ZV; | |
1473 it->face_id = -1; | |
1474 IT_CHARPOS (*it) = charpos; | |
1475 | |
1476 /* Compute byte position if not specified. */ | |
1477 if (bytepos <= 0) | |
1478 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1479 else | |
1480 IT_BYTEPOS (*it) = bytepos; | |
1481 | |
1482 /* Compute faces etc. */ | |
1483 reseat (it, it->current.pos, 1); | |
1484 } | |
1485 | |
1486 CHECK_IT (it); | |
1487 } | |
1488 | |
1489 | |
1490 /* Initialize IT for the display of window W with window start POS. */ | |
1491 | |
1492 void | |
1493 start_display (it, w, pos) | |
1494 struct it *it; | |
1495 struct window *w; | |
1496 struct text_pos pos; | |
1497 { | |
1498 int start_at_line_beg_p; | |
1499 struct glyph_row *row; | |
25546 | 1500 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1501 int first_y; |
1502 | |
1503 row = w->desired_matrix->rows + first_vpos; | |
1504 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1505 first_y = it->current_y; | |
1506 | |
1507 /* If window start is not at a line start, move back to the line | |
1508 start. This makes sure that we take continuation lines into | |
1509 account. */ | |
1510 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1511 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1512 if (!start_at_line_beg_p) | |
1513 reseat_at_previous_visible_line_start (it); | |
1514 | |
1515 /* If window start is not at a line start, skip forward to POS to | |
1516 get the correct continuation_lines_width and current_x. */ | |
1517 if (!start_at_line_beg_p) | |
1518 { | |
1519 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1520 | |
1521 /* If lines are continued, this line may end in the middle of a | |
1522 multi-glyph character (e.g. a control character displayed as | |
1523 \003, or in the middle of an overlay string). In this case | |
1524 move_it_to above will not have taken us to the start of | |
1525 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
|
1526 if (!it->truncate_lines_p) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1527 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1528 if (it->current_x > 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1529 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1530 if (it->current.dpvec_index >= 0 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1531 || it->current.overlay_string_index >= 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1532 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1533 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
|
1534 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
|
1535 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1536 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1537 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
|
1538 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1539 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1540 /* 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
|
1541 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
|
1542 fields in the iterator structure. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1543 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
|
1544 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 1545 } |
1546 | |
1547 it->current_y = first_y; | |
1548 it->vpos = 0; | |
1549 it->current_x = it->hpos = 0; | |
1550 } | |
1551 | |
1552 #if 0 /* Don't assert the following because start_display is sometimes | |
1553 called intentionally with a window start that is not at a | |
1554 line start. Please leave this code in as a comment. */ | |
1555 | |
1556 /* Window start should be on a line start, now. */ | |
1557 xassert (it->continuation_lines_width | |
1558 || IT_CHARPOS (it) == BEGV | |
1559 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1560 #endif /* 0 */ | |
1561 } | |
1562 | |
1563 | |
1564 /* Initialize IT for stepping through current_buffer in window W, | |
1565 starting at position POS that includes overlay string and display | |
1566 vector/ control character translation position information. */ | |
1567 | |
1568 static void | |
1569 init_from_display_pos (it, w, pos) | |
1570 struct it *it; | |
1571 struct window *w; | |
1572 struct display_pos *pos; | |
1573 { | |
1574 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1575 text, so we might end up at a position different from POS. This | |
1576 is only a problem when POS is a row start after a newline and an | |
1577 overlay starts there with an after-string, and the overlay has an | |
1578 invisible property. Since we don't skip invisible text in | |
1579 display_line and elsewhere immediately after consuming the | |
1580 newline before the row start, such a POS will not be in a string, | |
1581 but the call to init_iterator below will move us to the | |
1582 after-string. */ | |
1583 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1584 NULL, DEFAULT_FACE_ID); | |
1585 | |
1586 /* If position is within an overlay string, set up IT to | |
1587 the right overlay string. */ | |
1588 if (pos->overlay_string_index >= 0) | |
1589 { | |
1590 int relative_index; | |
1591 | |
1592 /* We already have the first chunk of overlay strings in | |
1593 IT->overlay_strings. Load more until the one for | |
1594 pos->overlay_string_index is in IT->overlay_strings. */ | |
1595 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1596 { | |
1597 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1598 it->current.overlay_string_index = 0; | |
1599 while (n--) | |
1600 { | |
1601 load_overlay_strings (it); | |
1602 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1603 } | |
1604 } | |
1605 | |
1606 it->current.overlay_string_index = pos->overlay_string_index; | |
1607 relative_index = (it->current.overlay_string_index | |
1608 % OVERLAY_STRING_CHUNK_SIZE); | |
1609 it->string = it->overlay_strings[relative_index]; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1610 xassert (STRINGP (it->string)); |
25012 | 1611 it->current.string_pos = pos->string_pos; |
1612 it->method = next_element_from_string; | |
1613 } | |
1614 else if (CHARPOS (pos->string_pos) >= 0) | |
1615 { | |
1616 /* Recorded position is not in an overlay string, but in another | |
1617 string. This can only be a string from a `display' property. | |
1618 IT should already be filled with that string. */ | |
1619 it->current.string_pos = pos->string_pos; | |
1620 xassert (STRINGP (it->string)); | |
1621 } | |
1622 | |
1623 /* Restore position in display vector translations or control | |
1624 character translations. */ | |
1625 if (pos->dpvec_index >= 0) | |
1626 { | |
1627 /* This fills IT->dpvec. */ | |
1628 get_next_display_element (it); | |
1629 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1630 it->current.dpvec_index = pos->dpvec_index; | |
1631 } | |
1632 | |
1633 CHECK_IT (it); | |
1634 } | |
1635 | |
1636 | |
1637 /* Initialize IT for stepping through current_buffer in window W | |
1638 starting at ROW->start. */ | |
1639 | |
1640 static void | |
1641 init_to_row_start (it, w, row) | |
1642 struct it *it; | |
1643 struct window *w; | |
1644 struct glyph_row *row; | |
1645 { | |
1646 init_from_display_pos (it, w, &row->start); | |
1647 it->continuation_lines_width = row->continuation_lines_width; | |
1648 CHECK_IT (it); | |
1649 } | |
1650 | |
1651 | |
1652 /* Initialize IT for stepping through current_buffer in window W | |
1653 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1654 | |
1655 static void | |
1656 init_to_row_end (it, w, row) | |
1657 struct it *it; | |
1658 struct window *w; | |
1659 struct glyph_row *row; | |
1660 { | |
1661 init_from_display_pos (it, w, &row->end); | |
1662 | |
1663 if (row->continued_p) | |
1664 it->continuation_lines_width = (row->continuation_lines_width | |
1665 + row->pixel_width); | |
1666 CHECK_IT (it); | |
1667 } | |
1668 | |
1669 | |
1670 | |
1671 | |
1672 /*********************************************************************** | |
1673 Text properties | |
1674 ***********************************************************************/ | |
1675 | |
1676 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1677 overlay changes. Set IT->stop_charpos to the next position where | |
1678 to stop. */ | |
1679 | |
1680 static void | |
1681 handle_stop (it) | |
1682 struct it *it; | |
1683 { | |
1684 enum prop_handled handled; | |
1685 int handle_overlay_change_p = 1; | |
1686 struct props *p; | |
1687 | |
1688 it->dpvec = NULL; | |
1689 it->current.dpvec_index = -1; | |
1690 | |
1691 do | |
1692 { | |
1693 handled = HANDLED_NORMALLY; | |
1694 | |
1695 /* Call text property handlers. */ | |
1696 for (p = it_props; p->handler; ++p) | |
1697 { | |
1698 handled = p->handler (it); | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1699 |
25012 | 1700 if (handled == HANDLED_RECOMPUTE_PROPS) |
1701 break; | |
1702 else if (handled == HANDLED_RETURN) | |
1703 return; | |
1704 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1705 handle_overlay_change_p = 0; | |
1706 } | |
1707 | |
1708 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1709 { | |
1710 /* Don't check for overlay strings below when set to deliver | |
1711 characters from a display vector. */ | |
1712 if (it->method == next_element_from_display_vector) | |
1713 handle_overlay_change_p = 0; | |
1714 | |
1715 /* Handle overlay changes. */ | |
1716 if (handle_overlay_change_p) | |
1717 handled = handle_overlay_change (it); | |
1718 | |
1719 /* Determine where to stop next. */ | |
1720 if (handled == HANDLED_NORMALLY) | |
1721 compute_stop_pos (it); | |
1722 } | |
1723 } | |
1724 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1725 } | |
1726 | |
1727 | |
1728 /* Compute IT->stop_charpos from text property and overlay change | |
1729 information for IT's current position. */ | |
1730 | |
1731 static void | |
1732 compute_stop_pos (it) | |
1733 struct it *it; | |
1734 { | |
1735 register INTERVAL iv, next_iv; | |
1736 Lisp_Object object, limit, position; | |
1737 | |
1738 /* If nowhere else, stop at the end. */ | |
1739 it->stop_charpos = it->end_charpos; | |
1740 | |
1741 if (STRINGP (it->string)) | |
1742 { | |
1743 /* Strings are usually short, so don't limit the search for | |
1744 properties. */ | |
1745 object = it->string; | |
1746 limit = Qnil; | |
1747 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1748 } | |
1749 else | |
1750 { | |
1751 int charpos; | |
1752 | |
1753 /* If next overlay change is in front of the current stop pos | |
1754 (which is IT->end_charpos), stop there. Note: value of | |
1755 next_overlay_change is point-max if no overlay change | |
1756 follows. */ | |
1757 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1758 if (charpos < it->stop_charpos) | |
1759 it->stop_charpos = charpos; | |
1760 | |
1761 /* If showing the region, we have to stop at the region | |
1762 start or end because the face might change there. */ | |
1763 if (it->region_beg_charpos > 0) | |
1764 { | |
1765 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1766 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1767 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1768 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1769 } | |
1770 | |
1771 /* Set up variables for computing the stop position from text | |
1772 property changes. */ | |
1773 XSETBUFFER (object, current_buffer); | |
1774 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1775 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1776 | |
1777 } | |
1778 | |
1779 /* Get the interval containing IT's position. Value is a null | |
1780 interval if there isn't such an interval. */ | |
1781 iv = validate_interval_range (object, &position, &position, 0); | |
1782 if (!NULL_INTERVAL_P (iv)) | |
1783 { | |
1784 Lisp_Object values_here[LAST_PROP_IDX]; | |
1785 struct props *p; | |
1786 | |
1787 /* Get properties here. */ | |
1788 for (p = it_props; p->handler; ++p) | |
1789 values_here[p->idx] = textget (iv->plist, *p->name); | |
1790 | |
1791 /* Look for an interval following iv that has different | |
1792 properties. */ | |
1793 for (next_iv = next_interval (iv); | |
1794 (!NULL_INTERVAL_P (next_iv) | |
1795 && (NILP (limit) | |
1796 || XFASTINT (limit) > next_iv->position)); | |
1797 next_iv = next_interval (next_iv)) | |
1798 { | |
1799 for (p = it_props; p->handler; ++p) | |
1800 { | |
1801 Lisp_Object new_value; | |
1802 | |
1803 new_value = textget (next_iv->plist, *p->name); | |
1804 if (!EQ (values_here[p->idx], new_value)) | |
1805 break; | |
1806 } | |
1807 | |
1808 if (p->handler) | |
1809 break; | |
1810 } | |
1811 | |
1812 if (!NULL_INTERVAL_P (next_iv)) | |
1813 { | |
1814 if (INTEGERP (limit) | |
1815 && next_iv->position >= XFASTINT (limit)) | |
1816 /* No text property change up to limit. */ | |
1817 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1818 else | |
1819 /* Text properties change in next_iv. */ | |
1820 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1821 } | |
1822 } | |
1823 | |
1824 xassert (STRINGP (it->string) | |
1825 || (it->stop_charpos >= BEGV | |
1826 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1827 } | |
1828 | |
1829 | |
1830 /* Return the position of the next overlay change after POS in | |
1831 current_buffer. Value is point-max if no overlay change | |
1832 follows. This is like `next-overlay-change' but doesn't use | |
1833 xmalloc. */ | |
1834 | |
1835 static int | |
1836 next_overlay_change (pos) | |
1837 int pos; | |
1838 { | |
1839 int noverlays; | |
1840 int endpos; | |
1841 Lisp_Object *overlays; | |
1842 int len; | |
1843 int i; | |
1844 | |
1845 /* Get all overlays at the given position. */ | |
1846 len = 10; | |
1847 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
|
1848 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1849 if (noverlays > len) |
1850 { | |
1851 len = noverlays; | |
1852 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
|
1853 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 1854 } |
1855 | |
1856 /* If any of these overlays ends before endpos, | |
1857 use its ending point instead. */ | |
1858 for (i = 0; i < noverlays; ++i) | |
1859 { | |
1860 Lisp_Object oend; | |
1861 int oendpos; | |
1862 | |
1863 oend = OVERLAY_END (overlays[i]); | |
1864 oendpos = OVERLAY_POSITION (oend); | |
1865 endpos = min (endpos, oendpos); | |
1866 } | |
1867 | |
1868 return endpos; | |
1869 } | |
1870 | |
1871 | |
1872 | |
1873 /*********************************************************************** | |
1874 Fontification | |
1875 ***********************************************************************/ | |
1876 | |
1877 /* Handle changes in the `fontified' property of the current buffer by | |
1878 calling hook functions from Qfontification_functions to fontify | |
1879 regions of text. */ | |
1880 | |
1881 static enum prop_handled | |
1882 handle_fontified_prop (it) | |
1883 struct it *it; | |
1884 { | |
1885 Lisp_Object prop, pos; | |
1886 enum prop_handled handled = HANDLED_NORMALLY; | |
1887 | |
1888 /* Get the value of the `fontified' property at IT's current buffer | |
1889 position. (The `fontified' property doesn't have a special | |
1890 meaning in strings.) If the value is nil, call functions from | |
1891 Qfontification_functions. */ | |
1892 if (!STRINGP (it->string) | |
1893 && it->s == NULL | |
1894 && !NILP (Vfontification_functions) | |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1895 && !NILP (Vrun_hooks) |
25012 | 1896 && (pos = make_number (IT_CHARPOS (*it)), |
1897 prop = Fget_char_property (pos, Qfontified, Qnil), | |
1898 NILP (prop))) | |
1899 { | |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1900 int count = specpdl_ptr - specpdl; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1901 Lisp_Object val; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1902 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1903 val = Vfontification_functions; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1904 specbind (Qfontification_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1905 specbind (Qafter_change_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1906 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1907 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
|
1908 safe_call1 (val, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1909 else |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1910 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1911 Lisp_Object globals, fn; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1912 struct gcpro gcpro1, gcpro2; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1913 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1914 globals = Qnil; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1915 GCPRO2 (val, globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1916 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1917 for (; CONSP (val); val = XCDR (val)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1918 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1919 fn = XCAR (val); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1920 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1921 if (EQ (fn, Qt)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1922 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1923 /* 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
|
1924 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
|
1925 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
|
1926 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
|
1927 loop. */ |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1928 for (globals = Fdefault_value (Qfontification_functions); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1929 CONSP (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1930 globals = XCDR (globals)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1931 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1932 fn = XCAR (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1933 if (!EQ (fn, Qt)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1934 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1935 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1936 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1937 else |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1938 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1939 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1940 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1941 UNGCPRO; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1942 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1943 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
1944 unbind_to (count, Qnil); |
25012 | 1945 |
1946 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
1947 something. This avoids an endless loop if they failed to | |
1948 fontify the text for which reason ever. */ | |
1949 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
1950 handled = HANDLED_RECOMPUTE_PROPS; | |
1951 } | |
1952 | |
1953 return handled; | |
1954 } | |
1955 | |
1956 | |
1957 | |
1958 /*********************************************************************** | |
1959 Faces | |
1960 ***********************************************************************/ | |
1961 | |
1962 /* Set up iterator IT from face properties at its current position. | |
1963 Called from handle_stop. */ | |
1964 | |
1965 static enum prop_handled | |
1966 handle_face_prop (it) | |
1967 struct it *it; | |
1968 { | |
1969 int new_face_id, next_stop; | |
1970 | |
1971 if (!STRINGP (it->string)) | |
1972 { | |
1973 new_face_id | |
1974 = face_at_buffer_position (it->w, | |
1975 IT_CHARPOS (*it), | |
1976 it->region_beg_charpos, | |
1977 it->region_end_charpos, | |
1978 &next_stop, | |
1979 (IT_CHARPOS (*it) | |
1980 + TEXT_PROP_DISTANCE_LIMIT), | |
1981 0); | |
1982 | |
1983 /* Is this a start of a run of characters with box face? | |
1984 Caveat: this can be called for a freshly initialized | |
1985 iterator; face_id is -1 is this case. We know that the new | |
1986 face will not change until limit, i.e. if the new face has a | |
1987 box, all characters up to limit will have one. But, as | |
1988 usual, we don't know whether limit is really the end. */ | |
1989 if (new_face_id != it->face_id) | |
1990 { | |
1991 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1992 | |
1993 /* If new face has a box but old face has not, this is | |
1994 the start of a run of characters with box, i.e. it has | |
1995 a shadow on the left side. The value of face_id of the | |
1996 iterator will be -1 if this is the initial call that gets | |
1997 the face. In this case, we have to look in front of IT's | |
1998 position and see whether there is a face != new_face_id. */ | |
1999 it->start_of_box_run_p | |
2000 = (new_face->box != FACE_NO_BOX | |
2001 && (it->face_id >= 0 | |
2002 || IT_CHARPOS (*it) == BEG | |
2003 || new_face_id != face_before_it_pos (it))); | |
2004 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2005 } | |
2006 } | |
2007 else | |
2008 { | |
2009 new_face_id | |
2010 = face_at_string_position (it->w, | |
2011 it->string, | |
2012 IT_STRING_CHARPOS (*it), | |
2013 (it->current.overlay_string_index >= 0 | |
2014 ? IT_CHARPOS (*it) | |
2015 : 0), | |
2016 it->region_beg_charpos, | |
2017 it->region_end_charpos, | |
2018 &next_stop, | |
2019 it->base_face_id); | |
2020 | |
2021 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
2022 /* If IT is used to display a mode line we would really like to | |
2023 use the mode line face instead of the frame's default face. */ | |
2024 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
2025 && new_face_id == DEFAULT_FACE_ID) | |
2026 new_face_id = MODE_LINE_FACE_ID; | |
2027 #endif | |
2028 | |
2029 /* Is this a start of a run of characters with box? Caveat: | |
2030 this can be called for a freshly allocated iterator; face_id | |
2031 is -1 is this case. We know that the new face will not | |
2032 change until the next check pos, i.e. if the new face has a | |
2033 box, all characters up to that position will have a | |
2034 box. But, as usual, we don't know whether that position | |
2035 is really the end. */ | |
2036 if (new_face_id != it->face_id) | |
2037 { | |
2038 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2039 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
2040 | |
2041 /* If new face has a box but old face hasn't, this is the | |
2042 start of a run of characters with box, i.e. it has a | |
2043 shadow on the left side. */ | |
2044 it->start_of_box_run_p | |
2045 = new_face->box && (old_face == NULL || !old_face->box); | |
2046 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2047 } | |
2048 } | |
2049 | |
2050 it->face_id = new_face_id; | |
2051 return HANDLED_NORMALLY; | |
2052 } | |
2053 | |
2054 | |
2055 /* Compute the face one character before or after the current position | |
2056 of IT. BEFORE_P non-zero means get the face in front of IT's | |
2057 position. Value is the id of the face. */ | |
2058 | |
2059 static int | |
2060 face_before_or_after_it_pos (it, before_p) | |
2061 struct it *it; | |
2062 int before_p; | |
2063 { | |
2064 int face_id, limit; | |
2065 int next_check_charpos; | |
2066 struct text_pos pos; | |
2067 | |
2068 xassert (it->s == NULL); | |
2069 | |
2070 if (STRINGP (it->string)) | |
2071 { | |
2072 /* No face change past the end of the string (for the case | |
2073 we are padding with spaces). No face change before the | |
2074 string start. */ | |
2075 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
2076 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
2077 return it->face_id; | |
2078 | |
2079 /* Set pos to the position before or after IT's current position. */ | |
2080 if (before_p) | |
2081 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
2082 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2083 /* 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
|
2084 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2085 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2086 ? 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
|
2087 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 2088 |
2089 /* Get the face for ASCII, or unibyte. */ | |
2090 face_id | |
2091 = face_at_string_position (it->w, | |
2092 it->string, | |
2093 CHARPOS (pos), | |
2094 (it->current.overlay_string_index >= 0 | |
2095 ? IT_CHARPOS (*it) | |
2096 : 0), | |
2097 it->region_beg_charpos, | |
2098 it->region_end_charpos, | |
2099 &next_check_charpos, | |
2100 it->base_face_id); | |
2101 | |
2102 /* Correct the face for charsets different from ASCII. Do it | |
2103 for the multibyte case only. The face returned above is | |
2104 suitable for unibyte text if IT->string is unibyte. */ | |
2105 if (STRING_MULTIBYTE (it->string)) | |
2106 { | |
2107 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
2108 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
|
2109 int c, len; |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2110 struct face *face = FACE_FROM_ID (it->f, face_id); |
25012 | 2111 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
2112 c = string_char_and_length (p, rest, &len); |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2113 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2114 } |
2115 } | |
2116 else | |
2117 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2118 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
|
2119 || (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
|
2120 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2121 |
25012 | 2122 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
2123 pos = it->current.pos; | |
2124 | |
2125 if (before_p) | |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2126 DEC_TEXT_POS (pos, it->multibyte_p); |
25012 | 2127 else |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2128 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2129 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2130 /* 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
|
2131 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2132 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
|
2133 else |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2134 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
|
2135 } |
25012 | 2136 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2137 face_id = face_at_buffer_position (it->w, | |
2138 CHARPOS (pos), | |
2139 it->region_beg_charpos, | |
2140 it->region_end_charpos, | |
2141 &next_check_charpos, | |
2142 limit, 0); | |
2143 | |
2144 /* Correct the face for charsets different from ASCII. Do it | |
2145 for the multibyte case only. The face returned above is | |
2146 suitable for unibyte text if current_buffer is unibyte. */ | |
2147 if (it->multibyte_p) | |
2148 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2149 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos)); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2150 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
|
2151 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2152 } |
2153 } | |
2154 | |
2155 return face_id; | |
2156 } | |
2157 | |
2158 | |
2159 | |
2160 /*********************************************************************** | |
2161 Invisible text | |
2162 ***********************************************************************/ | |
2163 | |
2164 /* Set up iterator IT from invisible properties at its current | |
2165 position. Called from handle_stop. */ | |
2166 | |
2167 static enum prop_handled | |
2168 handle_invisible_prop (it) | |
2169 struct it *it; | |
2170 { | |
2171 enum prop_handled handled = HANDLED_NORMALLY; | |
2172 | |
2173 if (STRINGP (it->string)) | |
2174 { | |
2175 extern Lisp_Object Qinvisible; | |
2176 Lisp_Object prop, end_charpos, limit, charpos; | |
2177 | |
2178 /* Get the value of the invisible text property at the | |
2179 current position. Value will be nil if there is no such | |
2180 property. */ | |
2181 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2182 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2183 | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2184 if (!NILP (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2185 && IT_STRING_CHARPOS (*it) < it->end_charpos) |
25012 | 2186 { |
2187 handled = HANDLED_RECOMPUTE_PROPS; | |
2188 | |
2189 /* Get the position at which the next change of the | |
2190 invisible text property can be found in IT->string. | |
2191 Value will be nil if the property value is the same for | |
2192 all the rest of IT->string. */ | |
2193 XSETINT (limit, XSTRING (it->string)->size); | |
2194 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2195 it->string, limit); | |
2196 | |
2197 /* Text at current position is invisible. The next | |
2198 change in the property is at position end_charpos. | |
2199 Move IT's current position to that position. */ | |
2200 if (INTEGERP (end_charpos) | |
2201 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2202 { | |
2203 struct text_pos old; | |
2204 old = it->current.string_pos; | |
2205 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2206 compute_string_pos (&it->current.string_pos, old, it->string); | |
2207 } | |
2208 else | |
2209 { | |
2210 /* The rest of the string is invisible. If this is an | |
2211 overlay string, proceed with the next overlay string | |
2212 or whatever comes and return a character from there. */ | |
2213 if (it->current.overlay_string_index >= 0) | |
2214 { | |
2215 next_overlay_string (it); | |
2216 /* Don't check for overlay strings when we just | |
2217 finished processing them. */ | |
2218 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2219 } | |
2220 else | |
2221 { | |
2222 struct Lisp_String *s = XSTRING (it->string); | |
2223 IT_STRING_CHARPOS (*it) = s->size; | |
2224 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2225 } | |
2226 } | |
2227 } | |
2228 } | |
2229 else | |
2230 { | |
2231 int visible_p, newpos, next_stop; | |
2232 Lisp_Object pos, prop; | |
2233 | |
2234 /* First of all, is there invisible text at this position? */ | |
2235 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2236 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2237 | |
2238 /* 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
|
2239 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
|
2240 && IT_CHARPOS (*it) < it->end_charpos) |
25012 | 2241 { |
2242 /* Record whether we have to display an ellipsis for the | |
2243 invisible text. */ | |
2244 int display_ellipsis_p | |
2245 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2246 | |
2247 handled = HANDLED_RECOMPUTE_PROPS; | |
2248 | |
2249 /* Loop skipping over invisible text. The loop is left at | |
2250 ZV or with IT on the first char being visible again. */ | |
2251 do | |
2252 { | |
2253 /* Try to skip some invisible text. Return value is the | |
2254 position reached which can be equal to IT's position | |
2255 if there is nothing invisible here. This skips both | |
2256 over invisible text properties and overlays with | |
2257 invisible property. */ | |
2258 newpos = skip_invisible (IT_CHARPOS (*it), | |
2259 &next_stop, ZV, it->window); | |
2260 | |
2261 /* If we skipped nothing at all we weren't at invisible | |
2262 text in the first place. If everything to the end of | |
2263 the buffer was skipped, end the loop. */ | |
2264 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2265 visible_p = 1; | |
2266 else | |
2267 { | |
2268 /* We skipped some characters but not necessarily | |
2269 all there are. Check if we ended up on visible | |
2270 text. Fget_char_property returns the property of | |
2271 the char before the given position, i.e. if we | |
2272 get visible_p = 1, this means that the char at | |
2273 newpos is visible. */ | |
2274 XSETFASTINT (pos, newpos); | |
2275 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2276 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2277 } | |
2278 | |
2279 /* If we ended up on invisible text, proceed to | |
2280 skip starting with next_stop. */ | |
2281 if (!visible_p) | |
2282 IT_CHARPOS (*it) = next_stop; | |
2283 } | |
2284 while (!visible_p); | |
2285 | |
2286 /* The position newpos is now either ZV or on visible text. */ | |
2287 IT_CHARPOS (*it) = newpos; | |
2288 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2289 | |
2290 /* Maybe return `...' next for the end of the invisible text. */ | |
2291 if (display_ellipsis_p) | |
2292 { | |
2293 if (it->dp | |
2294 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2295 { | |
2296 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2297 it->dpvec = v->contents; | |
2298 it->dpend = v->contents + v->size; | |
2299 } | |
2300 else | |
2301 { | |
2302 /* Default `...'. */ | |
2303 it->dpvec = default_invis_vector; | |
2304 it->dpend = default_invis_vector + 3; | |
2305 } | |
2306 | |
2307 /* The ellipsis display does not replace the display of | |
2308 the character at the new position. Indicate this by | |
2309 setting IT->dpvec_char_len to zero. */ | |
2310 it->dpvec_char_len = 0; | |
2311 | |
2312 it->current.dpvec_index = 0; | |
2313 it->method = next_element_from_display_vector; | |
2314 } | |
2315 } | |
2316 } | |
2317 | |
2318 return handled; | |
2319 } | |
2320 | |
2321 | |
277 | 2322 |
25012 | 2323 /*********************************************************************** |
2324 'display' property | |
2325 ***********************************************************************/ | |
2326 | |
2327 /* Set up iterator IT from `display' property at its current position. | |
2328 Called from handle_stop. */ | |
2329 | |
2330 static enum prop_handled | |
2331 handle_display_prop (it) | |
2332 struct it *it; | |
2333 { | |
2334 Lisp_Object prop, object; | |
2335 struct text_pos *position; | |
2336 int space_or_image_found_p; | |
2337 | |
2338 if (STRINGP (it->string)) | |
2339 { | |
2340 object = it->string; | |
2341 position = &it->current.string_pos; | |
2342 } | |
2343 else | |
2344 { | |
2345 object = Qnil; | |
2346 position = &it->current.pos; | |
2347 } | |
2348 | |
2349 /* Reset those iterator values set from display property values. */ | |
2350 it->font_height = Qnil; | |
2351 it->space_width = Qnil; | |
2352 it->voffset = 0; | |
2353 | |
2354 /* We don't support recursive `display' properties, i.e. string | |
2355 values that have a string `display' property, that have a string | |
2356 `display' property etc. */ | |
2357 if (!it->string_from_display_prop_p) | |
2358 it->area = TEXT_AREA; | |
2359 | |
2360 prop = Fget_char_property (make_number (position->charpos), | |
2361 Qdisplay, object); | |
2362 if (NILP (prop)) | |
2363 return HANDLED_NORMALLY; | |
2364 | |
2365 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
|
2366 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2367 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2368 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2369 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2370 /* A list of sub-properties. */ |
25012 | 2371 while (CONSP (prop)) |
2372 { | |
2373 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2374 space_or_image_found_p = 1; | |
2375 prop = XCDR (prop); | |
2376 } | |
2377 } | |
2378 else if (VECTORP (prop)) | |
2379 { | |
2380 int i; | |
2381 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2382 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2383 object, position)) | |
2384 space_or_image_found_p = 1; | |
2385 } | |
2386 else | |
2387 { | |
2388 if (handle_single_display_prop (it, prop, object, position)) | |
2389 space_or_image_found_p = 1; | |
2390 } | |
2391 | |
2392 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2393 } | |
2394 | |
2395 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2396 /* Value is the position of the end of the `display' property starting |
25012 | 2397 at START_POS in OBJECT. */ |
2398 | |
2399 static struct text_pos | |
2400 display_prop_end (it, object, start_pos) | |
2401 struct it *it; | |
2402 Lisp_Object object; | |
2403 struct text_pos start_pos; | |
2404 { | |
2405 Lisp_Object end; | |
2406 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2407 |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2408 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
|
2409 Qdisplay, object, Qnil); |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2410 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2411 if (STRINGP (object)) |
25012 | 2412 compute_string_pos (&end_pos, start_pos, it->string); |
2413 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2414 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2415 |
2416 return end_pos; | |
2417 } | |
2418 | |
2419 | |
2420 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2421 is the object in which the `display' property was found. *POSITION | |
2422 is the position at which it was found. | |
2423 | |
2424 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2425 end position of the `display' property. | |
2426 | |
2427 Value is non-zero if a `space' or `image' property value was found. */ | |
2428 | |
2429 static int | |
2430 handle_single_display_prop (it, prop, object, position) | |
2431 struct it *it; | |
2432 Lisp_Object prop; | |
2433 Lisp_Object object; | |
2434 struct text_pos *position; | |
2435 { | |
2436 Lisp_Object value; | |
2437 int space_or_image_found_p = 0; | |
2438 Lisp_Object form; | |
2439 | |
25614 | 2440 /* 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
|
2441 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2442 form = Qt; |
25614 | 2443 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2444 { |
2445 prop = XCDR (prop); | |
2446 if (!CONSP (prop)) | |
2447 return 0; | |
2448 form = XCAR (prop); | |
2449 prop = XCDR (prop); | |
2450 } | |
2451 | |
2452 if (!NILP (form) && !EQ (form, Qt)) | |
2453 { | |
2454 struct gcpro gcpro1; | |
2455 struct text_pos end_pos, pt; | |
2456 | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2457 GCPRO1 (form); |
25012 | 2458 end_pos = display_prop_end (it, object, *position); |
2459 | |
2460 /* Temporarily set point to the end position, and then evaluate | |
2461 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
|
2462 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2463 { |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2464 CHARPOS (pt) = PT; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2465 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
|
2466 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
|
2467 } |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2468 |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2469 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
|
2470 |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2471 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2472 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
25012 | 2473 UNGCPRO; |
2474 } | |
2475 | |
2476 if (NILP (form)) | |
2477 return 0; | |
2478 | |
2479 if (CONSP (prop) | |
2480 && EQ (XCAR (prop), Qheight) | |
2481 && CONSP (XCDR (prop))) | |
2482 { | |
2483 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2484 return 0; | |
2485 | |
2486 /* `(height HEIGHT)'. */ | |
2487 it->font_height = XCAR (XCDR (prop)); | |
2488 if (!NILP (it->font_height)) | |
2489 { | |
2490 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2491 int new_height = -1; | |
2492 | |
2493 if (CONSP (it->font_height) | |
2494 && (EQ (XCAR (it->font_height), Qplus) | |
2495 || EQ (XCAR (it->font_height), Qminus)) | |
2496 && CONSP (XCDR (it->font_height)) | |
2497 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2498 { | |
2499 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2500 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2501 if (EQ (XCAR (it->font_height), Qplus)) | |
2502 steps = - steps; | |
2503 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2504 } | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2505 else if (FUNCTIONP (it->font_height)) |
25012 | 2506 { |
2507 /* Call function with current height as argument. | |
2508 Value is the new height. */ | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2509 Lisp_Object height; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2510 height = safe_call1 (it->font_height, |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2511 face->lface[LFACE_HEIGHT_INDEX]); |
25012 | 2512 if (NUMBERP (height)) |
2513 new_height = XFLOATINT (height); | |
2514 } | |
2515 else if (NUMBERP (it->font_height)) | |
2516 { | |
2517 /* Value is a multiple of the canonical char height. */ | |
2518 struct face *face; | |
2519 | |
2520 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2521 new_height = (XFLOATINT (it->font_height) | |
2522 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2523 } | |
2524 else | |
2525 { | |
2526 /* Evaluate IT->font_height with `height' bound to the | |
2527 current specified height to get the new height. */ | |
2528 Lisp_Object value; | |
2529 int count = specpdl_ptr - specpdl; | |
2530 | |
2531 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
|
2532 value = safe_eval (it->font_height); |
25012 | 2533 unbind_to (count, Qnil); |
2534 | |
2535 if (NUMBERP (value)) | |
2536 new_height = XFLOATINT (value); | |
2537 } | |
2538 | |
2539 if (new_height > 0) | |
2540 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2541 } | |
2542 } | |
2543 else if (CONSP (prop) | |
2544 && EQ (XCAR (prop), Qspace_width) | |
2545 && CONSP (XCDR (prop))) | |
2546 { | |
2547 /* `(space_width WIDTH)'. */ | |
2548 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2549 return 0; | |
2550 | |
2551 value = XCAR (XCDR (prop)); | |
2552 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2553 it->space_width = value; | |
2554 } | |
2555 else if (CONSP (prop) | |
2556 && EQ (XCAR (prop), Qraise) | |
2557 && CONSP (XCDR (prop))) | |
2558 { | |
2559 /* `(raise FACTOR)'. */ | |
2560 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2561 return 0; | |
2562 | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2563 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2564 value = XCAR (XCDR (prop)); |
2565 if (NUMBERP (value)) | |
2566 { | |
2567 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2568 it->voffset = - (XFLOATINT (value) | |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
2569 * (FONT_HEIGHT (face->font))); |
25012 | 2570 } |
2571 #endif /* HAVE_WINDOW_SYSTEM */ | |
2572 } | |
2573 else if (!it->string_from_display_prop_p) | |
2574 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2575 /* `((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
|
2576 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2577 Lisp_Object location, value; |
2578 struct text_pos start_pos; | |
2579 int valid_p; | |
2580 | |
2581 /* Characters having this form of property are not displayed, so | |
2582 we have to find the end of the property. */ | |
2583 start_pos = *position; | |
2584 *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
|
2585 value = Qnil; |
25012 | 2586 |
2587 /* Let's stop at the new position and assume that all | |
2588 text properties change there. */ | |
2589 it->stop_charpos = position->charpos; | |
2590 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2591 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2592 if (CONSP (prop) && CONSP (XCAR (prop))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2593 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2594 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2595 |
25012 | 2596 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2597 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2598 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2599 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2600 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2601 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2602 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2603 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2604 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2605 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2606 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2607 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2608 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2609 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2610 if (EQ (location, Qunbound)) |
25012 | 2611 { |
2612 location = Qnil; | |
2613 value = prop; | |
2614 } | |
2615 | |
2616 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2617 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2618 valid_p = STRINGP (value); |
2619 else | |
2620 valid_p = (STRINGP (value) | |
2621 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2622 || valid_image_p (value)); | |
2623 #else /* not HAVE_WINDOW_SYSTEM */ | |
2624 valid_p = STRINGP (value); | |
2625 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2626 | |
2627 if ((EQ (location, Qleft_margin) | |
2628 || EQ (location, Qright_margin) | |
2629 || NILP (location)) | |
2630 && valid_p) | |
2631 { | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2632 space_or_image_found_p = 1; |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2633 |
25012 | 2634 /* Save current settings of IT so that we can restore them |
2635 when we are finished with the glyph property value. */ | |
2636 push_it (it); | |
2637 | |
2638 if (NILP (location)) | |
2639 it->area = TEXT_AREA; | |
2640 else if (EQ (location, Qleft_margin)) | |
2641 it->area = LEFT_MARGIN_AREA; | |
2642 else | |
2643 it->area = RIGHT_MARGIN_AREA; | |
2644 | |
2645 if (STRINGP (value)) | |
2646 { | |
2647 it->string = value; | |
2648 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2649 it->current.overlay_string_index = -1; | |
2650 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2651 it->end_charpos = it->string_nchars | |
2652 = XSTRING (it->string)->size; | |
2653 it->method = next_element_from_string; | |
2654 it->stop_charpos = 0; | |
2655 it->string_from_display_prop_p = 1; | |
2656 } | |
2657 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2658 { | |
2659 it->method = next_element_from_stretch; | |
2660 it->object = value; | |
2661 it->current.pos = it->position = start_pos; | |
2662 } | |
2663 #ifdef HAVE_WINDOW_SYSTEM | |
2664 else | |
2665 { | |
2666 it->what = IT_IMAGE; | |
2667 it->image_id = lookup_image (it->f, value); | |
2668 it->position = start_pos; | |
2669 it->object = NILP (object) ? it->w->buffer : object; | |
2670 it->method = next_element_from_image; | |
2671 | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
2672 /* Say that we haven't consumed the characters with |
25012 | 2673 `display' property yet. The call to pop_it in |
2674 set_iterator_to_next will clean this up. */ | |
2675 *position = start_pos; | |
2676 } | |
2677 #endif /* HAVE_WINDOW_SYSTEM */ | |
2678 } | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2679 else |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2680 /* 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
|
2681 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
|
2682 *position = start_pos; |
25012 | 2683 } |
2684 | |
2685 return space_or_image_found_p; | |
2686 } | |
2687 | |
2688 | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2689 /* 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
|
2690 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2691 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2692 static int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2693 single_display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2694 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2695 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2696 /* Skip over `when FORM'. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2697 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2698 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2699 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2700 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2701 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2702 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2703 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2704 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2705 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2706 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2707 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2708 /* 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
|
2709 we don't need to treat text as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2710 if (EQ (XCAR (prop), Qmargin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2711 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2712 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2713 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2714 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2715 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2716 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2717 if (!CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2718 || EQ (XCAR (prop), Qleft_margin) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2719 || EQ (XCAR (prop), Qright_margin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2720 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2721 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2722 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2723 return CONSP (prop) && EQ (XCAR (prop), Qimage); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2724 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2725 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2726 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2727 /* 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
|
2728 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2729 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2730 int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2731 display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2732 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2733 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2734 if (CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2735 && CONSP (XCAR (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2736 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2737 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2738 /* A list of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2739 while (CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2740 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2741 if (single_display_prop_intangible_p (XCAR (prop))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2742 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2743 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2744 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2745 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2746 else if (VECTORP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2747 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2748 /* A vector of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2749 int i; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2750 for (i = 0; i < XVECTOR (prop)->size; ++i) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2751 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
|
2752 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2753 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2754 else |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2755 return single_display_prop_intangible_p (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2756 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2757 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2758 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2759 |
25012 | 2760 |
2761 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2762 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2763 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2764 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2765 /* 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
|
2766 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2767 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2768 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2769 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2770 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2771 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2772 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2773 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2774 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2775 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2776 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2777 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2778 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2779 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2780 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2781 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2782 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2783 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2784 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2785 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2786 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2787 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2788 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2789 /* 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
|
2790 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
|
2791 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
|
2792 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
|
2793 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2794 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2795 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2796 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
|
2797 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2798 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2799 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2800 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2801 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2802 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2803 /* 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
|
2804 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2805 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
|
2806 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2807 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2808 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2809 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2810 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2811 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2812 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2813 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2814 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2815 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2816 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2817 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2818 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2819 /*********************************************************************** |
25012 | 2820 Overlay strings |
2821 ***********************************************************************/ | |
2822 | |
2823 /* The following structure is used to record overlay strings for | |
2824 later sorting in load_overlay_strings. */ | |
2825 | |
2826 struct overlay_entry | |
2827 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2828 Lisp_Object overlay; |
25012 | 2829 Lisp_Object string; |
2830 int priority; | |
2831 int after_string_p; | |
2832 }; | |
2833 | |
2834 | |
2835 /* Set up iterator IT from overlay strings at its current position. | |
2836 Called from handle_stop. */ | |
2837 | |
2838 static enum prop_handled | |
2839 handle_overlay_change (it) | |
2840 struct it *it; | |
2841 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2842 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
|
2843 return HANDLED_RECOMPUTE_PROPS; |
25012 | 2844 else |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2845 return HANDLED_NORMALLY; |
25012 | 2846 } |
2847 | |
2848 | |
2849 /* Set up the next overlay string for delivery by IT, if there is an | |
2850 overlay string to deliver. Called by set_iterator_to_next when the | |
2851 end of the current overlay string is reached. If there are more | |
2852 overlay strings to display, IT->string and | |
2853 IT->current.overlay_string_index are set appropriately here. | |
2854 Otherwise IT->string is set to nil. */ | |
2855 | |
2856 static void | |
2857 next_overlay_string (it) | |
2858 struct it *it; | |
2859 { | |
2860 ++it->current.overlay_string_index; | |
2861 if (it->current.overlay_string_index == it->n_overlay_strings) | |
2862 { | |
2863 /* No more overlay strings. Restore IT's settings to what | |
2864 they were before overlay strings were processed, and | |
2865 continue to deliver from current_buffer. */ | |
2866 pop_it (it); | |
2867 xassert (it->stop_charpos >= BEGV | |
2868 && it->stop_charpos <= it->end_charpos); | |
2869 it->string = Qnil; | |
2870 it->current.overlay_string_index = -1; | |
2871 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
2872 it->n_overlay_strings = 0; | |
2873 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
|
2874 |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2875 /* 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
|
2876 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
|
2877 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
|
2878 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
|
2879 it->overlay_strings_at_end_processed_p = 1; |
25012 | 2880 } |
2881 else | |
2882 { | |
2883 /* There are more overlay strings to process. If | |
2884 IT->current.overlay_string_index has advanced to a position | |
2885 where we must load IT->overlay_strings with more strings, do | |
2886 it. */ | |
2887 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
2888 | |
2889 if (it->current.overlay_string_index && i == 0) | |
2890 load_overlay_strings (it); | |
2891 | |
2892 /* Initialize IT to deliver display elements from the overlay | |
2893 string. */ | |
2894 it->string = it->overlay_strings[i]; | |
2895 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2896 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
2897 it->method = next_element_from_string; | |
2898 it->stop_charpos = 0; | |
2899 } | |
2900 | |
2901 CHECK_IT (it); | |
2902 } | |
2903 | |
2904 | |
2905 /* Compare two overlay_entry structures E1 and E2. Used as a | |
2906 comparison function for qsort in load_overlay_strings. Overlay | |
2907 strings for the same position are sorted so that | |
2908 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2909 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
|
2910 when they come from the same overlay. |
25012 | 2911 |
2912 2. Within after-strings, strings are sorted so that overlay strings | |
2913 from overlays with higher priorities come first. | |
2914 | |
2915 2. Within before-strings, strings are sorted so that overlay | |
2916 strings from overlays with higher priorities come last. | |
2917 | |
2918 Value is analogous to strcmp. */ | |
2919 | |
2920 | |
2921 static int | |
2922 compare_overlay_entries (e1, e2) | |
2923 void *e1, *e2; | |
2924 { | |
2925 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
2926 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
2927 int result; | |
2928 | |
2929 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
|
2930 { |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2931 /* 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
|
2932 they come from different overlays. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2933 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
|
2934 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
|
2935 else |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2936 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
|
2937 } |
25012 | 2938 else if (entry1->after_string_p) |
2939 /* After-strings sorted in order of decreasing priority. */ | |
2940 result = entry2->priority - entry1->priority; | |
2941 else | |
2942 /* Before-strings sorted in order of increasing priority. */ | |
2943 result = entry1->priority - entry2->priority; | |
2944 | |
2945 return result; | |
2946 } | |
2947 | |
2948 | |
2949 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
2950 current buffer position. Set IT->n_overlays to the total number of | |
2951 overlay strings found. | |
2952 | |
2953 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
2954 a time. On entry into load_overlay_strings, | |
2955 IT->current.overlay_string_index gives the number of overlay | |
2956 strings that have already been loaded by previous calls to this | |
2957 function. | |
2958 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2959 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
|
2960 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
|
2961 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
|
2962 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
|
2963 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
|
2964 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
|
2965 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
|
2966 in this case. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
2967 |
25012 | 2968 Overlay strings are sorted so that after-string strings come in |
2969 front of before-string strings. Within before and after-strings, | |
2970 strings are sorted by overlay priority. See also function | |
2971 compare_overlay_entries. */ | |
2972 | |
2973 static void | |
2974 load_overlay_strings (it) | |
2975 struct it *it; | |
2976 { | |
2977 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
|
2978 Lisp_Object ov, overlay, window, str, invisible; |
25012 | 2979 int start, end; |
2980 int size = 20; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
2981 int n = 0, i, j, invis_p; |
25012 | 2982 struct overlay_entry *entries |
2983 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
2984 int charpos = IT_CHARPOS (*it); |
25012 | 2985 |
2986 /* Append the overlay string STRING of overlay OVERLAY to vector | |
2987 `entries' which has size `size' and currently contains `n' | |
2988 elements. AFTER_P non-zero means STRING is an after-string of | |
2989 OVERLAY. */ | |
2990 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
2991 do \ | |
2992 { \ | |
2993 Lisp_Object priority; \ | |
2994 \ | |
2995 if (n == size) \ | |
2996 { \ | |
2997 int new_size = 2 * size; \ | |
2998 struct overlay_entry *old = entries; \ | |
2999 entries = \ | |
3000 (struct overlay_entry *) alloca (new_size \ | |
3001 * sizeof *entries); \ | |
3002 bcopy (old, entries, size * sizeof *entries); \ | |
3003 size = new_size; \ | |
3004 } \ | |
3005 \ | |
3006 entries[n].string = (STRING); \ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3007 entries[n].overlay = (OVERLAY); \ |
25012 | 3008 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
|
3009 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \ |
25012 | 3010 entries[n].after_string_p = (AFTER_P); \ |
3011 ++n; \ | |
3012 } \ | |
3013 while (0) | |
3014 | |
3015 /* 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
|
3016 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
|
3017 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3018 overlay = XCAR (ov); |
25012 | 3019 xassert (OVERLAYP (overlay)); |
3020 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3021 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3022 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3023 if (end < charpos) |
25012 | 3024 break; |
3025 | |
3026 /* Skip this overlay if it doesn't start or end at IT's current | |
3027 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3028 if (end != charpos && start != charpos) |
25012 | 3029 continue; |
3030 | |
3031 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3032 window = Foverlay_get (overlay, Qwindow); | |
3033 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3034 continue; | |
3035 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3036 /* 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
|
3037 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
|
3038 end position are indistinguishable. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3039 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3040 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3041 |
25012 | 3042 /* 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
|
3043 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3044 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3045 && XSTRING (str)->size) | |
3046 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3047 | |
3048 /* 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
|
3049 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3050 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3051 && XSTRING (str)->size) | |
3052 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3053 } | |
3054 | |
3055 /* 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
|
3056 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
|
3057 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3058 overlay = XCAR (ov); |
25012 | 3059 xassert (OVERLAYP (overlay)); |
3060 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3061 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3062 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3063 if (start > charpos) |
25012 | 3064 break; |
3065 | |
3066 /* Skip this overlay if it doesn't start or end at IT's current | |
3067 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3068 if (end != charpos && start != charpos) |
25012 | 3069 continue; |
3070 | |
3071 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3072 window = Foverlay_get (overlay, Qwindow); | |
3073 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3074 continue; | |
3075 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3076 /* 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
|
3077 dimension, and both before- and after-strings apply. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3078 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3079 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3080 |
25012 | 3081 /* 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
|
3082 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3083 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3084 && XSTRING (str)->size) | |
3085 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3086 | |
3087 /* 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
|
3088 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3089 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3090 && XSTRING (str)->size) | |
3091 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3092 } | |
3093 | |
3094 #undef RECORD_OVERLAY_STRING | |
3095 | |
3096 /* Sort entries. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3097 if (n > 1) |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3098 qsort (entries, n, sizeof *entries, compare_overlay_entries); |
25012 | 3099 |
3100 /* Record the total number of strings to process. */ | |
3101 it->n_overlay_strings = n; | |
3102 | |
3103 /* IT->current.overlay_string_index is the number of overlay strings | |
3104 that have already been consumed by IT. Copy some of the | |
3105 remaining overlay strings to IT->overlay_strings. */ | |
3106 i = 0; | |
3107 j = it->current.overlay_string_index; | |
3108 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
3109 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
|
3110 |
25012 | 3111 CHECK_IT (it); |
3112 } | |
3113 | |
3114 | |
3115 /* Get the first chunk of overlay strings at IT's current buffer | |
3116 position. Value is non-zero if at least one overlay string was | |
3117 found. */ | |
3118 | |
3119 static int | |
3120 get_overlay_strings (it) | |
3121 struct it *it; | |
3122 { | |
3123 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
3124 process. This fills IT->overlay_strings with strings, and sets | |
3125 IT->n_overlay_strings to the total number of strings to process. | |
3126 IT->pos.overlay_string_index has to be set temporarily to zero | |
3127 because load_overlay_strings needs this; it must be set to -1 | |
3128 when no overlay strings are found because a zero value would | |
3129 indicate a position in the first overlay string. */ | |
3130 it->current.overlay_string_index = 0; | |
3131 load_overlay_strings (it); | |
3132 | |
3133 /* If we found overlay strings, set up IT to deliver display | |
3134 elements from the first one. Otherwise set up IT to deliver | |
3135 from current_buffer. */ | |
3136 if (it->n_overlay_strings) | |
3137 { | |
3138 /* Make sure we know settings in current_buffer, so that we can | |
3139 restore meaningful values when we're done with the overlay | |
3140 strings. */ | |
3141 compute_stop_pos (it); | |
3142 xassert (it->face_id >= 0); | |
3143 | |
3144 /* Save IT's settings. They are restored after all overlay | |
3145 strings have been processed. */ | |
3146 xassert (it->sp == 0); | |
3147 push_it (it); | |
3148 | |
3149 /* Set up IT to deliver display elements from the first overlay | |
3150 string. */ | |
3151 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
3152 it->stop_charpos = 0; | |
3153 it->string = it->overlay_strings[0]; | |
3154 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3155 xassert (STRINGP (it->string)); | |
3156 it->method = next_element_from_string; | |
3157 } | |
3158 else | |
3159 { | |
3160 it->string = Qnil; | |
3161 it->current.overlay_string_index = -1; | |
3162 it->method = next_element_from_buffer; | |
3163 } | |
3164 | |
3165 CHECK_IT (it); | |
3166 | |
3167 /* Value is non-zero if we found at least one overlay string. */ | |
3168 return STRINGP (it->string); | |
3169 } | |
3170 | |
3171 | |
3172 | |
3173 /*********************************************************************** | |
3174 Saving and restoring state | |
3175 ***********************************************************************/ | |
3176 | |
3177 /* Save current settings of IT on IT->stack. Called, for example, | |
3178 before setting up IT for an overlay string, to be able to restore | |
3179 IT's settings to what they were after the overlay string has been | |
3180 processed. */ | |
3181 | |
3182 static void | |
3183 push_it (it) | |
3184 struct it *it; | |
3185 { | |
3186 struct iterator_stack_entry *p; | |
3187 | |
3188 xassert (it->sp < 2); | |
3189 p = it->stack + it->sp; | |
3190 | |
3191 p->stop_charpos = it->stop_charpos; | |
3192 xassert (it->face_id >= 0); | |
3193 p->face_id = it->face_id; | |
3194 p->string = it->string; | |
3195 p->pos = it->current; | |
3196 p->end_charpos = it->end_charpos; | |
3197 p->string_nchars = it->string_nchars; | |
3198 p->area = it->area; | |
3199 p->multibyte_p = it->multibyte_p; | |
3200 p->space_width = it->space_width; | |
3201 p->font_height = it->font_height; | |
3202 p->voffset = it->voffset; | |
3203 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
3204 ++it->sp; | |
3205 } | |
3206 | |
3207 | |
3208 /* Restore IT's settings from IT->stack. Called, for example, when no | |
3209 more overlay strings must be processed, and we return to delivering | |
3210 display elements from a buffer, or when the end of a string from a | |
3211 `display' property is reached and we return to delivering display | |
3212 elements from an overlay string, or from a buffer. */ | |
3213 | |
3214 static void | |
3215 pop_it (it) | |
3216 struct it *it; | |
3217 { | |
3218 struct iterator_stack_entry *p; | |
3219 | |
3220 xassert (it->sp > 0); | |
3221 --it->sp; | |
3222 p = it->stack + it->sp; | |
3223 it->stop_charpos = p->stop_charpos; | |
3224 it->face_id = p->face_id; | |
3225 it->string = p->string; | |
3226 it->current = p->pos; | |
3227 it->end_charpos = p->end_charpos; | |
3228 it->string_nchars = p->string_nchars; | |
3229 it->area = p->area; | |
3230 it->multibyte_p = p->multibyte_p; | |
3231 it->space_width = p->space_width; | |
3232 it->font_height = p->font_height; | |
3233 it->voffset = p->voffset; | |
3234 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
3235 } | |
3236 | |
3237 | |
3238 | |
3239 /*********************************************************************** | |
3240 Moving over lines | |
3241 ***********************************************************************/ | |
3242 | |
3243 /* Set IT's current position to the previous line start. */ | |
3244 | |
3245 static void | |
3246 back_to_previous_line_start (it) | |
3247 struct it *it; | |
3248 { | |
3249 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3250 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3251 } | |
3252 | |
3253 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3254 /* Move IT to the next line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3255 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3256 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
|
3257 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
|
3258 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
|
3259 of *SKIPPED_P. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3260 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3261 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
|
3262 displayed via the `display' property. That's the reason we can't |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3263 simply use find_next_newline_no_quit. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3264 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3265 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3266 forward_to_next_line_start (it, skipped_p) |
25012 | 3267 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3268 int *skipped_p; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3269 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3270 int newline_found_p, n; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3271 const int MAX_NEWLINE_DISTANCE = 500; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3272 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3273 /* 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
|
3274 from buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3275 n = newline_found_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3276 while (n < MAX_NEWLINE_DISTANCE |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3277 && get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3278 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3279 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3280 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
|
3281 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3282 if (!STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3283 ++n; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3284 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3285 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3286 /* 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
|
3287 short-cut. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3288 if (!newline_found_p && n == MAX_NEWLINE_DISTANCE) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3289 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3290 int start = IT_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3291 int limit = find_next_newline_no_quit (start, 1); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3292 Lisp_Object pos; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3293 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3294 xassert (!STRINGP (it->string)); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3295 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3296 /* 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
|
3297 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
|
3298 buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3299 if (it->stop_charpos >= limit |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3300 || ((pos = Fnext_single_property_change (make_number (start), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3301 Qdisplay, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3302 Qnil, make_number (limit)), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3303 NILP (pos)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3304 && next_overlay_change (start) == ZV)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3305 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3306 IT_CHARPOS (*it) = limit; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3307 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3308 *skipped_p = newline_found_p = 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3309 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3310 else |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3311 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3312 while (get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3313 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3314 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3315 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
|
3316 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3317 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3318 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3319 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3320 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3321 return newline_found_p; |
25012 | 3322 } |
3323 | |
3324 | |
3325 /* Set IT's current position to the previous visible line start. Skip | |
3326 invisible text that is so either due to text properties or due to | |
3327 selective display. Caution: this does not change IT->current_x and | |
3328 IT->hpos. */ | |
3329 | |
3330 static void | |
3331 back_to_previous_visible_line_start (it) | |
3332 struct it *it; | |
3333 { | |
3334 int visible_p = 0; | |
3335 | |
3336 /* Go back one newline if not on BEGV already. */ | |
3337 if (IT_CHARPOS (*it) > BEGV) | |
3338 back_to_previous_line_start (it); | |
3339 | |
3340 /* Move over lines that are invisible because of selective display | |
3341 or text properties. */ | |
3342 while (IT_CHARPOS (*it) > BEGV | |
3343 && !visible_p) | |
3344 { | |
3345 visible_p = 1; | |
3346 | |
3347 /* If selective > 0, then lines indented more than that values | |
3348 are invisible. */ | |
3349 if (it->selective > 0 | |
3350 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3351 it->selective)) | |
3352 visible_p = 0; | |
3353 else | |
3354 { | |
3355 Lisp_Object prop; | |
3356 | |
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
|
3357 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
|
3358 Qinvisible, it->window); |
25012 | 3359 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
3360 visible_p = 0; | |
3361 } | |
3362 | |
3363 /* Back one more newline if the current one is invisible. */ | |
3364 if (!visible_p) | |
3365 back_to_previous_line_start (it); | |
3366 } | |
3367 | |
3368 xassert (IT_CHARPOS (*it) >= BEGV); | |
3369 xassert (IT_CHARPOS (*it) == BEGV | |
3370 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3371 CHECK_IT (it); | |
3372 } | |
3373 | |
3374 | |
3375 /* Reseat iterator IT at the previous visible line start. Skip | |
3376 invisible text that is so either due to text properties or due to | |
3377 selective display. At the end, update IT's overlay information, | |
3378 face information etc. */ | |
3379 | |
3380 static void | |
3381 reseat_at_previous_visible_line_start (it) | |
3382 struct it *it; | |
3383 { | |
3384 back_to_previous_visible_line_start (it); | |
3385 reseat (it, it->current.pos, 1); | |
3386 CHECK_IT (it); | |
3387 } | |
3388 | |
3389 | |
3390 /* 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
|
3391 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
|
3392 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
|
3393 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
|
3394 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
|
3395 is invisible because of text properties. */ |
25012 | 3396 |
3397 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3398 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3399 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3400 int on_newline_p; |
25012 | 3401 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3402 int newline_found_p, skipped_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3403 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3404 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
|
3405 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3406 /* 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
|
3407 more than the value of IT->selective. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3408 if (it->selective > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3409 while (IT_CHARPOS (*it) < ZV |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3410 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3411 it->selective)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3412 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
|
3413 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3414 /* 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
|
3415 if (on_newline_p && newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3416 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3417 if (STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3418 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3419 if (IT_STRING_CHARPOS (*it) > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3420 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3421 --IT_STRING_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3422 --IT_STRING_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3423 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3424 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3425 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
|
3426 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3427 --IT_CHARPOS (*it); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3428 --IT_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3429 reseat (it, it->current.pos, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3430 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3431 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3432 else if (skipped_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3433 reseat (it, it->current.pos, 0); |
25012 | 3434 |
3435 CHECK_IT (it); | |
3436 } | |
3437 | |
3438 | |
3439 | |
3440 /*********************************************************************** | |
3441 Changing an iterator's position | |
3442 ***********************************************************************/ | |
3443 | |
3444 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3445 is non-zero, always check for text properties at the new position. | |
3446 Otherwise, text properties are only looked up if POS >= | |
3447 IT->check_charpos of a property. */ | |
3448 | |
3449 static void | |
3450 reseat (it, pos, force_p) | |
3451 struct it *it; | |
3452 struct text_pos pos; | |
3453 int force_p; | |
3454 { | |
3455 int original_pos = IT_CHARPOS (*it); | |
3456 | |
3457 reseat_1 (it, pos, 0); | |
3458 | |
3459 /* Determine where to check text properties. Avoid doing it | |
3460 where possible because text property lookup is very expensive. */ | |
3461 if (force_p | |
3462 || CHARPOS (pos) > it->stop_charpos | |
3463 || CHARPOS (pos) < original_pos) | |
3464 handle_stop (it); | |
3465 | |
3466 CHECK_IT (it); | |
3467 } | |
3468 | |
3469 | |
3470 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3471 IT->stop_pos to POS, also. */ | |
3472 | |
3473 static void | |
3474 reseat_1 (it, pos, set_stop_p) | |
3475 struct it *it; | |
3476 struct text_pos pos; | |
3477 int set_stop_p; | |
3478 { | |
3479 /* Don't call this function when scanning a C string. */ | |
3480 xassert (it->s == NULL); | |
3481 | |
3482 /* POS must be a reasonable value. */ | |
3483 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3484 | |
3485 it->current.pos = it->position = pos; | |
3486 XSETBUFFER (it->object, current_buffer); | |
3487 it->dpvec = NULL; | |
3488 it->current.dpvec_index = -1; | |
3489 it->current.overlay_string_index = -1; | |
3490 IT_STRING_CHARPOS (*it) = -1; | |
3491 IT_STRING_BYTEPOS (*it) = -1; | |
3492 it->string = Qnil; | |
3493 it->method = next_element_from_buffer; | |
3494 it->sp = 0; | |
3495 | |
3496 if (set_stop_p) | |
3497 it->stop_charpos = CHARPOS (pos); | |
3498 } | |
3499 | |
3500 | |
3501 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3502 If S is non-null, it is a C string to iterate over. Otherwise, | |
3503 STRING gives a Lisp string to iterate over. | |
3504 | |
3505 If PRECISION > 0, don't return more then PRECISION number of | |
3506 characters from the string. | |
3507 | |
3508 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3509 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3510 field width. | |
3511 | |
3512 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3513 MULTIBYTE > 0 means enable it, | |
3514 MULTIBYTE < 0 means use IT->multibyte_p. | |
3515 | |
3516 IT must be initialized via a prior call to init_iterator before | |
3517 calling this function. */ | |
3518 | |
3519 static void | |
3520 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3521 struct it *it; | |
3522 unsigned char *s; | |
3523 Lisp_Object string; | |
3524 int charpos; | |
3525 int precision, field_width, multibyte; | |
3526 { | |
3527 /* No region in strings. */ | |
3528 it->region_beg_charpos = it->region_end_charpos = -1; | |
3529 | |
3530 /* No text property checks performed by default, but see below. */ | |
3531 it->stop_charpos = -1; | |
3532 | |
3533 /* Set iterator position and end position. */ | |
3534 bzero (&it->current, sizeof it->current); | |
3535 it->current.overlay_string_index = -1; | |
3536 it->current.dpvec_index = -1; | |
3537 xassert (charpos >= 0); | |
3538 | |
3539 /* Use the setting of MULTIBYTE if specified. */ | |
3540 if (multibyte >= 0) | |
3541 it->multibyte_p = multibyte > 0; | |
3542 | |
3543 if (s == NULL) | |
3544 { | |
3545 xassert (STRINGP (string)); | |
3546 it->string = string; | |
3547 it->s = NULL; | |
3548 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3549 it->method = next_element_from_string; | |
3550 it->current.string_pos = string_pos (charpos, string); | |
3551 } | |
3552 else | |
3553 { | |
3554 it->s = s; | |
3555 it->string = Qnil; | |
3556 | |
3557 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3558 for displaying C strings. */ | |
3559 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3560 if (it->multibyte_p) | |
3561 { | |
3562 it->current.pos = c_string_pos (charpos, s, 1); | |
3563 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3564 } | |
3565 else | |
3566 { | |
3567 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3568 it->end_charpos = it->string_nchars = strlen (s); | |
3569 } | |
3570 | |
3571 it->method = next_element_from_c_string; | |
3572 } | |
3573 | |
3574 /* PRECISION > 0 means don't return more than PRECISION characters | |
3575 from the string. */ | |
3576 if (precision > 0 && it->end_charpos - charpos > precision) | |
3577 it->end_charpos = it->string_nchars = charpos + precision; | |
3578 | |
3579 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3580 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3581 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3582 padding with `-' at the end of a mode line. */ | |
3583 if (field_width < 0) | |
3584 field_width = INFINITY; | |
3585 if (field_width > it->end_charpos - charpos) | |
3586 it->end_charpos = charpos + field_width; | |
3587 | |
3588 /* Use the standard display table for displaying strings. */ | |
3589 if (DISP_TABLE_P (Vstandard_display_table)) | |
3590 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3591 | |
3592 it->stop_charpos = charpos; | |
3593 CHECK_IT (it); | |
3594 } | |
3595 | |
3596 | |
3597 | |
3598 /*********************************************************************** | |
3599 Iteration | |
3600 ***********************************************************************/ | |
3601 | |
3602 /* Load IT's display element fields with information about the next | |
3603 display element from the current position of IT. Value is zero if | |
3604 end of buffer (or C string) is reached. */ | |
3605 | |
3606 int | |
3607 get_next_display_element (it) | |
3608 struct it *it; | |
3609 { | |
3610 /* Non-zero means that we found an display element. Zero means that | |
3611 we hit the end of what we iterate over. Performance note: the | |
3612 function pointer `method' used here turns out to be faster than | |
3613 using a sequence of if-statements. */ | |
3614 int success_p = (*it->method) (it); | |
3615 | |
3616 if (it->what == IT_CHARACTER) | |
3617 { | |
3618 /* Map via display table or translate control characters. | |
3619 IT->c, IT->len etc. have been set to the next character by | |
3620 the function call above. If we have a display table, and it | |
3621 contains an entry for IT->c, translate it. Don't do this if | |
3622 IT->c itself comes from a display table, otherwise we could | |
3623 end up in an infinite recursion. (An alternative could be to | |
3624 count the recursion depth of this function and signal an | |
3625 error when a certain maximum depth is reached.) Is it worth | |
3626 it? */ | |
3627 if (success_p && it->dpvec == NULL) | |
3628 { | |
3629 Lisp_Object dv; | |
3630 | |
3631 if (it->dp | |
3632 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3633 VECTORP (dv))) | |
3634 { | |
3635 struct Lisp_Vector *v = XVECTOR (dv); | |
3636 | |
3637 /* Return the first character from the display table | |
3638 entry, if not empty. If empty, don't display the | |
3639 current character. */ | |
3640 if (v->size) | |
3641 { | |
3642 it->dpvec_char_len = it->len; | |
3643 it->dpvec = v->contents; | |
3644 it->dpend = v->contents + v->size; | |
3645 it->current.dpvec_index = 0; | |
3646 it->method = next_element_from_display_vector; | |
3647 } | |
3648 | |
3649 success_p = get_next_display_element (it); | |
3650 } | |
3651 | |
3652 /* Translate control characters into `\003' or `^C' form. | |
3653 Control characters coming from a display table entry are | |
3654 currently not translated because we use IT->dpvec to hold | |
3655 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
|
3656 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
|
3657 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3658 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3659 octal form. */ |
25012 | 3660 else if ((it->c < ' ' |
3661 && (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
|
3662 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3663 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3664 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3665 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3666 { |
3667 /* IT->c is a control character which must be displayed | |
3668 either as '\003' or as `^C' where the '\\' and '^' | |
3669 can be defined in the display table. Fill | |
3670 IT->ctl_chars with glyphs for what we have to | |
3671 display. Then, set IT->dpvec to these glyphs. */ | |
3672 GLYPH g; | |
3673 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3674 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3675 { |
3676 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3677 if (it->dp | |
3678 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3679 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3680 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3681 else | |
3682 g = FAST_MAKE_GLYPH ('^', 0); | |
3683 XSETINT (it->ctl_chars[0], g); | |
3684 | |
3685 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3686 XSETINT (it->ctl_chars[1], g); | |
3687 | |
3688 /* Set up IT->dpvec and return first character from it. */ | |
3689 it->dpvec_char_len = it->len; | |
3690 it->dpvec = it->ctl_chars; | |
3691 it->dpend = it->dpvec + 2; | |
3692 it->current.dpvec_index = 0; | |
3693 it->method = next_element_from_display_vector; | |
3694 get_next_display_element (it); | |
3695 } | |
3696 else | |
3697 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3698 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
|
3699 int len; |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3700 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3701 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3702 |
25012 | 3703 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3704 if (it->dp | |
3705 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3706 && 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
|
3707 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3708 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3709 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3710 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3711 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
|
3712 str[0] = it->c, len = 1; |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3713 else |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3714 len = CHAR_STRING (it->c, str); |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3715 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3716 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3717 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3718 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
|
3719 /* 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
|
3720 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3721 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
|
3722 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
|
3723 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
|
3724 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
|
3725 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
|
3726 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
|
3727 } |
25012 | 3728 |
3729 /* Set up IT->dpvec and return the first character | |
3730 from it. */ | |
3731 it->dpvec_char_len = it->len; | |
3732 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3733 it->dpend = it->dpvec + len * 4; |
25012 | 3734 it->current.dpvec_index = 0; |
3735 it->method = next_element_from_display_vector; | |
3736 get_next_display_element (it); | |
3737 } | |
3738 } | |
3739 } | |
3740 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3741 /* 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
|
3742 multibyte character in unibyte text. */ |
25012 | 3743 if (it->multibyte_p |
3744 && success_p | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3745 && FRAME_WINDOW_P (it->f)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3746 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3747 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
|
3748 it->face_id = FACE_FOR_CHAR (it->f, face, it->c); |
25012 | 3749 } |
3750 } | |
3751 | |
3752 /* Is this character the last one of a run of characters with | |
3753 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3754 if (it->face_box_p | |
3755 && it->s == NULL) | |
3756 { | |
3757 int face_id; | |
3758 struct face *face; | |
3759 | |
3760 it->end_of_box_run_p | |
3761 = ((face_id = face_after_it_pos (it), | |
3762 face_id != it->face_id) | |
3763 && (face = FACE_FROM_ID (it->f, face_id), | |
3764 face->box == FACE_NO_BOX)); | |
3765 } | |
3766 | |
3767 /* Value is 0 if end of buffer or string reached. */ | |
3768 return success_p; | |
3769 } | |
3770 | |
3771 | |
3772 /* Move IT to the next display element. | |
3773 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3774 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
|
3775 skip to the next visible line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3776 |
25012 | 3777 Functions get_next_display_element and set_iterator_to_next are |
3778 separate because I find this arrangement easier to handle than a | |
3779 get_next_display_element function that also increments IT's | |
3780 position. The way it is we can first look at an iterator's current | |
3781 display element, decide whether it fits on a line, and if it does, | |
3782 increment the iterator position. The other way around we probably | |
3783 would either need a flag indicating whether the iterator has to be | |
3784 incremented the next time, or we would have to implement a | |
3785 decrement position function which would not be easy to write. */ | |
3786 | |
3787 void | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3788 set_iterator_to_next (it, reseat_p) |
25012 | 3789 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3790 int reseat_p; |
25012 | 3791 { |
3792 if (it->method == next_element_from_buffer) | |
3793 { | |
3794 /* The current display element of IT is a character from | |
3795 current_buffer. Advance in the buffer, and maybe skip over | |
3796 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
|
3797 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
|
3798 reseat_at_next_visible_line_start (it, 0); |
25012 | 3799 else |
3800 { | |
3801 xassert (it->len != 0); | |
3802 IT_BYTEPOS (*it) += it->len; | |
3803 IT_CHARPOS (*it) += 1; | |
3804 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
3805 } | |
3806 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3807 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
|
3808 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3809 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
|
3810 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3811 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3812 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3813 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3814 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3815 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3816 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3817 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3818 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3819 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3820 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3821 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3822 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3823 } |
25012 | 3824 else if (it->method == next_element_from_c_string) |
3825 { | |
3826 /* Current display element of IT is from a C string. */ | |
3827 IT_BYTEPOS (*it) += it->len; | |
3828 IT_CHARPOS (*it) += 1; | |
3829 } | |
3830 else if (it->method == next_element_from_display_vector) | |
3831 { | |
3832 /* Current display element of IT is from a display table entry. | |
3833 Advance in the display table definition. Reset it to null if | |
3834 end reached, and continue with characters from buffers/ | |
3835 strings. */ | |
3836 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3837 |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
3838 /* 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
|
3839 display vector entry (these entries may contain faces). */ |
25012 | 3840 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
|
3841 |
25012 | 3842 if (it->dpvec + it->current.dpvec_index == it->dpend) |
3843 { | |
3844 if (it->s) | |
3845 it->method = next_element_from_c_string; | |
3846 else if (STRINGP (it->string)) | |
3847 it->method = next_element_from_string; | |
3848 else | |
3849 it->method = next_element_from_buffer; | |
3850 | |
3851 it->dpvec = NULL; | |
3852 it->current.dpvec_index = -1; | |
3853 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3854 /* 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
|
3855 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
|
3856 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
|
3857 else if (it->dpvec_char_len > 0) |
25012 | 3858 { |
3859 it->len = it->dpvec_char_len; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3860 set_iterator_to_next (it, reseat_p); |
25012 | 3861 } |
3862 } | |
3863 } | |
3864 else if (it->method == next_element_from_string) | |
3865 { | |
3866 /* Current display element is a character from a Lisp string. */ | |
3867 xassert (it->s == NULL && STRINGP (it->string)); | |
3868 IT_STRING_BYTEPOS (*it) += it->len; | |
3869 IT_STRING_CHARPOS (*it) += 1; | |
3870 | |
3871 consider_string_end: | |
3872 | |
3873 if (it->current.overlay_string_index >= 0) | |
3874 { | |
3875 /* IT->string is an overlay string. Advance to the | |
3876 next, if there is one. */ | |
3877 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3878 next_overlay_string (it); | |
3879 } | |
3880 else | |
3881 { | |
3882 /* IT->string is not an overlay string. If we reached | |
3883 its end, and there is something on IT->stack, proceed | |
3884 with what is on the stack. This can be either another | |
3885 string, this time an overlay string, or a buffer. */ | |
3886 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
3887 && it->sp > 0) | |
3888 { | |
3889 pop_it (it); | |
3890 if (!STRINGP (it->string)) | |
3891 it->method = next_element_from_buffer; | |
3892 } | |
3893 } | |
3894 } | |
3895 else if (it->method == next_element_from_image | |
3896 || it->method == next_element_from_stretch) | |
3897 { | |
3898 /* The position etc with which we have to proceed are on | |
3899 the stack. The position may be at the end of a string, | |
3900 if the `display' property takes up the whole string. */ | |
3901 pop_it (it); | |
3902 it->image_id = 0; | |
3903 if (STRINGP (it->string)) | |
3904 { | |
3905 it->method = next_element_from_string; | |
3906 goto consider_string_end; | |
3907 } | |
3908 else | |
3909 it->method = next_element_from_buffer; | |
3910 } | |
3911 else | |
3912 /* There are no other methods defined, so this should be a bug. */ | |
3913 abort (); | |
3914 | |
3915 /* Reset flags indicating start and end of a sequence of | |
3916 characters with box. */ | |
3917 it->start_of_box_run_p = it->end_of_box_run_p = 0; | |
3918 | |
3919 xassert (it->method != next_element_from_string | |
3920 || (STRINGP (it->string) | |
3921 && IT_STRING_CHARPOS (*it) >= 0)); | |
3922 } | |
3923 | |
3924 | |
3925 /* Load IT's display element fields with information about the next | |
3926 display element which comes from a display table entry or from the | |
3927 result of translating a control character to one of the forms `^C' | |
3928 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
3929 | |
3930 static int | |
3931 next_element_from_display_vector (it) | |
3932 struct it *it; | |
3933 { | |
3934 /* Precondition. */ | |
3935 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
3936 | |
3937 /* Remember the current face id in case glyphs specify faces. | |
3938 IT's face is restored in set_iterator_to_next. */ | |
3939 it->saved_face_id = it->face_id; | |
3940 | |
3941 if (INTEGERP (*it->dpvec) | |
3942 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
3943 { | |
3944 int lface_id; | |
3945 GLYPH g; | |
3946 | |
3947 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
3948 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
|
3949 it->len = CHAR_BYTES (it->c); |
25012 | 3950 |
3951 /* The entry may contain a face id to use. Such a face id is | |
3952 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
|
3953 zero means no face is specified. */ |
25012 | 3954 lface_id = FAST_GLYPH_FACE (g); |
3955 if (lface_id) | |
3956 { | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
3957 /* The function returns -1 if lface_id is invalid. */ |
25012 | 3958 int face_id = ascii_face_of_lisp_face (it->f, lface_id); |
3959 if (face_id >= 0) | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
3960 it->face_id = face_id; |
25012 | 3961 } |
3962 } | |
3963 else | |
3964 /* Display table entry is invalid. Return a space. */ | |
3965 it->c = ' ', it->len = 1; | |
3966 | |
3967 /* Don't change position and object of the iterator here. They are | |
3968 still the values of the character that had this display table | |
3969 entry or was translated, and that's what we want. */ | |
3970 it->what = IT_CHARACTER; | |
3971 return 1; | |
3972 } | |
3973 | |
3974 | |
3975 /* Load IT with the next display element from Lisp string IT->string. | |
3976 IT->current.string_pos is the current position within the string. | |
3977 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
3978 overlay string. */ | |
3979 | |
3980 static int | |
3981 next_element_from_string (it) | |
3982 struct it *it; | |
3983 { | |
3984 struct text_pos position; | |
3985 | |
3986 xassert (STRINGP (it->string)); | |
3987 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
3988 position = it->current.string_pos; | |
3989 | |
3990 /* Time to check for invisible text? */ | |
3991 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
3992 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
3993 { | |
3994 handle_stop (it); | |
3995 | |
3996 /* Since a handler may have changed IT->method, we must | |
3997 recurse here. */ | |
3998 return get_next_display_element (it); | |
3999 } | |
4000 | |
4001 if (it->current.overlay_string_index >= 0) | |
4002 { | |
4003 /* Get the next character from an overlay string. In overlay | |
4004 strings, There is no field width or padding with spaces to | |
4005 do. */ | |
4006 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4007 { | |
4008 it->what = IT_EOB; | |
4009 return 0; | |
4010 } | |
4011 else if (STRING_MULTIBYTE (it->string)) | |
4012 { | |
4013 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
4014 - IT_STRING_BYTEPOS (*it)); | |
4015 unsigned char *s = (XSTRING (it->string)->data | |
4016 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4017 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 4018 } |
4019 else | |
4020 { | |
4021 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4022 it->len = 1; | |
4023 } | |
4024 } | |
4025 else | |
4026 { | |
4027 /* Get the next character from a Lisp string that is not an | |
4028 overlay string. Such strings come from the mode line, for | |
4029 example. We may have to pad with spaces, or truncate the | |
4030 string. See also next_element_from_c_string. */ | |
4031 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
4032 { | |
4033 it->what = IT_EOB; | |
4034 return 0; | |
4035 } | |
4036 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
4037 { | |
4038 /* Pad with spaces. */ | |
4039 it->c = ' ', it->len = 1; | |
4040 CHARPOS (position) = BYTEPOS (position) = -1; | |
4041 } | |
4042 else if (STRING_MULTIBYTE (it->string)) | |
4043 { | |
4044 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
4045 - IT_STRING_BYTEPOS (*it)); | |
4046 unsigned char *s = (XSTRING (it->string)->data | |
4047 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4048 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 4049 } |
4050 else | |
4051 { | |
4052 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4053 it->len = 1; | |
4054 } | |
4055 } | |
4056 | |
4057 /* Record what we have and where it came from. Note that we store a | |
4058 buffer position in IT->position although it could arguably be a | |
4059 string position. */ | |
4060 it->what = IT_CHARACTER; | |
4061 it->object = it->string; | |
4062 it->position = position; | |
4063 return 1; | |
4064 } | |
4065 | |
4066 | |
4067 /* Load IT with next display element from C string IT->s. | |
4068 IT->string_nchars is the maximum number of characters to return | |
4069 from the string. IT->end_charpos may be greater than | |
4070 IT->string_nchars when this function is called, in which case we | |
4071 may have to return padding spaces. Value is zero if end of string | |
4072 reached, including padding spaces. */ | |
4073 | |
4074 static int | |
4075 next_element_from_c_string (it) | |
4076 struct it *it; | |
4077 { | |
4078 int success_p = 1; | |
4079 | |
4080 xassert (it->s); | |
4081 it->what = IT_CHARACTER; | |
4082 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
4083 it->object = Qnil; | |
4084 | |
4085 /* IT's position can be greater IT->string_nchars in case a field | |
4086 width or precision has been specified when the iterator was | |
4087 initialized. */ | |
4088 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4089 { | |
4090 /* End of the game. */ | |
4091 it->what = IT_EOB; | |
4092 success_p = 0; | |
4093 } | |
4094 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
4095 { | |
4096 /* Pad with spaces. */ | |
4097 it->c = ' ', it->len = 1; | |
4098 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
4099 } | |
4100 else if (it->multibyte_p) | |
4101 { | |
4102 /* Implementation note: The calls to strlen apparently aren't a | |
4103 performance problem because there is no noticeable performance | |
4104 difference between Emacs running in unibyte or multibyte mode. */ | |
4105 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
|
4106 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
|
4107 maxlen, &it->len); |
25012 | 4108 } |
4109 else | |
4110 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
4111 | |
4112 return success_p; | |
4113 } | |
4114 | |
4115 | |
4116 /* Set up IT to return characters from an ellipsis, if appropriate. | |
4117 The definition of the ellipsis glyphs may come from a display table | |
4118 entry. This function Fills IT with the first glyph from the | |
4119 ellipsis if an ellipsis is to be displayed. */ | |
4120 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4121 static int |
25012 | 4122 next_element_from_ellipsis (it) |
4123 struct it *it; | |
4124 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4125 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4126 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4127 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
|
4128 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4129 /* 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
|
4130 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
|
4131 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
|
4132 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4133 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4134 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4135 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4136 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
|
4137 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4138 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4139 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4140 /* 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
|
4141 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4142 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4143 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4144 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4145 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
|
4146 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4147 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4148 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4149 reseat_at_next_visible_line_start (it, 1); |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4150 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4151 return get_next_display_element (it); |
25012 | 4152 } |
4153 | |
4154 | |
4155 /* Deliver an image display element. The iterator IT is already | |
4156 filled with image information (done in handle_display_prop). Value | |
4157 is always 1. */ | |
4158 | |
4159 | |
4160 static int | |
4161 next_element_from_image (it) | |
4162 struct it *it; | |
4163 { | |
4164 it->what = IT_IMAGE; | |
4165 return 1; | |
4166 } | |
4167 | |
4168 | |
4169 /* Fill iterator IT with next display element from a stretch glyph | |
4170 property. IT->object is the value of the text property. Value is | |
4171 always 1. */ | |
4172 | |
4173 static int | |
4174 next_element_from_stretch (it) | |
4175 struct it *it; | |
4176 { | |
4177 it->what = IT_STRETCH; | |
4178 return 1; | |
4179 } | |
4180 | |
4181 | |
4182 /* Load IT with the next display element from current_buffer. Value | |
4183 is zero if end of buffer reached. IT->stop_charpos is the next | |
4184 position at which to stop and check for text properties or buffer | |
4185 end. */ | |
4186 | |
4187 static int | |
4188 next_element_from_buffer (it) | |
4189 struct it *it; | |
4190 { | |
4191 int success_p = 1; | |
4192 | |
4193 /* Check this assumption, otherwise, we would never enter the | |
4194 if-statement, below. */ | |
4195 xassert (IT_CHARPOS (*it) >= BEGV | |
4196 && IT_CHARPOS (*it) <= it->stop_charpos); | |
4197 | |
4198 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
4199 { | |
4200 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4201 { | |
4202 int overlay_strings_follow_p; | |
4203 | |
4204 /* End of the game, except when overlay strings follow that | |
4205 haven't been returned yet. */ | |
4206 if (it->overlay_strings_at_end_processed_p) | |
4207 overlay_strings_follow_p = 0; | |
4208 else | |
4209 { | |
4210 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
|
4211 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 4212 } |
4213 | |
4214 if (overlay_strings_follow_p) | |
4215 success_p = get_next_display_element (it); | |
4216 else | |
4217 { | |
4218 it->what = IT_EOB; | |
4219 it->position = it->current.pos; | |
4220 success_p = 0; | |
4221 } | |
4222 } | |
4223 else | |
4224 { | |
4225 handle_stop (it); | |
4226 return get_next_display_element (it); | |
4227 } | |
4228 } | |
4229 else | |
4230 { | |
4231 /* No face changes, overlays etc. in sight, so just return a | |
4232 character from current_buffer. */ | |
4233 unsigned char *p; | |
4234 | |
4235 /* Maybe run the redisplay end trigger hook. Performance note: | |
4236 This doesn't seem to cost measurable time. */ | |
4237 if (it->redisplay_end_trigger_charpos | |
4238 && it->glyph_row | |
4239 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
4240 run_redisplay_end_trigger_hook (it); | |
4241 | |
4242 /* Get the next character, maybe multibyte. */ | |
4243 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
|
4244 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 4245 { |
4246 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
4247 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4248 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 4249 } |
4250 else | |
4251 it->c = *p, it->len = 1; | |
4252 | |
4253 /* Record what we have and where it came from. */ | |
4254 it->what = IT_CHARACTER;; | |
4255 it->object = it->w->buffer; | |
4256 it->position = it->current.pos; | |
4257 | |
4258 /* Normally we return the character found above, except when we | |
4259 really want to return an ellipsis for selective display. */ | |
4260 if (it->selective) | |
4261 { | |
4262 if (it->c == '\n') | |
4263 { | |
4264 /* A value of selective > 0 means hide lines indented more | |
4265 than that number of columns. */ | |
4266 if (it->selective > 0 | |
4267 && IT_CHARPOS (*it) + 1 < ZV | |
4268 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
4269 IT_BYTEPOS (*it) + 1, | |
4270 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4271 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4272 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
|
4273 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4274 } |
25012 | 4275 } |
4276 else if (it->c == '\r' && it->selective == -1) | |
4277 { | |
4278 /* A value of selective == -1 means that everything from the | |
4279 CR to the end of the line is invisible, with maybe an | |
4280 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4281 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
|
4282 it->dpvec_char_len = -1; |
25012 | 4283 } |
4284 } | |
4285 } | |
4286 | |
4287 /* 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
|
4288 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4289 return success_p; |
4290 } | |
4291 | |
4292 | |
4293 /* Run the redisplay end trigger hook for IT. */ | |
4294 | |
4295 static void | |
4296 run_redisplay_end_trigger_hook (it) | |
4297 struct it *it; | |
4298 { | |
4299 Lisp_Object args[3]; | |
4300 | |
4301 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4302 displaying something, or otherwise we should not run the hook. */ | |
4303 xassert (it->glyph_row); | |
4304 | |
4305 /* Set up hook arguments. */ | |
4306 args[0] = Qredisplay_end_trigger_functions; | |
4307 args[1] = it->window; | |
4308 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4309 it->redisplay_end_trigger_charpos = 0; | |
4310 | |
4311 /* Since we are *trying* to run these functions, don't try to run | |
4312 them again, even if they get an error. */ | |
4313 it->w->redisplay_end_trigger = Qnil; | |
4314 Frun_hook_with_args (3, args); | |
4315 | |
4316 /* Notice if it changed the face of the character we are on. */ | |
4317 handle_face_prop (it); | |
4318 } | |
4319 | |
4320 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4321 /* 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
|
4322 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4323 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4324 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4325 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4326 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4327 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4328 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4329 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4330 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4331 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4332 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4333 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4334 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4335 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4336 |
25012 | 4337 |
4338 /*********************************************************************** | |
4339 Moving an iterator without producing glyphs | |
4340 ***********************************************************************/ | |
4341 | |
4342 /* Move iterator IT to a specified buffer or X position within one | |
4343 line on the display without producing glyphs. | |
4344 | |
4345 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4346 whichever is reached first. | |
4347 | |
4348 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4349 | |
4350 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4351 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4352 TO_X includes the amount by which a window is horizontally | |
4353 scrolled. | |
4354 | |
4355 Value is | |
4356 | |
4357 MOVE_POS_MATCH_OR_ZV | |
4358 - when TO_POS or ZV was reached. | |
4359 | |
4360 MOVE_X_REACHED | |
4361 -when TO_X was reached before TO_POS or ZV were reached. | |
4362 | |
4363 MOVE_LINE_CONTINUED | |
4364 - when we reached the end of the display area and the line must | |
4365 be continued. | |
4366 | |
4367 MOVE_LINE_TRUNCATED | |
4368 - when we reached the end of the display area and the line is | |
4369 truncated. | |
4370 | |
4371 MOVE_NEWLINE_OR_CR | |
4372 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4373 display is on. */ | |
4374 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4375 static enum move_it_result |
25012 | 4376 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4377 struct it *it; | |
4378 int to_charpos, to_x, op; | |
4379 { | |
4380 enum move_it_result result = MOVE_UNDEFINED; | |
4381 struct glyph_row *saved_glyph_row; | |
4382 | |
4383 /* Don't produce glyphs in produce_glyphs. */ | |
4384 saved_glyph_row = it->glyph_row; | |
4385 it->glyph_row = NULL; | |
4386 | |
4387 while (1) | |
4388 { | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
4389 int x, i, ascent = 0, descent = 0; |
25012 | 4390 |
4391 /* Stop when ZV or TO_CHARPOS reached. */ | |
4392 if (!get_next_display_element (it) | |
4393 || ((op & MOVE_TO_POS) != 0 | |
4394 && BUFFERP (it->object) | |
4395 && IT_CHARPOS (*it) >= to_charpos)) | |
4396 { | |
4397 result = MOVE_POS_MATCH_OR_ZV; | |
4398 break; | |
4399 } | |
4400 | |
4401 /* The call to produce_glyphs will get the metrics of the | |
4402 display element IT is loaded with. We record in x the | |
4403 x-position before this display element in case it does not | |
4404 fit on the line. */ | |
4405 x = it->current_x; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4406 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4407 /* 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
|
4408 fit on the line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4409 if (!it->truncate_lines_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4410 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4411 ascent = it->max_ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4412 descent = it->max_descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4413 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4414 |
25012 | 4415 PRODUCE_GLYPHS (it); |
4416 | |
4417 if (it->area != TEXT_AREA) | |
4418 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4419 set_iterator_to_next (it, 1); |
25012 | 4420 continue; |
4421 } | |
4422 | |
4423 /* The number of glyphs we get back in IT->nglyphs will normally | |
4424 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4425 character on a terminal frame, or (iii) a line end. For the | |
4426 second case, IT->nglyphs - 1 padding glyphs will be present | |
4427 (on X frames, there is only one glyph produced for a | |
4428 composite character. | |
4429 | |
4430 The behavior implemented below means, for continuation lines, | |
4431 that as many spaces of a TAB as fit on the current line are | |
4432 displayed there. For terminal frames, as many glyphs of a | |
4433 multi-glyph character are displayed in the current line, too. | |
4434 This is what the old redisplay code did, and we keep it that | |
4435 way. Under X, the whole shape of a complex character must | |
4436 fit on the line or it will be completely displayed in the | |
4437 next line. | |
4438 | |
4439 Note that both for tabs and padding glyphs, all glyphs have | |
4440 the same width. */ | |
4441 if (it->nglyphs) | |
4442 { | |
4443 /* More than one glyph or glyph doesn't fit on line. All | |
4444 glyphs have the same width. */ | |
4445 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4446 int new_x; | |
4447 | |
4448 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4449 { | |
4450 new_x = x + single_glyph_width; | |
4451 | |
4452 /* We want to leave anything reaching TO_X to the caller. */ | |
4453 if ((op & MOVE_TO_X) && new_x > to_x) | |
4454 { | |
4455 it->current_x = x; | |
4456 result = MOVE_X_REACHED; | |
4457 break; | |
4458 } | |
4459 else if (/* Lines are continued. */ | |
4460 !it->truncate_lines_p | |
4461 && (/* And glyph doesn't fit on the line. */ | |
4462 new_x > it->last_visible_x | |
4463 /* Or it fits exactly and we're on a window | |
4464 system frame. */ | |
4465 || (new_x == it->last_visible_x | |
4466 && FRAME_WINDOW_P (it->f)))) | |
4467 { | |
4468 if (/* IT->hpos == 0 means the very first glyph | |
4469 doesn't fit on the line, e.g. a wide image. */ | |
4470 it->hpos == 0 | |
4471 || (new_x == it->last_visible_x | |
4472 && FRAME_WINDOW_P (it->f))) | |
4473 { | |
4474 ++it->hpos; | |
4475 it->current_x = new_x; | |
4476 if (i == it->nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4477 set_iterator_to_next (it, 1); |
25012 | 4478 } |
4479 else | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4480 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4481 it->current_x = x; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4482 it->max_ascent = ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4483 it->max_descent = descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4484 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4485 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4486 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
|
4487 IT_CHARPOS (*it))); |
25012 | 4488 result = MOVE_LINE_CONTINUED; |
4489 break; | |
4490 } | |
4491 else if (new_x > it->first_visible_x) | |
4492 { | |
4493 /* Glyph is visible. Increment number of glyphs that | |
4494 would be displayed. */ | |
4495 ++it->hpos; | |
4496 } | |
4497 else | |
4498 { | |
4499 /* Glyph is completely off the left margin of the display | |
4500 area. Nothing to do. */ | |
4501 } | |
4502 } | |
4503 | |
4504 if (result != MOVE_UNDEFINED) | |
4505 break; | |
4506 } | |
4507 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4508 { | |
4509 /* Stop when TO_X specified and reached. This check is | |
4510 necessary here because of lines consisting of a line end, | |
4511 only. The line end will not produce any glyphs and we | |
4512 would never get MOVE_X_REACHED. */ | |
4513 xassert (it->nglyphs == 0); | |
4514 result = MOVE_X_REACHED; | |
4515 break; | |
4516 } | |
4517 | |
4518 /* Is this a line end? If yes, we're done. */ | |
4519 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4520 { | |
4521 result = MOVE_NEWLINE_OR_CR; | |
4522 break; | |
4523 } | |
4524 | |
4525 /* The current display element has been consumed. Advance | |
4526 to the next. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4527 set_iterator_to_next (it, 1); |
25012 | 4528 |
4529 /* Stop if lines are truncated and IT's current x-position is | |
4530 past the right edge of the window now. */ | |
4531 if (it->truncate_lines_p | |
4532 && it->current_x >= it->last_visible_x) | |
4533 { | |
4534 result = MOVE_LINE_TRUNCATED; | |
4535 break; | |
4536 } | |
4537 } | |
4538 | |
4539 /* Restore the iterator settings altered at the beginning of this | |
4540 function. */ | |
4541 it->glyph_row = saved_glyph_row; | |
4542 return result; | |
4543 } | |
4544 | |
4545 | |
4546 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4547 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4548 the description of enum move_operation_enum. | |
4549 | |
4550 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4551 screen line, this function will set IT to the next position > | |
4552 TO_CHARPOS. */ | |
4553 | |
4554 void | |
4555 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4556 struct it *it; | |
4557 int to_charpos, to_x, to_y, to_vpos; | |
4558 int op; | |
4559 { | |
4560 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4561 int line_height; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4562 int reached = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4563 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4564 for (;;) |
25012 | 4565 { |
4566 if (op & MOVE_TO_VPOS) | |
4567 { | |
4568 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4569 start of the line TO_VPOS. */ | |
4570 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4571 { | |
4572 if (it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4573 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4574 reached = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4575 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4576 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4577 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4578 skip = move_it_in_display_line_to (it, -1, -1, 0); |
25012 | 4579 } |
4580 else | |
4581 { | |
4582 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4583 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
|
4584 if (it->vpos == to_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4585 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4586 reached = 2; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4587 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4588 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4589 |
25012 | 4590 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); |
4591 | |
4592 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
|
4593 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4594 reached = 3; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4595 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4596 } |
25012 | 4597 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) |
4598 { | |
4599 /* We have reached TO_X but not in the line we want. */ | |
4600 skip = move_it_in_display_line_to (it, to_charpos, | |
4601 -1, MOVE_TO_POS); | |
4602 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4603 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4604 reached = 4; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4605 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4606 } |
25012 | 4607 } |
4608 } | |
4609 } | |
4610 else if (op & MOVE_TO_Y) | |
4611 { | |
4612 struct it it_backup; | |
4613 | |
4614 /* TO_Y specified means stop at TO_X in the line containing | |
4615 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4616 problem is that we can't really tell whether the line | |
4617 contains TO_Y before we have completely scanned it, and | |
4618 this may skip past TO_X. What we do is to first scan to | |
4619 TO_X. | |
4620 | |
4621 If TO_X is not specified, use a TO_X of zero. The reason | |
4622 is to make the outcome of this function more predictable. | |
4623 If we didn't use TO_X == 0, we would stop at the end of | |
4624 the line which is probably not what a caller would expect | |
4625 to happen. */ | |
4626 skip = move_it_in_display_line_to (it, to_charpos, | |
4627 ((op & MOVE_TO_X) | |
4628 ? to_x : 0), | |
4629 (MOVE_TO_X | |
4630 | (op & MOVE_TO_POS))); | |
4631 | |
4632 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4633 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4634 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4635 reached = 5; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4636 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4637 } |
25012 | 4638 |
4639 /* If TO_X was reached, we would like to know whether TO_Y | |
4640 is in the line. This can only be said if we know the | |
4641 total line height which requires us to scan the rest of | |
4642 the line. */ | |
4643 if (skip == MOVE_X_REACHED) | |
4644 { | |
4645 it_backup = *it; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4646 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it))); |
25012 | 4647 skip2 = move_it_in_display_line_to (it, to_charpos, -1, |
4648 op & MOVE_TO_POS); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4649 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it))); |
25012 | 4650 } |
4651 | |
4652 /* Now, decide whether TO_Y is in this line. */ | |
4653 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
|
4654 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height)); |
25012 | 4655 |
4656 if (to_y >= it->current_y | |
4657 && to_y < it->current_y + line_height) | |
4658 { | |
4659 if (skip == MOVE_X_REACHED) | |
4660 /* If TO_Y is in this line and TO_X was reached above, | |
4661 we scanned too far. We have to restore IT's settings | |
4662 to the ones before skipping. */ | |
4663 *it = it_backup; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4664 reached = 6; |
25012 | 4665 } |
4666 else if (skip == MOVE_X_REACHED) | |
4667 { | |
4668 skip = skip2; | |
4669 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4670 reached = 7; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4671 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4672 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4673 if (reached) |
25012 | 4674 break; |
4675 } | |
4676 else | |
4677 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4678 | |
4679 switch (skip) | |
4680 { | |
4681 case MOVE_POS_MATCH_OR_ZV: | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4682 reached = 8; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4683 goto out; |
25012 | 4684 |
4685 case MOVE_NEWLINE_OR_CR: | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4686 set_iterator_to_next (it, 1); |
25012 | 4687 it->continuation_lines_width = 0; |
4688 break; | |
4689 | |
4690 case MOVE_LINE_TRUNCATED: | |
4691 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
|
4692 reseat_at_next_visible_line_start (it, 0); |
25012 | 4693 if ((op & MOVE_TO_POS) != 0 |
4694 && IT_CHARPOS (*it) > to_charpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4695 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4696 reached = 9; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4697 goto out; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4698 } |
25012 | 4699 break; |
4700 | |
4701 case MOVE_LINE_CONTINUED: | |
4702 it->continuation_lines_width += it->current_x; | |
4703 break; | |
4704 | |
4705 default: | |
4706 abort (); | |
4707 } | |
4708 | |
4709 /* Reset/increment for the next run. */ | |
4710 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4711 it->current_x = it->hpos = 0; | |
4712 it->current_y += it->max_ascent + it->max_descent; | |
4713 ++it->vpos; | |
4714 last_height = it->max_ascent + it->max_descent; | |
4715 last_max_ascent = it->max_ascent; | |
4716 it->max_ascent = it->max_descent = 0; | |
4717 } | |
30744
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 out: |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4720 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4721 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached)); |
25012 | 4722 } |
4723 | |
4724 | |
4725 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4726 | |
4727 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4728 means move IT backward to the preceding line start or BEGV. This | |
4729 function may move over more than DY pixels if IT->current_y - DY | |
4730 ends up in the middle of a line; in this case IT->current_y will be | |
4731 set to the top of the line moved to. */ | |
4732 | |
4733 void | |
4734 move_it_vertically_backward (it, dy) | |
4735 struct it *it; | |
4736 int dy; | |
4737 { | |
4738 int nlines, h, line_height; | |
4739 struct it it2; | |
4740 int start_pos = IT_CHARPOS (*it); | |
4741 | |
4742 xassert (dy >= 0); | |
4743 | |
4744 /* Estimate how many newlines we must move back. */ | |
4745 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4746 | |
4747 /* Set the iterator's position that many lines back. */ | |
4748 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4749 back_to_previous_visible_line_start (it); | |
4750 | |
4751 /* Reseat the iterator here. When moving backward, we don't want | |
4752 reseat to skip forward over invisible text, set up the iterator | |
4753 to deliver from overlay strings at the new position etc. So, | |
4754 use reseat_1 here. */ | |
4755 reseat_1 (it, it->current.pos, 1); | |
4756 | |
4757 /* We are now surely at a line start. */ | |
4758 it->current_x = it->hpos = 0; | |
4759 | |
4760 /* Move forward and see what y-distance we moved. First move to the | |
4761 start of the next line so that we get its height. We need this | |
4762 height to be able to tell whether we reached the specified | |
4763 y-distance. */ | |
4764 it2 = *it; | |
4765 it2.max_ascent = it2.max_descent = 0; | |
4766 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
4767 MOVE_TO_POS | MOVE_TO_VPOS); | |
4768 xassert (IT_CHARPOS (*it) >= BEGV); | |
4769 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
|
4770 |
25012 | 4771 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); |
4772 xassert (IT_CHARPOS (*it) >= BEGV); | |
4773 h = it2.current_y - it->current_y; | |
4774 nlines = it2.vpos - it->vpos; | |
4775 | |
4776 /* Correct IT's y and vpos position. */ | |
4777 it->vpos -= nlines; | |
4778 it->current_y -= h; | |
4779 | |
4780 if (dy == 0) | |
4781 { | |
4782 /* DY == 0 means move to the start of the screen line. The | |
4783 value of nlines is > 0 if continuation lines were involved. */ | |
4784 if (nlines > 0) | |
4785 move_it_by_lines (it, nlines, 1); | |
4786 xassert (IT_CHARPOS (*it) <= start_pos); | |
4787 } | |
4788 else if (nlines) | |
4789 { | |
4790 /* The y-position we try to reach. Note that h has been | |
4791 subtracted in front of the if-statement. */ | |
4792 int target_y = it->current_y + h - dy; | |
4793 | |
4794 /* If we did not reach target_y, try to move further backward if | |
4795 we can. If we moved too far backward, try to move forward. */ | |
4796 if (target_y < it->current_y | |
4797 && IT_CHARPOS (*it) > BEGV) | |
4798 { | |
4799 move_it_vertically (it, target_y - it->current_y); | |
4800 xassert (IT_CHARPOS (*it) >= BEGV); | |
4801 } | |
4802 else if (target_y >= it->current_y + line_height | |
4803 && IT_CHARPOS (*it) < ZV) | |
4804 { | |
4805 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
4806 xassert (IT_CHARPOS (*it) >= BEGV); | |
4807 } | |
4808 } | |
4809 } | |
4810 | |
4811 | |
4812 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
4813 move backwards. DY = 0 means move to start of screen line. At the | |
4814 end, IT will be on the start of a screen line. */ | |
4815 | |
4816 void | |
4817 move_it_vertically (it, dy) | |
4818 struct it *it; | |
4819 int dy; | |
4820 { | |
4821 if (dy <= 0) | |
4822 move_it_vertically_backward (it, -dy); | |
4823 else if (dy > 0) | |
4824 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4825 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy)); |
25012 | 4826 move_it_to (it, ZV, -1, it->current_y + dy, -1, |
4827 MOVE_TO_POS | MOVE_TO_Y); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4828 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it))); |
25012 | 4829 |
4830 /* If buffer ends in ZV without a newline, move to the start of | |
4831 the line to satisfy the post-condition. */ | |
4832 if (IT_CHARPOS (*it) == ZV | |
4833 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
4834 move_it_by_lines (it, 0, 0); | |
4835 } | |
4836 } | |
4837 | |
4838 | |
4839 /* Return non-zero if some text between buffer positions START_CHARPOS | |
4840 and END_CHARPOS is invisible. IT->window is the window for text | |
4841 property lookup. */ | |
4842 | |
4843 static int | |
4844 invisible_text_between_p (it, start_charpos, end_charpos) | |
4845 struct it *it; | |
4846 int start_charpos, end_charpos; | |
4847 { | |
4848 Lisp_Object prop, limit; | |
4849 int invisible_found_p; | |
4850 | |
4851 xassert (it != NULL && start_charpos <= end_charpos); | |
4852 | |
4853 /* Is text at START invisible? */ | |
4854 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
4855 it->window); | |
4856 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
4857 invisible_found_p = 1; | |
4858 else | |
4859 { | |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
4860 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
|
4861 Qinvisible, Qnil, |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
4862 make_number (end_charpos)); |
25012 | 4863 invisible_found_p = XFASTINT (limit) < end_charpos; |
4864 } | |
4865 | |
4866 return invisible_found_p; | |
4867 } | |
4868 | |
4869 | |
4870 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
4871 negative means move up. DVPOS == 0 means move to the start of the | |
4872 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
4873 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
4874 | |
4875 Further optimization ideas: If we would know that IT->f doesn't use | |
4876 a face with proportional font, we could be faster for | |
4877 truncate-lines nil. */ | |
4878 | |
4879 void | |
4880 move_it_by_lines (it, dvpos, need_y_p) | |
4881 struct it *it; | |
4882 int dvpos, need_y_p; | |
4883 { | |
4884 struct position pos; | |
4885 | |
4886 if (!FRAME_WINDOW_P (it->f)) | |
4887 { | |
4888 struct text_pos textpos; | |
4889 | |
4890 /* We can use vmotion on frames without proportional fonts. */ | |
4891 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
4892 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
4893 reseat (it, textpos, 1); | |
4894 it->vpos += pos.vpos; | |
4895 it->current_y += pos.vpos; | |
4896 } | |
4897 else if (dvpos == 0) | |
4898 { | |
4899 /* DVPOS == 0 means move to the start of the screen line. */ | |
4900 move_it_vertically_backward (it, 0); | |
4901 xassert (it->current_x == 0 && it->hpos == 0); | |
4902 } | |
4903 else if (dvpos > 0) | |
4904 { | |
4905 /* If there are no continuation lines, and if there is no | |
4906 selective display, try the simple method of moving forward | |
4907 DVPOS newlines, then see where we are. */ | |
4908 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4909 { | |
4910 int shortage = 0, charpos; | |
4911 | |
4912 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n')) | |
4913 charpos = IT_CHARPOS (*it) + 1; | |
4914 else | |
4915 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
4916 &shortage, 0); | |
4917 | |
4918 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
4919 { | |
4920 struct text_pos pos; | |
4921 CHARPOS (pos) = charpos; | |
4922 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4923 reseat (it, pos, 1); | |
4924 it->vpos += dvpos - shortage; | |
4925 it->hpos = it->current_x = 0; | |
4926 return; | |
4927 } | |
4928 } | |
4929 | |
4930 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
4931 } | |
4932 else | |
4933 { | |
4934 struct it it2; | |
4935 int start_charpos, i; | |
4936 | |
4937 /* If there are no continuation lines, and if there is no | |
4938 selective display, try the simple method of moving backward | |
4939 -DVPOS newlines. */ | |
4940 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4941 { | |
4942 int shortage; | |
4943 int charpos = IT_CHARPOS (*it); | |
4944 int bytepos = IT_BYTEPOS (*it); | |
4945 | |
4946 /* If in the middle of a line, go to its start. */ | |
4947 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
4948 { | |
4949 charpos = find_next_newline_no_quit (charpos, -1); | |
4950 bytepos = CHAR_TO_BYTE (charpos); | |
4951 } | |
4952 | |
4953 if (charpos == BEGV) | |
4954 { | |
4955 struct text_pos pos; | |
4956 CHARPOS (pos) = charpos; | |
4957 BYTEPOS (pos) = bytepos; | |
4958 reseat (it, pos, 1); | |
4959 it->hpos = it->current_x = 0; | |
4960 return; | |
4961 } | |
4962 else | |
4963 { | |
4964 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
4965 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
4966 { | |
4967 struct text_pos pos; | |
4968 CHARPOS (pos) = charpos; | |
4969 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4970 reseat (it, pos, 1); | |
4971 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
4972 it->hpos = it->current_x = 0; | |
4973 return; | |
4974 } | |
4975 } | |
4976 } | |
4977 | |
4978 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
4979 start_charpos = IT_CHARPOS (*it); | |
4980 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
4981 back_to_previous_visible_line_start (it); | |
4982 reseat (it, it->current.pos, 1); | |
4983 it->current_x = it->hpos = 0; | |
4984 | |
4985 /* Above call may have moved too far if continuation lines | |
4986 are involved. Scan forward and see if it did. */ | |
4987 it2 = *it; | |
4988 it2.vpos = it2.current_y = 0; | |
4989 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
4990 it->vpos -= it2.vpos; | |
4991 it->current_y -= it2.current_y; | |
4992 it->current_x = it->hpos = 0; | |
4993 | |
4994 /* If we moved too far, move IT some lines forward. */ | |
4995 if (it2.vpos > -dvpos) | |
4996 { | |
4997 int delta = it2.vpos + dvpos; | |
4998 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
4999 } | |
5000 } | |
5001 } | |
5002 | |
5003 | |
5004 | |
5005 /*********************************************************************** | |
5006 Messages | |
5007 ***********************************************************************/ | |
5008 | |
5009 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5010 /* 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
|
5011 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5012 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5013 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5014 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
|
5015 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5016 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5017 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5018 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5019 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5020 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5021 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5022 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
|
5023 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5024 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5025 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5026 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5027 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
|
5028 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5029 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
|
5030 msg = Fformat (3, args); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5031 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5032 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
|
5033 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5034 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5035 |
28876
04cbb0510d7e
(add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents:
28869
diff
changeset
|
5036 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
|
5037 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5038 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5039 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5040 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5041 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5042 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5043 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5044 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5045 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5046 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5047 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
|
5048 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5049 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5050 |
25012 | 5051 /* Add a string M of length LEN to the message log, optionally |
5052 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
5053 nonzero, means interpret the contents of M as multibyte. This | |
5054 function calls low-level routines in order to bypass text property | |
5055 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
|
5056 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5057 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5058 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5059 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5060 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5061 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5062 if (!NILP (Vmessage_log_max)) |
10393 | 5063 { |
5064 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5065 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
|
5066 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
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
5071 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5072 old_deactivate_mark = Vdeactivate_mark; |
10393 | 5073 oldbuf = current_buffer; |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
5074 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
|
5075 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5076 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5077 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5078 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5079 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5080 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5081 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5082 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
|
5083 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5084 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
|
5085 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5086 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5087 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5088 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5089 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5090 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5091 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
|
5092 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5093 /* 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
|
5094 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
|
5095 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
|
5096 && 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
|
5097 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5098 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5099 unsigned char work[1]; |
25012 | 5100 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5101 /* 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
|
5102 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
|
5103 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
|
5104 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
5105 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
|
5106 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
|
5107 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5108 : 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
|
5109 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
|
5110 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5111 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5112 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
|
5113 && ! 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
|
5114 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5115 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
|
5116 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5117 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
|
5118 /* 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
|
5119 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
|
5120 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
|
5121 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5122 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
|
5123 nbytes = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5124 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
|
5125 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5126 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5127 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5128 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
|
5129 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5130 if (nlflag) |
10393 | 5131 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5132 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
|
5133 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5134 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5135 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
|
5136 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5137 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5138 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5139 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5140 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5141 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
|
5142 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5143 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5144 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
5145 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
|
5146 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5147 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5148 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5149 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5150 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5151 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5152 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5153 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5154 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5155 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5156 /* 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
|
5157 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5158 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5159 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5160 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
|
5161 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5162 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5163 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5164 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5165 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5166 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5167 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5168 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5169 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5170 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
|
5171 } |
10393 | 5172 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5173 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5174 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5175 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5176 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5177 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5178 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5179 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5180 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5181 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5182 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5183 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5184 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5185 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5186 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5187 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5188 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
|
5189 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5190 /* 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
|
5191 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5192 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
|
5193 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5194 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5195 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5196 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5197 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5198 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5199 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5200 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 5201 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5202 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5203 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
|
5204 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5205 Vdeactivate_mark = old_deactivate_mark; |
10393 | 5206 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5207 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5208 |
25012 | 5209 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5210 /* 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
|
5211 (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
|
5212 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
|
5213 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
|
5214 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
|
5215 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5216 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5217 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
|
5218 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5219 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5220 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5221 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
5222 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
|
5223 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5224 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
|
5225 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
|
5226 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5227 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5228 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5229 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.' |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5230 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5231 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5232 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5233 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5234 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5235 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5236 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5237 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5238 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5239 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5240 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5241 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5242 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5243 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5244 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5245 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5246 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5247 } |
25012 | 5248 |
5249 | |
5250 /* Display an echo area message M with a specified length of LEN | |
5251 chars. The string may include null characters. If M is 0, clear | |
5252 out any existing message, and let the mini-buffer text show through. | |
5253 | |
5254 The buffer M must continue to exist until after the echo area gets | |
5255 cleared or some other message gets displayed there. This means do | |
5256 not pass text that is stored in a Lisp string; do not pass text in | |
5257 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5258 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5259 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5260 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5261 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5262 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5263 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5264 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5265 /* 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
|
5266 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5267 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5268 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5269 message2_nolog (m, len, multibyte); |
10393 | 5270 } |
5271 | |
5272 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5273 /* The non-logging counterpart of message2. */ |
10393 | 5274 |
5275 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5276 message2_nolog (m, len, multibyte) |
10393 | 5277 char *m; |
5278 int len; | |
5279 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5280 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5281 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5282 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5283 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5284 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5285 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5286 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5287 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
|
5288 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
5289 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5290 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5291 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5292 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5293 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5294 /* 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
|
5295 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5296 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 5297 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5298 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5299 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5300 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5301 Lisp_Object mini_window; |
25012 | 5302 struct frame *f; |
5303 | |
5304 /* 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
|
5305 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5306 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
|
5307 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
|
5308 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5309 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5310 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
|
5311 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5312 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
|
5313 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5314 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5315 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5316 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5317 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5318 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5319 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5320 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5321 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5322 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5323 do_pending_window_change (0); |
25012 | 5324 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
|
5325 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
|
5326 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
|
5327 (*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
|
5328 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5329 } |
25012 | 5330 |
5331 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5332 /* 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
|
5333 bytes. The string may include null characters. If M is not a |
25012 | 5334 string, clear out any existing message, and let the mini-buffer |
5335 text show through. */ | |
5336 | |
5337 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5338 message3 (m, nbytes, multibyte) |
25012 | 5339 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5340 int nbytes; |
25012 | 5341 int multibyte; |
5342 { | |
5343 struct gcpro gcpro1; | |
5344 | |
5345 GCPRO1 (m); | |
5346 | |
5347 /* First flush out any partial line written with print. */ | |
5348 message_log_maybe_newline (); | |
5349 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5350 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
|
5351 message3_nolog (m, nbytes, multibyte); |
25012 | 5352 |
5353 UNGCPRO; | |
5354 } | |
5355 | |
5356 | |
5357 /* The non-logging version of message3. */ | |
5358 | |
5359 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5360 message3_nolog (m, nbytes, multibyte) |
25012 | 5361 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5362 int nbytes, multibyte; |
25012 | 5363 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5364 struct frame *sf = SELECTED_FRAME (); |
25012 | 5365 message_enable_multibyte = multibyte; |
5366 | |
5367 if (noninteractive) | |
5368 { | |
5369 if (noninteractive_need_newline) | |
5370 putc ('\n', stderr); | |
5371 noninteractive_need_newline = 0; | |
5372 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5373 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5374 if (cursor_in_echo_area == 0) |
5375 fprintf (stderr, "\n"); | |
5376 fflush (stderr); | |
5377 } | |
5378 /* A null message buffer means that the frame hasn't really been | |
5379 initialized yet. Error messages get reported properly by | |
5380 cmd_error, so this must be just an informative message; toss it. */ | |
5381 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5382 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5383 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5384 { |
5385 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
|
5386 Lisp_Object frame; |
25012 | 5387 struct frame *f; |
5388 | |
5389 /* Get the frame containing the mini-buffer | |
5390 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5391 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
|
5392 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
|
5393 f = XFRAME (frame); |
25012 | 5394 |
5395 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5396 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
|
5397 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5398 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5399 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5400 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
|
5401 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5402 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
|
5403 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5404 Fraise_frame (frame); |
25012 | 5405 } |
5406 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5407 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5408 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5409 do_pending_window_change (0); |
25012 | 5410 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
|
5411 do_pending_window_change (0); |
25012 | 5412 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5413 (*frame_up_to_date_hook) (f); | |
5414 } | |
5415 } | |
5416 | |
5417 | |
5418 /* Display a null-terminated echo area message M. If M is 0, clear | |
5419 out any existing message, and let the mini-buffer text show through. | |
5420 | |
5421 The buffer M must continue to exist until after the echo area gets | |
5422 cleared or some other message gets displayed there. Do not pass | |
5423 text that is stored in a Lisp string. Do not pass text in a buffer | |
5424 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
|
5425 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5426 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5427 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5428 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5429 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5430 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
|
5431 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5432 |
25012 | 5433 |
5434 /* The non-logging counterpart of message1. */ | |
5435 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5436 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5437 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5438 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5439 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5440 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
|
5441 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5442 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5443 /* 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
|
5444 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5445 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5446 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5447 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5448 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5449 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5450 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5451 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5452 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5453 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5454 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5455 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5456 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5457 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5458 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5459 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5460 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5461 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5462 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5463 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5464 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5465 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5466 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5467 /* 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
|
5468 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
|
5469 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
|
5470 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5471 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5472 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5473 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5474 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5475 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5476 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5477 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5478 /* 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
|
5479 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
|
5480 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
|
5481 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5482 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5483 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5484 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5485 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5486 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5487 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5488 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
|
5489 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5490 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5491 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5492 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5493 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5494 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5495 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5496 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5497 /* 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
|
5498 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5499 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5500 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5501 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5502 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5503 |
25012 | 5504 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5505 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5506 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
|
5507 |
277 | 5508 /* VARARGS 1 */ |
5509 void | |
5510 message (m, a1, a2, a3) | |
5511 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5512 EMACS_INT a1, a2, a3; |
277 | 5513 { |
5514 if (noninteractive) | |
5515 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5516 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5517 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5518 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
|
5519 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
|
5520 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
|
5521 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5522 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5523 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
|
5524 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5525 } |
277 | 5526 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5527 else if (INTERACTIVE) |
277 | 5528 { |
25012 | 5529 /* The frame whose mini-buffer we're going to display the message |
5530 on. It may be larger than the selected frame, so we need to | |
5531 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
|
5532 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5533 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5534 |
5535 /* 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
|
5536 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5537 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
|
5538 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5539 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5540 /* 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
|
5541 initialized yet. Error messages get reported properly by |
25012 | 5542 cmd_error, so this must be just an informative message; toss |
5543 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5544 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
|
5545 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5546 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5547 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5548 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
|
5549 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5550 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5551 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5552 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5553 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5554 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5555 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5556 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
|
5557 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5558 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5559 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
|
5560 (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
|
5561 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5562 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5563 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
|
5564 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5565 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5566 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5567 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5568 /* 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
|
5569 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
|
5570 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
|
5571 } |
277 | 5572 } |
5573 } | |
5574 | |
25012 | 5575 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5576 /* The non-logging version of message. */ |
25012 | 5577 |
11193 | 5578 void |
5579 message_nolog (m, a1, a2, a3) | |
5580 char *m; | |
5581 EMACS_INT a1, a2, a3; | |
5582 { | |
5583 Lisp_Object old_log_max; | |
5584 old_log_max = Vmessage_log_max; | |
5585 Vmessage_log_max = Qnil; | |
5586 message (m, a1, a2, a3); | |
5587 Vmessage_log_max = old_log_max; | |
5588 } | |
5589 | |
25012 | 5590 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5591 /* 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
|
5592 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
|
5593 critical. */ |
25012 | 5594 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5595 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5596 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5597 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5598 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
|
5599 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5600 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5601 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5602 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
|
5603 !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
|
5604 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5605 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5606 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5607 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5608 /* 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
|
5609 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5610 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5611 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5612 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5613 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5614 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5615 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5616 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5617 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5618 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5619 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5620 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
|
5621 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
|
5622 int j; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5623 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5624 old_buffer = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5625 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5626 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
|
5627 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
|
5628 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5629 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
|
5630 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
|
5631 echo_area_buffer[j] = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5632 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5633 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5634 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5635 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5636 /* 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
|
5637 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
|
5638 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5639 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
|
5640 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
|
5641 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
|
5642 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5643 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
|
5644 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
|
5645 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5646 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
|
5647 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
|
5648 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
|
5649 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5650 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
|
5651 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5652 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5653 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
|
5654 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5655 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
|
5656 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
|
5657 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
|
5658 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
|
5659 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
|
5660 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5661 Lisp_Object buffer; |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
5662 int this_one, the_other, clear_buffer_p, rc; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5663 int count = specpdl_ptr - specpdl; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5664 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5665 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5666 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
|
5667 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5668 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5669 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5670 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5671 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
|
5672 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5673 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
|
5674 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5675 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5676 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
|
5677 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5678 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5679 /* 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
|
5680 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
|
5681 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
|
5682 && 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
|
5683 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
|
5684 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5685 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5686 /* 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
|
5687 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5688 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
|
5689 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5690 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
|
5691 = (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
|
5692 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5693 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5694 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5695 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5696 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5697 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
|
5698 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5699 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
|
5700 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
|
5701 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5702 /* 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
|
5703 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
|
5704 == 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
|
5705 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
|
5706 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
|
5707 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
|
5708 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5709 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
|
5710 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5711 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5712 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5713 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
|
5714 } |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5715 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5716 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
|
5717 current_buffer->read_only = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5718 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5719 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
|
5720 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5721 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5722 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5723 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
|
5724 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5725 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
|
5726 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5727 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5728 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
|
5729 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5730 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5731 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5732 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5733 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5734 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5735 /* 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
|
5736 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
|
5737 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5738 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5739 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
|
5740 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5741 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5742 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5743 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5744 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5745 /* 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
|
5746 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
|
5747 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
|
5748 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
|
5749 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5750 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5751 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
|
5752 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5753 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
|
5754 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
|
5755 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
|
5756 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5757 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5758 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5759 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
|
5760 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
|
5761 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5762 = 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
|
5763 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5764 = 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
|
5765 } |
25012 | 5766 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5767 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5768 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5769 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5770 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
|
5771 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5772 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5773 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
|
5774 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5775 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5776 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5777 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5778 /* 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
|
5779 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
|
5780 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5781 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5782 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
|
5783 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5784 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5785 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5786 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5787 set_buffer_internal_1 (XBUFFER (XVECTOR (vector)->contents[i])); ++i; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5788 Vdeactivate_mark = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5789 windows_or_buffers_changed = XFASTINT (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5790 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5791 if (WINDOWP (XVECTOR (vector)->contents[i])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5792 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5793 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5794 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
|
5795 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5796 w = XWINDOW (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5797 buffer = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5798 charpos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5799 bytepos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5800 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5801 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5802 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
|
5803 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5804 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5805 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5806 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
|
5807 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5808 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5809 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5810 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5811 /* 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
|
5812 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
|
5813 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5814 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5815 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
|
5816 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5817 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5818 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5819 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5820 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5821 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5822 /* 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
|
5823 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
|
5824 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
|
5825 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
|
5826 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5827 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
|
5828 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5829 /* 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
|
5830 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5831 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5832 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5833 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
|
5834 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5835 /* 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
|
5836 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5837 != !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
|
5838 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
|
5839 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5840 /* 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
|
5841 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5842 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5843 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
|
5844 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5845 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
|
5846 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
|
5847 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5848 |
29643
77f1e8db4147
(setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents:
29634
diff
changeset
|
5849 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
|
5850 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5851 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5852 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5853 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5854 if (NILP (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5855 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5856 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
|
5857 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
|
5858 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5859 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
|
5860 } |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5861 |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5862 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
|
5863 /* Someone switched buffers between print requests. */ |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5864 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
|
5865 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5866 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5867 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5868 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5869 /* 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
|
5870 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
|
5871 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
|
5872 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
|
5873 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5874 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5875 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5876 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5877 { |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5878 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
|
5879 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5880 /* 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
|
5881 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
|
5882 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
|
5883 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
|
5884 redisplay. */ |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5885 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
|
5886 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5887 /* 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
|
5888 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
|
5889 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
|
5890 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
|
5891 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
|
5892 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
|
5893 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5894 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5895 = 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
|
5896 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
|
5897 (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
|
5898 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5899 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5900 echo_area_buffer[i] = Qnil; |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5901 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
5902 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
|
5903 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
|
5904 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5905 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5906 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5907 /* 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
|
5908 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
|
5909 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
|
5910 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
|
5911 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
|
5912 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5913 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5914 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
|
5915 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
|
5916 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
|
5917 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5918 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5919 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
|
5920 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5921 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5922 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
|
5923 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5924 /* 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
|
5925 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5926 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
|
5927 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5928 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5929 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
|
5930 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5931 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
|
5932 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5933 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5934 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
|
5935 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5936 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5937 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5938 /* 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
|
5939 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
|
5940 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5941 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5942 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5943 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5944 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5945 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5946 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5947 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
|
5948 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5949 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5950 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
|
5951 (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
|
5952 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5953 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5954 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5955 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5956 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5957 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5958 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5959 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5960 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5961 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5962 /* 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
|
5963 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
|
5964 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
|
5965 returns. */ |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5966 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5967 static int |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5968 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
|
5969 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
|
5970 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
|
5971 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5972 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5973 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
|
5974 } |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5975 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5976 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5977 /* 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
|
5978 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
|
5979 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
|
5980 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
|
5981 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5982 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5983 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
|
5984 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5985 int exact_p; |
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 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
|
5988 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
|
5989 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5990 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5991 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5992 /* Nil means don't try to resize. */ |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5993 if (NILP (Vmax_mini_window_height) |
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5994 || (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
|
5995 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5997 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
|
5998 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5999 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6000 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
|
6001 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
|
6002 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6003 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
|
6004 struct text_pos start; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6005 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6006 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
|
6007 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6008 /* 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
|
6009 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
|
6010 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
|
6011 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
|
6012 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
|
6013 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6014 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
|
6015 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6016 /* 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
|
6017 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
|
6018 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
|
6019 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6020 /* 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
|
6021 if (it.truncate_lines_p) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6022 height = 1; |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
6023 else |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6024 { |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6025 last_height = 0; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6026 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
|
6027 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
|
6028 height = it.current_y + last_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6029 else |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6030 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
|
6031 height -= it.extra_line_spacing; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6032 height = (height + unit - 1) / unit; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6033 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6034 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6035 /* 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
|
6036 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6037 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6038 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6039 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
|
6040 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
|
6041 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6042 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6043 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6044 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
|
6045 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
|
6046 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6047 /* Let it grow only, until we display an empty message, in which |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6048 case the window shrinks again. */ |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6049 if (height > XFASTINT (w->height)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6050 { |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
6051 int old_height = XFASTINT (w->height); |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6052 freeze_window_starts (f, 1); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6053 grow_mini_window (w, height - XFASTINT (w->height)); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6054 window_height_changed_p = XFASTINT (w->height) != old_height; |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6055 } |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6056 else if (height < XFASTINT (w->height) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6057 && (exact_p || BEGV == ZV)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6058 { |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6059 int old_height = XFASTINT (w->height); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6060 freeze_window_starts (f, 0); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
6061 shrink_mini_window (w); |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
6062 window_height_changed_p = XFASTINT (w->height) != old_height; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6063 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6064 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6065 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6066 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
|
6067 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6068 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6069 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6070 /* 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
|
6071 current message. */ |
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 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6074 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6075 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6076 Lisp_Object msg; |
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 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
|
6079 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6080 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6081 { |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6082 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
|
6083 (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
|
6084 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6085 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
|
6086 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6087 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6088 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6089 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6090 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6091 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6092 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6093 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
|
6094 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
|
6095 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
|
6096 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6097 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6098 Lisp_Object *msg = (Lisp_Object *) a1; |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6099 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6100 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6101 *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
|
6102 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6103 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6104 return 0; |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6107 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6108 /* 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
|
6109 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
|
6110 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
|
6111 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6112 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6113 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6114 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6115 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6116 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6117 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6118 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
|
6119 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6120 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6121 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6122 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6123 /* 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
|
6124 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6125 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6126 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6127 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6128 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6129 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6130 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6131 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6132 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6133 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
|
6134 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6135 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
|
6136 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6137 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6138 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6139 /* 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
|
6140 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6141 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6142 pop_message () |
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 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6145 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
|
6146 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6147 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6148 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6149 /* 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
|
6150 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
|
6151 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6152 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6153 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6154 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6155 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6156 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6157 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6158 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6159 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6160 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6161 /* 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
|
6162 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
|
6163 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6164 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6165 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6166 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6167 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6168 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6169 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
|
6170 /* 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
|
6171 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
|
6172 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
|
6173 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6174 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6175 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6176 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6177 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6178 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
|
6179 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
|
6180 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6181 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6182 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6183 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6184 /* 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
|
6185 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
|
6186 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6187 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6188 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
|
6189 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
|
6190 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
|
6191 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
|
6192 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6193 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6194 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
|
6195 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6196 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
|
6197 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6198 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6199 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6200 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6201 /* 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
|
6202 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6203 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
|
6204 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
|
6205 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
|
6206 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6207 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
|
6208 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
|
6209 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
|
6210 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6211 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6212 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
|
6213 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6214 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6215 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6216 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6217 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6218 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6219 || (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
|
6220 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6221 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
|
6222 (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
|
6223 message_buf_print = 0; |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
6224 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
|
6225 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6226 |
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 /* 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
|
6229 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
|
6230 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
|
6231 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6232 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6233 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6234 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
|
6235 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
|
6236 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
|
6237 EMACS_INT nbytes, multibyte_p; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6238 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6239 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
|
6240 Lisp_Object string = a2; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6241 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6242 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6243 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6244 /* 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
|
6245 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6246 != !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
|
6247 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
|
6248 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6249 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
|
6250 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6251 /* 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
|
6252 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
|
6253 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6254 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6255 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6256 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6257 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6258 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6259 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
|
6260 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
|
6261 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6262 /* 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
|
6263 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
|
6264 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
|
6265 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
|
6266 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6267 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6268 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6269 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6270 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6271 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6272 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
|
6273 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6274 /* 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
|
6275 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6276 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6277 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6278 /* 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
|
6279 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
|
6280 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6281 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
|
6282 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
|
6283 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6284 : 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
|
6285 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
|
6286 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6287 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6288 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6289 && !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
|
6290 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6291 /* 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
|
6292 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6293 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6294 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
|
6295 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6296 /* 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
|
6297 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
|
6298 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6299 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
|
6300 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6301 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
|
6302 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6303 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6304 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6305 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
|
6306 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6307 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6308 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6309 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6310 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6311 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6312 /* 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
|
6313 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
|
6314 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6315 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6316 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6317 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
|
6318 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
|
6319 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6320 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6321 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
|
6322 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6323 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6324 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
|
6325 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6326 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6327 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6328 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6329 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6330 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6331 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
|
6332 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
|
6333 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
|
6334 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
|
6335 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
|
6336 and ensure a complete redisplay of all windows. */ |
25012 | 6337 |
277 | 6338 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6339 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6340 { |
769 | 6341 if (frame_garbaged) |
277 | 6342 { |
25012 | 6343 Lisp_Object tail, frame; |
6344 | |
6345 FOR_EACH_FRAME (tail, frame) | |
6346 { | |
6347 struct frame *f = XFRAME (frame); | |
6348 | |
6349 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
6350 { | |
6351 clear_current_matrices (f); | |
6352 f->garbaged = 0; | |
6353 } | |
6354 } | |
6355 | |
769 | 6356 frame_garbaged = 0; |
25012 | 6357 ++windows_or_buffers_changed; |
6358 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6359 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6360 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6361 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6362 /* 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
|
6363 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
|
6364 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
|
6365 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6366 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6367 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
|
6368 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6369 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6370 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6371 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6372 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6373 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6374 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6375 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6376 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
|
6377 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6378 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
|
6379 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6380 /* 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
|
6381 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
|
6382 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6383 |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6384 #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
|
6385 /* 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
|
6386 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
|
6387 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
|
6388 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
|
6389 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6390 return 0; |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6391 #endif /* HAVE_WINDOW_SYSTEM */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6392 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6393 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6394 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6395 clear_garbaged_frames (); |
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 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
|
6398 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6399 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
|
6400 window_height_changed_p = display_echo_area (w); |
25012 | 6401 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
|
6402 |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6403 /* Update the display, unless called from redisplay_internal. */ |
25012 | 6404 if (update_frame_p) |
6405 { | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6406 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6407 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6408 /* If the display update has been interrupted by pending |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6409 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
|
6410 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
|
6411 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
|
6412 garbaged. This looks odd, so we prevent it here. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6413 if (!display_completed) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6414 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6415 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6416 if (window_height_changed_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6417 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6418 /* Must update other windows. */ |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6419 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
|
6420 redisplay_internal (0); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6421 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6422 else if (FRAME_WINDOW_P (f) && n == 0) |
25012 | 6423 { |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6424 /* Window configuration is the same as before. |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6425 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
|
6426 unless we displayed some mode lines. */ |
25012 | 6427 update_single_window (w, 1); |
6428 rif->flush_display (f); | |
6429 } | |
6430 else | |
6431 update_frame (f, 1, 1); | |
6432 } | |
277 | 6433 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6434 else if (!EQ (mini_window, selected_window)) |
277 | 6435 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
|
6436 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6437 /* 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
|
6438 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
|
6439 |
25012 | 6440 /* Prevent redisplay optimization in redisplay_internal by resetting |
6441 this_line_start_pos. This is done because the mini-buffer now | |
6442 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
|
6443 if (EQ (mini_window, selected_window)) |
25012 | 6444 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
|
6445 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6446 return window_height_changed_p; |
25012 | 6447 } |
6448 | |
6449 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6450 |
25012 | 6451 /*********************************************************************** |
6452 Frame Titles | |
6453 ***********************************************************************/ | |
6454 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6455 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6456 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6457 |
6458 /* A buffer for constructing frame titles in it; allocated from the | |
6459 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6460 | |
6461 static char *frame_title_buf; | |
6462 | |
6463 /* The buffer's end, and a current output position in it. */ | |
6464 | |
6465 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
|
6466 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
|
6467 |
25012 | 6468 |
6469 /* Store a single character C for the frame title in frame_title_buf. | |
6470 Re-allocate frame_title_buf if necessary. */ | |
6471 | |
6472 static void | |
6473 store_frame_title_char (c) | |
6474 char c; | |
6475 { | |
6476 /* If output position has reached the end of the allocated buffer, | |
6477 double the buffer's size. */ | |
6478 if (frame_title_ptr == frame_title_buf_end) | |
6479 { | |
6480 int len = frame_title_ptr - frame_title_buf; | |
6481 int new_size = 2 * len * sizeof *frame_title_buf; | |
6482 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6483 frame_title_buf_end = frame_title_buf + new_size; | |
6484 frame_title_ptr = frame_title_buf + len; | |
6485 } | |
6486 | |
6487 *frame_title_ptr++ = c; | |
6488 } | |
6489 | |
6490 | |
6491 /* Store part of a frame title in frame_title_buf, beginning at | |
6492 frame_title_ptr. STR is the string to store. Do not copy more | |
6493 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
6494 the whole string. Pad with spaces until FIELD_WIDTH number of | |
6495 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
6496 Called from display_mode_element when it is used to build a frame | |
6497 title. */ | |
6498 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6499 static int |
25012 | 6500 store_frame_title (str, field_width, precision) |
6501 unsigned char *str; | |
6502 int field_width, precision; | |
6503 { | |
6504 int n = 0; | |
6505 | |
6506 /* Copy at most PRECISION chars from STR. */ | |
6507 while ((precision <= 0 || n < precision) | |
6508 && *str) | |
6509 { | |
6510 store_frame_title_char (*str++); | |
6511 ++n; | |
6512 } | |
6513 | |
6514 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6515 while (field_width > 0 | |
6516 && n < field_width) | |
6517 { | |
6518 store_frame_title_char (' '); | |
6519 ++n; | |
6520 } | |
6521 | |
6522 return n; | |
6523 } | |
6524 | |
6525 | |
6526 /* Set the title of FRAME, if it has changed. The title format is | |
6527 Vicon_title_format if FRAME is iconified, otherwise it is | |
6528 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6529 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6530 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6531 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
|
6532 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6533 { |
25012 | 6534 struct frame *f = XFRAME (frame); |
6535 | |
6536 if (FRAME_WINDOW_P (f) | |
6537 || FRAME_MINIBUF_ONLY_P (f) | |
6538 || f->explicit_name) | |
6539 { | |
6540 /* Do we have more than one visible frame on this X display? */ | |
6541 Lisp_Object tail; | |
6542 Lisp_Object fmt; | |
6543 struct buffer *obuf; | |
6544 int len; | |
6545 struct it it; | |
6546 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6547 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
|
6548 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6549 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6550 |
6551 if (tf != f | |
6552 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6553 && !FRAME_MINIBUF_ONLY_P (tf) | |
6554 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6555 break; | |
6556 } | |
6557 | |
6558 /* Set global variable indicating that multiple frames exist. */ | |
6559 multiple_frames = CONSP (tail); | |
6560 | |
6561 /* Switch to the buffer of selected window of the frame. Set up | |
6562 frame_title_ptr so that display_mode_element will output into it; | |
6563 then display the title. */ | |
6564 obuf = current_buffer; | |
6565 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6566 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6567 frame_title_ptr = frame_title_buf; | |
6568 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6569 NULL, DEFAULT_FACE_ID); | |
6570 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6571 frame_title_ptr = NULL; | |
6572 set_buffer_internal (obuf); | |
6573 | |
6574 /* Set the title only if it's changed. This avoids consing in | |
6575 the common case where it hasn't. (If it turns out that we've | |
6576 already wasted too much time by walking through the list with | |
6577 display_mode_element, then we might need to optimize at a | |
6578 higher level than this.) */ | |
6579 if (! STRINGP (f->name) | |
6580 || STRING_BYTES (XSTRING (f->name)) != len | |
6581 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6582 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6583 } | |
6584 } | |
6585 | |
6586 #else /* not HAVE_WINDOW_SYSTEM */ | |
6587 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6588 #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
|
6589 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6590 |
6591 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6592 | |
6593 | |
6594 | |
277 | 6595 |
25012 | 6596 /*********************************************************************** |
6597 Menu Bars | |
6598 ***********************************************************************/ | |
6599 | |
6600 | |
6601 /* Prepare for redisplay by updating menu-bar item lists when | |
6602 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6603 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6604 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6605 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6606 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6607 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6608 struct gcpro gcpro1, gcpro2; |
25012 | 6609 struct frame *f; |
6610 struct frame *tooltip_frame; | |
6611 | |
6612 #ifdef HAVE_X_WINDOWS | |
6613 tooltip_frame = tip_frame; | |
6614 #else | |
6615 tooltip_frame = NULL; | |
6616 #endif | |
6617 | |
6618 /* Update all frame titles based on their buffer names, etc. We do | |
6619 this before the menu bars so that the buffer-menu will show the | |
6620 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6621 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6622 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
|
6623 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6624 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6625 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6626 FOR_EACH_FRAME (tail, frame) |
25012 | 6627 { |
6628 f = XFRAME (frame); | |
6629 if (f != tooltip_frame | |
6630 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) | |
6631 x_consider_frame_title (frame); | |
6632 } | |
6633 } | |
6634 #endif /* HAVE_WINDOW_SYSTEM */ | |
6635 | |
6636 /* Update the menu bar item lists, if appropriate. This has to be | |
6637 done before any actual redisplay or generation of display lines. */ | |
6638 all_windows = (update_mode_lines | |
6639 || buffer_shared > 1 | |
6640 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6641 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6642 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6643 Lisp_Object tail, frame; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6644 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6645 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6646 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
|
6647 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6648 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6649 { |
25012 | 6650 f = XFRAME (frame); |
6651 | |
6652 /* Ignore tooltip frame. */ | |
6653 if (f == tooltip_frame) | |
6654 continue; | |
6655 | |
6656 /* If a window on this frame changed size, report that to | |
6657 the user and clear the size-change flag. */ | |
6658 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6659 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6660 Lisp_Object functions; |
25012 | 6661 |
6662 /* Clear flag first in case we get an error below. */ | |
6663 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6664 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6665 GCPRO2 (tail, functions); |
25012 | 6666 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6667 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6668 { |
25012 | 6669 call1 (XCAR (functions), frame); |
6670 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6671 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6672 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6673 } |
25012 | 6674 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6675 GCPRO1 (tail); |
25012 | 6676 update_menu_bar (f, 0); |
6677 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6678 update_tool_bar (f, 0); |
25012 | 6679 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6680 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6681 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6682 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6683 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6684 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6685 else |
25012 | 6686 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6687 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6688 update_menu_bar (sf, 1); |
25012 | 6689 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6690 update_tool_bar (sf, 1); |
25012 | 6691 #endif |
6692 } | |
6693 | |
6694 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6695 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6696 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6697 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6698 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6699 } |
25012 | 6700 |
6701 | |
6702 /* Update the menu bar item list for frame F. This has to be done | |
6703 before we start to fill in any display lines, because it can call | |
6704 eval. | |
6705 | |
6706 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
|
6707 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6708 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6709 update_menu_bar (f, save_match_data) |
25012 | 6710 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6711 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6712 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6713 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6714 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
|
6715 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6716 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6717 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6718 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6719 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6720 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6721 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6722 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
|
6723 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
6724 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6725 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
|
6726 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6727 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
|
6728 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6729 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6730 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6731 /* 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
|
6732 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
|
6733 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
|
6734 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
|
6735 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
|
6736 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
|
6737 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6738 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
|
6739 || !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
|
6740 || ((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
|
6741 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6742 != !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
|
6743 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6744 && !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
|
6745 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6746 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6747 struct buffer *prev = current_buffer; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6748 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6749 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6750 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
|
6751 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6752 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
|
6753 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6754 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6755 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6756 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6757 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6758 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6759 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6760 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 6761 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6762 /* If it has changed current-menubar from previous value, |
25012 | 6763 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
|
6764 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6765 call0 (Qrecompute_lucid_menubar); |
25012 | 6766 |
14299 | 6767 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
|
6768 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 6769 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6770 /* Redisplay the menu bar in case we changed it. */ |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6771 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6772 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
|
6773 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
|
6774 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6775 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 6776 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
|
6777 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6778 #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
|
6779 /* 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
|
6780 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
|
6781 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6782 #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
|
6783 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6784 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
|
6785 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6786 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6787 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6788 } |
25012 | 6789 |
6790 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6791 |
25012 | 6792 /*********************************************************************** |
25543 | 6793 Tool-bars |
25012 | 6794 ***********************************************************************/ |
6795 | |
6796 #ifdef HAVE_WINDOW_SYSTEM | |
6797 | |
25543 | 6798 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 6799 before we start to fill in any display lines. Called from |
6800 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
6801 and restore it here. */ | |
6802 | |
6803 static void | |
25543 | 6804 update_tool_bar (f, save_match_data) |
25012 | 6805 struct frame *f; |
6806 int save_match_data; | |
6807 { | |
25543 | 6808 if (WINDOWP (f->tool_bar_window) |
6809 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 6810 { |
6811 Lisp_Object window; | |
6812 struct window *w; | |
6813 | |
6814 window = FRAME_SELECTED_WINDOW (f); | |
6815 w = XWINDOW (window); | |
6816 | |
6817 /* If the user has switched buffers or windows, we need to | |
6818 recompute to reflect the new bindings. But we'll | |
6819 recompute when update_mode_lines is set too; that means | |
6820 that people can use force-mode-line-update to request | |
6821 that the menu bar be recomputed. The adverse effect on | |
6822 the rest of the redisplay algorithm is about the same as | |
6823 windows_or_buffers_changed anyway. */ | |
6824 if (windows_or_buffers_changed | |
6825 || !NILP (w->update_mode_line) | |
6826 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
6827 < BUF_MODIFF (XBUFFER (w->buffer))) | |
6828 != !NILP (w->last_had_star)) | |
6829 || ((!NILP (Vtransient_mark_mode) | |
6830 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
6831 != !NILP (w->region_showing))) | |
6832 { | |
6833 struct buffer *prev = current_buffer; | |
6834 int count = specpdl_ptr - specpdl; | |
6835 | |
6836 /* Set current_buffer to the buffer of the selected | |
6837 window of the frame, so that we get the right local | |
6838 keymaps. */ | |
6839 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
6840 | |
6841 /* Save match data, if we must. */ | |
6842 if (save_match_data) | |
6843 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
6844 | |
6845 /* Make sure that we don't accidentally use bogus keymaps. */ | |
6846 if (NILP (Voverriding_local_map_menu_flag)) | |
6847 { | |
6848 specbind (Qoverriding_terminal_local_map, Qnil); | |
6849 specbind (Qoverriding_local_map, Qnil); | |
6850 } | |
6851 | |
25543 | 6852 /* Build desired tool-bar items from keymaps. */ |
6853 f->desired_tool_bar_items | |
6854 = tool_bar_items (f->desired_tool_bar_items, | |
6855 &f->n_desired_tool_bar_items); | |
25012 | 6856 |
25543 | 6857 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 6858 w->update_mode_line = Qt; |
6859 | |
6860 unbind_to (count, Qnil); | |
6861 set_buffer_internal_1 (prev); | |
6862 } | |
6863 } | |
6864 } | |
6865 | |
6866 | |
25543 | 6867 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
6868 F's desired tool-bar contents. F->desired_tool_bar_items must have | |
25012 | 6869 been set up previously by calling prepare_menu_bars. */ |
6870 | |
6871 static void | |
25543 | 6872 build_desired_tool_bar_string (f) |
25012 | 6873 struct frame *f; |
6874 { | |
6875 int i, size, size_needed, string_idx; | |
6876 struct gcpro gcpro1, gcpro2, gcpro3; | |
6877 Lisp_Object image, plist, props; | |
6878 | |
6879 image = plist = props = Qnil; | |
6880 GCPRO3 (image, plist, props); | |
6881 | |
25543 | 6882 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 6883 Otherwise, make a new string. */ |
6884 | |
6885 /* The size of the string we might be able to reuse. */ | |
25543 | 6886 size = (STRINGP (f->desired_tool_bar_string) |
6887 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 6888 : 0); |
6889 | |
6890 /* Each image in the string we build is preceded by a space, | |
6891 and there is a space at the end. */ | |
25543 | 6892 size_needed = f->n_desired_tool_bar_items + 1; |
6893 | |
6894 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 6895 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
|
6896 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
|
6897 make_number (' ')); |
25012 | 6898 else |
6899 { | |
6900 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
6901 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 6902 props, f->desired_tool_bar_string); |
25012 | 6903 } |
6904 | |
6905 /* Put a `display' property on the string for the images to display, | |
25543 | 6906 put a `menu_item' property on tool-bar items with a value that |
6907 is the index of the item in F's tool-bar item vector. */ | |
25012 | 6908 for (i = 0, string_idx = 0; |
25543 | 6909 i < f->n_desired_tool_bar_items; |
25012 | 6910 ++i, string_idx += 1) |
6911 { | |
6912 #define PROP(IDX) \ | |
25543 | 6913 (XVECTOR (f->desired_tool_bar_items) \ |
6914 ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)]) | |
6915 | |
6916 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
6917 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
|
6918 int margin, relief, idx; |
25012 | 6919 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; |
6920 extern Lisp_Object Qlaplace; | |
6921 | |
6922 /* If image is a vector, choose the image according to the | |
6923 button state. */ | |
25543 | 6924 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 6925 if (VECTORP (image)) |
6926 { | |
6927 if (enabled_p) | |
6928 idx = (selected_p | |
25543 | 6929 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
6930 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 6931 else |
6932 idx = (selected_p | |
25543 | 6933 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
6934 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 6935 |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6936 xassert (ASIZE (image) >= idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6937 image = AREF (image, idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6938 } |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6939 else |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6940 idx = -1; |
25012 | 6941 |
6942 /* Ignore invalid image specifications. */ | |
6943 if (!valid_image_p (image)) | |
6944 continue; | |
6945 | |
25543 | 6946 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 6947 plist = Fcopy_sequence (XCDR (image)); |
6948 | |
6949 /* Compute margin and relief to draw. */ | |
25543 | 6950 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
6951 margin = relief + max (0, tool_bar_button_margin); | |
6952 | |
6953 if (auto_raise_tool_bar_buttons_p) | |
25012 | 6954 { |
6955 /* Add a `:relief' property to the image spec if the item is | |
6956 selected. */ | |
6957 if (selected_p) | |
6958 { | |
6959 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
6960 margin -= relief; | |
6961 } | |
6962 } | |
6963 else | |
6964 { | |
6965 /* If image is selected, display it pressed, i.e. with a | |
6966 negative relief. If it's not selected, display it with a | |
6967 raised relief. */ | |
6968 plist = Fplist_put (plist, QCrelief, | |
6969 (selected_p | |
6970 ? make_number (-relief) | |
6971 : make_number (relief))); | |
6972 margin -= relief; | |
6973 } | |
6974 | |
6975 /* Put a margin around the image. */ | |
6976 if (margin) | |
6977 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
6978 | |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
6979 /* 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
|
6980 for the disabled state, make the image appear disabled by |
25012 | 6981 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
|
6982 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
|
6983 plist = Fplist_put (plist, QCalgorithm, Qdisabled); |
25012 | 6984 |
6985 /* Put a `display' text property on the string for the image to | |
6986 display. Put a `menu-item' property on the string that gives | |
25543 | 6987 the start of this item's properties in the tool-bar items |
25012 | 6988 vector. */ |
6989 image = Fcons (Qimage, plist); | |
6990 props = list4 (Qdisplay, image, | |
25543 | 6991 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 6992 Fadd_text_properties (make_number (string_idx), |
6993 make_number (string_idx + 1), | |
25543 | 6994 props, f->desired_tool_bar_string); |
25012 | 6995 #undef PROP |
6996 } | |
6997 | |
6998 UNGCPRO; | |
6999 } | |
7000 | |
7001 | |
25543 | 7002 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 7003 |
7004 static void | |
25543 | 7005 display_tool_bar_line (it) |
25012 | 7006 struct it *it; |
7007 { | |
7008 struct glyph_row *row = it->glyph_row; | |
7009 int max_x = it->last_visible_x; | |
7010 struct glyph *last; | |
7011 | |
7012 prepare_desired_row (row); | |
7013 row->y = it->current_y; | |
7014 | |
7015 while (it->current_x < max_x) | |
7016 { | |
7017 int x_before, x, n_glyphs_before, i, nglyphs; | |
7018 | |
7019 /* Get the next display element. */ | |
7020 if (!get_next_display_element (it)) | |
7021 break; | |
7022 | |
7023 /* Produce glyphs. */ | |
7024 x_before = it->current_x; | |
7025 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
7026 PRODUCE_GLYPHS (it); | |
7027 | |
7028 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
7029 i = 0; | |
7030 x = x_before; | |
7031 while (i < nglyphs) | |
7032 { | |
7033 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
7034 | |
7035 if (x + glyph->pixel_width > max_x) | |
7036 { | |
7037 /* Glyph doesn't fit on line. */ | |
7038 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
7039 it->current_x = x; | |
7040 goto out; | |
7041 } | |
7042 | |
7043 ++it->hpos; | |
7044 x += glyph->pixel_width; | |
7045 ++i; | |
7046 } | |
7047 | |
7048 /* Stop at line ends. */ | |
7049 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
7050 break; | |
7051 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
7052 set_iterator_to_next (it, 1); |
25012 | 7053 } |
7054 | |
7055 out:; | |
7056 | |
7057 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
7058 extend_face_to_end_of_line (it); | |
7059 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
7060 last->right_box_line_p = 1; | |
7061 compute_line_metrics (it); | |
7062 | |
25543 | 7063 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 7064 if (!row->displays_text_p) |
7065 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
7066 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
|
7067 row->ascent = row->phys_ascent = 0; |
25012 | 7068 } |
7069 | |
7070 row->full_width_p = 1; | |
7071 row->continued_p = 0; | |
7072 row->truncated_on_left_p = 0; | |
7073 row->truncated_on_right_p = 0; | |
7074 | |
7075 it->current_x = it->hpos = 0; | |
7076 it->current_y += row->height; | |
7077 ++it->vpos; | |
7078 ++it->glyph_row; | |
7079 } | |
7080 | |
7081 | |
25543 | 7082 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 7083 items of frame F visible. */ |
7084 | |
7085 static int | |
25543 | 7086 tool_bar_lines_needed (f) |
25012 | 7087 struct frame *f; |
7088 { | |
25543 | 7089 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 7090 struct it it; |
7091 | |
25543 | 7092 /* Initialize an iterator for iteration over |
7093 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
7094 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7095 it.first_visible_x = 0; |
7096 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 7097 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 7098 |
7099 while (!ITERATOR_AT_END_P (&it)) | |
7100 { | |
7101 it.glyph_row = w->desired_matrix->rows; | |
7102 clear_glyph_row (it.glyph_row); | |
25543 | 7103 display_tool_bar_line (&it); |
25012 | 7104 } |
7105 | |
7106 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
7107 } | |
7108 | |
7109 | |
25543 | 7110 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 7111 height should be changed. */ |
7112 | |
7113 static int | |
25543 | 7114 redisplay_tool_bar (f) |
25012 | 7115 struct frame *f; |
7116 { | |
7117 struct window *w; | |
7118 struct it it; | |
7119 struct glyph_row *row; | |
7120 int change_height_p = 0; | |
7121 | |
25543 | 7122 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
7123 do anything. This means you must start with tool-bar-lines | |
25012 | 7124 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 7125 can turn off tool-bars by specifying tool-bar-lines zero. */ |
7126 if (!WINDOWP (f->tool_bar_window) | |
7127 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 7128 XFASTINT (w->height) == 0)) |
7129 return 0; | |
7130 | |
25543 | 7131 /* Set up an iterator for the tool-bar window. */ |
7132 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7133 it.first_visible_x = 0; |
7134 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
7135 row = it.glyph_row; | |
7136 | |
25543 | 7137 /* Build a string that represents the contents of the tool-bar. */ |
7138 build_desired_tool_bar_string (f); | |
7139 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
7140 | |
7141 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 7142 while (it.current_y < it.last_visible_y) |
25543 | 7143 display_tool_bar_line (&it); |
7144 | |
7145 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 7146 window, so don't do it. */ |
7147 w->desired_matrix->no_scrolling_p = 1; | |
7148 w->must_be_updated_p = 1; | |
7149 | |
25543 | 7150 if (auto_resize_tool_bars_p) |
25012 | 7151 { |
7152 int nlines; | |
7153 | |
7154 /* If there are blank lines at the end, except for a partially | |
7155 visible blank line at the end that is smaller than | |
25543 | 7156 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 7157 row = it.glyph_row - 1; |
7158 if (!row->displays_text_p | |
7159 && row->height >= CANON_Y_UNIT (f)) | |
7160 change_height_p = 1; | |
7161 | |
25543 | 7162 /* If row displays tool-bar items, but is partially visible, |
7163 change the tool-bar's height. */ | |
25012 | 7164 if (row->displays_text_p |
7165 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
7166 change_height_p = 1; | |
7167 | |
25543 | 7168 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 7169 frame parameter. */ |
7170 if (change_height_p | |
25543 | 7171 && (nlines = tool_bar_lines_needed (f), |
25012 | 7172 nlines != XFASTINT (w->height))) |
7173 { | |
25543 | 7174 extern Lisp_Object Qtool_bar_lines; |
25012 | 7175 Lisp_Object frame; |
7176 | |
7177 XSETFRAME (frame, f); | |
7178 clear_glyph_matrix (w->desired_matrix); | |
7179 Fmodify_frame_parameters (frame, | |
25543 | 7180 Fcons (Fcons (Qtool_bar_lines, |
25012 | 7181 make_number (nlines)), |
7182 Qnil)); | |
7183 fonts_changed_p = 1; | |
7184 } | |
7185 } | |
7186 | |
7187 return change_height_p; | |
7188 } | |
7189 | |
7190 | |
25543 | 7191 /* Get information about the tool-bar item which is displayed in GLYPH |
7192 on frame F. Return in *PROP_IDX the index where tool-bar item | |
7193 properties start in F->current_tool_bar_items. Value is zero if | |
7194 GLYPH doesn't display a tool-bar item. */ | |
25012 | 7195 |
7196 int | |
25543 | 7197 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 7198 struct frame *f; |
7199 struct glyph *glyph; | |
7200 int *prop_idx; | |
7201 { | |
7202 Lisp_Object prop; | |
7203 int success_p; | |
7204 | |
7205 /* Get the text property `menu-item' at pos. The value of that | |
7206 property is the start index of this item's properties in | |
25543 | 7207 F->current_tool_bar_items. */ |
25012 | 7208 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 7209 Qmenu_item, f->current_tool_bar_string); |
25012 | 7210 if (INTEGERP (prop)) |
7211 { | |
7212 *prop_idx = XINT (prop); | |
7213 success_p = 1; | |
7214 } | |
7215 else | |
7216 success_p = 0; | |
7217 | |
7218 return success_p; | |
7219 } | |
7220 | |
7221 #endif /* HAVE_WINDOW_SYSTEM */ | |
7222 | |
7223 | |
7224 | |
7225 /************************************************************************ | |
7226 Horizontal scrolling | |
7227 ************************************************************************/ | |
7228 | |
7229 static int hscroll_window_tree P_ ((Lisp_Object)); | |
7230 static int hscroll_windows P_ ((Lisp_Object)); | |
7231 | |
7232 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
7233 hscroll value so that PT is (i) visible in the window, and (ii) so | |
7234 that it is not within a certain margin at the window's left and | |
7235 right border. Value is non-zero if any window's hscroll has been | |
7236 changed. */ | |
7237 | |
7238 static int | |
7239 hscroll_window_tree (window) | |
7240 Lisp_Object window; | |
7241 { | |
7242 int hscrolled_p = 0; | |
7243 | |
7244 while (WINDOWP (window)) | |
7245 { | |
7246 struct window *w = XWINDOW (window); | |
7247 | |
7248 if (WINDOWP (w->hchild)) | |
7249 hscrolled_p |= hscroll_window_tree (w->hchild); | |
7250 else if (WINDOWP (w->vchild)) | |
7251 hscrolled_p |= hscroll_window_tree (w->vchild); | |
7252 else if (w->cursor.vpos >= 0) | |
7253 { | |
7254 int hscroll_margin, text_area_x, text_area_y; | |
7255 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
|
7256 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7257 = 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
|
7258 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7259 = 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
|
7260 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7261 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7262 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7263 : current_cursor_row); |
25012 | 7264 |
7265 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
7266 &text_area_width, &text_area_height); | |
7267 | |
7268 /* Scroll when cursor is inside this scroll margin. */ | |
7269 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
7270 | |
7271 if ((XFASTINT (w->hscroll) | |
7272 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7273 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7274 && cursor_row->truncated_on_right_p |
25012 | 7275 && (w->cursor.x > text_area_width - hscroll_margin))) |
7276 { | |
7277 struct it it; | |
7278 int hscroll; | |
7279 struct buffer *saved_current_buffer; | |
7280 int pt; | |
7281 | |
7282 /* Find point in a display of infinite width. */ | |
7283 saved_current_buffer = current_buffer; | |
7284 current_buffer = XBUFFER (w->buffer); | |
7285 | |
7286 if (w == XWINDOW (selected_window)) | |
7287 pt = BUF_PT (current_buffer); | |
7288 else | |
7289 { | |
7290 pt = marker_position (w->pointm); | |
7291 pt = max (BEGV, pt); | |
7292 pt = min (ZV, pt); | |
7293 } | |
7294 | |
7295 /* Move iterator to pt starting at cursor_row->start in | |
7296 a line with infinite width. */ | |
7297 init_to_row_start (&it, w, cursor_row); | |
7298 it.last_visible_x = INFINITY; | |
7299 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
7300 current_buffer = saved_current_buffer; | |
7301 | |
7302 /* Center cursor in window. */ | |
7303 hscroll = (max (0, it.current_x - text_area_width / 2) | |
7304 / CANON_X_UNIT (it.f)); | |
7305 | |
7306 /* Don't call Fset_window_hscroll if value hasn't | |
7307 changed because it will prevent redisplay | |
7308 optimizations. */ | |
7309 if (XFASTINT (w->hscroll) != hscroll) | |
7310 { | |
7311 Fset_window_hscroll (window, make_number (hscroll)); | |
7312 hscrolled_p = 1; | |
7313 } | |
7314 } | |
7315 } | |
7316 | |
7317 window = w->next; | |
7318 } | |
7319 | |
7320 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
7321 return hscrolled_p; | |
7322 } | |
7323 | |
7324 | |
7325 /* Set hscroll so that cursor is visible and not inside horizontal | |
7326 scroll margins for all windows in the tree rooted at WINDOW. See | |
7327 also hscroll_window_tree above. Value is non-zero if any window's | |
7328 hscroll has been changed. If it has, desired matrices on the frame | |
7329 of WINDOW are cleared. */ | |
7330 | |
7331 static int | |
7332 hscroll_windows (window) | |
7333 Lisp_Object window; | |
7334 { | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7335 int hscrolled_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7336 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7337 if (automatic_hscrolling_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7338 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7339 hscrolled_p = hscroll_window_tree (window); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7340 if (hscrolled_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7341 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
|
7342 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7343 else |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7344 hscrolled_p = 0; |
25012 | 7345 return hscrolled_p; |
7346 } | |
7347 | |
7348 | |
7349 | |
7350 /************************************************************************ | |
7351 Redisplay | |
7352 ************************************************************************/ | |
7353 | |
7354 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
7355 to a non-zero value. This is sometimes handy to have in a debugger | |
7356 session. */ | |
7357 | |
7358 #if GLYPH_DEBUG | |
7359 | |
7360 /* First and last unchanged row for try_window_id. */ | |
7361 | |
7362 int debug_first_unchanged_at_end_vpos; | |
7363 int debug_last_unchanged_at_beg_vpos; | |
7364 | |
7365 /* Delta vpos and y. */ | |
7366 | |
7367 int debug_dvpos, debug_dy; | |
7368 | |
7369 /* Delta in characters and bytes for try_window_id. */ | |
7370 | |
7371 int debug_delta, debug_delta_bytes; | |
7372 | |
7373 /* Values of window_end_pos and window_end_vpos at the end of | |
7374 try_window_id. */ | |
7375 | |
7376 int debug_end_pos, debug_end_vpos; | |
7377 | |
7378 /* Append a string to W->desired_matrix->method. FMT is a printf | |
7379 format string. A1...A9 are a supplement for a variable-length | |
7380 argument list. If trace_redisplay_p is non-zero also printf the | |
7381 resulting string to stderr. */ | |
7382 | |
7383 static void | |
7384 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
7385 struct window *w; | |
7386 char *fmt; | |
7387 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
7388 { | |
7389 char buffer[512]; | |
7390 char *method = w->desired_matrix->method; | |
7391 int len = strlen (method); | |
7392 int size = sizeof w->desired_matrix->method; | |
7393 int remaining = size - len - 1; | |
7394 | |
7395 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
7396 if (len && remaining) | |
7397 { | |
7398 method[len] = '|'; | |
7399 --remaining, ++len; | |
7400 } | |
7401 | |
7402 strncpy (method + len, buffer, remaining); | |
7403 | |
7404 if (trace_redisplay_p) | |
7405 fprintf (stderr, "%p (%s): %s\n", | |
7406 w, | |
7407 ((BUFFERP (w->buffer) | |
7408 && STRINGP (XBUFFER (w->buffer)->name)) | |
7409 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
7410 : "no buffer"), | |
7411 buffer); | |
7412 } | |
7413 | |
7414 #endif /* GLYPH_DEBUG */ | |
7415 | |
7416 | |
7417 /* This counter is used to clear the face cache every once in a while | |
7418 in redisplay_internal. It is incremented for each redisplay. | |
7419 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7420 cleared. */ | |
7421 | |
7422 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7423 static int clear_face_cache_count; | |
7424 | |
7425 /* Record the previous terminal frame we displayed. */ | |
7426 | |
7427 static struct frame *previous_terminal_frame; | |
7428 | |
7429 /* Non-zero while redisplay_internal is in progress. */ | |
7430 | |
7431 int redisplaying_p; | |
7432 | |
7433 | |
7434 /* Value is non-zero if all changes in window W, which displays | |
7435 current_buffer, are in the text between START and END. START is a | |
7436 buffer position, END is given as a distance from Z. Used in | |
7437 redisplay_internal for display optimization. */ | |
7438 | |
7439 static INLINE int | |
7440 text_outside_line_unchanged_p (w, start, end) | |
7441 struct window *w; | |
7442 int start, end; | |
7443 { | |
7444 int unchanged_p = 1; | |
7445 | |
7446 /* If text or overlays have changed, see where. */ | |
7447 if (XFASTINT (w->last_modified) < MODIFF | |
7448 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7449 { | |
7450 /* Gap in the line? */ | |
7451 if (GPT < start || Z - GPT < end) | |
7452 unchanged_p = 0; | |
7453 | |
7454 /* Changes start in front of the line, or end after it? */ | |
7455 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7456 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7457 || END_UNCHANGED < end)) |
25012 | 7458 unchanged_p = 0; |
7459 | |
7460 /* If selective display, can't optimize if changes start at the | |
7461 beginning of the line. */ | |
7462 if (unchanged_p | |
7463 && INTEGERP (current_buffer->selective_display) | |
7464 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7465 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7466 unchanged_p = 0; |
7467 } | |
7468 | |
7469 return unchanged_p; | |
7470 } | |
7471 | |
7472 | |
7473 /* Do a frame update, taking possible shortcuts into account. This is | |
7474 the main external entry point for redisplay. | |
7475 | |
7476 If the last redisplay displayed an echo area message and that message | |
7477 is no longer requested, we clear the echo area or bring back the | |
7478 mini-buffer if that is in use. */ | |
7479 | |
7480 void | |
7481 redisplay () | |
7482 { | |
7483 redisplay_internal (0); | |
7484 } | |
7485 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7486 /* 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
|
7487 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
|
7488 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
|
7489 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7490 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7491 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
|
7492 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7493 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7494 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7495 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7496 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7497 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7498 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7499 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7500 /* 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
|
7501 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7502 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7503 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7504 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7505 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7506 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7507 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7508 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
|
7509 && 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
|
7510 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7511 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7512 /* 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
|
7513 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7514 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7515 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7516 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7517 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7518 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
|
7519 && 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
|
7520 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7521 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7522 } |
25012 | 7523 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7524 /* 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
|
7525 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7526 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7527 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7528 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7529 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7530 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7531 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7532 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7533 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7534 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7535 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7536 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7537 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7538 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7539 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7540 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7541 /* 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
|
7542 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
|
7543 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
|
7544 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
|
7545 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7546 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7547 && 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
|
7548 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7549 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7550 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7551 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7552 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7553 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7554 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7555 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7556 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
|
7557 || pt != XINT (w->last_point)) |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7558 && 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
|
7559 XINT (w->last_point), |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7560 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7561 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7562 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7563 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7564 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7565 |
25012 | 7566 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7567 response to any user action; therefore, we should preserve the echo | |
7568 area. (Actually, our caller does that job.) Perhaps in the future | |
7569 avoid recentering windows if it is not necessary; currently that | |
7570 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7571 |
277 | 7572 static void |
25012 | 7573 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7574 int preserve_echo_area; |
277 | 7575 { |
25012 | 7576 struct window *w = XWINDOW (selected_window); |
7577 struct frame *f = XFRAME (w->frame); | |
7578 int pause; | |
7579 int must_finish = 0; | |
7580 struct text_pos tlbufpos, tlendpos; | |
7581 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7582 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7583 struct frame *sf = SELECTED_FRAME (); |
25012 | 7584 |
7585 /* Non-zero means redisplay has to consider all windows on all | |
7586 frames. Zero means, only selected_window is considered. */ | |
7587 int consider_all_windows_p; | |
7588 | |
7589 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7590 | |
7591 /* No redisplay if running in batch mode or frame is not yet fully | |
7592 initialized, or redisplay is explicitly turned off by setting | |
7593 Vinhibit_redisplay. */ | |
7594 if (noninteractive | |
7595 || !NILP (Vinhibit_redisplay) | |
7596 || !f->glyphs_initialized_p) | |
7597 return; | |
7598 | |
7599 /* The flag redisplay_performed_directly_p is set by | |
7600 direct_output_for_insert when it already did the whole screen | |
7601 update necessary. */ | |
7602 if (redisplay_performed_directly_p) | |
7603 { | |
7604 redisplay_performed_directly_p = 0; | |
7605 if (!hscroll_windows (selected_window)) | |
7606 return; | |
7607 } | |
7608 | |
7609 #ifdef USE_X_TOOLKIT | |
7610 if (popup_activated ()) | |
7611 return; | |
7612 #endif | |
7613 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7614 /* I don't think this happens but let's be paranoid. */ |
25012 | 7615 if (redisplaying_p) |
7616 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7617 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7618 /* 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
|
7619 when we leave this function. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7620 count = specpdl_ptr - specpdl; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7621 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7622 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7623 |
25012 | 7624 retry: |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
7625 pause = 0; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7626 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7627 |
25012 | 7628 /* If new fonts have been loaded that make a glyph matrix adjustment |
7629 necessary, do it. */ | |
7630 if (fonts_changed_p) | |
7631 { | |
7632 adjust_glyphs (NULL); | |
7633 ++windows_or_buffers_changed; | |
7634 fonts_changed_p = 0; | |
7635 } | |
7636 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7637 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7638 && previous_terminal_frame != sf) |
25012 | 7639 { |
7640 /* Since frames on an ASCII terminal share the same display | |
7641 area, displaying a different frame means redisplay the whole | |
7642 thing. */ | |
7643 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7644 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7645 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7646 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7647 previous_terminal_frame = sf; |
25012 | 7648 |
7649 /* Set the visible flags for all frames. Do this before checking | |
7650 for resized or garbaged frames; they want to know if their frames | |
7651 are visible. See the comment in frame.h for | |
7652 FRAME_SAMPLE_VISIBILITY. */ | |
7653 { | |
7654 Lisp_Object tail, frame; | |
7655 | |
7656 number_of_visible_frames = 0; | |
7657 | |
7658 FOR_EACH_FRAME (tail, frame) | |
7659 { | |
7660 struct frame *f = XFRAME (frame); | |
7661 | |
7662 FRAME_SAMPLE_VISIBILITY (f); | |
7663 if (FRAME_VISIBLE_P (f)) | |
7664 ++number_of_visible_frames; | |
7665 clear_desired_matrices (f); | |
7666 } | |
7667 } | |
7668 | |
7669 /* 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
|
7670 do_pending_window_change (1); |
25012 | 7671 |
7672 /* Clear frames marked as garbaged. */ | |
7673 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7674 clear_garbaged_frames (); |
25012 | 7675 |
25543 | 7676 /* Build menubar and tool-bar items. */ |
25012 | 7677 prepare_menu_bars (); |
7678 | |
7679 if (windows_or_buffers_changed) | |
7680 update_mode_lines++; | |
7681 | |
7682 /* Detect case that we need to write or remove a star in the mode line. */ | |
7683 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7684 { | |
7685 w->update_mode_line = Qt; | |
7686 if (buffer_shared > 1) | |
7687 update_mode_lines++; | |
7688 } | |
7689 | |
7690 /* If %c is in the mode line, update it if needed. */ | |
7691 if (!NILP (w->column_number_displayed) | |
7692 /* This alternative quickly identifies a common case | |
7693 where no change is needed. */ | |
7694 && !(PT == XFASTINT (w->last_point) | |
7695 && XFASTINT (w->last_modified) >= MODIFF | |
7696 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7697 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7698 w->update_mode_line = Qt; | |
7699 | |
7700 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
7701 | |
7702 /* The variable buffer_shared is set in redisplay_window and | |
7703 indicates that we redisplay a buffer in different windows. See | |
7704 there. */ | |
7705 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
7706 | |
7707 /* If specs for an arrow have changed, do thorough redisplay | |
7708 to ensure we remove any arrow that should no longer exist. */ | |
7709 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
7710 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
7711 consider_all_windows_p = windows_or_buffers_changed = 1; | |
7712 | |
7713 /* Normally the message* functions will have already displayed and | |
7714 updated the echo area, but the frame may have been trashed, or | |
7715 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
|
7716 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
|
7717 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
|
7718 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
|
7719 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7720 int window_height_changed_p = echo_area_display (0); |
25012 | 7721 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7722 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7723 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7724 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7725 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
|
7726 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7727 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
|
7728 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7729 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7730 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7731 /* 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
|
7732 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7733 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7734 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7735 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7736 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7737 } |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
7738 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
|
7739 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7740 || 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
|
7741 || 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
|
7742 && 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
|
7743 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7744 /* 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
|
7745 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
|
7746 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7747 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
|
7748 ++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
|
7749 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7750 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7751 /* 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
|
7752 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7753 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7754 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7755 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7756 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7757 |
25012 | 7758 |
7759 /* If showing the region, and mark has changed, we must redisplay | |
7760 the whole window. The assignment to this_line_start_pos prevents | |
7761 the optimization directly below this if-statement. */ | |
7762 if (((!NILP (Vtransient_mark_mode) | |
7763 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7764 != !NILP (w->region_showing)) | |
7765 || (!NILP (w->region_showing) | |
7766 && !EQ (w->region_showing, | |
7767 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
7768 CHARPOS (this_line_start_pos) = 0; | |
7769 | |
7770 /* Optimize the case that only the line containing the cursor in the | |
7771 selected window has changed. Variables starting with this_ are | |
7772 set in display_line and record information about the line | |
7773 containing the cursor. */ | |
7774 tlbufpos = this_line_start_pos; | |
7775 tlendpos = this_line_end_pos; | |
7776 if (!consider_all_windows_p | |
7777 && CHARPOS (tlbufpos) > 0 | |
7778 && NILP (w->update_mode_line) | |
7779 && !current_buffer->clip_changed | |
7780 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
7781 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
7782 /* Make sure recorded data applies to current buffer, etc. */ | |
7783 && this_line_buffer == current_buffer | |
7784 && current_buffer == XBUFFER (w->buffer) | |
7785 && NILP (w->force_start) | |
7786 /* Point must be on the line that we have info recorded about. */ | |
7787 && PT >= CHARPOS (tlbufpos) | |
7788 && PT <= Z - CHARPOS (tlendpos) | |
7789 /* All text outside that line, including its final newline, | |
7790 must be unchanged */ | |
7791 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
7792 CHARPOS (tlendpos))) | |
7793 { | |
7794 if (CHARPOS (tlbufpos) > BEGV | |
7795 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
7796 && (CHARPOS (tlbufpos) == ZV | |
7797 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
7798 /* Former continuation line has disappeared by becoming empty */ | |
7799 goto cancel; | |
7800 else if (XFASTINT (w->last_modified) < MODIFF | |
7801 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
7802 || MINI_WINDOW_P (w)) | |
7803 { | |
7804 /* We have to handle the case of continuation around a | |
7805 wide-column character (See the comment in indent.c around | |
7806 line 885). | |
7807 | |
7808 For instance, in the following case: | |
7809 | |
7810 -------- Insert -------- | |
7811 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
7812 J_I_ ==> J_I_ `^^' are cursors. | |
7813 ^^ ^^ | |
7814 -------- -------- | |
7815 | |
7816 As we have to redraw the line above, we should goto cancel. */ | |
7817 | |
7818 struct it it; | |
7819 int line_height_before = this_line_pixel_height; | |
7820 | |
7821 /* Note that start_display will handle the case that the | |
7822 line starting at tlbufpos is a continuation lines. */ | |
7823 start_display (&it, w, tlbufpos); | |
7824 | |
7825 /* Implementation note: It this still necessary? */ | |
7826 if (it.current_x != this_line_start_x) | |
7827 goto cancel; | |
7828 | |
7829 TRACE ((stderr, "trying display optimization 1\n")); | |
7830 w->cursor.vpos = -1; | |
7831 overlay_arrow_seen = 0; | |
7832 it.vpos = this_line_vpos; | |
7833 it.current_y = this_line_y; | |
7834 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
7835 display_line (&it); | |
7836 | |
7837 /* If line contains point, is not continued, | |
7838 and ends at same distance from eob as before, we win */ | |
7839 if (w->cursor.vpos >= 0 | |
7840 /* Line is not continued, otherwise this_line_start_pos | |
7841 would have been set to 0 in display_line. */ | |
7842 && CHARPOS (this_line_start_pos) | |
7843 /* Line ends as before. */ | |
7844 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
7845 /* Line has same height as before. Otherwise other lines | |
7846 would have to be shifted up or down. */ | |
7847 && this_line_pixel_height == line_height_before) | |
7848 { | |
7849 /* If this is not the window's last line, we must adjust | |
7850 the charstarts of the lines below. */ | |
7851 if (it.current_y < it.last_visible_y) | |
7852 { | |
7853 struct glyph_row *row | |
7854 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
7855 int delta, delta_bytes; | |
7856 | |
7857 if (Z - CHARPOS (tlendpos) == ZV) | |
7858 { | |
7859 /* This line ends at end of (accessible part of) | |
7860 buffer. There is no newline to count. */ | |
7861 delta = (Z | |
7862 - CHARPOS (tlendpos) | |
7863 - MATRIX_ROW_START_CHARPOS (row)); | |
7864 delta_bytes = (Z_BYTE | |
7865 - BYTEPOS (tlendpos) | |
7866 - MATRIX_ROW_START_BYTEPOS (row)); | |
7867 } | |
7868 else | |
7869 { | |
7870 /* This line ends in a newline. Must take | |
7871 account of the newline and the rest of the | |
7872 text that follows. */ | |
7873 delta = (Z | |
7874 - CHARPOS (tlendpos) | |
7875 - MATRIX_ROW_START_CHARPOS (row)); | |
7876 delta_bytes = (Z_BYTE | |
7877 - BYTEPOS (tlendpos) | |
7878 - MATRIX_ROW_START_BYTEPOS (row)); | |
7879 } | |
7880 | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7881 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
|
7882 this_line_vpos + 1, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7883 w->current_matrix->nrows, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
7884 delta, delta_bytes); |
25012 | 7885 } |
7886 | |
7887 /* If this row displays text now but previously didn't, | |
7888 or vice versa, w->window_end_vpos may have to be | |
7889 adjusted. */ | |
7890 if ((it.glyph_row - 1)->displays_text_p) | |
7891 { | |
7892 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
7893 XSETINT (w->window_end_vpos, this_line_vpos); | |
7894 } | |
7895 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
7896 && this_line_vpos > 0) | |
7897 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
7898 w->window_end_valid = Qnil; | |
7899 | |
7900 /* Update hint: No need to try to scroll in update_window. */ | |
7901 w->desired_matrix->no_scrolling_p = 1; | |
7902 | |
7903 #if GLYPH_DEBUG | |
7904 *w->desired_matrix->method = 0; | |
7905 debug_method_add (w, "optimization 1"); | |
7906 #endif | |
7907 goto update; | |
7908 } | |
7909 else | |
7910 goto cancel; | |
7911 } | |
7912 else if (/* Cursor position hasn't changed. */ | |
7913 PT == XFASTINT (w->last_point) | |
7914 /* Make sure the cursor was last displayed | |
7915 in this window. Otherwise we have to reposition it. */ | |
7916 && 0 <= w->cursor.vpos | |
7917 && XINT (w->height) > w->cursor.vpos) | |
7918 { | |
7919 if (!must_finish) | |
7920 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7921 do_pending_window_change (1); |
25012 | 7922 |
7923 /* We used to always goto end_of_redisplay here, but this | |
7924 isn't enough if we have a blinking cursor. */ | |
7925 if (w->cursor_off_p == w->last_cursor_off_p) | |
7926 goto end_of_redisplay; | |
7927 } | |
7928 goto update; | |
7929 } | |
7930 /* If highlighting the region, or if the cursor is in the echo area, | |
7931 then we can't just move the cursor. */ | |
7932 else if (! (!NILP (Vtransient_mark_mode) | |
7933 && !NILP (current_buffer->mark_active)) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
7934 && (EQ (selected_window, current_buffer->last_selected_window) |
25012 | 7935 || highlight_nonselected_windows) |
7936 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
7937 && NILP (Vshow_trailing_whitespace) |
25012 | 7938 && !cursor_in_echo_area) |
7939 { | |
7940 struct it it; | |
7941 struct glyph_row *row; | |
7942 | |
7943 /* Skip from tlbufpos to PT and see where it is. Note that | |
7944 PT may be in invisible text. If so, we will end at the | |
7945 next visible position. */ | |
7946 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
7947 NULL, DEFAULT_FACE_ID); | |
7948 it.current_x = this_line_start_x; | |
7949 it.current_y = this_line_y; | |
7950 it.vpos = this_line_vpos; | |
7951 | |
7952 /* The call to move_it_to stops in front of PT, but | |
7953 moves over before-strings. */ | |
7954 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
7955 | |
7956 if (it.vpos == this_line_vpos | |
7957 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
7958 row->enabled_p)) | |
7959 { | |
7960 xassert (this_line_vpos == it.vpos); | |
7961 xassert (this_line_y == it.current_y); | |
7962 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
7963 goto update; | |
7964 } | |
7965 else | |
7966 goto cancel; | |
7967 } | |
7968 | |
7969 cancel: | |
7970 /* Text changed drastically or point moved off of line. */ | |
7971 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
7972 } | |
7973 | |
7974 CHARPOS (this_line_start_pos) = 0; | |
7975 consider_all_windows_p |= buffer_shared > 1; | |
7976 ++clear_face_cache_count; | |
7977 | |
7978 | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
7979 /* 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
|
7980 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
|
7981 frames. Otherwise do it for selected_window, only. */ |
25012 | 7982 |
7983 if (consider_all_windows_p) | |
7984 { | |
7985 Lisp_Object tail, frame; | |
7986 | |
7987 /* Clear the face cache eventually. */ | |
7988 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
7989 { | |
7990 clear_face_cache (0); | |
7991 clear_face_cache_count = 0; | |
7992 } | |
7993 | |
7994 /* Recompute # windows showing selected buffer. This will be | |
7995 incremented each time such a window is displayed. */ | |
7996 buffer_shared = 0; | |
7997 | |
7998 FOR_EACH_FRAME (tail, frame) | |
7999 { | |
8000 struct frame *f = XFRAME (frame); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8001 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8002 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 8003 { |
8004 /* Mark all the scroll bars to be removed; we'll redeem | |
8005 the ones we want when we redisplay their windows. */ | |
8006 if (condemn_scroll_bars_hook) | |
8007 (*condemn_scroll_bars_hook) (f); | |
8008 | |
8009 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
8010 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
8011 | |
8012 /* Any scroll bars which redisplay_windows should have | |
8013 nuked should now go away. */ | |
8014 if (judge_scroll_bars_hook) | |
8015 (*judge_scroll_bars_hook) (f); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8016 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8017 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8018 if (fonts_changed_p) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8019 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8020 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8021 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
|
8022 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8023 /* See if we have to hscroll. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8024 if (hscroll_windows (f->root_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8025 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8026 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8027 /* 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
|
8028 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
|
8029 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
|
8030 error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8031 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8032 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8033 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8034 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8035 /* Update the display. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8036 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
|
8037 pause |= update_frame (f, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8038 if (pause) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8039 break; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8040 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8041 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
|
8042 if (frame_up_to_date_hook) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8043 frame_up_to_date_hook (f); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8044 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8045 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8046 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8047 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8048 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
|
8049 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8050 Lisp_Object mini_window; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8051 struct frame *mini_frame; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8052 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8053 redisplay_window (selected_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8054 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8055 /* 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
|
8056 update: |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8057 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8058 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8059 if (fonts_changed_p) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8060 goto retry; |
25012 | 8061 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8062 /* 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
|
8063 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
|
8064 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
|
8065 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8066 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8067 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8068 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8069 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
25012 | 8070 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8071 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8072 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8073 |
25012 | 8074 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
|
8075 pause = update_frame (sf, 0, 0); |
25012 | 8076 } |
8077 | |
8078 /* We may have called echo_area_display at the top of this | |
8079 function. If the echo area is on another frame, that may | |
8080 have put text on a frame other than the selected one, so the | |
8081 above call to update_frame would not have caught it. Catch | |
8082 it here. */ | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8083 mini_window = FRAME_MINIBUF_WINDOW (sf); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8084 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
25012 | 8085 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8086 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
|
8087 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8088 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
|
8089 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
|
8090 if (!pause && hscroll_windows (mini_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8091 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8092 } |
25012 | 8093 } |
8094 | |
8095 /* If display was paused because of pending input, make sure we do a | |
8096 thorough update the next time. */ | |
8097 if (pause) | |
8098 { | |
8099 /* Prevent the optimization at the beginning of | |
8100 redisplay_internal that tries a single-line update of the | |
8101 line containing the cursor in the selected window. */ | |
8102 CHARPOS (this_line_start_pos) = 0; | |
8103 | |
8104 /* Let the overlay arrow be updated the next time. */ | |
8105 if (!NILP (last_arrow_position)) | |
8106 { | |
8107 last_arrow_position = Qt; | |
8108 last_arrow_string = Qt; | |
8109 } | |
8110 | |
8111 /* If we pause after scrolling, some rows in the current | |
8112 matrices of some windows are not valid. */ | |
8113 if (!WINDOW_FULL_WIDTH_P (w) | |
8114 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
8115 update_mode_lines = 1; | |
8116 } | |
8117 | |
8118 /* Now text on frame agrees with windows, so put info into the | |
8119 windows for partial redisplay to follow. */ | |
8120 if (!pause) | |
8121 { | |
8122 register struct buffer *b = XBUFFER (w->buffer); | |
8123 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8124 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8125 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
|
8126 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
|
8127 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 8128 |
8129 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8130 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 8131 else |
8132 { | |
8133 XSETFASTINT (w->last_point, BUF_PT (b)); | |
8134 w->last_cursor = w->cursor; | |
8135 w->last_cursor_off_p = w->cursor_off_p; | |
8136 | |
8137 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8138 b->prevent_redisplay_optimizations_p = 0; |
25012 | 8139 w->update_mode_line = Qnil; |
8140 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
8141 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
8142 w->last_had_star | |
8143 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
8144 ? Qt : Qnil); | |
8145 | |
8146 /* Record if we are showing a region, so can make sure to | |
8147 update it fully at next redisplay. */ | |
8148 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
|
8149 && (EQ (selected_window, |
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8150 current_buffer->last_selected_window) |
25012 | 8151 || highlight_nonselected_windows) |
8152 && !NILP (XBUFFER (w->buffer)->mark_active) | |
8153 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
8154 : Qnil); | |
8155 | |
8156 w->window_end_valid = w->buffer; | |
8157 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8158 last_arrow_string = Voverlay_arrow_string; | |
8159 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8160 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8161 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8162 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8163 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8164 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8165 } |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
8166 |
25012 | 8167 update_mode_lines = 0; |
8168 windows_or_buffers_changed = 0; | |
8169 } | |
8170 | |
8171 /* Start SIGIO interrupts coming again. Having them off during the | |
8172 code above makes it less likely one will discard output, but not | |
8173 impossible, since there might be stuff in the system buffer here. | |
8174 But it is much hairier to try to do anything about that. */ | |
8175 if (interrupt_input) | |
8176 request_sigio (); | |
8177 start_polling (); | |
8178 | |
8179 /* If a frame has become visible which was not before, redisplay | |
8180 again, so that we display it. Expose events for such a frame | |
8181 (which it gets when becoming visible) don't call the parts of | |
8182 redisplay constructing glyphs, so simply exposing a frame won't | |
8183 display anything in this case. So, we have to display these | |
8184 frames here explicitly. */ | |
8185 if (!pause) | |
8186 { | |
8187 Lisp_Object tail, frame; | |
8188 int new_count = 0; | |
8189 | |
8190 FOR_EACH_FRAME (tail, frame) | |
8191 { | |
8192 int this_is_visible = 0; | |
8193 | |
8194 if (XFRAME (frame)->visible) | |
8195 this_is_visible = 1; | |
8196 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
8197 if (XFRAME (frame)->visible) | |
8198 this_is_visible = 1; | |
8199 | |
8200 if (this_is_visible) | |
8201 new_count++; | |
8202 } | |
8203 | |
8204 if (new_count != number_of_visible_frames) | |
8205 windows_or_buffers_changed++; | |
8206 } | |
8207 | |
8208 /* 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
|
8209 do_pending_window_change (1); |
25012 | 8210 |
8211 /* If we just did a pending size change, or have additional | |
8212 visible frames, redisplay again. */ | |
8213 if (windows_or_buffers_changed && !pause) | |
8214 goto retry; | |
8215 | |
8216 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8217 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8218 unbind_to (count, Qnil); |
25012 | 8219 } |
8220 | |
8221 | |
8222 /* Redisplay, but leave alone any recent echo area message unless | |
8223 another message has been requested in its place. | |
8224 | |
8225 This is useful in situations where you need to redisplay but no | |
8226 user action has occurred, making it inappropriate for the message | |
8227 area to be cleared. See tracking_off and | |
8228 wait_reading_process_input for examples of these situations. */ | |
8229 | |
8230 void | |
8231 redisplay_preserve_echo_area () | |
8232 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8233 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
|
8234 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8235 /* 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
|
8236 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
|
8237 display_last_displayed_message_p = 1; |
25012 | 8238 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8239 display_last_displayed_message_p = 0; |
25012 | 8240 } |
8241 else | |
8242 redisplay_internal (1); | |
8243 } | |
8244 | |
8245 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8246 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8247 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
|
8248 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8249 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8250 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8251 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8252 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8253 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8254 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
|
8255 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8256 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8257 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8258 |
25012 | 8259 /* Mark the display of windows in the window tree rooted at WINDOW as |
8260 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
8261 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
8262 the next time redisplay_internal is called. */ | |
8263 | |
8264 void | |
8265 mark_window_display_accurate (window, accurate_p) | |
8266 Lisp_Object window; | |
8267 int accurate_p; | |
8268 { | |
8269 struct window *w; | |
8270 | |
8271 for (; !NILP (window); window = w->next) | |
8272 { | |
8273 w = XWINDOW (window); | |
8274 | |
8275 if (BUFFERP (w->buffer)) | |
8276 { | |
8277 struct buffer *b = XBUFFER (w->buffer); | |
8278 | |
8279 XSETFASTINT (w->last_modified, | |
8280 accurate_p ? BUF_MODIFF (b) : 0); | |
8281 XSETFASTINT (w->last_overlay_modified, | |
8282 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
8283 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
8284 ? Qt : Qnil); | |
8285 | |
8286 #if 0 /* I don't think this is necessary because display_line does it. | |
8287 Let's check it. */ | |
8288 /* Record if we are showing a region, so can make sure to | |
8289 update it fully at next redisplay. */ | |
8290 w->region_showing | |
8291 = (!NILP (Vtransient_mark_mode) | |
8292 && (w == XWINDOW (current_buffer->last_selected_window) | |
8293 || highlight_nonselected_windows) | |
8294 && (!NILP (b->mark_active) | |
8295 ? Fmarker_position (b->mark) | |
8296 : Qnil)); | |
8297 #endif | |
8298 | |
8299 if (accurate_p) | |
8300 { | |
8301 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8302 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8303 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8304 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8305 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8306 w->last_cursor = w->cursor; |
8307 w->last_cursor_off_p = w->cursor_off_p; | |
8308 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
|
8309 w->last_point = make_number (BUF_PT (b)); |
25012 | 8310 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
|
8311 w->last_point = make_number (XMARKER (w->pointm)->charpos); |
25012 | 8312 } |
8313 } | |
8314 | |
8315 w->window_end_valid = w->buffer; | |
8316 w->update_mode_line = Qnil; | |
8317 | |
8318 if (!NILP (w->vchild)) | |
8319 mark_window_display_accurate (w->vchild, accurate_p); | |
8320 if (!NILP (w->hchild)) | |
8321 mark_window_display_accurate (w->hchild, accurate_p); | |
8322 } | |
8323 | |
8324 if (accurate_p) | |
8325 { | |
8326 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8327 last_arrow_string = Voverlay_arrow_string; | |
8328 } | |
8329 else | |
8330 { | |
8331 /* Force a thorough redisplay the next time by setting | |
8332 last_arrow_position and last_arrow_string to t, which is | |
8333 unequal to any useful value of Voverlay_arrow_... */ | |
8334 last_arrow_position = Qt; | |
8335 last_arrow_string = Qt; | |
8336 } | |
8337 } | |
8338 | |
277 | 8339 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8340 /* 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
|
8341 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
|
8342 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
|
8343 macro DISP_CHAR_VECTOR. */ |
25012 | 8344 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8345 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8346 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
|
8347 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
|
8348 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8349 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8350 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8351 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8352 |
25012 | 8353 if (SINGLE_BYTE_CHAR_P (c)) |
8354 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
|
8355 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
8356 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
|
8357 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8358 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8359 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8360 code[2] = -1; |
25012 | 8361 |
8362 /* Here, the possible range of code[0] (== charset ID) is | |
8363 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
|
8364 for multibyte characters after 256th element, we must increment |
25012 | 8365 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
|
8366 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8367 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8368 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8369 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
|
8370 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8371 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
|
8372 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
|
8373 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
|
8374 } |
25012 | 8375 |
8376 /* Here, val is a sub char table. We return the default value of | |
8377 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8378 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8379 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8380 |
25012 | 8381 |
8382 | |
8383 /*********************************************************************** | |
8384 Window Redisplay | |
8385 ***********************************************************************/ | |
8386 | |
8387 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
8388 | |
8389 static void | |
8390 redisplay_windows (window) | |
8391 Lisp_Object window; | |
8392 { | |
8393 while (!NILP (window)) | |
8394 { | |
8395 struct window *w = XWINDOW (window); | |
8396 | |
8397 if (!NILP (w->hchild)) | |
8398 redisplay_windows (w->hchild); | |
8399 else if (!NILP (w->vchild)) | |
8400 redisplay_windows (w->vchild); | |
8401 else | |
8402 redisplay_window (window, 0); | |
8403 | |
8404 window = w->next; | |
8405 } | |
8406 } | |
8407 | |
8408 | |
8409 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8410 DELTA is the number of bytes by which positions recorded in ROW | |
8411 differ from current buffer positions. */ | |
8412 | |
8413 void | |
8414 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8415 struct window *w; | |
8416 struct glyph_row *row; | |
8417 struct glyph_matrix *matrix; | |
8418 int delta, delta_bytes, dy, dvpos; | |
8419 { | |
8420 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8421 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8422 int x = row->x; | |
8423 int pt_old = PT - delta; | |
8424 | |
8425 /* Skip over glyphs not having an object at the start of the row. | |
8426 These are special glyphs like truncation marks on terminal | |
8427 frames. */ | |
8428 if (row->displays_text_p) | |
8429 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
|
8430 && INTEGERP (glyph->object) |
25012 | 8431 && glyph->charpos < 0) |
8432 { | |
8433 x += glyph->pixel_width; | |
8434 ++glyph; | |
8435 } | |
8436 | |
8437 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
|
8438 && !INTEGERP (glyph->object) |
25012 | 8439 && (!BUFFERP (glyph->object) |
8440 || glyph->charpos < pt_old)) | |
8441 { | |
8442 x += glyph->pixel_width; | |
8443 ++glyph; | |
8444 } | |
8445 | |
8446 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8447 w->cursor.x = x; | |
8448 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8449 w->cursor.y = row->y + dy; | |
8450 | |
8451 if (w == XWINDOW (selected_window)) | |
8452 { | |
8453 if (!row->continued_p | |
8454 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8455 && row->x == 0) | |
8456 { | |
8457 this_line_buffer = XBUFFER (w->buffer); | |
8458 | |
8459 CHARPOS (this_line_start_pos) | |
8460 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8461 BYTEPOS (this_line_start_pos) | |
8462 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8463 | |
8464 CHARPOS (this_line_end_pos) | |
8465 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8466 BYTEPOS (this_line_end_pos) | |
8467 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8468 | |
8469 this_line_y = w->cursor.y; | |
8470 this_line_pixel_height = row->height; | |
8471 this_line_vpos = w->cursor.vpos; | |
8472 this_line_start_x = row->x; | |
8473 } | |
8474 else | |
8475 CHARPOS (this_line_start_pos) = 0; | |
8476 } | |
8477 } | |
8478 | |
8479 | |
8480 /* 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
|
8481 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
|
8482 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8483 We assume that the window's buffer is really current. */ |
25012 | 8484 |
8485 static INLINE struct text_pos | |
8486 run_window_scroll_functions (window, startp) | |
8487 Lisp_Object window; | |
8488 struct text_pos startp; | |
8489 { | |
8490 struct window *w = XWINDOW (window); | |
8491 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
|
8492 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8493 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
|
8494 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8495 |
25012 | 8496 if (!NILP (Vwindow_scroll_functions)) |
8497 { | |
8498 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8499 make_number (CHARPOS (startp))); | |
8500 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
|
8501 /* 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
|
8502 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
|
8503 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8504 } |
8505 | |
8506 return startp; | |
8507 } | |
8508 | |
8509 | |
8510 /* Modify the desired matrix of window W and W->vscroll so that the | |
8511 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8512 |
277 | 8513 static void |
25012 | 8514 make_cursor_line_fully_visible (w) |
8515 struct window *w; | |
8516 { | |
8517 struct glyph_matrix *matrix; | |
8518 struct glyph_row *row; | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8519 int window_height, header_line_height; |
25012 | 8520 |
8521 /* It's not always possible to find the cursor, e.g, when a window | |
8522 is full of overlay strings. Don't do anything in that case. */ | |
8523 if (w->cursor.vpos < 0) | |
8524 return; | |
8525 | |
8526 matrix = w->desired_matrix; | |
8527 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8528 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8529 /* 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
|
8530 to do. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8531 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
|
8532 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8533 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8534 /* 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
|
8535 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
|
8536 window_height = window_box_height (w); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8537 if (row->height >= window_height) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8538 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8539 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8540 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) |
25012 | 8541 { |
8542 int dy = row->height - row->visible_height; | |
8543 w->vscroll = 0; | |
8544 w->cursor.y += dy; | |
8545 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8546 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8547 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */ |
25012 | 8548 { |
8549 int dy = - (row->height - row->visible_height); | |
8550 w->vscroll = dy; | |
8551 w->cursor.y += dy; | |
8552 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8553 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8554 |
25012 | 8555 /* When we change the cursor y-position of the selected window, |
8556 change this_line_y as well so that the display optimization for | |
8557 the cursor line of the selected window in redisplay_internal uses | |
8558 the correct y-position. */ | |
8559 if (w == XWINDOW (selected_window)) | |
8560 this_line_y = w->cursor.y; | |
8561 } | |
8562 | |
8563 | |
8564 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8565 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8566 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8567 in redisplay_window to bring a partially visible line into view in | |
8568 the case that only the cursor has moved. | |
8569 | |
8570 Value is | |
8571 | |
8572 1 if scrolling succeeded | |
8573 | |
8574 0 if scrolling didn't find point. | |
8575 | |
8576 -1 if new fonts have been loaded so that we must interrupt | |
8577 redisplay, adjust glyph matrices, and try again. */ | |
8578 | |
8579 static int | |
8580 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8581 scroll_step, temp_scroll_step) | |
277 | 8582 Lisp_Object window; |
25012 | 8583 int just_this_one_p; |
8584 int scroll_conservatively, scroll_step; | |
8585 int temp_scroll_step; | |
8586 { | |
8587 struct window *w = XWINDOW (window); | |
8588 struct frame *f = XFRAME (w->frame); | |
8589 struct text_pos scroll_margin_pos; | |
8590 struct text_pos pos; | |
8591 struct text_pos startp; | |
8592 struct it it; | |
8593 Lisp_Object window_end; | |
8594 int this_scroll_margin; | |
8595 int dy = 0; | |
8596 int scroll_max; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8597 int rc; |
25012 | 8598 int amount_to_scroll = 0; |
8599 Lisp_Object aggressive; | |
277 | 8600 int height; |
25012 | 8601 |
8602 #if GLYPH_DEBUG | |
8603 debug_method_add (w, "try_scrolling"); | |
8604 #endif | |
8605 | |
8606 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8607 | |
8608 /* Compute scroll margin height in pixels. We scroll when point is | |
8609 within this distance from the top or bottom of the window. */ | |
8610 if (scroll_margin > 0) | |
8611 { | |
8612 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8613 this_scroll_margin *= CANON_Y_UNIT (f); | |
8614 } | |
8615 else | |
8616 this_scroll_margin = 0; | |
8617 | |
8618 /* Compute how much we should try to scroll maximally to bring point | |
8619 into view. */ | |
8620 if (scroll_step) | |
8621 scroll_max = scroll_step; | |
8622 else if (scroll_conservatively) | |
8623 scroll_max = scroll_conservatively; | |
8624 else if (temp_scroll_step) | |
8625 scroll_max = temp_scroll_step; | |
8626 else if (NUMBERP (current_buffer->scroll_down_aggressively) | |
8627 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8628 /* We're trying to scroll because of aggressive scrolling | |
8629 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8630 there should be a variable for this. */ | |
8631 scroll_max = 10; | |
8632 else | |
8633 scroll_max = 0; | |
8634 scroll_max *= CANON_Y_UNIT (f); | |
8635 | |
8636 /* Decide whether we have to scroll down. Start at the window end | |
8637 and move this_scroll_margin up to find the position of the scroll | |
8638 margin. */ | |
8639 window_end = Fwindow_end (window, Qt); | |
8640 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8641 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8642 if (this_scroll_margin) | |
8643 { | |
8644 start_display (&it, w, scroll_margin_pos); | |
8645 move_it_vertically (&it, - this_scroll_margin); | |
8646 scroll_margin_pos = it.current.pos; | |
8647 } | |
8648 | |
8649 if (PT >= CHARPOS (scroll_margin_pos)) | |
8650 { | |
8651 int y0; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8652 #if 0 |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8653 int line_height; |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8654 #endif |
25012 | 8655 |
8656 /* Point is in the scroll margin at the bottom of the window, or | |
8657 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
|
8658 |
25012 | 8659 /* Compute the distance from the scroll margin to PT. |
8660 Give up if the distance is greater than scroll_max. */ | |
8661 start_display (&it, w, scroll_margin_pos); | |
8662 y0 = it.current_y; | |
8663 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8664 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
|
8665 #if 0 /* Taking the line's height into account here looks wrong. */ |
25012 | 8666 line_height = (it.max_ascent + it.max_descent |
8667 ? it.max_ascent + it.max_descent | |
8668 : last_height); | |
8669 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
|
8670 #else |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8671 dy = it.current_y - y0; |
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
8672 #endif |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8673 |
25012 | 8674 if (dy > scroll_max) |
8675 return 0; | |
8676 | |
8677 /* Move the window start down. If scrolling conservatively, | |
8678 move it just enough down to make point visible. If | |
8679 scroll_step is set, move it down by scroll_step. */ | |
8680 start_display (&it, w, startp); | |
8681 | |
8682 if (scroll_conservatively) | |
8683 amount_to_scroll = dy; | |
8684 else if (scroll_step || temp_scroll_step) | |
8685 amount_to_scroll = scroll_max; | |
8686 else | |
8687 { | |
8688 aggressive = current_buffer->scroll_down_aggressively; | |
8689 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8690 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8691 if (NUMBERP (aggressive)) |
8692 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8693 } | |
8694 | |
8695 if (amount_to_scroll <= 0) | |
8696 return 0; | |
8697 | |
8698 move_it_vertically (&it, amount_to_scroll); | |
8699 startp = it.current.pos; | |
8700 } | |
8701 else | |
8702 { | |
8703 /* See if point is inside the scroll margin at the top of the | |
8704 window. */ | |
8705 scroll_margin_pos = startp; | |
8706 if (this_scroll_margin) | |
8707 { | |
8708 start_display (&it, w, startp); | |
8709 move_it_vertically (&it, this_scroll_margin); | |
8710 scroll_margin_pos = it.current.pos; | |
8711 } | |
8712 | |
8713 if (PT < CHARPOS (scroll_margin_pos)) | |
8714 { | |
8715 /* Point is in the scroll margin at the top of the window or | |
8716 above what is displayed in the window. */ | |
8717 int y0; | |
8718 | |
8719 /* Compute the vertical distance from PT to the scroll | |
8720 margin position. Give up if distance is greater than | |
8721 scroll_max. */ | |
8722 SET_TEXT_POS (pos, PT, PT_BYTE); | |
8723 start_display (&it, w, pos); | |
8724 y0 = it.current_y; | |
8725 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
8726 it.last_visible_y, -1, | |
8727 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8728 dy = it.current_y - y0; | |
8729 if (dy > scroll_max) | |
8730 return 0; | |
8731 | |
8732 /* Compute new window start. */ | |
8733 start_display (&it, w, startp); | |
8734 | |
8735 if (scroll_conservatively) | |
8736 amount_to_scroll = dy; | |
8737 else if (scroll_step || temp_scroll_step) | |
8738 amount_to_scroll = scroll_max; | |
8739 else | |
8740 { | |
8741 aggressive = current_buffer->scroll_up_aggressively; | |
8742 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8743 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8744 if (NUMBERP (aggressive)) |
8745 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8746 } | |
8747 | |
8748 if (amount_to_scroll <= 0) | |
8749 return 0; | |
8750 | |
8751 move_it_vertically (&it, - amount_to_scroll); | |
8752 startp = it.current.pos; | |
8753 } | |
8754 } | |
8755 | |
8756 /* Run window scroll functions. */ | |
8757 startp = run_window_scroll_functions (window, startp); | |
8758 | |
8759 /* Display the window. Give up if new fonts are loaded, or if point | |
8760 doesn't appear. */ | |
8761 if (!try_window (window, startp)) | |
8762 rc = -1; | |
8763 else if (w->cursor.vpos < 0) | |
8764 { | |
8765 clear_glyph_matrix (w->desired_matrix); | |
8766 rc = 0; | |
8767 } | |
8768 else | |
8769 { | |
8770 /* Maybe forget recorded base line for line number display. */ | |
8771 if (!just_this_one_p | |
8772 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8773 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 8774 w->base_line_number = Qnil; |
8775 | |
8776 /* If cursor ends up on a partially visible line, shift display | |
8777 lines up or down. */ | |
8778 make_cursor_line_fully_visible (w); | |
8779 rc = 1; | |
8780 } | |
8781 | |
8782 return rc; | |
8783 } | |
8784 | |
8785 | |
8786 /* Compute a suitable window start for window W if display of W starts | |
8787 on a continuation line. Value is non-zero if a new window start | |
8788 was computed. | |
8789 | |
8790 The new window start will be computed, based on W's width, starting | |
8791 from the start of the continued line. It is the start of the | |
8792 screen line with the minimum distance from the old start W->start. */ | |
8793 | |
8794 static int | |
8795 compute_window_start_on_continuation_line (w) | |
8796 struct window *w; | |
8797 { | |
8798 struct text_pos pos, start_pos; | |
8799 int window_start_changed_p = 0; | |
8800 | |
8801 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
8802 | |
8803 /* If window start is on a continuation line... Window start may be | |
8804 < BEGV in case there's invisible text at the start of the | |
8805 buffer (M-x rmail, for example). */ | |
8806 if (CHARPOS (start_pos) > BEGV | |
8807 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
8808 { | |
8809 struct it it; | |
8810 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8811 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8812 /* 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
|
8813 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8814 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
|
8815 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8816 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 8817 |
8818 /* Find the start of the continued line. This should be fast | |
8819 because scan_buffer is fast (newline cache). */ | |
25546 | 8820 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 8821 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
8822 row, DEFAULT_FACE_ID); | |
8823 reseat_at_previous_visible_line_start (&it); | |
8824 | |
8825 /* If the line start is "too far" away from the window start, | |
8826 say it takes too much time to compute a new window start. */ | |
8827 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
8828 < XFASTINT (w->height) * XFASTINT (w->width)) | |
8829 { | |
8830 int min_distance, distance; | |
8831 | |
8832 /* Move forward by display lines to find the new window | |
8833 start. If window width was enlarged, the new start can | |
8834 be expected to be > the old start. If window width was | |
8835 decreased, the new window start will be < the old start. | |
8836 So, we're looking for the display line start with the | |
8837 minimum distance from the old window start. */ | |
8838 pos = it.current.pos; | |
8839 min_distance = INFINITY; | |
8840 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
8841 distance < min_distance) | |
8842 { | |
8843 min_distance = distance; | |
8844 pos = it.current.pos; | |
8845 move_it_by_lines (&it, 1, 0); | |
8846 } | |
8847 | |
8848 /* Set the window start there. */ | |
8849 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
8850 window_start_changed_p = 1; | |
8851 } | |
8852 } | |
8853 | |
8854 return window_start_changed_p; | |
8855 } | |
8856 | |
8857 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8858 /* 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
|
8859 with window start STARTP. Value is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8860 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8861 1 if successful |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8862 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8863 0 if this method cannot be used |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8864 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8865 -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
|
8866 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
|
8867 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
|
8868 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8869 static int |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8870 try_cursor_movement (window, startp, scroll_step) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8871 Lisp_Object window; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8872 struct text_pos startp; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8873 int *scroll_step; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8874 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8875 struct window *w = XWINDOW (window); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8876 struct frame *f = XFRAME (w->frame); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8877 int rc = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8878 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8879 /* 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
|
8880 not moved off the frame. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8881 if (/* Point may be in this window. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8882 PT >= CHARPOS (startp) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8883 /* If we don't check this, we are called to move the cursor in a |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8884 horizontally split window with a current matrix that doesn't |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8885 fit the display. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8886 && !windows_or_buffers_changed |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8887 /* Selective display hasn't changed. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8888 && !current_buffer->clip_changed |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8889 /* If force-mode-line-update was called, really redisplay; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8890 that's how redisplay is forced after e.g. changing |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8891 buffer-invisibility-spec. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8892 && NILP (w->update_mode_line) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8893 /* 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
|
8894 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
|
8895 set the cursor. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8896 && !(!NILP (Vtransient_mark_mode) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8897 && !NILP (current_buffer->mark_active)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8898 && NILP (w->region_showing) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8899 && NILP (Vshow_trailing_whitespace) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8900 /* 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
|
8901 && INTEGERP (w->last_point) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8902 /* 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
|
8903 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
|
8904 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
|
8905 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
|
8906 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
|
8907 handles the same cases. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8908 && !EQ (window, minibuf_window) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8909 /* 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
|
8910 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
|
8911 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
|
8912 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
|
8913 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
|
8914 && INTEGERP (w->window_end_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8915 && 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
|
8916 && (FRAME_WINDOW_P (f) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8917 || !MARKERP (Voverlay_arrow_position) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8918 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8919 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8920 int this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8921 struct glyph_row *row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8922 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8923 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8924 debug_method_add (w, "cursor movement"); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8925 #endif |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8926 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8927 /* 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
|
8928 of the window. This is a pixel value. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8929 this_scroll_margin = max (0, scroll_margin); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8930 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
|
8931 this_scroll_margin *= CANON_Y_UNIT (f); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8932 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8933 /* 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
|
8934 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
|
8935 if (w->last_cursor.vpos < 0 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8936 || 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
|
8937 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8938 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8939 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8940 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
|
8941 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8942 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8943 if (!row->enabled_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8944 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8945 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8946 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8947 if (rc == 0) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8948 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8949 int scroll_p = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8950 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8951 if (PT > XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8952 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8953 /* Point has moved forward. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8954 int last_y = window_text_bottom_y (w) - this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8955 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8956 while (MATRIX_ROW_END_CHARPOS (row) < PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8957 && MATRIX_ROW_BOTTOM_Y (row) < last_y) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8958 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8959 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8960 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8961 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8962 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8963 /* 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
|
8964 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
|
8965 display it in the next line. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
8966 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
8967 && MATRIX_ROW_END_CHARPOS (row) == PT |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
8968 && !cursor_row_p (w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
8969 ++row; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8970 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8971 /* If within the scroll margin, scroll. Note that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8972 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
|
8973 the next line would be drawn, and that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8974 this_scroll_margin can be zero. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8975 if (MATRIX_ROW_BOTTOM_Y (row) > last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8976 || PT > MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8977 /* Line is completely visible last line in window |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8978 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
|
8979 || (MATRIX_ROW_BOTTOM_Y (row) == last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8980 && PT == MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8981 && !row->ends_at_zv_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8982 && !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
|
8983 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8984 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8985 else if (PT < XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8986 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8987 /* 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
|
8988 CHARPOS (startp) because of the outer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8989 if-statement. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8990 while (!row->mode_line_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8991 && (MATRIX_ROW_START_CHARPOS (row) > PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8992 || (MATRIX_ROW_START_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8993 && 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
|
8994 && (row->y > this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8995 || CHARPOS (startp) == BEGV)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8996 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8997 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8998 --row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
8999 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9000 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9001 /* Consider the following case: Window starts at BEGV, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9002 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
|
9003 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
|
9004 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
|
9005 BEGV and START. Try to handle that case. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9006 if (row < w->current_matrix->rows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9007 || row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9008 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9009 row = w->current_matrix->rows; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9010 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9011 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9012 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9013 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9014 /* 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
|
9015 skip forward over overlay strings. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9016 while (MATRIX_ROW_END_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9017 && MATRIX_ROW_ENDS_IN_OVERLAY_STRING_P (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9018 && !row->ends_at_zv_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9019 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9020 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9021 /* If within the scroll margin, scroll. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9022 if (row->y < this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9023 && CHARPOS (startp) != BEGV) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9024 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9025 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9026 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9027 if (PT < MATRIX_ROW_START_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9028 || PT > MATRIX_ROW_END_CHARPOS (row)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9029 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9030 /* 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
|
9031 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9032 } |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9033 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
|
9034 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9035 /* If we end up in a partially visible line, let's make it |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9036 fully visible, except when it's taller than the window, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9037 in which case we can't do much about it. */ |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9038 if (row->height > window_box_height (w)) |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9039 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9040 *scroll_step = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9041 rc = -1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9042 } |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9043 else |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9044 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9045 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
|
9046 try_window (window, startp); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9047 make_cursor_line_fully_visible (w); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9048 rc = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9049 } |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9050 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9051 else if (scroll_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9052 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9053 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9054 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9055 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
|
9056 rc = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9057 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9058 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9059 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9060 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9061 return rc; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9062 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9063 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9064 |
25012 | 9065 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only |
9066 selected_window is redisplayed. */ | |
9067 | |
9068 static void | |
9069 redisplay_window (window, just_this_one_p) | |
9070 Lisp_Object window; | |
9071 int just_this_one_p; | |
9072 { | |
9073 struct window *w = XWINDOW (window); | |
9074 struct frame *f = XFRAME (w->frame); | |
9075 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 9076 struct buffer *old = current_buffer; |
25012 | 9077 struct text_pos lpoint, opoint, startp; |
9078 int update_mode_line; | |
277 | 9079 int tem; |
25012 | 9080 struct it it; |
9081 /* Record it now because it's overwritten. */ | |
9082 int current_matrix_up_to_date_p = 0; | |
9083 int temp_scroll_step = 0; | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9084 int count = specpdl_ptr - specpdl; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9085 int rc; |
277 | 9086 |
25012 | 9087 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
9088 opoint = lpoint; | |
9089 | |
9090 /* W must be a leaf window here. */ | |
9091 xassert (!NILP (w->buffer)); | |
9092 #if GLYPH_DEBUG | |
9093 *w->desired_matrix->method = 0; | |
9094 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9095 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9096 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9097 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9098 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9099 |
25012 | 9100 /* Has the mode line to be updated? */ |
9101 update_mode_line = (!NILP (w->update_mode_line) | |
9102 || update_mode_lines | |
9103 || buffer->clip_changed); | |
433 | 9104 |
9105 if (MINI_WINDOW_P (w)) | |
9106 { | |
25012 | 9107 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
|
9108 && !NILP (echo_area_buffer[0])) |
25012 | 9109 { |
9110 if (update_mode_line) | |
9111 /* We may have to update a tty frame's menu bar or a | |
25543 | 9112 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 9113 goto finish_menu_bars; |
9114 else | |
9115 /* We've already displayed the echo area glyphs in this window. */ | |
9116 goto finish_scroll_bars; | |
9117 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
9118 else if (w != XWINDOW (minibuf_window)) |
433 | 9119 { |
25012 | 9120 /* W is a mini-buffer window, but it's not the currently |
9121 active one, so clear it. */ | |
9122 int yb = window_text_bottom_y (w); | |
9123 struct glyph_row *row; | |
9124 int y; | |
9125 | |
9126 for (y = 0, row = w->desired_matrix->rows; | |
9127 y < yb; | |
9128 y += row->height, ++row) | |
9129 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
|
9130 goto finish_scroll_bars; |
433 | 9131 } |
9132 } | |
277 | 9133 |
25012 | 9134 /* Otherwise set up data on this window; select its buffer and point |
9135 value. */ | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9136 /* 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
|
9137 variables. */ |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9138 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9139 SET_TEXT_POS (opoint, PT, PT_BYTE); |
9140 | |
9141 current_matrix_up_to_date_p | |
9142 = (!NILP (w->window_end_valid) | |
9143 && !current_buffer->clip_changed | |
9144 && XFASTINT (w->last_modified) >= MODIFF | |
9145 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
9146 | |
9147 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
9148 the window end being valid, so set it to nil there. */ | |
9149 if (windows_or_buffers_changed) | |
9150 { | |
9151 /* If window starts on a continuation line, maybe adjust the | |
9152 window start in case the window's width changed. */ | |
9153 if (XMARKER (w->start)->buffer == current_buffer) | |
9154 compute_window_start_on_continuation_line (w); | |
9155 | |
9156 w->window_end_valid = Qnil; | |
9157 } | |
9158 | |
9159 /* Some sanity checks. */ | |
9160 CHECK_WINDOW_END (w); | |
9161 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
|
9162 abort (); |
25012 | 9163 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9164 abort (); |
277 | 9165 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9166 /* 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
|
9167 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9168 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9169 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9170 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9171 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9172 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9173 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9174 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9175 |
25012 | 9176 /* Count number of windows showing the selected buffer. An indirect |
9177 buffer counts as its base buffer. */ | |
9178 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9179 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9180 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9181 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9182 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
|
9183 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9184 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9185 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9186 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9187 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9188 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9189 } |
277 | 9190 |
25012 | 9191 /* Point refers normally to the selected window. For any other |
9192 window, set up appropriate value. */ | |
277 | 9193 if (!EQ (window, selected_window)) |
9194 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9195 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9196 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
|
9197 if (new_pt < BEGV) |
277 | 9198 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9199 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9200 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9201 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 9202 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9203 else if (new_pt > (ZV - 1)) |
277 | 9204 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9205 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9206 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9207 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 9208 } |
25012 | 9209 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9210 /* 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
|
9211 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 9212 } |
9213 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9214 /* If any of the character widths specified in the display table |
25012 | 9215 have changed, invalidate the width run cache. It's true that |
9216 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
|
9217 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
|
9218 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
|
9219 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
|
9220 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
9221 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
|
9222 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9223 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
|
9224 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
|
9225 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9226 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
|
9227 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
|
9228 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9229 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
|
9230 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9231 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9232 |
277 | 9233 /* If window-start is screwed up, choose a new one. */ |
9234 if (XMARKER (w->start)->buffer != current_buffer) | |
9235 goto recenter; | |
9236 | |
25012 | 9237 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 9238 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9239 /* 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
|
9240 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9241 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9242 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9243 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9244 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9245 w->optional_new_start = Qnil; |
25012 | 9246 start_display (&it, w, startp); |
9247 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9248 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9249 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9250 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9251 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9252 |
433 | 9253 /* 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
|
9254 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
|
9255 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9256 || w->frozen_window_start_p) |
277 | 9257 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9258 w->force_start = Qnil; |
25012 | 9259 w->vscroll = 0; |
9260 w->window_end_valid = Qnil; | |
9261 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9262 /* Forget any recorded base line for line number display. */ |
25012 | 9263 if (!current_matrix_up_to_date_p |
9264 || current_buffer->clip_changed) | |
9265 w->base_line_number = Qnil; | |
9266 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9267 /* 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
|
9268 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
|
9269 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9270 /* 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
|
9271 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
|
9272 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
|
9273 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
|
9274 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9275 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9276 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9277 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9278 w->update_mode_line = Qt; |
25012 | 9279 startp = run_window_scroll_functions (window, startp); |
9280 } | |
9281 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9282 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9283 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9284 if (CHARPOS (startp) < BEGV) |
9285 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
9286 else if (CHARPOS (startp) > ZV) | |
9287 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
9288 | |
9289 /* Redisplay, then check if cursor has been set during the | |
9290 redisplay. Give up if new fonts were loaded. */ | |
9291 if (!try_window (window, startp)) | |
9292 { | |
9293 w->force_start = Qt; | |
9294 clear_glyph_matrix (w->desired_matrix); | |
9295 goto restore_buffers; | |
9296 } | |
9297 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9298 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 9299 { |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9300 /* 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
|
9301 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
|
9302 can use it here. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9303 int window_height; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9304 struct glyph_row *row; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9305 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9306 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
|
9307 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
|
9308 while (MATRIX_ROW_BOTTOM_Y (row) < window_height) |
25012 | 9309 ++row; |
9310 | |
9311 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
9312 MATRIX_ROW_START_BYTEPOS (row)); | |
9313 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
9314 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9315 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 9316 else if (current_buffer == old) |
9317 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
9318 | |
9319 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
9320 | |
9321 /* If we are highlighting the region, then we just changed | |
9322 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
|
9323 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
|
9324 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9325 { |
25012 | 9326 clear_glyph_matrix (w->desired_matrix); |
9327 if (!try_window (window, startp)) | |
9328 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9329 } |
277 | 9330 } |
25012 | 9331 |
9332 make_cursor_line_fully_visible (w); | |
9333 #if GLYPH_DEBUG | |
9334 debug_method_add (w, "forced window start"); | |
9335 #endif | |
277 | 9336 goto done; |
9337 } | |
9338 | |
25012 | 9339 /* Handle case where text has not changed, only point, and it has |
9340 not moved off the frame. */ | |
9341 if (current_matrix_up_to_date_p | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9342 && (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
|
9343 rc != 0)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9344 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9345 if (rc == -1) |
25012 | 9346 goto try_to_scroll; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9347 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9348 goto done; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9349 } |
277 | 9350 /* If current starting point was originally the beginning of a line |
9351 but no longer is, find a new starting point. */ | |
485 | 9352 else if (!NILP (w->start_at_line_beg) |
25012 | 9353 && !(CHARPOS (startp) <= BEGV |
9354 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
9355 { | |
9356 #if GLYPH_DEBUG | |
9357 debug_method_add (w, "recenter 1"); | |
9358 #endif | |
277 | 9359 goto recenter; |
9360 } | |
25012 | 9361 |
9362 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9363 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9364 !windows_or_buffers_changed |
25012 | 9365 /* Window must be either use window-based redisplay or |
9366 be full width. */ | |
9367 && (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
|
9368 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 9369 && !MINI_WINDOW_P (w) |
9370 /* Point is not known NOT to appear in window. */ | |
9371 && PT >= CHARPOS (startp) | |
277 | 9372 && XFASTINT (w->last_modified) |
25012 | 9373 /* Window is not hscrolled. */ |
9374 && XFASTINT (w->hscroll) == 0 | |
9375 /* Selective display has not changed. */ | |
9376 && !current_buffer->clip_changed | |
9377 /* Current matrix is up to date. */ | |
9378 && !NILP (w->window_end_valid) | |
9379 /* Can't use this case if highlighting a region because | |
9380 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
|
9381 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9382 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9383 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9384 && NILP (Vshow_trailing_whitespace) |
25012 | 9385 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
9386 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 9387 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 9388 /* Value is > 0 if update has been done, it is -1 if we |
9389 know that the same window start will not work. It is 0 | |
9390 if unsuccessful for some other reason. */ | |
9391 && (tem = try_window_id (w)) != 0) | |
9392 { | |
9393 #if GLYPH_DEBUG | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9394 debug_method_add (w, "try_window_id %d", tem); |
25012 | 9395 #endif |
9396 | |
9397 if (fonts_changed_p) | |
9398 goto restore_buffers; | |
277 | 9399 if (tem > 0) |
9400 goto done; | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9401 |
25012 | 9402 /* Otherwise try_window_id has returned -1 which means that we |
9403 don't want the alternative below this comment to execute. */ | |
9404 } | |
9405 else if (CHARPOS (startp) >= BEGV | |
9406 && CHARPOS (startp) <= ZV | |
9407 && PT >= CHARPOS (startp) | |
9408 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
9409 /* Avoid starting at end of buffer. */ |
25012 | 9410 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9411 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9412 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 9413 { |
25012 | 9414 #if GLYPH_DEBUG |
9415 debug_method_add (w, "same window start"); | |
9416 #endif | |
9417 | |
9418 /* Try to redisplay starting at same place as before. | |
9419 If point has not moved off frame, accept the results. */ | |
9420 if (!current_matrix_up_to_date_p | |
9421 /* 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
|
9422 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
|
9423 buffer. */ |
25012 | 9424 || !NILP (Vwindow_scroll_functions) |
9425 || MINI_WINDOW_P (w) | |
9426 || !try_window_reusing_current_matrix (w)) | |
9427 { | |
9428 IF_DEBUG (debug_method_add (w, "1")); | |
9429 try_window (window, startp); | |
9430 } | |
9431 | |
9432 if (fonts_changed_p) | |
9433 goto restore_buffers; | |
9434 | |
9435 if (w->cursor.vpos >= 0) | |
9436 { | |
9437 if (!just_this_one_p | |
9438 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9439 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9440 /* 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
|
9441 w->base_line_number = Qnil; |
25012 | 9442 |
9443 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9444 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9445 } |
277 | 9446 else |
25012 | 9447 clear_glyph_matrix (w->desired_matrix); |
9448 } | |
9449 | |
9450 try_to_scroll: | |
277 | 9451 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9452 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9453 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9454 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9455 /* 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
|
9456 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9457 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9458 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9459 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9460 } |
277 | 9461 |
25012 | 9462 /* Try to scroll by specified few lines. */ |
9463 if ((scroll_conservatively | |
9464 || scroll_step | |
9465 || temp_scroll_step | |
9466 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9467 || 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
|
9468 && !current_buffer->clip_changed |
25012 | 9469 && CHARPOS (startp) >= BEGV |
9470 && CHARPOS (startp) <= ZV) | |
9471 { | |
9472 /* The function returns -1 if new fonts were loaded, 1 if | |
9473 successful, 0 if not successful. */ | |
9474 int rc = try_scrolling (window, just_this_one_p, | |
9475 scroll_conservatively, | |
9476 scroll_step, | |
9477 temp_scroll_step); | |
9478 if (rc > 0) | |
9479 goto done; | |
9480 else if (rc < 0) | |
9481 goto restore_buffers; | |
9482 } | |
9483 | |
9484 /* Finally, just choose place to start which centers point */ | |
9485 | |
9486 recenter: | |
9487 | |
9488 #if GLYPH_DEBUG | |
9489 debug_method_add (w, "recenter"); | |
9490 #endif | |
9491 | |
9492 /* w->vscroll = 0; */ | |
9493 | |
9494 /* Forget any previously recorded base line for line number display. */ | |
9495 if (!current_matrix_up_to_date_p | |
9496 || current_buffer->clip_changed) | |
9497 w->base_line_number = Qnil; | |
9498 | |
9499 /* Move backward half the height of the window. */ | |
9500 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9501 it.current_y = it.last_visible_y; | |
9502 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9503 xassert (IT_CHARPOS (it) >= BEGV); | |
9504 | |
9505 /* The function move_it_vertically_backward may move over more | |
9506 than the specified y-distance. If it->w is small, e.g. a | |
9507 mini-buffer window, we may end up in front of the window's | |
9508 display area. Start displaying at the start of the line | |
9509 containing PT in this case. */ | |
9510 if (it.current_y <= 0) | |
9511 { | |
9512 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9513 move_it_vertically (&it, 0); | |
9514 xassert (IT_CHARPOS (it) <= PT); | |
9515 it.current_y = 0; | |
9516 } | |
9517 | |
9518 it.current_x = it.hpos = 0; | |
9519 | |
9520 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9521 in case the window-scroll-functions functions get errors. */ | |
9522 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9523 | |
9524 /* Run scroll hooks. */ | |
9525 startp = run_window_scroll_functions (window, it.current.pos); | |
9526 | |
9527 /* Redisplay the window. */ | |
9528 if (!current_matrix_up_to_date_p | |
9529 || windows_or_buffers_changed | |
9530 /* Don't use try_window_reusing_current_matrix in this case | |
9531 because it can have changed the buffer. */ | |
9532 || !NILP (Vwindow_scroll_functions) | |
9533 || !just_this_one_p | |
9534 || MINI_WINDOW_P (w) | |
9535 || !try_window_reusing_current_matrix (w)) | |
9536 try_window (window, startp); | |
9537 | |
9538 /* If new fonts have been loaded (due to fontsets), give up. We | |
9539 have to start a new redisplay since we need to re-adjust glyph | |
9540 matrices. */ | |
9541 if (fonts_changed_p) | |
9542 goto restore_buffers; | |
9543 | |
9544 /* If cursor did not appear assume that the middle of the window is | |
9545 in the first line of the window. Do it again with the next line. | |
9546 (Imagine a window of height 100, displaying two lines of height | |
9547 60. Moving back 50 from it->last_visible_y will end in the first | |
9548 line.) */ | |
9549 if (w->cursor.vpos < 0) | |
9550 { | |
9551 if (!NILP (w->window_end_valid) | |
9552 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9553 { | |
9554 clear_glyph_matrix (w->desired_matrix); | |
9555 move_it_by_lines (&it, 1, 0); | |
9556 try_window (window, it.current.pos); | |
9557 } | |
9558 else if (PT < IT_CHARPOS (it)) | |
9559 { | |
9560 clear_glyph_matrix (w->desired_matrix); | |
9561 move_it_by_lines (&it, -1, 0); | |
9562 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
|
9563 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9564 else |
25012 | 9565 { |
9566 /* Not much we can do about it. */ | |
9567 } | |
9568 } | |
9569 | |
9570 /* Consider the following case: Window starts at BEGV, there is | |
9571 invisible, intangible text at BEGV, so that display starts at | |
9572 some point START > BEGV. It can happen that we are called with | |
9573 PT somewhere between BEGV and START. Try to handle that case. */ | |
9574 if (w->cursor.vpos < 0) | |
9575 { | |
9576 struct glyph_row *row = w->current_matrix->rows; | |
9577 if (row->mode_line_p) | |
9578 ++row; | |
9579 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
9580 } | |
9581 | |
9582 make_cursor_line_fully_visible (w); | |
9583 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9584 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
9585 |
25012 | 9586 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
9587 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
9588 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
9589 ? Qt : Qnil); | |
9590 | |
9591 /* 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
|
9592 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9593 /* If window not full width, must redo its mode line |
25012 | 9594 if (a) the window to its side is being redone and |
9595 (b) we do a frame-based redisplay. This is a consequence | |
9596 of how inverted lines are drawn in frame-based redisplay. */ | |
9597 || (!just_this_one_p | |
9598 && !FRAME_WINDOW_P (f) | |
9599 && !WINDOW_FULL_WIDTH_P (w)) | |
9600 /* 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
|
9601 || INTEGERP (w->base_line_pos) |
25012 | 9602 /* 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
|
9603 || (!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
|
9604 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 9605 /* This means that the window has a mode line. */ |
9606 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 9607 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 9608 { |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9609 Lisp_Object old_selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9610 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9611 old_selected_frame = selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9612 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9613 XSETFRAME (selected_frame, f); |
25012 | 9614 display_mode_lines (w); |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
9615 selected_frame = old_selected_frame; |
25012 | 9616 |
9617 /* If mode line height has changed, arrange for a thorough | |
9618 immediate redisplay using the correct mode line height. */ | |
9619 if (WINDOW_WANTS_MODELINE_P (w) | |
9620 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
9621 { | |
9622 fonts_changed_p = 1; | |
9623 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
9624 = DESIRED_MODE_LINE_HEIGHT (w); | |
9625 } | |
9626 | |
9627 /* If top line height has changed, arrange for a thorough | |
9628 immediate redisplay using the correct mode line height. */ | |
25546 | 9629 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9630 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 9631 { |
9632 fonts_changed_p = 1; | |
25546 | 9633 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
9634 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9635 } |
9636 | |
9637 if (fonts_changed_p) | |
9638 goto restore_buffers; | |
9639 } | |
9640 | |
9641 if (!line_number_displayed | |
9642 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9643 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9644 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9645 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9646 } |
277 | 9647 |
25012 | 9648 finish_menu_bars: |
9649 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9650 /* 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
|
9651 if (update_mode_line |
25012 | 9652 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9653 { | |
9654 int redisplay_menu_p = 0; | |
9655 | |
9656 if (FRAME_WINDOW_P (f)) | |
9657 { | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
9658 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
25012 | 9659 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
|
9660 #else |
25012 | 9661 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
|
9662 #endif |
25012 | 9663 } |
9664 else | |
9665 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9666 | |
9667 if (redisplay_menu_p) | |
9668 display_menu_bar (w); | |
9669 | |
9670 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9671 if (WINDOWP (f->tool_bar_window) |
9672 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9673 || auto_resize_tool_bars_p)) | |
9674 redisplay_tool_bar (f); | |
25012 | 9675 #endif |
9676 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9677 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9678 finish_scroll_bars: |
25012 | 9679 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9680 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
|
9681 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9682 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9683 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9684 /* 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
|
9685 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
|
9686 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
|
9687 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
|
9688 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9689 |
25012 | 9690 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
|
9691 if (!MINI_WINDOW_P (w) |
25012 | 9692 || (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
|
9693 && 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
|
9694 { |
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
|
9695 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
9696 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
|
9697 /* 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
|
9698 moment, we'll pretend it is. */ |
25012 | 9699 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
9700 | |
9701 if (end < start) | |
9702 end = start; | |
9703 if (whole < (end - start)) | |
9704 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9705 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9706 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9707 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9708 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9709 /* 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
|
9710 (*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
|
9711 |
25012 | 9712 /* Note that we actually used the scroll bar attached to this |
9713 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
|
9714 (*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
|
9715 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9716 |
25012 | 9717 restore_buffers: |
9718 | |
9719 /* Restore current_buffer and value of point in it. */ | |
9720 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
|
9721 set_buffer_internal_1 (old); |
25012 | 9722 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
|
9723 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9724 unbind_to (count, Qnil); |
277 | 9725 } |
25012 | 9726 |
9727 | |
9728 /* Build the complete desired matrix of WINDOW with a window start | |
9729 buffer position POS. Value is non-zero if successful. It is zero | |
9730 if fonts were loaded during redisplay which makes re-adjusting | |
9731 glyph matrices necessary. */ | |
9732 | |
9733 int | |
277 | 9734 try_window (window, pos) |
9735 Lisp_Object window; | |
25012 | 9736 struct text_pos pos; |
9737 { | |
9738 struct window *w = XWINDOW (window); | |
9739 struct it it; | |
9740 struct glyph_row *last_text_row = NULL; | |
9741 | |
9742 /* Make POS the new window start. */ | |
9743 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
9744 | |
9745 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
9746 w->cursor.vpos = -1; | |
277 | 9747 overlay_arrow_seen = 0; |
25012 | 9748 |
9749 /* Initialize iterator and info to start at POS. */ | |
9750 start_display (&it, w, pos); | |
9751 | |
9752 /* Display all lines of W. */ | |
9753 while (it.current_y < it.last_visible_y) | |
9754 { | |
9755 if (display_line (&it)) | |
9756 last_text_row = it.glyph_row - 1; | |
9757 if (fonts_changed_p) | |
9758 return 0; | |
9759 } | |
9760 | |
9761 /* If bottom moved off end of frame, change mode line percentage. */ | |
9762 if (XFASTINT (w->window_end_pos) <= 0 | |
9763 && Z != IT_CHARPOS (it)) | |
277 | 9764 w->update_mode_line = Qt; |
9765 | |
25012 | 9766 /* Set window_end_pos to the offset of the last character displayed |
9767 on the window from the end of current_buffer. Set | |
9768 window_end_vpos to its row number. */ | |
9769 if (last_text_row) | |
9770 { | |
9771 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
9772 w->window_end_bytepos | |
9773 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9774 XSETFASTINT (w->window_end_pos, | |
9775 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9776 XSETFASTINT (w->window_end_vpos, | |
9777 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9778 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
9779 ->displays_text_p); | |
9780 } | |
9781 else | |
9782 { | |
9783 w->window_end_bytepos = 0; | |
9784 XSETFASTINT (w->window_end_pos, 0); | |
9785 XSETFASTINT (w->window_end_vpos, 0); | |
9786 } | |
9787 | |
277 | 9788 /* But that is not valid info until redisplay finishes. */ |
9789 w->window_end_valid = Qnil; | |
25012 | 9790 return 1; |
9791 } | |
9792 | |
9793 | |
277 | 9794 |
25012 | 9795 /************************************************************************ |
9796 Window redisplay reusing current matrix when buffer has not changed | |
9797 ************************************************************************/ | |
9798 | |
9799 /* Try redisplay of window W showing an unchanged buffer with a | |
9800 different window start than the last time it was displayed by | |
9801 reusing its current matrix. Value is non-zero if successful. | |
9802 W->start is the new window start. */ | |
9803 | |
9804 static int | |
9805 try_window_reusing_current_matrix (w) | |
9806 struct window *w; | |
9807 { | |
9808 struct frame *f = XFRAME (w->frame); | |
9809 struct glyph_row *row, *bottom_row; | |
9810 struct it it; | |
9811 struct run run; | |
9812 struct text_pos start, new_start; | |
9813 int nrows_scrolled, i; | |
9814 struct glyph_row *last_text_row; | |
9815 struct glyph_row *last_reused_text_row; | |
9816 struct glyph_row *start_row; | |
9817 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
|
9818 |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9819 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
|
9820 !FRAME_WINDOW_P (f) |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9821 /* 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
|
9822 or such. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
9823 || windows_or_buffers_changed) |
25012 | 9824 return 0; |
9825 | |
9826 /* Can't do this if region may have changed. */ | |
9827 if ((!NILP (Vtransient_mark_mode) | |
9828 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9829 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9830 || !NILP (Vshow_trailing_whitespace)) |
25012 | 9831 return 0; |
9832 | |
9833 /* If top-line visibility has changed, give up. */ | |
25546 | 9834 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9835 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 9836 return 0; |
9837 | |
9838 /* Give up if old or new display is scrolled vertically. We could | |
9839 make this function handle this, but right now it doesn't. */ | |
9840 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9841 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
9842 return 0; | |
9843 | |
9844 /* The variable new_start now holds the new window start. The old | |
9845 start `start' can be determined from the current matrix. */ | |
9846 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
9847 start = start_row->start.pos; | |
9848 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
9849 | |
9850 /* Clear the desired matrix for the display below. */ | |
9851 clear_glyph_matrix (w->desired_matrix); | |
9852 | |
9853 if (CHARPOS (new_start) <= CHARPOS (start)) | |
9854 { | |
9855 int first_row_y; | |
9856 | |
9857 IF_DEBUG (debug_method_add (w, "twu1")); | |
9858 | |
9859 /* Display up to a row that can be reused. The variable | |
9860 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
|
9861 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
|
9862 header-line; it's not the same as the MATRIX_ROW_VPOS! */ |
25012 | 9863 start_display (&it, w, new_start); |
9864 first_row_y = it.current_y; | |
9865 w->cursor.vpos = -1; | |
9866 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
|
9867 |
25012 | 9868 while (it.current_y < it.last_visible_y |
9869 && IT_CHARPOS (it) < CHARPOS (start) | |
9870 && !fonts_changed_p) | |
9871 if (display_line (&it)) | |
9872 last_text_row = it.glyph_row - 1; | |
9873 | |
9874 /* A value of current_y < last_visible_y means that we stopped | |
9875 at the previous window start, which in turn means that we | |
9876 have at least one reusable row. */ | |
9877 if (it.current_y < it.last_visible_y) | |
9878 { | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
9879 /* IT.vpos always starts from 0; it counts text lines. */ |
25012 | 9880 nrows_scrolled = it.vpos; |
9881 | |
9882 /* Find PT if not already found in the lines displayed. */ | |
9883 if (w->cursor.vpos < 0) | |
9884 { | |
9885 int dy = it.current_y - first_row_y; | |
9886 | |
9887 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9888 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9889 { | |
9890 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
9891 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
9892 { | |
9893 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
9894 dy, nrows_scrolled); | |
9895 break; | |
9896 } | |
9897 | |
9898 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
9899 break; | |
9900 | |
9901 ++row; | |
9902 } | |
9903 | |
9904 /* Give up if point was not found. This shouldn't | |
9905 happen often; not more often than with try_window | |
9906 itself. */ | |
9907 if (w->cursor.vpos < 0) | |
9908 { | |
9909 clear_glyph_matrix (w->desired_matrix); | |
9910 return 0; | |
9911 } | |
9912 } | |
9913 | |
9914 /* Scroll the display. Do it before the current matrix is | |
9915 changed. The problem here is that update has not yet | |
9916 run, i.e. part of the current matrix is not up to date. | |
9917 scroll_run_hook will clear the cursor, and use the | |
9918 current matrix to get the height of the row the cursor is | |
9919 in. */ | |
9920 run.current_y = first_row_y; | |
9921 run.desired_y = it.current_y; | |
9922 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
|
9923 |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
9924 if (run.height > 0 && run.current_y != run.desired_y) |
25012 | 9925 { |
9926 update_begin (f); | |
9927 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
|
9928 rif->clear_mouse_face (w); |
25012 | 9929 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
|
9930 rif->update_window_end_hook (w, 0, 0); |
25012 | 9931 update_end (f); |
9932 } | |
9933 | |
9934 /* Shift current matrix down by nrows_scrolled lines. */ | |
9935 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9936 rotate_matrix (w->current_matrix, | |
9937 start_vpos, | |
9938 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9939 nrows_scrolled); | |
9940 | |
9941 /* Disable lines not reused. */ | |
9942 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
|
9943 (start_row + i)->enabled_p = 0; |
25012 | 9944 |
9945 /* Re-compute Y positions. */ | |
25546 | 9946 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9947 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
9948 for (row = start_row + nrows_scrolled; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
9949 row < bottom_row; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
9950 ++row) |
25012 | 9951 { |
9952 row->y = it.current_y; | |
9953 | |
9954 if (row->y < min_y) | |
9955 row->visible_height = row->height - (min_y - row->y); | |
9956 else if (row->y + row->height > max_y) | |
9957 row->visible_height | |
9958 = row->height - (row->y + row->height - max_y); | |
9959 else | |
9960 row->visible_height = row->height; | |
9961 | |
9962 it.current_y += row->height; | |
9963 | |
9964 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9965 last_reused_text_row = row; | |
9966 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
9967 break; | |
9968 } | |
9969 } | |
9970 | |
9971 /* Update window_end_pos etc.; last_reused_text_row is the last | |
9972 reused row from the current matrix containing text, if any. | |
9973 The value of last_text_row is the last displayed line | |
9974 containing text. */ | |
9975 if (last_reused_text_row) | |
9976 { | |
9977 w->window_end_bytepos | |
9978 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
9979 XSETFASTINT (w->window_end_pos, | |
9980 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
9981 XSETFASTINT (w->window_end_vpos, | |
9982 MATRIX_ROW_VPOS (last_reused_text_row, | |
9983 w->current_matrix)); | |
9984 } | |
9985 else if (last_text_row) | |
9986 { | |
9987 w->window_end_bytepos | |
9988 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9989 XSETFASTINT (w->window_end_pos, | |
9990 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9991 XSETFASTINT (w->window_end_vpos, | |
9992 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9993 } | |
9994 else | |
9995 { | |
9996 /* This window must be completely empty. */ | |
9997 w->window_end_bytepos = 0; | |
9998 XSETFASTINT (w->window_end_pos, 0); | |
9999 XSETFASTINT (w->window_end_vpos, 0); | |
10000 } | |
10001 w->window_end_valid = Qnil; | |
10002 | |
10003 /* Update hint: don't try scrolling again in update_window. */ | |
10004 w->desired_matrix->no_scrolling_p = 1; | |
10005 | |
10006 #if GLYPH_DEBUG | |
10007 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
10008 #endif | |
10009 return 1; | |
10010 } | |
10011 else if (CHARPOS (new_start) > CHARPOS (start)) | |
10012 { | |
10013 struct glyph_row *pt_row, *row; | |
10014 struct glyph_row *first_reusable_row; | |
10015 struct glyph_row *first_row_to_display; | |
10016 int dy; | |
10017 int yb = window_text_bottom_y (w); | |
10018 | |
10019 IF_DEBUG (debug_method_add (w, "twu2")); | |
10020 | |
10021 /* Find the row starting at new_start, if there is one. Don't | |
10022 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
|
10023 first_reusable_row = start_row; |
25012 | 10024 while (first_reusable_row->enabled_p |
10025 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
10026 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
10027 < CHARPOS (new_start))) | |
10028 ++first_reusable_row; | |
10029 | |
10030 /* Give up if there is no row to reuse. */ | |
10031 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
|
10032 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10033 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10034 != CHARPOS (new_start))) |
25012 | 10035 return 0; |
10036 | |
10037 /* We can reuse fully visible rows beginning with | |
10038 first_reusable_row to the end of the window. Set | |
10039 first_row_to_display to the first row that cannot be reused. | |
10040 Set pt_row to the row containing point, if there is any. */ | |
10041 first_row_to_display = first_reusable_row; | |
10042 pt_row = NULL; | |
10043 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
10044 { | |
10045 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
10046 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
10047 pt_row = first_row_to_display; | |
10048 | |
10049 ++first_row_to_display; | |
10050 } | |
10051 | |
10052 /* Start displaying at the start of first_row_to_display. */ | |
10053 xassert (first_row_to_display->y < yb); | |
10054 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
|
10055 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
|
10056 - start_vpos); |
25012 | 10057 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) |
10058 - nrows_scrolled); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10059 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
|
10060 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 10061 |
10062 /* Display lines beginning with first_row_to_display in the | |
10063 desired matrix. Set last_text_row to the last row displayed | |
10064 that displays text. */ | |
10065 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
10066 if (pt_row == NULL) | |
10067 w->cursor.vpos = -1; | |
10068 last_text_row = NULL; | |
10069 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
10070 if (display_line (&it)) | |
10071 last_text_row = it.glyph_row - 1; | |
10072 | |
10073 /* Give up If point isn't in a row displayed or reused. */ | |
10074 if (w->cursor.vpos < 0) | |
10075 { | |
10076 clear_glyph_matrix (w->desired_matrix); | |
10077 return 0; | |
10078 } | |
10079 | |
10080 /* If point is in a reused row, adjust y and vpos of the cursor | |
10081 position. */ | |
10082 if (pt_row) | |
10083 { | |
10084 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
10085 w->current_matrix); | |
10086 w->cursor.y -= first_reusable_row->y; | |
10087 } | |
10088 | |
10089 /* Scroll the display. */ | |
10090 run.current_y = first_reusable_row->y; | |
25546 | 10091 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10092 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
|
10093 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
|
10094 |
25012 | 10095 if (run.height) |
10096 { | |
10097 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10098 update_begin (f); | |
10099 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
|
10100 rif->clear_mouse_face (w); |
25012 | 10101 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
|
10102 rif->update_window_end_hook (w, 0, 0); |
25012 | 10103 update_end (f); |
10104 } | |
10105 | |
10106 /* Adjust Y positions of reused rows. */ | |
10107 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
25546 | 10108 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10109 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10110 for (row = first_reusable_row; row < first_row_to_display; ++row) |
25012 | 10111 { |
10112 row->y -= dy; | |
10113 if (row->y < min_y) | |
10114 row->visible_height = row->height - (min_y - row->y); | |
10115 else if (row->y + row->height > max_y) | |
10116 row->visible_height | |
10117 = row->height - (row->y + row->height - max_y); | |
10118 else | |
10119 row->visible_height = row->height; | |
10120 } | |
10121 | |
10122 /* Disable rows not reused. */ | |
10123 while (row < bottom_row) | |
10124 { | |
10125 row->enabled_p = 0; | |
10126 ++row; | |
10127 } | |
10128 | |
10129 /* Scroll the current matrix. */ | |
10130 xassert (nrows_scrolled > 0); | |
10131 rotate_matrix (w->current_matrix, | |
10132 start_vpos, | |
10133 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10134 -nrows_scrolled); | |
10135 | |
10136 /* Adjust window end. A null value of last_text_row means that | |
10137 the window end is in reused rows which in turn means that | |
10138 only its vpos can have changed. */ | |
10139 if (last_text_row) | |
10140 { | |
10141 w->window_end_bytepos | |
10142 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10143 XSETFASTINT (w->window_end_pos, | |
10144 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10145 XSETFASTINT (w->window_end_vpos, | |
10146 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10147 } | |
10148 else | |
10149 { | |
10150 XSETFASTINT (w->window_end_vpos, | |
10151 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
10152 } | |
10153 | |
10154 w->window_end_valid = Qnil; | |
10155 w->desired_matrix->no_scrolling_p = 1; | |
10156 | |
10157 #if GLYPH_DEBUG | |
10158 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
10159 #endif | |
10160 return 1; | |
10161 } | |
10162 | |
10163 return 0; | |
10164 } | |
10165 | |
10166 | |
10167 | |
10168 /************************************************************************ | |
10169 Window redisplay reusing current matrix when buffer has changed | |
10170 ************************************************************************/ | |
10171 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10172 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
|
10173 static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, |
25012 | 10174 int *, int *)); |
10175 static struct glyph_row * | |
10176 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
10177 struct glyph_row *)); | |
10178 | |
10179 | |
10180 /* Return the last row in MATRIX displaying text. If row START is | |
10181 non-null, start searching with that row. IT gives the dimensions | |
10182 of the display. Value is null if matrix is empty; otherwise it is | |
10183 a pointer to the row found. */ | |
10184 | |
10185 static struct glyph_row * | |
10186 find_last_row_displaying_text (matrix, it, start) | |
10187 struct glyph_matrix *matrix; | |
10188 struct it *it; | |
10189 struct glyph_row *start; | |
10190 { | |
10191 struct glyph_row *row, *row_found; | |
10192 | |
10193 /* Set row_found to the last row in IT->w's current matrix | |
10194 displaying text. The loop looks funny but think of partially | |
10195 visible lines. */ | |
10196 row_found = NULL; | |
10197 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
10198 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10199 { | |
10200 xassert (row->enabled_p); | |
10201 row_found = row; | |
10202 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
10203 break; | |
10204 ++row; | |
10205 } | |
10206 | |
10207 return row_found; | |
10208 } | |
10209 | |
10210 | |
10211 /* Return the last row in the current matrix of W that is not affected | |
10212 by changes at the start of current_buffer that occurred since the | |
10213 last time W was redisplayed. Value is null if no such row exists. | |
10214 | |
10215 The global variable beg_unchanged has to contain the number of | |
10216 bytes unchanged at the start of current_buffer. BEG + | |
10217 beg_unchanged is the buffer position of the first changed byte in | |
10218 current_buffer. Characters at positions < BEG + beg_unchanged are | |
10219 at the same buffer positions as they were when the current matrix | |
10220 was built. */ | |
10221 | |
10222 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10223 find_last_unchanged_at_beg_row (w) |
25012 | 10224 struct window *w; |
10225 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10226 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 10227 struct glyph_row *row; |
10228 struct glyph_row *row_found = NULL; | |
10229 int yb = window_text_bottom_y (w); | |
10230 | |
10231 /* Find the last row displaying unchanged text. */ | |
10232 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10233 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
10234 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
10235 { | |
10236 if (/* If row ends before first_changed_pos, it is unchanged, | |
10237 except in some case. */ | |
10238 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
10239 /* When row ends in ZV and we write at ZV it is not | |
10240 unchanged. */ | |
10241 && !row->ends_at_zv_p | |
10242 /* When first_changed_pos is the end of a continued line, | |
10243 row is not unchanged because it may be no longer | |
10244 continued. */ | |
10245 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
10246 && row->continued_p)) | |
10247 row_found = row; | |
10248 | |
10249 /* Stop if last visible row. */ | |
10250 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
10251 break; | |
10252 | |
10253 ++row; | |
10254 } | |
10255 | |
10256 return row_found; | |
10257 } | |
10258 | |
10259 | |
10260 /* Find the first glyph row in the current matrix of W that is not | |
10261 affected by changes at the end of current_buffer since the last | |
10262 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
|
10263 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
|
10264 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
|
10265 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
|
10266 exists, i.e. all rows are affected by changes. */ |
25012 | 10267 |
10268 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10269 find_first_unchanged_at_end_row (w, delta, delta_bytes) |
25012 | 10270 struct window *w; |
10271 int *delta, *delta_bytes; | |
10272 { | |
10273 struct glyph_row *row; | |
10274 struct glyph_row *row_found = NULL; | |
10275 | |
10276 *delta = *delta_bytes = 0; | |
10277 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10278 /* 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
|
10279 is not up to date. */ |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10280 if (NILP (w->window_end_valid)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10281 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10282 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10283 /* A value of window_end_pos >= END_UNCHANGED means that the window |
25012 | 10284 end is in the range of changed text. If so, there is no |
10285 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
|
10286 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 10287 return NULL; |
10288 | |
10289 /* Set row to the last row in W's current matrix displaying text. */ | |
10290 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10291 | |
10292 /* If matrix is entirely empty, no unchanged row exists. */ | |
10293 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10294 { | |
10295 /* The value of row is the last glyph row in the matrix having a | |
10296 meaningful buffer position in it. The end position of row | |
10297 corresponds to window_end_pos. This allows us to translate | |
10298 buffer positions in the current matrix to current buffer | |
10299 positions for characters not in changed text. */ | |
10300 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
10301 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
10302 int last_unchanged_pos, last_unchanged_pos_old; | |
10303 struct glyph_row *first_text_row | |
10304 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10305 | |
10306 *delta = Z - Z_old; | |
10307 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
10308 | |
10309 /* Set last_unchanged_pos to the buffer position of the last | |
10310 character in the buffer that has not been changed. Z is the | |
10311 index + 1 of the last byte in current_buffer, i.e. by | |
10312 subtracting end_unchanged we get the index of the last | |
10313 unchanged character, and we have to add BEG to get its buffer | |
10314 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10315 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 10316 last_unchanged_pos_old = last_unchanged_pos - *delta; |
10317 | |
10318 /* Search backward from ROW for a row displaying a line that | |
10319 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
|
10320 for (; row > first_text_row; --row) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10321 { |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10322 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
|
10323 abort (); |
25012 | 10324 |
10325 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
10326 row_found = row; | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10327 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10328 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10329 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10330 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
|
10331 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10332 |
25012 | 10333 return row_found; |
10334 } | |
10335 | |
10336 | |
10337 /* Make sure that glyph rows in the current matrix of window W | |
10338 reference the same glyph memory as corresponding rows in the | |
10339 frame's frame matrix. This function is called after scrolling W's | |
10340 current matrix on a terminal frame in try_window_id and | |
10341 try_window_reusing_current_matrix. */ | |
10342 | |
10343 static void | |
10344 sync_frame_with_window_matrix_rows (w) | |
10345 struct window *w; | |
10346 { | |
10347 struct frame *f = XFRAME (w->frame); | |
10348 struct glyph_row *window_row, *window_row_end, *frame_row; | |
10349 | |
10350 /* Preconditions: W must be a leaf window and full-width. Its frame | |
10351 must have a frame matrix. */ | |
10352 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
10353 xassert (WINDOW_FULL_WIDTH_P (w)); | |
10354 xassert (!FRAME_WINDOW_P (f)); | |
10355 | |
10356 /* If W is a full-width window, glyph pointers in W's current matrix | |
10357 have, by definition, to be the same as glyph pointers in the | |
10358 corresponding frame matrix. */ | |
10359 window_row = w->current_matrix->rows; | |
10360 window_row_end = window_row + w->current_matrix->nrows; | |
10361 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
10362 while (window_row < window_row_end) | |
10363 { | |
10364 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10365 |
25012 | 10366 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
10367 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
|
10368 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10369 /* 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
|
10370 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
|
10371 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10372 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10373 |
25012 | 10374 ++window_row, ++frame_row; |
10375 } | |
10376 } | |
10377 | |
10378 | |
25543 | 10379 /* Find the glyph row in window W containing CHARPOS. Consider all |
10380 rows between START and END (not inclusive). END null means search | |
10381 all rows to the end of the display area of W. Value is the row | |
10382 containing CHARPOS or null. */ | |
10383 | |
10384 static struct glyph_row * | |
10385 row_containing_pos (w, charpos, start, end) | |
10386 struct window *w; | |
10387 int charpos; | |
10388 struct glyph_row *start, *end; | |
10389 { | |
10390 struct glyph_row *row = start; | |
10391 int last_y; | |
10392 | |
10393 /* If we happen to start on a header-line, skip that. */ | |
10394 if (row->mode_line_p) | |
10395 ++row; | |
10396 | |
10397 if ((end && row >= end) || !row->enabled_p) | |
10398 return NULL; | |
10399 | |
10400 last_y = window_text_bottom_y (w); | |
10401 | |
10402 while ((end == NULL || row < end) | |
10403 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
10404 /* The end position of a row equals the start | |
10405 position of the next row. If CHARPOS is there, we | |
10406 would rather display it in the next line, except | |
10407 when this line ends in ZV. */ | |
10408 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
10409 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
10410 || !row->ends_at_zv_p))) | |
10411 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
10412 ++row; | |
10413 | |
10414 /* Give up if CHARPOS not found. */ | |
10415 if ((end && row >= end) | |
10416 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
10417 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
10418 row = NULL; | |
10419 | |
10420 return row; | |
10421 } | |
10422 | |
10423 | |
25012 | 10424 /* Try to redisplay window W by reusing its existing display. W's |
10425 current matrix must be up to date when this function is called, | |
10426 i.e. window_end_valid must not be nil. | |
10427 | |
10428 Value is | |
10429 | |
10430 1 if display has been updated | |
10431 0 if otherwise unsuccessful | |
10432 -1 if redisplay with same window start is known not to succeed | |
10433 | |
10434 The following steps are performed: | |
10435 | |
10436 1. Find the last row in the current matrix of W that is not | |
10437 affected by changes at the start of current_buffer. If no such row | |
10438 is found, give up. | |
10439 | |
10440 2. Find the first row in W's current matrix that is not affected by | |
10441 changes at the end of current_buffer. Maybe there is no such row. | |
10442 | |
10443 3. Display lines beginning with the row + 1 found in step 1 to the | |
10444 row found in step 2 or, if step 2 didn't find a row, to the end of | |
10445 the window. | |
10446 | |
10447 4. If cursor is not known to appear on the window, give up. | |
10448 | |
10449 5. If display stopped at the row found in step 2, scroll the | |
10450 display and current matrix as needed. | |
10451 | |
10452 6. Maybe display some lines at the end of W, if we must. This can | |
10453 happen under various circumstances, like a partially visible line | |
10454 becoming fully visible, or because newly displayed lines are displayed | |
10455 in smaller font sizes. | |
10456 | |
10457 7. Update W's window end information. */ | |
10458 | |
10459 /* Check that window end is what we expect it to be. */ | |
277 | 10460 |
10461 static int | |
25012 | 10462 try_window_id (w) |
10463 struct window *w; | |
10464 { | |
10465 struct frame *f = XFRAME (w->frame); | |
10466 struct glyph_matrix *current_matrix = w->current_matrix; | |
10467 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10468 struct glyph_row *last_unchanged_at_beg_row; | |
10469 struct glyph_row *first_unchanged_at_end_row; | |
10470 struct glyph_row *row; | |
10471 struct glyph_row *bottom_row; | |
10472 int bottom_vpos; | |
10473 struct it it; | |
10474 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10475 struct text_pos start_pos; | |
10476 struct run run; | |
10477 int first_unchanged_at_end_vpos = 0; | |
10478 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10479 struct text_pos start; | |
10480 | |
10481 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10482 | |
10483 /* Check pre-conditions. Window end must be valid, otherwise | |
10484 the current matrix would not be up to date. */ | |
10485 xassert (!NILP (w->window_end_valid)); | |
10486 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10487 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10488 | |
10489 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10490 only if buffer has really changed. The reason is that the gap is | |
10491 initially at Z for freshly visited files. The code below would | |
10492 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
|
10493 if (MODIFF > SAVE_MODIFF |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10494 /* 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
|
10495 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) |
25012 | 10496 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10497 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10498 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10499 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10500 END_UNCHANGED = Z - GPT; |
25012 | 10501 } |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
10502 |
25012 | 10503 /* If window starts after a line end, and the last change is in |
10504 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
|
10505 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
|
10506 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
|
10507 be adjusted, of course. */ |
25012 | 10508 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); |
10509 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10510 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10511 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10512 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10513 { | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10514 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
|
10515 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
|
10516 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10517 if (delta) |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10518 { |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10519 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
|
10520 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
|
10521 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10522 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
|
10523 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
|
10524 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
|
10525 delta, delta_bytes); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10526 } |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10527 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10528 #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
|
10529 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
|
10530 changed. */ |
25012 | 10531 w->window_end_pos |
10532 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10533 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
|
10534 = 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
|
10535 #endif |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10536 |
25012 | 10537 return 1; |
10538 } | |
10539 | |
10540 /* Return quickly if changes are all below what is displayed in the | |
10541 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
|
10542 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10543 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10544 { | |
10545 /* We have to update window end positions because the buffer's | |
10546 size has changed. */ | |
10547 w->window_end_pos | |
10548 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10549 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
|
10550 = 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
|
10551 |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10552 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
|
10553 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
|
10554 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
|
10555 return 2; |
25012 | 10556 } |
10557 | |
10558 /* Check that window start agrees with the start of the first glyph | |
10559 row in its current matrix. Check this after we know the window | |
10560 start is not in changed text, otherwise positions would not be | |
10561 comparable. */ | |
10562 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10563 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10564 return 0; | |
10565 | |
10566 /* Compute the position at which we have to start displaying new | |
10567 lines. Some of the lines at the top of the window might be | |
10568 reusable because they are not displaying changed text. Find the | |
10569 last row in W's current matrix not affected by changes at the | |
10570 start of current_buffer. Value is null if changes start in the | |
10571 first line of window. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10572 last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); |
25012 | 10573 if (last_unchanged_at_beg_row) |
10574 { | |
10575 init_to_row_end (&it, w, last_unchanged_at_beg_row); | |
10576 start_pos = it.current.pos; | |
10577 | |
10578 /* Start displaying new lines in the desired matrix at the same | |
10579 vpos we would use in the current matrix, i.e. below | |
10580 last_unchanged_at_beg_row. */ | |
10581 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
10582 current_matrix); | |
10583 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10584 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
10585 | |
10586 xassert (it.hpos == 0 && it.current_x == 0); | |
10587 } | |
277 | 10588 else |
25012 | 10589 { |
10590 /* There are no reusable lines at the start of the window. | |
10591 Start displaying in the first line. */ | |
10592 start_display (&it, w, start); | |
10593 start_pos = it.current.pos; | |
10594 } | |
10595 | |
10596 /* Find the first row that is not affected by changes at the end of | |
10597 the buffer. Value will be null if there is no unchanged row, in | |
10598 which case we must redisplay to the end of the window. delta | |
10599 will be set to the value by which buffer positions beginning with | |
10600 first_unchanged_at_end_row have to be adjusted due to text | |
10601 changes. */ | |
10602 first_unchanged_at_end_row | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10603 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes); |
25012 | 10604 IF_DEBUG (debug_delta = delta); |
10605 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
10606 | |
10607 /* Set stop_pos to the buffer position up to which we will have to | |
10608 display new lines. If first_unchanged_at_end_row != NULL, this | |
10609 is the buffer position of the start of the line displayed in that | |
10610 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
10611 that we don't stop at a buffer position. */ | |
10612 stop_pos = 0; | |
10613 if (first_unchanged_at_end_row) | |
10614 { | |
10615 xassert (last_unchanged_at_beg_row == NULL | |
10616 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
10617 | |
10618 /* If this is a continuation line, move forward to the next one | |
10619 that isn't. Changes in lines above affect this line. | |
10620 Caution: this may move first_unchanged_at_end_row to a row | |
10621 not displaying text. */ | |
10622 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
10623 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10624 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10625 < it.last_visible_y)) | |
10626 ++first_unchanged_at_end_row; | |
10627 | |
10628 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
10629 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
10630 >= it.last_visible_y)) | |
10631 first_unchanged_at_end_row = NULL; | |
10632 else | |
10633 { | |
10634 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
10635 + delta); | |
10636 first_unchanged_at_end_vpos | |
10637 = 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
|
10638 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 10639 } |
10640 } | |
10641 else if (last_unchanged_at_beg_row == NULL) | |
10642 return 0; | |
10643 | |
10644 | |
10645 #if GLYPH_DEBUG | |
10646 | |
10647 /* Either there is no unchanged row at the end, or the one we have | |
10648 now displays text. This is a necessary condition for the window | |
10649 end pos calculation at the end of this function. */ | |
10650 xassert (first_unchanged_at_end_row == NULL | |
10651 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
10652 | |
10653 debug_last_unchanged_at_beg_vpos | |
10654 = (last_unchanged_at_beg_row | |
10655 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
10656 : -1); | |
10657 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
10658 | |
10659 #endif /* GLYPH_DEBUG != 0 */ | |
10660 | |
10661 | |
10662 /* Display new lines. Set last_text_row to the last new line | |
10663 displayed which has text on it, i.e. might end up as being the | |
10664 line where the window_end_vpos is. */ | |
10665 w->cursor.vpos = -1; | |
10666 last_text_row = NULL; | |
277 | 10667 overlay_arrow_seen = 0; |
25012 | 10668 while (it.current_y < it.last_visible_y |
10669 && !fonts_changed_p | |
10670 && (first_unchanged_at_end_row == NULL | |
10671 || IT_CHARPOS (it) < stop_pos)) | |
10672 { | |
10673 if (display_line (&it)) | |
10674 last_text_row = it.glyph_row - 1; | |
10675 } | |
10676 | |
10677 if (fonts_changed_p) | |
10678 return -1; | |
10679 | |
10680 | |
10681 /* Compute differences in buffer positions, y-positions etc. for | |
10682 lines reused at the bottom of the window. Compute what we can | |
10683 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10684 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
|
10685 /* 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
|
10686 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10687 && it.current_y < it.last_visible_y) |
25012 | 10688 { |
10689 dvpos = (it.vpos | |
10690 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
10691 current_matrix)); | |
10692 dy = it.current_y - first_unchanged_at_end_row->y; | |
10693 run.current_y = first_unchanged_at_end_row->y; | |
10694 run.desired_y = run.current_y + dy; | |
10695 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
10696 } | |
10697 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10698 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10699 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
|
10700 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
|
10701 } |
25012 | 10702 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
10703 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
10704 |
25012 | 10705 /* Find the cursor if not already found. We have to decide whether |
10706 PT will appear on this window (it sometimes doesn't, but this is | |
10707 not a very frequent case.) This decision has to be made before | |
10708 the current matrix is altered. A value of cursor.vpos < 0 means | |
10709 that PT is either in one of the lines beginning at | |
10710 first_unchanged_at_end_row or below the window. Don't care for | |
10711 lines that might be displayed later at the window end; as | |
10712 mentioned, this is not a frequent case. */ | |
10713 if (w->cursor.vpos < 0) | |
10714 { | |
10715 /* Cursor in unchanged rows at the top? */ | |
10716 if (PT < CHARPOS (start_pos) | |
10717 && last_unchanged_at_beg_row) | |
10718 { | |
25543 | 10719 row = row_containing_pos (w, PT, |
10720 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
10721 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
|
10722 if (row) |
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
10723 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 10724 } |
10725 | |
10726 /* Start from first_unchanged_at_end_row looking for PT. */ | |
10727 else if (first_unchanged_at_end_row) | |
10728 { | |
25543 | 10729 row = row_containing_pos (w, PT - delta, |
10730 first_unchanged_at_end_row, NULL); | |
10731 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
10732 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
|
10733 delta_bytes, dy, dvpos); |
25012 | 10734 } |
10735 | |
10736 /* Give up if cursor was not found. */ | |
10737 if (w->cursor.vpos < 0) | |
10738 { | |
10739 clear_glyph_matrix (w->desired_matrix); | |
10740 return -1; | |
10741 } | |
10742 } | |
10743 | |
10744 /* Don't let the cursor end in the scroll margins. */ | |
10745 { | |
10746 int this_scroll_margin, cursor_height; | |
10747 | |
10748 this_scroll_margin = max (0, scroll_margin); | |
10749 this_scroll_margin = min (this_scroll_margin, | |
10750 XFASTINT (w->height) / 4); | |
10751 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
10752 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
10753 | |
10754 if ((w->cursor.y < this_scroll_margin | |
10755 && CHARPOS (start) > BEGV) | |
10756 /* Don't take scroll margin into account at the bottom because | |
10757 old redisplay didn't do it either. */ | |
10758 || w->cursor.y + cursor_height > it.last_visible_y) | |
10759 { | |
10760 w->cursor.vpos = -1; | |
10761 clear_glyph_matrix (w->desired_matrix); | |
10762 return -1; | |
10763 } | |
10764 } | |
10765 | |
10766 /* Scroll the display. Do it before changing the current matrix so | |
10767 that xterm.c doesn't get confused about where the cursor glyph is | |
10768 found. */ | |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
10769 if (dy && run.height) |
25012 | 10770 { |
10771 update_begin (f); | |
10772 | |
10773 if (FRAME_WINDOW_P (f)) | |
10774 { | |
10775 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
|
10776 rif->clear_mouse_face (w); |
25012 | 10777 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
|
10778 rif->update_window_end_hook (w, 0, 0); |
25012 | 10779 } |
10780 else | |
10781 { | |
10782 /* Terminal frame. In this case, dvpos gives the number of | |
10783 lines to scroll by; dvpos < 0 means scroll up. */ | |
10784 int first_unchanged_at_end_vpos | |
10785 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
10786 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
10787 int end = XFASTINT (w->top) + window_internal_height (w); | |
10788 | |
10789 /* Perform the operation on the screen. */ | |
10790 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
10791 { |
25012 | 10792 /* Scroll last_unchanged_at_beg_row to the end of the |
10793 window down dvpos lines. */ | |
10794 set_terminal_window (end); | |
10795 | |
10796 /* On dumb terminals delete dvpos lines at the end | |
10797 before inserting dvpos empty lines. */ | |
10798 if (!scroll_region_ok) | |
10799 ins_del_lines (end - dvpos, -dvpos); | |
10800 | |
10801 /* Insert dvpos empty lines in front of | |
10802 last_unchanged_at_beg_row. */ | |
10803 ins_del_lines (from, dvpos); | |
10804 } | |
10805 else if (dvpos < 0) | |
10806 { | |
10807 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
10808 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
10809 set_terminal_window (end); | |
10810 | |
10811 /* Delete dvpos lines in front of | |
10812 last_unchanged_at_beg_vpos. ins_del_lines will set | |
10813 the cursor to the given vpos and emit |dvpos| delete | |
10814 line sequences. */ | |
10815 ins_del_lines (from + dvpos, dvpos); | |
10816 | |
10817 /* On a dumb terminal insert dvpos empty lines at the | |
10818 end. */ | |
10819 if (!scroll_region_ok) | |
10820 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
|
10821 } |
25012 | 10822 |
10823 set_terminal_window (0); | |
10824 } | |
10825 | |
10826 update_end (f); | |
10827 } | |
10828 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10829 /* 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
|
10830 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
|
10831 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10832 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
|
10833 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 10834 if (dvpos < 0) |
10835 { | |
10836 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
10837 bottom_vpos, dvpos); | |
10838 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
10839 bottom_vpos, 0); | |
10840 } | |
10841 else if (dvpos > 0) | |
10842 { | |
10843 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
10844 bottom_vpos, dvpos); | |
10845 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
10846 first_unchanged_at_end_vpos + dvpos, 0); | |
10847 } | |
10848 | |
10849 /* For frame-based redisplay, make sure that current frame and window | |
10850 matrix are in sync with respect to glyph memory. */ | |
10851 if (!FRAME_WINDOW_P (f)) | |
10852 sync_frame_with_window_matrix_rows (w); | |
10853 | |
10854 /* Adjust buffer positions in reused rows. */ | |
10855 if (delta) | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10856 increment_matrix_positions (current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10857 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
|
10858 bottom_vpos, delta, delta_bytes); |
25012 | 10859 |
10860 /* Adjust Y positions. */ | |
10861 if (dy) | |
10862 shift_glyph_matrix (w, current_matrix, | |
10863 first_unchanged_at_end_vpos + dvpos, | |
10864 bottom_vpos, dy); | |
10865 | |
10866 if (first_unchanged_at_end_row) | |
10867 first_unchanged_at_end_row += dvpos; | |
10868 | |
10869 /* If scrolling up, there may be some lines to display at the end of | |
10870 the window. */ | |
10871 last_text_row_at_end = NULL; | |
10872 if (dy < 0) | |
10873 { | |
10874 /* Set last_row to the glyph row in the current matrix where the | |
10875 window end line is found. It has been moved up or down in | |
10876 the matrix by dvpos. */ | |
10877 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
10878 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
10879 | |
10880 /* If last_row is the window end line, it should display text. */ | |
10881 xassert (last_row->displays_text_p); | |
10882 | |
10883 /* If window end line was partially visible before, begin | |
10884 displaying at that line. Otherwise begin displaying with the | |
10885 line following it. */ | |
10886 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
10887 { | |
10888 init_to_row_start (&it, w, last_row); | |
10889 it.vpos = last_vpos; | |
10890 it.current_y = last_row->y; | |
10891 } | |
10892 else | |
10893 { | |
10894 init_to_row_end (&it, w, last_row); | |
10895 it.vpos = 1 + last_vpos; | |
10896 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
10897 ++last_row; | |
10898 } | |
10899 | |
10900 /* We may start in a continuation line. If so, we have to get | |
10901 the right continuation_lines_width and current_x. */ | |
10902 it.continuation_lines_width = last_row->continuation_lines_width; | |
10903 it.hpos = it.current_x = 0; | |
10904 | |
10905 /* Display the rest of the lines at the window end. */ | |
10906 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10907 while (it.current_y < it.last_visible_y | |
10908 && !fonts_changed_p) | |
10909 { | |
10910 /* Is it always sure that the display agrees with lines in | |
10911 the current matrix? I don't think so, so we mark rows | |
10912 displayed invalid in the current matrix by setting their | |
10913 enabled_p flag to zero. */ | |
10914 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
10915 if (display_line (&it)) | |
10916 last_text_row_at_end = it.glyph_row - 1; | |
10917 } | |
10918 } | |
10919 | |
10920 /* Update window_end_pos and window_end_vpos. */ | |
10921 if (first_unchanged_at_end_row | |
10922 && first_unchanged_at_end_row->y < it.last_visible_y | |
10923 && !last_text_row_at_end) | |
10924 { | |
10925 /* Window end line if one of the preserved rows from the current | |
10926 matrix. Set row to the last row displaying text in current | |
10927 matrix starting at first_unchanged_at_end_row, after | |
10928 scrolling. */ | |
10929 xassert (first_unchanged_at_end_row->displays_text_p); | |
10930 row = find_last_row_displaying_text (w->current_matrix, &it, | |
10931 first_unchanged_at_end_row); | |
10932 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
10933 | |
10934 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
10935 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
10936 XSETFASTINT (w->window_end_vpos, | |
10937 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
10938 } | |
10939 else if (last_text_row_at_end) | |
10940 { | |
10941 XSETFASTINT (w->window_end_pos, | |
10942 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
10943 w->window_end_bytepos | |
10944 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
10945 XSETFASTINT (w->window_end_vpos, | |
10946 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
10947 } | |
10948 else if (last_text_row) | |
10949 { | |
10950 /* We have displayed either to the end of the window or at the | |
10951 end of the window, i.e. the last row with text is to be found | |
10952 in the desired matrix. */ | |
10953 XSETFASTINT (w->window_end_pos, | |
10954 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10955 w->window_end_bytepos | |
10956 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10957 XSETFASTINT (w->window_end_vpos, | |
10958 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
10959 } | |
10960 else if (first_unchanged_at_end_row == NULL | |
10961 && last_text_row == NULL | |
10962 && last_text_row_at_end == NULL) | |
10963 { | |
10964 /* Displayed to end of window, but no line containing text was | |
10965 displayed. Lines were deleted at the end of the window. */ | |
10966 int vpos; | |
25546 | 10967 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 10968 |
10969 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 10970 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
10971 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
10972 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
10973 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 10974 break; |
10975 | |
10976 w->window_end_vpos = make_number (vpos); | |
10977 } | |
10978 else | |
10979 abort (); | |
10980 | |
10981 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
10982 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
10983 | |
10984 /* Record that display has not been completed. */ | |
277 | 10985 w->window_end_valid = Qnil; |
25012 | 10986 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
|
10987 return 3; |
277 | 10988 } |
25012 | 10989 |
10990 | |
10991 | |
10992 /*********************************************************************** | |
10993 More debugging support | |
10994 ***********************************************************************/ | |
10995 | |
10996 #if GLYPH_DEBUG | |
10997 | |
10998 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
10999 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
11000 | |
11001 | |
11002 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
11003 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
11004 | |
29748
1cd9b7a33ad1
(dump_glyph_matrix): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents:
29698
diff
changeset
|
11005 static void |
25012 | 11006 dump_glyph_matrix (matrix, with_glyphs_p) |
11007 struct glyph_matrix *matrix; | |
11008 int with_glyphs_p; | |
11009 { | |
11010 int i; | |
11011 for (i = 0; i < matrix->nrows; ++i) | |
11012 dump_glyph_row (matrix, i, with_glyphs_p); | |
11013 } | |
11014 | |
11015 | |
11016 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
11017 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
11018 | |
11019 void | |
11020 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
11021 struct glyph_matrix *matrix; | |
11022 int vpos, with_glyphs_p; | |
11023 { | |
11024 struct glyph_row *row; | |
11025 | |
11026 if (vpos < 0 || vpos >= matrix->nrows) | |
11027 return; | |
11028 | |
11029 row = MATRIX_ROW (matrix, vpos); | |
11030 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11031 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
|
11032 fprintf (stderr, "=======================================================================\n"); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11033 |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11034 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
|
11035 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
25012 | 11036 row - matrix->rows, |
11037 MATRIX_ROW_START_CHARPOS (row), | |
11038 MATRIX_ROW_END_CHARPOS (row), | |
11039 row->used[TEXT_AREA], | |
11040 row->contains_overlapping_glyphs_p, | |
11041 row->enabled_p, | |
11042 row->inverse_p, | |
11043 row->truncated_on_left_p, | |
11044 row->truncated_on_right_p, | |
11045 row->overlay_arrow_p, | |
11046 row->continued_p, | |
11047 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
11048 row->displays_text_p, | |
11049 row->ends_at_zv_p, | |
11050 row->fill_line_p, | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11051 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
|
11052 row->starts_in_middle_of_char_p, |
25012 | 11053 row->x, |
11054 row->y, | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11055 row->pixel_width, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11056 row->height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11057 row->visible_height, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11058 row->ascent, |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
11059 row->phys_ascent); |
25012 | 11060 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, |
11061 row->end.overlay_string_index); | |
11062 fprintf (stderr, "%9d %5d\n", | |
11063 CHARPOS (row->start.string_pos), | |
11064 CHARPOS (row->end.string_pos)); | |
11065 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
11066 row->end.dpvec_index); | |
11067 | |
11068 if (with_glyphs_p) | |
11069 { | |
11070 struct glyph *glyph, *glyph_end; | |
11071 int prev_had_glyphs_p; | |
11072 | |
11073 glyph = row->glyphs[TEXT_AREA]; | |
11074 glyph_end = glyph + row->used[TEXT_AREA]; | |
11075 | |
11076 /* Glyph for a line end in text. */ | |
11077 if (glyph == glyph_end && glyph->charpos > 0) | |
11078 ++glyph_end; | |
11079 | |
11080 if (glyph < glyph_end) | |
11081 { | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11082 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n"); |
25012 | 11083 prev_had_glyphs_p = 1; |
11084 } | |
11085 else | |
11086 prev_had_glyphs_p = 0; | |
11087 | |
11088 while (glyph < glyph_end) | |
11089 { | |
11090 if (glyph->type == CHAR_GLYPH) | |
11091 { | |
11092 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11093 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11094 glyph - row->glyphs[TEXT_AREA], |
11095 'C', | |
11096 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11097 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11098 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11099 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11100 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11101 : '-')), |
25012 | 11102 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11103 glyph->u.ch, |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11104 (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
|
11105 ? glyph->u.ch |
25012 | 11106 : '.'), |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11107 glyph->face_id, |
25012 | 11108 glyph->left_box_line_p, |
11109 glyph->right_box_line_p); | |
11110 } | |
11111 else if (glyph->type == STRETCH_GLYPH) | |
11112 { | |
11113 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11114 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11115 glyph - row->glyphs[TEXT_AREA], |
11116 'S', | |
11117 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11118 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11119 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11120 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11121 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11122 : '-')), |
25012 | 11123 glyph->pixel_width, |
11124 0, | |
11125 '.', | |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11126 glyph->face_id, |
25012 | 11127 glyph->left_box_line_p, |
11128 glyph->right_box_line_p); | |
11129 } | |
11130 else if (glyph->type == IMAGE_GLYPH) | |
11131 { | |
11132 fprintf (stderr, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11133 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
25012 | 11134 glyph - row->glyphs[TEXT_AREA], |
11135 'I', | |
11136 glyph->charpos, | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11137 (BUFFERP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11138 ? 'B' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11139 : (STRINGP (glyph->object) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11140 ? 'S' |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
11141 : '-')), |
25012 | 11142 glyph->pixel_width, |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11143 glyph->u.img_id, |
25012 | 11144 '.', |
27015
526f3b2398ce
(dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents:
27011
diff
changeset
|
11145 glyph->face_id, |
25012 | 11146 glyph->left_box_line_p, |
11147 glyph->right_box_line_p); | |
11148 } | |
11149 ++glyph; | |
11150 } | |
11151 } | |
11152 } | |
11153 | |
11154 | |
11155 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
11156 Sdump_glyph_matrix, 0, 1, "p", | |
11157 "Dump the current matrix of the selected window to stderr.\n\ | |
11158 Shows contents of glyph row structures. With non-nil optional\n\ | |
11159 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
11160 (with_glyphs_p) | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
11161 Lisp_Object with_glyphs_p; |
25012 | 11162 { |
11163 struct window *w = XWINDOW (selected_window); | |
11164 struct buffer *buffer = XBUFFER (w->buffer); | |
11165 | |
11166 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
11167 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
11168 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
11169 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
11170 fprintf (stderr, "=============================================\n"); | |
11171 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
11172 return Qnil; | |
11173 } | |
11174 | |
11175 | |
11176 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
11177 "Dump glyph row ROW to stderr.") | |
11178 (row) | |
11179 Lisp_Object row; | |
11180 { | |
11181 CHECK_NUMBER (row, 0); | |
11182 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
11183 return Qnil; | |
11184 } | |
11185 | |
11186 | |
25543 | 11187 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 11188 0, 0, "", "") |
11189 () | |
11190 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11191 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11192 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 11193 ->current_matrix); |
11194 dump_glyph_row (m, 0, 1); | |
11195 return Qnil; | |
11196 } | |
11197 | |
11198 | |
11199 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
11200 Strace_redisplay_toggle, 0, 0, "", | |
11201 "Toggle tracing of redisplay.") | |
11202 () | |
11203 { | |
11204 trace_redisplay_p = !trace_redisplay_p; | |
11205 return Qnil; | |
11206 } | |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11207 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11208 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11209 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
|
11210 "Print STRING to stderr.") |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11211 (string) |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11212 Lisp_Object string; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11213 { |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11214 CHECK_STRING (string, 0); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11215 fprintf (stderr, "%s", XSTRING (string)->data); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11216 return Qnil; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11217 } |
25012 | 11218 |
11219 #endif /* GLYPH_DEBUG */ | |
11220 | |
11221 | |
277 | 11222 |
25012 | 11223 /*********************************************************************** |
11224 Building Desired Matrix Rows | |
11225 ***********************************************************************/ | |
11226 | |
11227 /* Return a temporary glyph row holding the glyphs of an overlay | |
11228 arrow. Only used for non-window-redisplay windows. */ | |
11229 | |
11230 static struct glyph_row * | |
11231 get_overlay_arrow_glyph_row (w) | |
11232 struct window *w; | |
11233 { | |
11234 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
11235 struct buffer *buffer = XBUFFER (w->buffer); | |
11236 struct buffer *old = current_buffer; | |
11237 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
11238 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
11239 unsigned char *arrow_end = arrow_string + arrow_len; | |
11240 unsigned char *p; | |
11241 struct it it; | |
11242 int multibyte_p; | |
11243 int n_glyphs_before; | |
11244 | |
11245 set_buffer_temp (buffer); | |
11246 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
11247 it.glyph_row->used[TEXT_AREA] = 0; | |
11248 SET_TEXT_POS (it.position, 0, 0); | |
11249 | |
11250 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
11251 p = arrow_string; | |
11252 while (p < arrow_end) | |
11253 { | |
11254 Lisp_Object face, ilisp; | |
11255 | |
11256 /* Get the next character. */ | |
11257 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
11258 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 11259 else |
11260 it.c = *p, it.len = 1; | |
11261 p += it.len; | |
11262 | |
11263 /* Get its face. */ | |
11264 XSETFASTINT (ilisp, p - arrow_string); | |
11265 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
11266 it.face_id = compute_char_face (f, it.c, face); | |
11267 | |
11268 /* Compute its width, get its glyphs. */ | |
11269 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
|
11270 SET_TEXT_POS (it.position, -1, -1); |
25012 | 11271 PRODUCE_GLYPHS (&it); |
11272 | |
11273 /* If this character doesn't fit any more in the line, we have | |
11274 to remove some glyphs. */ | |
11275 if (it.current_x > it.last_visible_x) | |
11276 { | |
11277 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
11278 break; | |
11279 } | |
11280 } | |
11281 | |
11282 set_buffer_temp (old); | |
11283 return it.glyph_row; | |
11284 } | |
11285 | |
11286 | |
11287 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
11288 glyphs are only inserted for terminal frames since we can't really | |
11289 win with truncation glyphs when partially visible glyphs are | |
11290 involved. Which glyphs to insert is determined by | |
11291 produce_special_glyphs. */ | |
11292 | |
11293 static void | |
11294 insert_left_trunc_glyphs (it) | |
11295 struct it *it; | |
11296 { | |
11297 struct it truncate_it; | |
11298 struct glyph *from, *end, *to, *toend; | |
11299 | |
11300 xassert (!FRAME_WINDOW_P (it->f)); | |
11301 | |
11302 /* Get the truncation glyphs. */ | |
11303 truncate_it = *it; | |
11304 truncate_it.current_x = 0; | |
11305 truncate_it.face_id = DEFAULT_FACE_ID; | |
11306 truncate_it.glyph_row = &scratch_glyph_row; | |
11307 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
11308 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
|
11309 truncate_it.object = make_number (0); |
25012 | 11310 produce_special_glyphs (&truncate_it, IT_TRUNCATION); |
11311 | |
11312 /* Overwrite glyphs from IT with truncation glyphs. */ | |
11313 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
11314 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
11315 to = it->glyph_row->glyphs[TEXT_AREA]; | |
11316 toend = to + it->glyph_row->used[TEXT_AREA]; | |
11317 | |
11318 while (from < end) | |
11319 *to++ = *from++; | |
11320 | |
11321 /* There may be padding glyphs left over. Remove them. */ | |
11322 from = to; | |
11323 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
11324 ++from; | |
11325 while (from < toend) | |
11326 *to++ = *from++; | |
11327 | |
11328 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
11329 } | |
11330 | |
11331 | |
11332 /* Compute the pixel height and width of IT->glyph_row. | |
11333 | |
11334 Most of the time, ascent and height of a display line will be equal | |
11335 to the max_ascent and max_height values of the display iterator | |
11336 structure. This is not the case if | |
11337 | |
11338 1. We hit ZV without displaying anything. In this case, max_ascent | |
11339 and max_height will be zero. | |
11340 | |
11341 2. We have some glyphs that don't contribute to the line height. | |
11342 (The glyph row flag contributes_to_line_height_p is for future | |
11343 pixmap extensions). | |
11344 | |
11345 The first case is easily covered by using default values because in | |
11346 these cases, the line height does not really matter, except that it | |
11347 must not be zero. */ | |
11348 | |
11349 static void | |
11350 compute_line_metrics (it) | |
11351 struct it *it; | |
11352 { | |
11353 struct glyph_row *row = it->glyph_row; | |
11354 int area, i; | |
11355 | |
11356 if (FRAME_WINDOW_P (it->f)) | |
11357 { | |
25546 | 11358 int i, header_line_height; |
25012 | 11359 |
11360 /* The line may consist of one space only, that was added to | |
11361 place the cursor on it. If so, the row's height hasn't been | |
11362 computed yet. */ | |
11363 if (row->height == 0) | |
11364 { | |
11365 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
|
11366 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 11367 row->ascent = it->max_ascent; |
11368 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
|
11369 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
|
11370 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11371 } |
11372 | |
11373 /* Compute the width of this line. */ | |
11374 row->pixel_width = row->x; | |
11375 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
11376 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
11377 | |
11378 xassert (row->pixel_width >= 0); | |
11379 xassert (row->ascent >= 0 && row->height > 0); | |
11380 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11381 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
|
11382 || 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
|
11383 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11384 /* 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
|
11385 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
|
11386 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
|
11387 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
|
11388 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11389 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11390 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
|
11391 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11392 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11393 |
25012 | 11394 /* Compute how much of the line is visible. */ |
11395 row->visible_height = row->height; | |
11396 | |
25546 | 11397 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
11398 if (row->y < header_line_height) | |
11399 row->visible_height -= header_line_height - row->y; | |
25012 | 11400 else |
11401 { | |
11402 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
11403 if (row->y + row->height > max_y) | |
11404 row->visible_height -= row->y + row->height - max_y; | |
11405 } | |
11406 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
11407 else |
25012 | 11408 { |
11409 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
|
11410 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
|
11411 row->height = row->phys_height = row->visible_height = 1; |
25012 | 11412 } |
11413 | |
11414 /* Compute a hash code for this row. */ | |
11415 row->hash = 0; | |
11416 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
11417 for (i = 0; i < row->used[area]; ++i) | |
11418 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
11419 + 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
|
11420 + 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
|
11421 + row->glyphs[area][i].padding_p |
25012 | 11422 + (row->glyphs[area][i].type << 2)); |
11423 | |
11424 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
|
11425 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 11426 } |
11427 | |
11428 | |
11429 /* Append one space to the glyph row of iterator IT if doing a | |
11430 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
11431 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
|
11432 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
|
11433 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11434 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
|
11435 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
|
11436 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
|
11437 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
|
11438 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11439 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
|
11440 end of the line if the row ends in italic text. */ |
25012 | 11441 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11442 static int |
25012 | 11443 append_space (it, default_face_p) |
11444 struct it *it; | |
11445 int default_face_p; | |
11446 { | |
11447 if (FRAME_WINDOW_P (it->f)) | |
11448 { | |
11449 int n = it->glyph_row->used[TEXT_AREA]; | |
11450 | |
11451 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
11452 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
11453 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11454 /* Save some values that must not be changed. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11455 Must save IT->c and IT->len because otherwise |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11456 ITERATOR_AT_END_P wouldn't work anymore after |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11457 append_space has been called. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11458 int saved_what = it->what; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11459 int saved_c = it->c, saved_len = it->len; |
25012 | 11460 int saved_x = it->current_x; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11461 int saved_face_id = it->face_id; |
25012 | 11462 struct text_pos saved_pos; |
11463 Lisp_Object saved_object; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11464 struct face *face; |
25012 | 11465 |
11466 saved_object = it->object; | |
11467 saved_pos = it->position; | |
11468 | |
11469 it->what = IT_CHARACTER; | |
11470 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
|
11471 it->object = make_number (0); |
25012 | 11472 it->c = ' '; |
11473 it->len = 1; | |
11474 | |
11475 if (default_face_p) | |
11476 it->face_id = DEFAULT_FACE_ID; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11477 face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11478 it->face_id = FACE_FOR_CHAR (it->f, face, 0); |
25012 | 11479 |
11480 PRODUCE_GLYPHS (it); | |
11481 | |
11482 it->current_x = saved_x; | |
11483 it->object = saved_object; | |
11484 it->position = saved_pos; | |
11485 it->what = saved_what; | |
11486 it->face_id = saved_face_id; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11487 it->len = saved_len; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11488 it->c = saved_c; |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11489 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11490 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11491 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11492 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11493 return 0; |
25012 | 11494 } |
11495 | |
11496 | |
11497 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
11498 to the end of the display line. Called from display_line. | |
11499 If the glyph row is empty, add a space glyph to it so that we | |
11500 know the face to draw. Set the glyph row flag fill_line_p. */ | |
11501 | |
11502 static void | |
11503 extend_face_to_end_of_line (it) | |
11504 struct it *it; | |
11505 { | |
11506 struct face *face; | |
11507 struct frame *f = it->f; | |
11508 | |
11509 /* If line is already filled, do nothing. */ | |
11510 if (it->current_x >= it->last_visible_x) | |
11511 return; | |
11512 | |
11513 /* Face extension extends the background and box of IT->face_id | |
11514 to the end of the line. If the background equals the background | |
11515 of the frame, we haven't to do anything. */ | |
11516 face = FACE_FROM_ID (f, it->face_id); | |
11517 if (FRAME_WINDOW_P (f) | |
11518 && face->box == FACE_NO_BOX | |
11519 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
11520 && !face->stipple) | |
11521 return; | |
11522 | |
11523 /* Set the glyph row flag indicating that the face of the last glyph | |
11524 in the text area has to be drawn to the end of the text area. */ | |
11525 it->glyph_row->fill_line_p = 1; | |
11526 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11527 /* 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
|
11528 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
|
11529 get_next_display_element returns a multibyte character. Note |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11530 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
|
11531 if (!SINGLE_BYTE_CHAR_P (it->c)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11532 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11533 it->face_id = FACE_FOR_CHAR (f, face, 0); |
25012 | 11534 } |
11535 | |
11536 if (FRAME_WINDOW_P (f)) | |
11537 { | |
11538 /* If the row is empty, add a space with the current face of IT, | |
11539 so that we know which face to draw. */ | |
11540 if (it->glyph_row->used[TEXT_AREA] == 0) | |
11541 { | |
11542 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
|
11543 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 11544 it->glyph_row->used[TEXT_AREA] = 1; |
11545 } | |
11546 } | |
11547 else | |
11548 { | |
11549 /* Save some values that must not be changed. */ | |
11550 int saved_x = it->current_x; | |
11551 struct text_pos saved_pos; | |
11552 Lisp_Object saved_object; | |
11553 int saved_what = it->what; | |
11554 | |
11555 saved_object = it->object; | |
11556 saved_pos = it->position; | |
11557 | |
11558 it->what = IT_CHARACTER; | |
11559 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
|
11560 it->object = make_number (0); |
25012 | 11561 it->c = ' '; |
11562 it->len = 1; | |
11563 | |
11564 PRODUCE_GLYPHS (it); | |
11565 | |
11566 while (it->current_x <= it->last_visible_x) | |
11567 PRODUCE_GLYPHS (it); | |
11568 | |
11569 /* Don't count these blanks really. It would let us insert a left | |
11570 truncation glyph below and make us set the cursor on them, maybe. */ | |
11571 it->current_x = saved_x; | |
11572 it->object = saved_object; | |
11573 it->position = saved_pos; | |
11574 it->what = saved_what; | |
11575 } | |
11576 } | |
11577 | |
11578 | |
11579 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
11580 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11581 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11582 static int |
25012 | 11583 trailing_whitespace_p (charpos) |
11584 int charpos; | |
11585 { | |
11586 int bytepos = CHAR_TO_BYTE (charpos); | |
11587 int c = 0; | |
11588 | |
11589 while (bytepos < ZV_BYTE | |
11590 && (c = FETCH_CHAR (bytepos), | |
11591 c == ' ' || c == '\t')) | |
11592 ++bytepos; | |
11593 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11594 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11595 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11596 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11597 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11598 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11599 return 0; |
25012 | 11600 } |
11601 | |
11602 | |
11603 /* Highlight trailing whitespace, if any, in ROW. */ | |
11604 | |
11605 void | |
11606 highlight_trailing_whitespace (f, row) | |
11607 struct frame *f; | |
11608 struct glyph_row *row; | |
11609 { | |
11610 int used = row->used[TEXT_AREA]; | |
11611 | |
11612 if (used) | |
11613 { | |
11614 struct glyph *start = row->glyphs[TEXT_AREA]; | |
11615 struct glyph *glyph = start + used - 1; | |
11616 | |
11617 /* Skip over the space glyph inserted to display the | |
11618 cursor at the end of a line. */ | |
11619 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
|
11620 && 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
|
11621 && INTEGERP (glyph->object)) |
25012 | 11622 --glyph; |
11623 | |
11624 /* If last glyph is a space or stretch, and it's trailing | |
11625 whitespace, set the face of all trailing whitespace glyphs in | |
11626 IT->glyph_row to `trailing-whitespace'. */ | |
11627 if (glyph >= start | |
11628 && BUFFERP (glyph->object) | |
11629 && (glyph->type == STRETCH_GLYPH | |
11630 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11631 && glyph->u.ch == ' ')) |
25012 | 11632 && trailing_whitespace_p (glyph->charpos)) |
11633 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11634 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0); |
25012 | 11635 |
11636 while (glyph >= start | |
11637 && BUFFERP (glyph->object) | |
11638 && (glyph->type == STRETCH_GLYPH | |
11639 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11640 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
11641 (glyph--)->face_id = face_id; |
25012 | 11642 } |
11643 } | |
11644 } | |
11645 | |
11646 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11647 /* Value is non-zero if glyph row ROW in window W should be |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11648 used to put the cursor on. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11649 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11650 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11651 cursor_row_p (w, row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11652 struct window *w; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11653 struct glyph_row *row; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11654 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11655 if (PT == MATRIX_ROW_END_CHARPOS (row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11656 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11657 /* If PT is at the end of ROW, and that row ends with a |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11658 newline from a string, we don't want the cursor there. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11659 if (row->end.overlay_string_index >= 0 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11660 && ((truncate_partial_width_windows |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11661 && !WINDOW_FULL_WIDTH_P (w)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11662 || !NILP (current_buffer->truncate_lines))) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11663 return 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11664 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11665 /* If PT is at the end of ROW, we normally want the cursor |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11666 at the start of the row below, except when ROW ends |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11667 at ZV or in the middle of a character. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11668 if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11669 || row->ends_at_zv_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11670 return 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11671 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11672 return 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11673 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11674 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11675 return 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11676 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11677 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11678 |
25012 | 11679 /* Construct the glyph row IT->glyph_row in the desired matrix of |
11680 IT->w from text at the current position of IT. See dispextern.h | |
11681 for an overview of struct it. Value is non-zero if | |
11682 IT->glyph_row displays text, as opposed to a line displaying ZV | |
11683 only. */ | |
11684 | |
11685 static int | |
11686 display_line (it) | |
11687 struct it *it; | |
11688 { | |
11689 struct glyph_row *row = it->glyph_row; | |
11690 | |
11691 /* We always start displaying at hpos zero even if hscrolled. */ | |
11692 xassert (it->hpos == 0 && it->current_x == 0); | |
11693 | |
11694 /* We must not display in a row that's not a text row. */ | |
11695 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
11696 < it->w->desired_matrix->nrows); | |
11697 | |
11698 /* Is IT->w showing the region? */ | |
11699 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
11700 | |
11701 /* Clear the result glyph row and enable it. */ | |
11702 prepare_desired_row (row); | |
11703 | |
11704 row->y = it->current_y; | |
11705 row->start = it->current; | |
11706 row->continuation_lines_width = it->continuation_lines_width; | |
11707 row->displays_text_p = 1; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11708 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
|
11709 it->starts_in_middle_of_char_p = 0; |
277 | 11710 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
11711 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 11712 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
|
11713 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
|
11714 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
|
11715 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 11716 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
11717 | |
11718 /* Move over display elements that are not visible because we are | |
11719 hscrolled. This may stop at an x-position < IT->first_visible_x | |
11720 if the first glyph is partially visible or if we hit a line end. */ | |
11721 if (it->current_x < it->first_visible_x) | |
11722 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
11723 MOVE_TO_POS | MOVE_TO_X); | |
11724 | |
11725 /* Get the initial row height. This is either the height of the | |
11726 text hscrolled, if there is any, or zero. */ | |
11727 row->ascent = it->max_ascent; | |
11728 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
|
11729 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
|
11730 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11731 |
11732 /* Loop generating characters. The loop is left with IT on the next | |
11733 character to display. */ | |
11734 while (1) | |
11735 { | |
11736 int n_glyphs_before, hpos_before, x_before; | |
11737 int x, i, nglyphs; | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
11738 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
|
11739 |
25012 | 11740 /* Retrieve the next thing to display. Value is zero if end of |
11741 buffer reached. */ | |
11742 if (!get_next_display_element (it)) | |
11743 { | |
11744 /* 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
|
11745 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
|
11746 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
|
11747 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11748 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
|
11749 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
11750 { |
25012 | 11751 row->glyphs[TEXT_AREA]->charpos = -1; |
11752 row->displays_text_p = 0; | |
11753 | |
11754 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
11755 row->indicate_empty_line_p = 1; | |
11756 } | |
11757 | |
11758 it->continuation_lines_width = 0; | |
11759 row->ends_at_zv_p = 1; | |
11760 break; | |
11761 } | |
11762 | |
11763 /* Now, get the metrics of what we want to display. This also | |
11764 generates glyphs in `row' (which is IT->glyph_row). */ | |
11765 n_glyphs_before = row->used[TEXT_AREA]; | |
11766 x = it->current_x; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11767 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11768 /* 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
|
11769 fit on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11770 if (!it->truncate_lines_p) |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11771 { |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11772 ascent = it->max_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11773 descent = it->max_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11774 phys_ascent = it->max_phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11775 phys_descent = it->max_phys_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11776 } |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11777 |
25012 | 11778 PRODUCE_GLYPHS (it); |
11779 | |
11780 /* If this display element was in marginal areas, continue with | |
11781 the next one. */ | |
11782 if (it->area != TEXT_AREA) | |
11783 { | |
11784 row->ascent = max (row->ascent, it->max_ascent); | |
11785 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
|
11786 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
|
11787 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
|
11788 it->max_phys_ascent + it->max_phys_descent); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11789 set_iterator_to_next (it, 1); |
25012 | 11790 continue; |
11791 } | |
11792 | |
11793 /* Does the display element fit on the line? If we truncate | |
11794 lines, we should draw past the right edge of the window. If | |
11795 we don't truncate, we want to stop so that we can display the | |
11796 continuation glyph before the right margin. If lines are | |
11797 continued, there are two possible strategies for characters | |
11798 resulting in more than 1 glyph (e.g. tabs): Display as many | |
11799 glyphs as possible in this line and leave the rest for the | |
11800 continuation line, or display the whole element in the next | |
11801 line. Original redisplay did the former, so we do it also. */ | |
11802 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
11803 hpos_before = it->hpos; | |
11804 x_before = x; | |
11805 | |
11806 if (nglyphs == 1 | |
11807 && it->current_x < it->last_visible_x) | |
11808 { | |
11809 ++it->hpos; | |
11810 row->ascent = max (row->ascent, it->max_ascent); | |
11811 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
|
11812 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
|
11813 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
|
11814 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11815 if (it->current_x - it->pixel_width < it->first_visible_x) |
11816 row->x = x - it->first_visible_x; | |
11817 } | |
11818 else | |
11819 { | |
11820 int new_x; | |
11821 struct glyph *glyph; | |
11822 | |
11823 for (i = 0; i < nglyphs; ++i, x = new_x) | |
11824 { | |
11825 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
11826 new_x = x + glyph->pixel_width; | |
11827 | |
11828 if (/* Lines are continued. */ | |
11829 !it->truncate_lines_p | |
11830 && (/* Glyph doesn't fit on the line. */ | |
11831 new_x > it->last_visible_x | |
11832 /* Or it fits exactly on a window system frame. */ | |
11833 || (new_x == it->last_visible_x | |
11834 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11835 { |
25012 | 11836 /* End of a continued line. */ |
11837 | |
11838 if (it->hpos == 0 | |
11839 || (new_x == it->last_visible_x | |
11840 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11841 { |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11842 /* 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
|
11843 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
|
11844 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
|
11845 after the glyph. */ |
25012 | 11846 row->continued_p = 1; |
11847 it->current_x = new_x; | |
11848 it->continuation_lines_width += new_x; | |
11849 ++it->hpos; | |
11850 if (i == nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11851 set_iterator_to_next (it, 1); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11852 } |
29461
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11853 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
|
11854 && !FRAME_WINDOW_P (it->f)) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11855 { |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11856 /* 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
|
11857 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
|
11858 on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11859 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
|
11860 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11861 /* 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
|
11862 glyphs like in 20.x. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11863 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
|
11864 < row->glyphs[1 + TEXT_AREA]) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11865 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
|
11866 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11867 row->continued_p = 1; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11868 it->current_x = x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11869 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
|
11870 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11871 /* 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
|
11872 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
|
11873 it->max_ascent = ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11874 it->max_descent = descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
11875 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
|
11876 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
|
11877 } |
25012 | 11878 else |
11879 { | |
11880 /* Display element draws past the right edge of | |
11881 the window. Restore positions to values | |
11882 before the element. The next line starts | |
11883 with current_x before the glyph that could | |
11884 not be displayed, so that TAB works right. */ | |
11885 row->used[TEXT_AREA] = n_glyphs_before + i; | |
11886 | |
11887 /* Display continuation glyphs. */ | |
11888 if (!FRAME_WINDOW_P (it->f)) | |
11889 produce_special_glyphs (it, IT_CONTINUATION); | |
11890 row->continued_p = 1; | |
11891 | |
11892 it->current_x = x; | |
11893 it->continuation_lines_width += x; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11894 if (nglyphs > 1 && i > 0) |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11895 { |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
11896 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
|
11897 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
|
11898 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11899 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11900 /* 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
|
11901 element not fitting on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11902 it->max_ascent = ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11903 it->max_descent = descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11904 it->max_phys_ascent = phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11905 it->max_phys_descent = phys_descent; |
25012 | 11906 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
11907 |
25012 | 11908 break; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11909 } |
25012 | 11910 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
|
11911 { |
25012 | 11912 /* Increment number of glyphs actually displayed. */ |
11913 ++it->hpos; | |
11914 | |
11915 if (x < it->first_visible_x) | |
11916 /* Glyph is partially visible, i.e. row starts at | |
11917 negative X position. */ | |
11918 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
|
11919 } |
25012 | 11920 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11921 { |
25012 | 11922 /* Glyph is completely off the left margin of the |
11923 window. This should not happen because of the | |
11924 move_it_in_display_line at the start of | |
11925 this function. */ | |
11926 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11927 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11928 } |
25012 | 11929 |
11930 row->ascent = max (row->ascent, it->max_ascent); | |
11931 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
|
11932 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
|
11933 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
|
11934 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11935 |
11936 /* End of this display line if row is continued. */ | |
11937 if (row->continued_p) | |
11938 break; | |
11939 } | |
11940 | |
11941 /* Is this a line end? If yes, we're also done, after making | |
11942 sure that a non-default face is extended up to the right | |
11943 margin of the window. */ | |
11944 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
11945 { | |
11946 int used_before = row->used[TEXT_AREA]; | |
11947 | |
11948 /* Add a space at the end of the line that is used to | |
11949 display the cursor there. */ | |
11950 append_space (it, 0); | |
11951 | |
11952 /* Extend the face to the end of the line. */ | |
11953 extend_face_to_end_of_line (it); | |
11954 | |
11955 /* Make sure we have the position. */ | |
11956 if (used_before == 0) | |
11957 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
11958 | |
11959 /* 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
|
11960 set_iterator_to_next (it, 1); |
25012 | 11961 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
|
11962 break; |
277 | 11963 } |
25012 | 11964 |
11965 /* Proceed with next display element. Note that this skips | |
11966 over lines invisible because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11967 set_iterator_to_next (it, 1); |
25012 | 11968 |
11969 /* If we truncate lines, we are done when the last displayed | |
11970 glyphs reach past the right margin of the window. */ | |
11971 if (it->truncate_lines_p | |
11972 && (FRAME_WINDOW_P (it->f) | |
11973 ? (it->current_x >= it->last_visible_x) | |
11974 : (it->current_x > it->last_visible_x))) | |
11975 { | |
11976 /* Maybe add truncation glyphs. */ | |
11977 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11978 { |
25012 | 11979 --it->glyph_row->used[TEXT_AREA]; |
11980 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 11981 } |
25012 | 11982 |
11983 row->truncated_on_right_p = 1; | |
11984 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
|
11985 reseat_at_next_visible_line_start (it, 0); |
25012 | 11986 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
11987 it->hpos = hpos_before; | |
11988 it->current_x = x_before; | |
11989 break; | |
11990 } | |
11991 } | |
11992 | |
11993 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
11994 at the left window margin. */ | |
11995 if (it->first_visible_x | |
11996 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
11997 { | |
11998 if (!FRAME_WINDOW_P (it->f)) | |
11999 insert_left_trunc_glyphs (it); | |
12000 row->truncated_on_left_p = 1; | |
12001 } | |
12002 | |
12003 /* If the start of this line is the overlay arrow-position, then | |
12004 mark this glyph row as the one containing the overlay arrow. | |
12005 This is clearly a mess with variable size fonts. It would be | |
12006 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
|
12007 if (MARKERP (Voverlay_arrow_position) |
277 | 12008 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 12009 && (MATRIX_ROW_START_CHARPOS (row) |
12010 == 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
|
12011 && STRINGP (Voverlay_arrow_string) |
277 | 12012 && ! overlay_arrow_seen) |
12013 { | |
25012 | 12014 /* Overlay arrow in window redisplay is a bitmap. */ |
12015 if (!FRAME_WINDOW_P (it->f)) | |
12016 { | |
12017 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
12018 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
12019 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
12020 struct glyph *p = row->glyphs[TEXT_AREA]; | |
12021 struct glyph *p2, *end; | |
12022 | |
12023 /* Copy the arrow glyphs. */ | |
12024 while (glyph < arrow_end) | |
12025 *p++ = *glyph++; | |
12026 | |
12027 /* Throw away padding glyphs. */ | |
12028 p2 = p; | |
12029 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
12030 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
12031 ++p2; | |
12032 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
|
12033 { |
25012 | 12034 while (p2 < end) |
12035 *p++ = *p2++; | |
12036 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
|
12037 } |
25012 | 12038 } |
12039 | |
277 | 12040 overlay_arrow_seen = 1; |
25012 | 12041 row->overlay_arrow_p = 1; |
12042 } | |
12043 | |
12044 /* Compute pixel dimensions of this line. */ | |
12045 compute_line_metrics (it); | |
12046 | |
12047 /* Remember the position at which this line ends. */ | |
12048 row->end = it->current; | |
12049 | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
12050 /* Maybe set the cursor. */ |
25012 | 12051 if (it->w->cursor.vpos < 0 |
12052 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12053 && PT <= MATRIX_ROW_END_CHARPOS (row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12054 && cursor_row_p (it->w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12055 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); |
25012 | 12056 |
12057 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12058 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 12059 highlight_trailing_whitespace (it->f, it->glyph_row); |
12060 | |
12061 /* Prepare for the next line. This line starts horizontally at (X | |
12062 HPOS) = (0 0). Vertical positions are incremented. As a | |
12063 convenience for the caller, IT->glyph_row is set to the next | |
12064 row to be used. */ | |
12065 it->current_x = it->hpos = 0; | |
12066 it->current_y += row->height; | |
12067 ++it->vpos; | |
12068 ++it->glyph_row; | |
12069 return row->displays_text_p; | |
12070 } | |
12071 | |
12072 | |
277 | 12073 |
25012 | 12074 /*********************************************************************** |
12075 Menu Bar | |
12076 ***********************************************************************/ | |
12077 | |
12078 /* Redisplay the menu bar in the frame for window W. | |
12079 | |
12080 The menu bar of X frames that don't have X toolkit support is | |
12081 displayed in a special window W->frame->menu_bar_window. | |
12082 | |
12083 The menu bar of terminal frames is treated specially as far as | |
12084 glyph matrices are concerned. Menu bar lines are not part of | |
12085 windows, so the update is done directly on the frame matrix rows | |
12086 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12087 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12088 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12089 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12090 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12091 { |
25012 | 12092 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12093 struct it it; | |
12094 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12095 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12096 |
25012 | 12097 /* 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
|
12098 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12099 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12100 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12101 #endif |
25012 | 12102 #ifdef USE_X_TOOLKIT |
12103 if (FRAME_X_P (f)) | |
12104 return; | |
12105 #endif | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12106 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12107 #ifdef USE_X_TOOLKIT |
25012 | 12108 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
|
12109 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 12110 it.first_visible_x = 0; |
12111 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12112 #else /* not USE_X_TOOLKIT */ | |
12113 if (FRAME_WINDOW_P (f)) | |
12114 { | |
12115 /* Menu bar lines are displayed in the desired matrix of the | |
12116 dummy window menu_bar_window. */ | |
12117 struct window *menu_w; | |
12118 xassert (WINDOWP (f->menu_bar_window)); | |
12119 menu_w = XWINDOW (f->menu_bar_window); | |
12120 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
|
12121 MENU_FACE_ID); |
25012 | 12122 it.first_visible_x = 0; |
12123 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12124 } | |
12125 else | |
12126 { | |
12127 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
12128 pixel x/y. */ | |
12129 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
|
12130 MENU_FACE_ID); |
25012 | 12131 it.first_visible_x = 0; |
12132 it.last_visible_x = FRAME_WIDTH (f); | |
12133 } | |
12134 #endif /* not USE_X_TOOLKIT */ | |
12135 | |
12136 /* Clear all rows of the menu bar. */ | |
12137 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
12138 { | |
12139 struct glyph_row *row = it.glyph_row + i; | |
12140 clear_glyph_row (row); | |
12141 row->enabled_p = 1; | |
12142 row->full_width_p = 1; | |
12143 } | |
12144 | |
12145 /* Make the first line of the menu bar appear in reverse video. */ | |
12146 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
12147 | |
12148 /* Display all items of the menu bar. */ | |
12149 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
|
12150 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
|
12151 { |
25012 | 12152 Lisp_Object string; |
12153 | |
12154 /* 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
|
12155 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
|
12156 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12157 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12158 |
25012 | 12159 /* Remember where item was displayed. */ |
12160 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
12161 | |
12162 /* Display the item, pad with one space. */ | |
12163 if (it.current_x < it.last_visible_x) | |
12164 display_string (NULL, string, Qnil, 0, 0, &it, | |
12165 XSTRING (string)->size + 1, 0, 0, -1); | |
12166 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12167 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12168 /* Fill out the line with spaces. */ |
25012 | 12169 if (it.current_x < it.last_visible_x) |
12170 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
12171 | |
12172 /* Compute the total height of the lines. */ | |
12173 compute_line_metrics (&it); | |
12174 } | |
12175 | |
12176 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12177 |
25012 | 12178 /*********************************************************************** |
12179 Mode Line | |
12180 ***********************************************************************/ | |
12181 | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12182 /* 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
|
12183 FORCE is non-zero, redisplay mode lines unconditionally. |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12184 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
|
12185 the number of windows whose mode lines were redisplayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12186 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12187 static int |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12188 redisplay_mode_lines (window, force) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12189 Lisp_Object window; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12190 int force; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12191 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12192 int nwindows = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12193 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12194 while (!NILP (window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12195 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12196 struct window *w = XWINDOW (window); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12197 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12198 if (WINDOWP (w->hchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12199 nwindows += redisplay_mode_lines (w->hchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12200 else if (WINDOWP (w->vchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12201 nwindows += redisplay_mode_lines (w->vchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12202 else if (force |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12203 || FRAME_GARBAGED_P (XFRAME (w->frame)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12204 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12205 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12206 Lisp_Object old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12207 struct text_pos lpoint; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12208 struct buffer *old = current_buffer; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12209 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12210 /* 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
|
12211 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12212 set_buffer_internal_1 (XBUFFER (w->buffer)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12213 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12214 /* Point refers normally to the selected window. For any |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12215 other window, set up appropriate value. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12216 if (!EQ (window, selected_window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12217 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12218 struct text_pos pt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12219 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12220 SET_TEXT_POS_FROM_MARKER (pt, w->pointm); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12221 if (CHARPOS (pt) < BEGV) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12222 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12223 else if (CHARPOS (pt) > (ZV - 1)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12224 TEMP_SET_PT_BOTH (ZV, ZV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12225 else |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12226 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12227 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12228 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12229 /* Temporarily set up the selected frame. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12230 old_selected_frame = selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12231 selected_frame = w->frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12232 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12233 /* Display mode lines. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12234 clear_glyph_matrix (w->desired_matrix); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12235 if (display_mode_lines (w)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12236 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12237 ++nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12238 w->must_be_updated_p = 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12239 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12240 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12241 /* Restore old settings. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12242 selected_frame = old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12243 set_buffer_internal_1 (old); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12244 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12245 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12246 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12247 window = w->next; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12248 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12249 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12250 return nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12251 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12252 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12253 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12254 /* 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
|
12255 of mode lines displayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12256 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12257 static int |
25012 | 12258 display_mode_lines (w) |
277 | 12259 struct window *w; |
12260 { | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12261 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12262 |
25012 | 12263 /* 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
|
12264 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
|
12265 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12266 |
25012 | 12267 if (WINDOW_WANTS_MODELINE_P (w)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12268 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12269 display_mode_line (w, MODE_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12270 current_buffer->mode_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12271 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12272 } |
25546 | 12273 |
12274 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12275 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12276 display_mode_line (w, HEADER_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12277 current_buffer->header_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12278 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12279 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12280 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12281 return n; |
25012 | 12282 } |
12283 | |
12284 | |
12285 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 12286 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
25012 | 12287 FORMAT is the mode line format to display. */ |
12288 | |
12289 static void | |
12290 display_mode_line (w, face_id, format) | |
12291 struct window *w; | |
12292 enum face_id face_id; | |
12293 Lisp_Object format; | |
12294 { | |
12295 struct it it; | |
12296 struct face *face; | |
12297 | |
12298 init_iterator (&it, w, -1, -1, NULL, face_id); | |
12299 prepare_desired_row (it.glyph_row); | |
12300 | |
12301 /* Temporarily make frame's keyboard the current kboard so that | |
12302 kboard-local variables in the mode_line_format will get the right | |
12303 values. */ | |
12304 push_frame_kboard (it.f); | |
12305 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
|
12306 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
12307 |
25012 | 12308 /* Fill up with spaces. */ |
12309 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
12310 | |
12311 compute_line_metrics (&it); | |
12312 it.glyph_row->full_width_p = 1; | |
12313 it.glyph_row->mode_line_p = 1; | |
12314 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
12315 it.glyph_row->continued_p = 0; | |
12316 it.glyph_row->truncated_on_left_p = 0; | |
12317 it.glyph_row->truncated_on_right_p = 0; | |
12318 | |
12319 /* Make a 3D mode-line have a shadow at its right end. */ | |
12320 face = FACE_FROM_ID (it.f, face_id); | |
12321 extend_face_to_end_of_line (&it); | |
12322 if (face->box != FACE_NO_BOX) | |
12323 { | |
12324 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
12325 + it.glyph_row->used[TEXT_AREA] - 1); | |
12326 last->right_box_line_p = 1; | |
12327 } | |
12328 } | |
12329 | |
12330 | |
12331 /* Contribute ELT to the mode line for window IT->w. How it | |
12332 translates into text depends on its data type. | |
12333 | |
12334 IT describes the display environment in which we display, as usual. | |
277 | 12335 |
12336 DEPTH is the depth in recursion. It is used to prevent | |
12337 infinite recursion here. | |
12338 | |
25012 | 12339 FIELD_WIDTH is the number of characters the display of ELT should |
12340 occupy in the mode line, and PRECISION is the maximum number of | |
12341 characters to display from ELT's representation. See | |
12342 display_string for details. * | |
12343 | |
12344 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 12345 |
12346 static int | |
25012 | 12347 display_mode_element (it, depth, field_width, precision, elt) |
12348 struct it *it; | |
277 | 12349 int depth; |
25012 | 12350 int field_width, precision; |
12351 Lisp_Object elt; | |
12352 { | |
12353 int n = 0, field, prec; | |
12354 | |
277 | 12355 tail_recurse: |
12356 if (depth > 10) | |
12357 goto invalid; | |
12358 | |
12359 depth++; | |
12360 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
12361 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 12362 { |
12363 case Lisp_String: | |
12364 { | |
12365 /* A string: output it and check for %-constructs within it. */ | |
25012 | 12366 unsigned char c; |
12367 unsigned char *this = XSTRING (elt)->data; | |
12368 unsigned char *lisp_string = this; | |
12369 | |
12370 while ((precision <= 0 || n < precision) | |
12371 && *this | |
12372 && (frame_title_ptr | |
12373 || it->current_x < it->last_visible_x)) | |
277 | 12374 { |
12375 unsigned char *last = this; | |
25012 | 12376 |
12377 /* Advance to end of string or next format specifier. */ | |
277 | 12378 while ((c = *this++) != '\0' && c != '%') |
12379 ; | |
25012 | 12380 |
277 | 12381 if (this - 1 != last) |
12382 { | |
25012 | 12383 /* Output to end of string or up to '%'. Field width |
12384 is length of string. Don't output more than | |
12385 PRECISION allows us. */ | |
12386 prec = --this - last; | |
12387 if (precision > 0 && prec > precision - n) | |
12388 prec = precision - n; | |
12389 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12390 if (frame_title_ptr) |
25012 | 12391 n += store_frame_title (last, prec, prec); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12392 else |
25012 | 12393 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
12394 it, 0, prec, 0, -1); | |
277 | 12395 } |
12396 else /* c == '%' */ | |
12397 { | |
25012 | 12398 unsigned char *percent_position = this; |
12399 | |
12400 /* Get the specified minimum width. Zero means | |
12401 don't pad. */ | |
12402 field = 0; | |
277 | 12403 while ((c = *this++) >= '0' && c <= '9') |
25012 | 12404 field = field * 10 + c - '0'; |
12405 | |
12406 /* Don't pad beyond the total padding allowed. */ | |
12407 if (field_width - n > 0 && field > field_width - n) | |
12408 field = field_width - n; | |
12409 | |
12410 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
12411 prec = precision - n; | |
12412 | |
277 | 12413 if (c == 'M') |
25012 | 12414 n += display_mode_element (it, depth, field, prec, |
12415 Vglobal_mode_string); | |
277 | 12416 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
|
12417 { |
25012 | 12418 unsigned char *spec |
12419 = decode_mode_spec (it->w, c, field, prec); | |
12420 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12421 if (frame_title_ptr) |
25012 | 12422 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
|
12423 else |
25012 | 12424 { |
12425 int nglyphs_before | |
12426 = it->glyph_row->used[TEXT_AREA]; | |
12427 int charpos | |
12428 = percent_position - XSTRING (elt)->data; | |
12429 int nwritten | |
12430 = display_string (spec, Qnil, elt, charpos, 0, it, | |
12431 field, prec, 0, -1); | |
12432 | |
12433 /* Assign to the glyphs written above the | |
12434 string where the `%x' came from, position | |
12435 of the `%'. */ | |
12436 if (nwritten > 0) | |
12437 { | |
12438 struct glyph *glyph | |
12439 = (it->glyph_row->glyphs[TEXT_AREA] | |
12440 + nglyphs_before); | |
12441 int i; | |
12442 | |
12443 for (i = 0; i < nwritten; ++i) | |
12444 { | |
12445 glyph[i].object = elt; | |
12446 glyph[i].charpos = charpos; | |
12447 } | |
12448 | |
12449 n += nwritten; | |
12450 } | |
12451 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12452 } |
277 | 12453 } |
12454 } | |
12455 } | |
12456 break; | |
12457 | |
12458 case Lisp_Symbol: | |
12459 /* A symbol: process the value of the symbol recursively | |
12460 as if it appeared here directly. Avoid error if symbol void. | |
12461 Special case: if value of symbol is a string, output the string | |
12462 literally. */ | |
12463 { | |
12464 register Lisp_Object tem; | |
12465 tem = Fboundp (elt); | |
485 | 12466 if (!NILP (tem)) |
277 | 12467 { |
12468 tem = Fsymbol_value (elt); | |
12469 /* If value is a string, output that string literally: | |
12470 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
|
12471 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12472 { |
25012 | 12473 prec = XSTRING (tem)->size; |
12474 if (precision > 0 && prec > precision - n) | |
12475 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12476 if (frame_title_ptr) |
25012 | 12477 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
|
12478 else |
25012 | 12479 n += display_string (NULL, tem, Qnil, 0, 0, it, |
12480 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
|
12481 } |
277 | 12482 else if (!EQ (tem, elt)) |
25012 | 12483 { |
12484 /* Give up right away for nil or t. */ | |
12485 elt = tem; | |
12486 goto tail_recurse; | |
12487 } | |
277 | 12488 } |
12489 } | |
12490 break; | |
12491 | |
12492 case Lisp_Cons: | |
12493 { | |
12494 register Lisp_Object car, tem; | |
12495 | |
12496 /* A cons cell: three distinct cases. | |
12497 If first element is a string or a cons, process all the elements | |
12498 and effectively concatenate them. | |
12499 If first element is a negative number, truncate displaying cdr to | |
12500 at most that many characters. If positive, pad (with spaces) | |
12501 to at least that many characters. | |
12502 If first element is a symbol, process the cadr or caddr recursively | |
12503 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
|
12504 car = XCAR (elt); |
25012 | 12505 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
12506 { | |
12507 /* An element of the form (:eval FORM) means evaluate FORM | |
12508 and use the result as mode line elements. */ | |
12509 struct gcpro gcpro1; | |
12510 Lisp_Object spec; | |
12511 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
12512 spec = safe_eval (XCAR (XCDR (elt))); |
25012 | 12513 GCPRO1 (spec); |
12514 n += display_mode_element (it, depth, field_width - n, | |
12515 precision - n, spec); | |
12516 UNGCPRO; | |
12517 } | |
12518 else if (SYMBOLP (car)) | |
277 | 12519 { |
12520 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12521 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
|
12522 if (!CONSP (elt)) |
277 | 12523 goto invalid; |
12524 /* elt is now the cdr, and we know it is a cons cell. | |
12525 Use its car if CAR has a non-nil value. */ | |
485 | 12526 if (!NILP (tem)) |
277 | 12527 { |
12528 tem = Fsymbol_value (car); | |
485 | 12529 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12530 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12531 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12532 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12533 } |
277 | 12534 } |
12535 /* Symbol's value is nil (or symbol is unbound) | |
12536 Get the cddr of the original list | |
12537 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
|
12538 elt = XCDR (elt); |
485 | 12539 if (NILP (elt)) |
277 | 12540 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12541 else if (!CONSP (elt)) |
277 | 12542 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12543 elt = XCAR (elt); |
277 | 12544 goto tail_recurse; |
12545 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12546 else if (INTEGERP (car)) |
277 | 12547 { |
12548 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12549 elt = XCDR (elt); |
277 | 12550 if (lim < 0) |
25012 | 12551 { |
12552 /* Negative int means reduce maximum width. */ | |
12553 if (precision <= 0) | |
12554 precision = -lim; | |
12555 else | |
12556 precision = min (precision, -lim); | |
12557 } | |
277 | 12558 else if (lim > 0) |
12559 { | |
12560 /* Padding specified. Don't let it be more than | |
12561 current maximum. */ | |
25012 | 12562 if (precision > 0) |
12563 lim = min (precision, lim); | |
12564 | |
277 | 12565 /* If that's more padding than already wanted, queue it. |
12566 But don't reduce padding already specified even if | |
12567 that is beyond the current truncation point. */ | |
25012 | 12568 field_width = max (lim, field_width); |
277 | 12569 } |
12570 goto tail_recurse; | |
12571 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12572 else if (STRINGP (car) || CONSP (car)) |
277 | 12573 { |
12574 register int limit = 50; | |
25012 | 12575 /* Limit is to protect against circular lists. */ |
12576 while (CONSP (elt) | |
12577 && --limit > 0 | |
12578 && (precision <= 0 || n < precision)) | |
277 | 12579 { |
25012 | 12580 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
|
12581 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12582 elt = XCDR (elt); |
277 | 12583 } |
12584 } | |
12585 } | |
12586 break; | |
12587 | |
12588 default: | |
12589 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12590 if (frame_title_ptr) |
25012 | 12591 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
|
12592 else |
25012 | 12593 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
12594 precision - n, 0, 0); | |
12595 return n; | |
12596 } | |
12597 | |
12598 /* Pad to FIELD_WIDTH. */ | |
12599 if (field_width > 0 && n < field_width) | |
12600 { | |
12601 if (frame_title_ptr) | |
12602 n += store_frame_title ("", field_width - n, 0); | |
12603 else | |
12604 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
12605 0, 0, 0); | |
12606 } | |
12607 | |
12608 return n; | |
12609 } | |
12610 | |
12611 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12612 /* 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
|
12613 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
|
12614 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12615 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12616 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12617 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12618 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12619 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12620 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12621 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12622 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12623 if (d <= 0) |
25012 | 12624 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12625 else |
25012 | 12626 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12627 while (d > 0) |
25012 | 12628 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12629 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12630 d /= 10; |
25012 | 12631 } |
12632 } | |
12633 | |
12634 for (width -= (int) (p - buf); width > 0; --width) | |
12635 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12636 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12637 while (p > buf) |
25012 | 12638 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12639 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12640 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12641 *p-- = d; |
25012 | 12642 } |
12643 } | |
12644 | |
12645 /* 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
|
12646 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
|
12647 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
|
12648 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
12649 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
|
12650 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12651 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12652 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
|
12653 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12654 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12655 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12656 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12657 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12658 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
|
12659 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12660 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12661 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12662 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
|
12663 |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12664 val = Fget (coding_system, Qcoding_system); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
12665 eoltype = Qnil; |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12666 |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12667 if (!VECTORP (val)) /* Not yet decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12668 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12669 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12670 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
12671 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12672 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
|
12673 /* 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
|
12674 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12675 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12676 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12677 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12678 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12679 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
|
12680 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12681 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12682 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
12683 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12684 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12685 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12686 /* 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
|
12687 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12688 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
|
12689 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
|
12690 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
|
12691 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
|
12692 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
|
12693 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
|
12694 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12695 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
12696 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12697 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12698 } |
25012 | 12699 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12700 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12701 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12702 /* 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
|
12703 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12704 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12705 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12706 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12707 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12708 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12709 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12710 { |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
12711 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
|
12712 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
|
12713 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12714 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12715 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12716 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12717 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
|
12718 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
12719 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
|
12720 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12721 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
12722 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12723 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12724 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12725 |
277 | 12726 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 12727 generated by character C. PRECISION >= 0 means don't return a |
12728 string longer than that value. FIELD_WIDTH > 0 means pad the | |
12729 string returned with spaces to that value. */ | |
277 | 12730 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
12731 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
|
12732 |
277 | 12733 static char * |
25012 | 12734 decode_mode_spec (w, c, field_width, precision) |
277 | 12735 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
|
12736 register int c; |
25012 | 12737 int field_width, precision; |
277 | 12738 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12739 Lisp_Object obj; |
25012 | 12740 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12741 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
|
12742 struct buffer *b = XBUFFER (w->buffer); |
277 | 12743 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
12744 obj = Qnil; |
277 | 12745 |
12746 switch (c) | |
12747 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12748 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12749 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
|
12750 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12751 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
|
12752 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12753 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12754 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12755 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12756 /* 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
|
12757 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
|
12758 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12759 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
|
12760 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12761 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12762 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12763 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12764 /* 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
|
12765 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
|
12766 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12767 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12768 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12769 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12770 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12771 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12772 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12773 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12774 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12775 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12776 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12777 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
|
12778 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12779 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
|
12780 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
|
12781 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12782 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12783 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
|
12784 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12785 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12786 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12787 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12788 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12789 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12790 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12791 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
|
12792 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12793 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
|
12794 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
|
12795 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12796 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12797 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
|
12798 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12799 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12800 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12801 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12802 register int i; |
25012 | 12803 |
12804 /* Let lots_of_dashes be a string of infinite length. */ | |
12805 if (field_width <= 0 | |
12806 || field_width > sizeof (lots_of_dashes)) | |
12807 { | |
12808 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
12809 decode_mode_spec_buf[i] = '-'; | |
12810 decode_mode_spec_buf[i] = '\0'; | |
12811 return decode_mode_spec_buf; | |
12812 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12813 else |
25012 | 12814 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
|
12815 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12816 |
277 | 12817 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12818 obj = b->name; |
277 | 12819 break; |
12820 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12821 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12822 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12823 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
|
12824 XSETFASTINT (w->column_number_displayed, col); |
25012 | 12825 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
|
12826 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
|
12827 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12828 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12829 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12830 /* %F displays the frame name. */ |
25012 | 12831 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
|
12832 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
12833 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
|
12834 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
|
12835 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
|
12836 |
277 | 12837 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12838 obj = b->filename; |
277 | 12839 break; |
12840 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12841 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12842 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12843 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12844 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12845 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12846 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12847 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12848 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12849 /* 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
|
12850 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12851 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
|
12852 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
12853 /* 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
|
12854 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
|
12855 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12856 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12857 /* 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
|
12858 if (INTEGERP (Vline_number_display_limit) |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
12859 && 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
|
12860 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12861 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12862 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12863 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12864 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12865 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12866 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12867 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12868 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12869 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12870 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12871 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12872 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
|
12873 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12874 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12875 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12876 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12877 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12878 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12879 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12880 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12881 /* 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
|
12882 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12883 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12884 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12885 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12886 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12887 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12888 /* 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
|
12889 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
|
12890 "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
|
12891 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
|
12892 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12893 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12894 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
|
12895 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
|
12896 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12897 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
|
12898 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12899 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12900 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12901 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12902 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12903 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
|
12904 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12905 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12906 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12907 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12908 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12909 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12910 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12911 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12912 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12913 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12914 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12915 /* 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
|
12916 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
|
12917 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
|
12918 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12919 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12920 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12921 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12922 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12923 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12924 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12925 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12926 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
|
12927 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12928 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12929 /* 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
|
12930 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12931 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12932 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12933 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12934 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12935 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12936 /* Make the string to show. */ |
25012 | 12937 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
|
12938 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12939 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12940 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12941 char* p = decode_mode_spec_buf; |
25012 | 12942 int pad = field_width - 2; |
12943 while (pad-- > 0) | |
12944 *p++ = ' '; | |
12945 *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
|
12946 *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
|
12947 *p = '\0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12948 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12949 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12950 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12951 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12952 |
277 | 12953 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12954 obj = b->mode_name; |
277 | 12955 break; |
12956 | |
12957 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12958 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 12959 return " Narrow"; |
12960 break; | |
12961 | |
12962 case 'p': | |
12963 { | |
12964 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
|
12965 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
|
12966 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12967 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 12968 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12969 if (pos <= BUF_BEGV (b)) |
277 | 12970 return "All"; |
12971 else | |
12972 return "Bottom"; | |
12973 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12974 else if (pos <= BUF_BEGV (b)) |
277 | 12975 return "Top"; |
12976 else | |
12977 { | |
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
|
12978 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
|
12979 /* 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
|
12980 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
|
12981 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
|
12982 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 12983 /* We can't normally display a 3-digit number, |
12984 so get us a 2-digit number that is close. */ | |
12985 if (total == 100) | |
12986 total = 99; | |
12987 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
12988 return decode_mode_spec_buf; | |
12989 } | |
12990 } | |
12991 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12992 /* 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
|
12993 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12994 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12995 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
|
12996 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
|
12997 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
|
12998 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12999 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13000 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13001 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13002 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13003 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13004 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13005 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13006 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13007 { |
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
|
13008 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
|
13009 /* 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
|
13010 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
|
13011 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
|
13012 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
|
13013 /* 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
|
13014 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
|
13015 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13016 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13017 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13018 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13019 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13020 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13021 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13022 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13023 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13024 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13025 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13026 /* 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
|
13027 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
|
13028 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
|
13029 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
|
13030 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13031 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
|
13032 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13033 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13034 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13035 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
|
13036 #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
|
13037 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
|
13038 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13039 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13040 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13041 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13042 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13043 /* 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
|
13044 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13045 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13046 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13047 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
|
13048 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13049 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
13050 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13051 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13052 /* 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
|
13053 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13054 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
|
13055 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
|
13056 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13057 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
|
13058 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13059 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13060 #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
|
13061 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13062 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13063 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13064 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13065 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
|
13066 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13067 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
|
13068 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13069 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13070 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13071 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13072 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13073 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13074 } |
277 | 13075 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13076 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13077 if (STRINGP (obj)) |
277 | 13078 return (char *) XSTRING (obj)->data; |
13079 else | |
13080 return ""; | |
13081 } | |
25012 | 13082 |
13083 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13084 /* 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
|
13085 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13086 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
|
13087 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13088 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
|
13089 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13090 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13091 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
|
13092 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13093 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13094 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13095 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13096 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13097 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13098 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13099 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13100 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13101 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13102 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13103 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13104 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13105 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13106 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13107 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13108 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13109 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13110 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13111 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13112 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13113 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13114 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13115 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13116 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13117 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13118 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13119 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13120 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13121 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13122 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13123 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13124 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13125 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13126 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13127 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13128 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13129 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13130 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13131 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13132 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13133 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13134 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13135 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13136 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13137 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13138 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13139 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13140 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13141 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13142 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13143 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13144 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13145 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13146 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13147 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13148 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13149 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
|
13150 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13151 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13152 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13153 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13154 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13155 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13156 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13157 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13158 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13159 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13160 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13161 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13162 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13163 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13164 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13165 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13166 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13167 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
|
13168 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13169 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13170 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13171 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13172 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13173 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13174 /* 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
|
13175 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
|
13176 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13177 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13178 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13179 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13180 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13181 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13182 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13183 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13184 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13185 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13186 } |
25012 | 13187 |
13188 | |
277 | 13189 |
25012 | 13190 /*********************************************************************** |
13191 Displaying strings | |
13192 ***********************************************************************/ | |
13193 | |
13194 /* Display a NUL-terminated string, starting with index START. | |
13195 | |
13196 If STRING is non-null, display that C string. Otherwise, the Lisp | |
13197 string LISP_STRING is displayed. | |
13198 | |
13199 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
13200 FACE_STRING. Display STRING or LISP_STRING with the face at | |
13201 FACE_STRING_POS in FACE_STRING: | |
13202 | |
13203 Display the string in the environment given by IT, but use the | |
13204 standard display table, temporarily. | |
13205 | |
13206 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
13207 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
13208 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
13209 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
13210 | |
13211 PRECISION is the maximum number of characters to output from | |
13212 STRING. PRECISION < 0 means don't truncate the string. | |
13213 | |
13214 This is roughly equivalent to printf format specifiers: | |
13215 | |
13216 FIELD_WIDTH PRECISION PRINTF | |
13217 ---------------------------------------- | |
13218 -1 -1 %s | |
13219 -1 10 %.10s | |
13220 10 -1 %10s | |
13221 20 10 %20.10s | |
13222 | |
13223 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
13224 display them, and < 0 means obey the current buffer's value of | |
13225 enable_multibyte_characters. | |
13226 | |
13227 Value is the number of glyphs produced. */ | |
277 | 13228 |
13229 static int | |
25012 | 13230 display_string (string, lisp_string, face_string, face_string_pos, |
13231 start, it, field_width, precision, max_x, multibyte) | |
277 | 13232 unsigned char *string; |
25012 | 13233 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
|
13234 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
|
13235 int face_string_pos; |
25012 | 13236 int start; |
13237 struct it *it; | |
13238 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
|
13239 int multibyte; |
277 | 13240 { |
25012 | 13241 int hpos_at_start = it->hpos; |
13242 int saved_face_id = it->face_id; | |
13243 struct glyph_row *row = it->glyph_row; | |
13244 | |
13245 /* Initialize the iterator IT for iteration over STRING beginning | |
13246 with index START. We assume that IT may be modified here (which | |
13247 means that display_line has to do something when displaying a | |
13248 mini-buffer prompt, which it does). */ | |
13249 reseat_to_string (it, string, lisp_string, start, | |
13250 precision, field_width, multibyte); | |
13251 | |
13252 /* If displaying STRING, set up the face of the iterator | |
13253 from LISP_STRING, if that's given. */ | |
13254 if (STRINGP (face_string)) | |
13255 { | |
13256 int endptr; | |
13257 struct face *face; | |
13258 | |
13259 it->face_id | |
13260 = face_at_string_position (it->w, face_string, face_string_pos, | |
13261 0, it->region_beg_charpos, | |
13262 it->region_end_charpos, | |
13263 &endptr, it->base_face_id); | |
13264 face = FACE_FROM_ID (it->f, it->face_id); | |
13265 it->face_box_p = face->box != FACE_NO_BOX; | |
13266 } | |
13267 | |
13268 /* Set max_x to the maximum allowed X position. Don't let it go | |
13269 beyond the right edge of the window. */ | |
13270 if (max_x <= 0) | |
13271 max_x = it->last_visible_x; | |
13272 else | |
13273 max_x = min (max_x, it->last_visible_x); | |
13274 | |
13275 /* Skip over display elements that are not visible. because IT->w is | |
13276 hscrolled. */ | |
13277 if (it->current_x < it->first_visible_x) | |
13278 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
13279 MOVE_TO_POS | MOVE_TO_X); | |
13280 | |
13281 row->ascent = it->max_ascent; | |
13282 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
|
13283 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
|
13284 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 13285 |
13286 /* This condition is for the case that we are called with current_x | |
13287 past last_visible_x. */ | |
13288 while (it->current_x < max_x) | |
13289 { | |
13290 int x_before, x, n_glyphs_before, i, nglyphs; | |
13291 | |
13292 /* Get the next display element. */ | |
13293 if (!get_next_display_element (it)) | |
13294 break; | |
13295 | |
13296 /* Produce glyphs. */ | |
13297 x_before = it->current_x; | |
13298 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
13299 PRODUCE_GLYPHS (it); | |
13300 | |
13301 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
13302 i = 0; | |
13303 x = x_before; | |
13304 while (i < nglyphs) | |
13305 { | |
13306 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
13307 | |
13308 if (!it->truncate_lines_p | |
13309 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
13310 { |
25012 | 13311 /* End of continued line or max_x reached. */ |
13312 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
13313 it->current_x = x; | |
13314 break; | |
277 | 13315 } |
25012 | 13316 else if (x + glyph->pixel_width > it->first_visible_x) |
13317 { | |
13318 /* Glyph is at least partially visible. */ | |
13319 ++it->hpos; | |
13320 if (x < it->first_visible_x) | |
13321 it->glyph_row->x = x - it->first_visible_x; | |
13322 } | |
13323 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13324 { |
25012 | 13325 /* Glyph is off the left margin of the display area. |
13326 Should not happen. */ | |
13327 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13328 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
13329 |
25012 | 13330 row->ascent = max (row->ascent, it->max_ascent); |
13331 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
|
13332 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
|
13333 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
|
13334 it->max_phys_ascent + it->max_phys_descent); |
25012 | 13335 x += glyph->pixel_width; |
13336 ++i; | |
13337 } | |
13338 | |
13339 /* Stop if max_x reached. */ | |
13340 if (i < nglyphs) | |
13341 break; | |
13342 | |
13343 /* Stop at line ends. */ | |
13344 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
13345 { | |
13346 it->continuation_lines_width = 0; | |
13347 break; | |
13348 } | |
13349 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
13350 set_iterator_to_next (it, 1); |
25012 | 13351 |
13352 /* Stop if truncating at the right edge. */ | |
13353 if (it->truncate_lines_p | |
13354 && it->current_x >= it->last_visible_x) | |
13355 { | |
13356 /* Add truncation mark, but don't do it if the line is | |
13357 truncated at a padding space. */ | |
13358 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
|
13359 { |
25012 | 13360 if (!FRAME_WINDOW_P (it->f)) |
13361 produce_special_glyphs (it, IT_TRUNCATION); | |
13362 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
|
13363 } |
25012 | 13364 break; |
13365 } | |
13366 } | |
13367 | |
13368 /* Maybe insert a truncation at the left. */ | |
13369 if (it->first_visible_x | |
13370 && IT_CHARPOS (*it) > 0) | |
13371 { | |
13372 if (!FRAME_WINDOW_P (it->f)) | |
13373 insert_left_trunc_glyphs (it); | |
13374 it->glyph_row->truncated_on_left_p = 1; | |
13375 } | |
13376 | |
13377 it->face_id = saved_face_id; | |
13378 | |
13379 /* Value is number of columns displayed. */ | |
13380 return it->hpos - hpos_at_start; | |
13381 } | |
13382 | |
13383 | |
277 | 13384 |
25012 | 13385 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
13386 appears as an element of LIST or as the car of an element of LIST. | |
13387 If PROPVAL is a list, compare each element against LIST in that | |
13388 way, and return 1 if any element of PROPVAL is found in LIST. | |
13389 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
|
13390 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13391 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13392 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13393 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13394 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13395 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13396 register Lisp_Object tail, proptail; |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13397 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13398 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
|
13399 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13400 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13401 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13402 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13403 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13404 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
|
13405 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13406 } |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13407 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13408 if (CONSP (propval)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13409 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13410 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13411 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13412 Lisp_Object propelt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13413 propelt = XCAR (proptail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13414 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13415 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13416 register Lisp_Object tem; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13417 tem = XCAR (tail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13418 if (EQ (propelt, tem)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13419 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13420 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13421 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13422 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13423 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13424 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13425 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13426 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13427 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13428 |
25012 | 13429 |
13430 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
13431 the cdr of that element is non-nil. If PROPVAL is a list, check | |
13432 each element of PROPVAL in that way, and the first time some | |
13433 element is found, return 1 if the cdr of that element is non-nil. | |
13434 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
|
13435 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13436 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13437 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13438 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13439 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13440 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13441 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13442 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13443 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
|
13444 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13445 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13446 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13447 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13448 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13449 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13450 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13451 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13452 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
|
13453 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13454 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13455 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13456 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
|
13457 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13458 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13459 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13460 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13461 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13462 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13463 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13464 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13465 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13466 } |
25012 | 13467 |
13468 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13469 |
25012 | 13470 /*********************************************************************** |
13471 Initialization | |
13472 ***********************************************************************/ | |
13473 | |
277 | 13474 void |
13475 syms_of_xdisp () | |
13476 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13477 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
|
13478 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
|
13479 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13480 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13481 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13482 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13483 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13484 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13485 |
25012 | 13486 #if GLYPH_DEBUG |
13487 defsubr (&Sdump_glyph_matrix); | |
13488 defsubr (&Sdump_glyph_row); | |
25543 | 13489 defsubr (&Sdump_tool_bar_row); |
25012 | 13490 defsubr (&Strace_redisplay_toggle); |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
13491 defsubr (&Strace_to_stderr); |
25012 | 13492 #endif |
13493 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
13494 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
|
13495 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
|
13496 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
13497 staticpro (&Qoverriding_terminal_local_map); |
12267 | 13498 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
|
13499 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
13500 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
|
13501 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
|
13502 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13503 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13504 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
|
13505 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13506 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
13507 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 13508 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13509 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
13510 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
|
13511 |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13512 QCdata = intern (":data"); |
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
13513 staticpro (&QCdata); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13514 Qdisplay = intern ("display"); |
25012 | 13515 staticpro (&Qdisplay); |
13516 Qspace_width = intern ("space-width"); | |
13517 staticpro (&Qspace_width); | |
13518 Qraise = intern ("raise"); | |
13519 staticpro (&Qraise); | |
13520 Qspace = intern ("space"); | |
13521 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13522 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13523 staticpro (&Qmargin); |
25012 | 13524 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13525 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13526 Qright_margin = intern ("right-margin"); |
25012 | 13527 staticpro (&Qright_margin); |
13528 Qalign_to = intern ("align-to"); | |
13529 staticpro (&Qalign_to); | |
13530 QCalign_to = intern (":align-to"); | |
13531 staticpro (&QCalign_to); | |
13532 Qrelative_width = intern ("relative-width"); | |
13533 staticpro (&Qrelative_width); | |
13534 QCrelative_width = intern (":relative-width"); | |
13535 staticpro (&QCrelative_width); | |
13536 QCrelative_height = intern (":relative-height"); | |
13537 staticpro (&QCrelative_height); | |
13538 QCeval = intern (":eval"); | |
13539 staticpro (&QCeval); | |
25614 | 13540 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13541 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13542 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
13543 staticpro (&QCfile); |
25012 | 13544 Qfontified = intern ("fontified"); |
13545 staticpro (&Qfontified); | |
13546 Qfontification_functions = intern ("fontification-functions"); | |
13547 staticpro (&Qfontification_functions); | |
13548 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
13549 staticpro (&Qtrailing_whitespace); | |
13550 Qimage = intern ("image"); | |
13551 staticpro (&Qimage); | |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13552 Qmessage_truncate_lines = intern ("message-truncate-lines"); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13553 staticpro (&Qmessage_truncate_lines); |
25012 | 13554 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13555 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
13556 last_arrow_string = Qnil; |
277 | 13557 staticpro (&last_arrow_position); |
13558 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
|
13559 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13560 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
|
13561 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13562 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13563 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13564 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
|
13565 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
|
13566 staticpro (&echo_area_buffer[1]); |
277 | 13567 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13568 Vmessages_buffer_name = build_string ("*Messages*"); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13569 staticpro (&Vmessages_buffer_name); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
13570 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13571 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13572 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13573 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13574 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
13575 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13576 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13577 "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
|
13578 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13579 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
13580 |
277 | 13581 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
13582 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 13583 Vglobal_mode_string = Qnil; |
13584 | |
13585 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
13586 "Marker for where to display an arrow on top of the buffer text.\n\ | |
13587 This must be the beginning of a line in order to work.\n\ | |
13588 See also `overlay-arrow-string'."); | |
13589 Voverlay_arrow_position = Qnil; | |
13590 | |
13591 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
13592 "String to display as an arrow. See also `overlay-arrow-position'."); | |
13593 Voverlay_arrow_string = Qnil; | |
13594 | |
13595 DEFVAR_INT ("scroll-step", &scroll_step, | |
13596 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 13597 If that fails to bring point back on frame, point is centered instead.\n\ |
13598 If this is zero, point is always centered after it moves off frame."); | |
277 | 13599 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13600 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
|
13601 "*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
|
13602 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
|
13603 in the window."); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13604 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
13605 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13606 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13607 "*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
|
13608 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
|
13609 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13610 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
13611 |
25012 | 13612 #if GLYPH_DEBUG |
277 | 13613 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 13614 #endif |
277 | 13615 |
13616 DEFVAR_BOOL ("truncate-partial-width-windows", | |
13617 &truncate_partial_width_windows, | |
769 | 13618 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 13619 truncate_partial_width_windows = 1; |
13620 | |
13621 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
13622 "*Non-nil means use inverse video for the mode line."); | |
13623 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13624 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13625 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit, |
25012 | 13626 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 13627 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
|
13628 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
|
13629 Vline_number_display_limit = Qnil; |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13630 |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13631 DEFVAR_INT ("line-number-display-limit-width", |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13632 &line_number_display_limit_width, |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13633 "*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
|
13634 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
|
13635 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
|
13636 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13637 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
13638 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
|
13639 "*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
|
13640 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
|
13641 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13642 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
|
13643 "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
|
13644 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
|
13645 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
|
13646 `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
|
13647 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13648 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 13649 "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
|
13650 \(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
|
13651 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
|
13652 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
|
13653 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13654 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 13655 "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
|
13656 \(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
|
13657 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
|
13658 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
|
13659 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13660 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13661 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13662 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13663 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13664 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13665 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13666 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13667 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13668 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13669 Qnil))); |
10393 | 13670 |
13671 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
13672 "Maximum number of lines to keep in the message log buffer.\n\ | |
13673 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
13674 the buffer when it becomes large."); | |
13675 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13676 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
13677 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
|
13678 "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
|
13679 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
|
13680 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
|
13681 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
|
13682 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
|
13683 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
|
13684 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
13685 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 13686 "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
|
13687 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
|
13688 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
|
13689 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
|
13690 Vwindow_scroll_functions = Qnil; |
25012 | 13691 |
25543 | 13692 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
13693 "*Non-nil means automatically resize tool-bars.\n\ | |
13694 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
13695 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 13696 otherwise."); |
25543 | 13697 auto_resize_tool_bars_p = 1; |
13698 | |
13699 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
13700 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
13701 auto_raise_tool_bar_buttons_p = 1; | |
13702 | |
13703 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
13704 "*Margin around tool-bar buttons in pixels."); | |
13705 tool_bar_button_margin = 1; | |
13706 | |
13707 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
13708 "Relief thickness of tool-bar buttons."); | |
13709 tool_bar_button_relief = 3; | |
25012 | 13710 |
13711 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
13712 "List of functions to call to fontify regions of text.\n\ | |
13713 Each function is called with one argument POS. Functions must\n\ | |
13714 fontify a region starting at POS in the current buffer, and give\n\ | |
13715 fontified regions the property `fontified'.\n\ | |
13716 This variable automatically becomes buffer-local when set."); | |
13717 Vfontification_functions = Qnil; | |
13718 Fmake_local_variable (Qfontification_functions); | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13719 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13720 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 13721 &unibyte_display_via_language_environment, |
13722 "*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
|
13723 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
|
13724 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
|
13725 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
|
13726 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
13727 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
|
13728 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13729 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
|
13730 "*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
|
13731 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
13732 If an integer, it specifies a number of lines.\n\ |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
13733 If nil, don't resize."); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
13734 Vmax_mini_window_height = make_float (0.25); |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13735 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13736 DEFVAR_BOOL ("cursor-in-non-selected-windows", |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13737 &cursor_in_non_selected_windows, |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
13738 "*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
|
13739 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
|
13740 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
|
13741 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
13742 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
|
13743 "*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
|
13744 automatic_hscrolling_p = 1; |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13745 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13746 DEFVAR_LISP ("image-types", &Vimage_types, |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13747 "List of supported image types.\n\ |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
13748 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
|
13749 Vimage_types = Qnil; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13750 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
13751 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
|
13752 "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
|
13753 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
|
13754 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
|
13755 |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
13756 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
|
13757 "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
|
13758 Can be used to update submenus whose contents should vary."); |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
13759 |
277 | 13760 } |
13761 | |
25012 | 13762 |
13763 /* Initialize this module when Emacs starts. */ | |
13764 | |
21514 | 13765 void |
277 | 13766 init_xdisp () |
13767 { | |
13768 Lisp_Object root_window; | |
25012 | 13769 struct window *mini_w; |
13770 | |
13771 CHARPOS (this_line_start_pos) = 0; | |
277 | 13772 |
13773 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
|
13774 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 13775 |
13776 if (!noninteractive) | |
13777 { | |
25012 | 13778 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
13779 int i; | |
13780 | |
13781 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
|
13782 set_window_height (root_window, |
25012 | 13783 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
|
13784 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13785 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 13786 set_window_height (minibuf_window, 1, 0); |
13787 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13788 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
|
13789 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 13790 |
13791 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
13792 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
13793 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
13794 | |
13795 /* The default ellipsis glyphs `...'. */ | |
13796 for (i = 0; i < 3; ++i) | |
13797 XSETFASTINT (default_invis_vector[i], '.'); | |
13798 } | |
13799 | |
13800 #ifdef HAVE_WINDOW_SYSTEM | |
13801 { | |
13802 /* Allocate the buffer for frame titles. */ | |
13803 int size = 100; | |
13804 frame_title_buf = (char *) xmalloc (size); | |
13805 frame_title_buf_end = frame_title_buf + size; | |
13806 frame_title_ptr = NULL; | |
13807 } | |
13808 #endif /* HAVE_WINDOW_SYSTEM */ | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
13809 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
13810 help_echo_showing_p = 0; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
13811 } |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
13812 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
13813 |