Mercurial > emacs
annotate src/xdisp.c @ 36338:45507c61ceef
(Customizing Faces): Remove doubled `the'.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 23 Feb 2001 12:50:41 +0000 |
parents | ce84015c0c41 |
children | de61c584d4a2 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
35174
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000, 2001 |
25012 | 3 Free Software Foundation, Inc. |
277 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
277 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
277 | 21 |
25012 | 22 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>. |
23 | |
24 Redisplay. | |
25 | |
26 Emacs separates the task of updating the display from code | |
27 modifying global state, e.g. buffer text. This way functions | |
28 operating on buffers don't also have to be concerned with updating | |
29 the display. | |
30 | |
31 Updating the display is triggered by the Lisp interpreter when it | |
32 decides it's time to do it. This is done either automatically for | |
33 you as part of the interpreter's command loop or as the result of | |
34 calling Lisp functions like `sit-for'. The C function `redisplay' | |
35 in xdisp.c is the only entry into the inner redisplay code. (Or, | |
36 let's say almost---see the the description of direct update | |
37 operations, below.). | |
38 | |
39 The following diagram shows how redisplay code is invoked. As you | |
40 can see, Lisp calls redisplay and vice versa. Under window systems | |
41 like X, some portions of the redisplay code are also called | |
42 asynchronously during mouse movement or expose events. It is very | |
43 important that these code parts do NOT use the C library (malloc, | |
44 free) because many C libraries under Unix are not reentrant. They | |
45 may also NOT call functions of the Lisp interpreter which could | |
46 change the interpreter's state. If you don't follow these rules, | |
47 you will encounter bugs which are very hard to explain. | |
48 | |
49 (Direct functions, see below) | |
50 direct_output_for_insert, | |
51 direct_forward_char (dispnew.c) | |
52 +---------------------------------+ | |
53 | | | |
54 | V | |
55 +--------------+ redisplay() +----------------+ | |
56 | Lisp machine |---------------->| Redisplay code |<--+ | |
57 +--------------+ (xdisp.c) +----------------+ | | |
58 ^ | | | |
59 +----------------------------------+ | | |
60 Don't use this path when called | | |
61 asynchronously! | | |
62 | | |
63 expose_window (asynchronous) | | |
64 | | |
65 X expose events -----+ | |
66 | |
67 What does redisplay? Obviously, it has to figure out somehow what | |
68 has been changed since the last time the display has been updated, | |
69 and to make these changes visible. Preferably it would do that in | |
70 a moderately intelligent way, i.e. fast. | |
71 | |
72 Changes in buffer text can be deduced from window and buffer | |
73 structures, and from some global variables like `beg_unchanged' and | |
74 `end_unchanged'. The contents of the display are additionally | |
75 recorded in a `glyph matrix', a two-dimensional matrix of glyph | |
76 structures. Each row in such a matrix corresponds to a line on the | |
77 display, and each glyph in a row corresponds to a column displaying | |
78 a character, an image, or what else. This matrix is called the | |
79 `current glyph matrix' or `current matrix' in redisplay | |
80 terminology. | |
81 | |
82 For buffer parts that have been changed since the last update, a | |
83 second glyph matrix is constructed, the so called `desired glyph | |
84 matrix' or short `desired matrix'. Current and desired matrix are | |
85 then compared to find a cheap way to update the display, e.g. by | |
86 reusing part of the display by scrolling lines. | |
87 | |
88 | |
89 Direct operations. | |
90 | |
91 You will find a lot of of redisplay optimizations when you start | |
92 looking at the innards of redisplay. The overall goal of all these | |
93 optimizations is to make redisplay fast because it is done | |
94 frequently. | |
95 | |
96 Two optimizations are not found in xdisp.c. These are the direct | |
97 operations mentioned above. As the name suggests they follow a | |
98 different principle than the rest of redisplay. Instead of | |
99 building a desired matrix and then comparing it with the current | |
100 display, they perform their actions directly on the display and on | |
101 the current matrix. | |
102 | |
103 One direct operation updates the display after one character has | |
104 been entered. The other one moves the cursor by one position | |
105 forward or backward. You find these functions under the names | |
106 `direct_output_for_insert' and `direct_output_forward_char' in | |
107 dispnew.c. | |
108 | |
109 | |
110 Desired matrices. | |
111 | |
112 Desired matrices are always built per Emacs window. The function | |
113 `display_line' is the central function to look at if you are | |
114 interested. It constructs one row in a desired matrix given an | |
115 iterator structure containing both a buffer position and a | |
116 description of the environment in which the text is to be | |
117 displayed. But this is too early, read on. | |
118 | |
119 Characters and pixmaps displayed for a range of buffer text depend | |
120 on various settings of buffers and windows, on overlays and text | |
121 properties, on display tables, on selective display. The good news | |
122 is that all this hairy stuff is hidden behind a small set of | |
123 interface functions taking a iterator structure (struct it) | |
124 argument. | |
125 | |
126 Iteration over things to be be displayed is then simple. It is | |
127 started by initializing an iterator with a call to init_iterator | |
128 (or init_string_iterator for that matter). Calls to | |
129 get_next_display_element fill the iterator structure with relevant | |
130 information about the next thing to display. Calls to | |
131 set_iterator_to_next move the iterator to the next thing. | |
132 | |
133 Besides this, an iterator also contains information about the | |
134 display environment in which glyphs for display elements are to be | |
135 produced. It has fields for the width and height of the display, | |
136 the information whether long lines are truncated or continued, a | |
137 current X and Y position, and lots of other stuff you can better | |
138 see in dispextern.h. | |
139 | |
140 Glyphs in a desired matrix are normally constructed in a loop | |
141 calling get_next_display_element and then produce_glyphs. The call | |
142 to produce_glyphs will fill the iterator structure with pixel | |
143 information about the element being displayed and at the same time | |
144 produce glyphs for it. If the display element fits on the line | |
145 being displayed, set_iterator_to_next is called next, otherwise the | |
146 glyphs produced are discarded. | |
147 | |
148 | |
149 Frame matrices. | |
150 | |
151 That just couldn't be all, could it? What about terminal types not | |
152 supporting operations on sub-windows of the screen? To update the | |
153 display on such a terminal, window-based glyph matrices are not | |
154 well suited. To be able to reuse part of the display (scrolling | |
155 lines up and down), we must instead have a view of the whole | |
156 screen. This is what `frame matrices' are for. They are a trick. | |
157 | |
158 Frames on terminals like above have a glyph pool. Windows on such | |
159 a frame sub-allocate their glyph memory from their frame's glyph | |
160 pool. The frame itself is given its own glyph matrices. By | |
161 coincidence---or maybe something else---rows in window glyph | |
162 matrices are slices of corresponding rows in frame matrices. Thus | |
163 writing to window matrices implicitly updates a frame matrix which | |
164 provides us with the view of the whole screen that we originally | |
165 wanted to have without having to move many bytes around. To be | |
166 honest, there is a little bit more done, but not much more. If you | |
167 plan to extend that code, take a look at dispnew.c. The function | |
168 build_frame_matrix is a good starting point. */ | |
277 | 169 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
170 #include <config.h> |
277 | 171 #include <stdio.h> |
172 #include "lisp.h" | |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
173 #include "keyboard.h" |
769 | 174 #include "frame.h" |
277 | 175 #include "window.h" |
176 #include "termchar.h" | |
177 #include "dispextern.h" | |
178 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
179 #include "charset.h" |
277 | 180 #include "indent.h" |
181 #include "commands.h" | |
182 #include "macros.h" | |
183 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
184 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
185 #include "intervals.h" |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
186 #include "coding.h" |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
187 #include "process.h" |
21514 | 188 #include "region-cache.h" |
29433 | 189 #include "fontset.h" |
21514 | 190 |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
191 #ifdef HAVE_X_WINDOWS |
21514 | 192 #include "xterm.h" |
193 #endif | |
27634
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
194 #ifdef WINDOWSNT |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
195 #include "w32term.h" |
6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents:
27540
diff
changeset
|
196 #endif |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
197 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
198 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
199 #endif |
277 | 200 |
25012 | 201 #define min(a, b) ((a) < (b) ? (a) : (b)) |
202 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
203 | |
204 #define INFINITY 10000000 | |
205 | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
206 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
30320
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
207 extern void set_frame_menubar P_ ((struct frame *f, int, int)); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
208 extern int pending_menu_activation; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
209 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
210 |
277 | 211 extern int interrupt_input; |
212 extern int command_loop_level; | |
213 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
214 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
215 |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
216 extern Lisp_Object Qface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
217 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
218 extern Lisp_Object Voverriding_local_map; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
219 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 220 extern Lisp_Object Qmenu_item; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
221 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
222 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
223 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
224 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
225 Lisp_Object Qinhibit_point_motion_hooks; |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
226 Lisp_Object QCeval, Qwhen, QCfile, QCdata; |
25012 | 227 Lisp_Object Qfontified; |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
228 Lisp_Object Qgrow_only; |
25012 | 229 |
230 /* Functions called to fontify regions of text. */ | |
231 | |
232 Lisp_Object Vfontification_functions; | |
233 Lisp_Object Qfontification_functions; | |
234 | |
25543 | 235 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 236 over them. */ |
237 | |
25543 | 238 int auto_raise_tool_bar_buttons_p; |
239 | |
240 /* Margin around tool bar buttons in pixels. */ | |
241 | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
242 Lisp_Object Vtool_bar_button_margin; |
25543 | 243 |
244 /* Thickness of shadow to draw around tool bar buttons. */ | |
245 | |
246 int tool_bar_button_relief; | |
247 | |
248 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 249 items are visible, and no blank lines remain. */ |
250 | |
25543 | 251 int auto_resize_tool_bars_p; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
252 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
253 /* Non-nil means don't actually do any redisplay. */ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
254 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
255 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
256 |
25012 | 257 /* Names of text properties relevant for redisplay. */ |
258 | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
259 Lisp_Object Qdisplay, Qrelative_width, Qalign_to; |
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
260 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; |
25012 | 261 |
262 /* Symbols used in text property values. */ | |
263 | |
264 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; | |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
265 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
266 Lisp_Object Qmargin; |
26570
133c30f0647c
Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents:
26447
diff
changeset
|
267 extern Lisp_Object Qheight; |
25012 | 268 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
269 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
270 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
271 Lisp_Object Vshow_trailing_whitespace; |
25012 | 272 |
273 /* Name of the face used to highlight trailing whitespace. */ | |
274 | |
275 Lisp_Object Qtrailing_whitespace; | |
276 | |
277 /* The symbol `image' which is the car of the lists used to represent | |
278 images in Lisp. */ | |
279 | |
280 Lisp_Object Qimage; | |
281 | |
282 /* Non-zero means print newline to stdout before next mini-buffer | |
283 message. */ | |
277 | 284 |
285 int noninteractive_need_newline; | |
286 | |
25012 | 287 /* Non-zero means print newline to message log before next message. */ |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
288 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
289 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
290 |
25012 | 291 |
292 /* The buffer position of the first character appearing entirely or | |
293 partially on the line of the selected window which contains the | |
294 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
295 redisplay optimization in redisplay_internal. */ | |
296 | |
297 static struct text_pos this_line_start_pos; | |
298 | |
299 /* Number of characters past the end of the line above, including the | |
300 terminating newline. */ | |
301 | |
302 static struct text_pos this_line_end_pos; | |
303 | |
304 /* The vertical positions and the height of this line. */ | |
305 | |
277 | 306 static int this_line_vpos; |
25012 | 307 static int this_line_y; |
308 static int this_line_pixel_height; | |
309 | |
310 /* X position at which this display line starts. Usually zero; | |
311 negative if first character is partially visible. */ | |
312 | |
313 static int this_line_start_x; | |
314 | |
315 /* Buffer that this_line_.* variables are referring to. */ | |
316 | |
277 | 317 static struct buffer *this_line_buffer; |
318 | |
25012 | 319 /* Nonzero means truncate lines in all windows less wide than the |
320 frame. */ | |
321 | |
277 | 322 int truncate_partial_width_windows; |
323 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
324 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 325 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
326 int unibyte_display_via_language_environment; |
25012 | 327 |
328 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
329 Not guaranteed to be accurate except while parsing | |
330 frame-title-format. */ | |
331 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
332 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
333 |
277 | 334 Lisp_Object Vglobal_mode_string; |
335 | |
336 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 337 |
277 | 338 Lisp_Object Voverlay_arrow_position; |
339 | |
25012 | 340 /* String to display for the arrow. Only used on terminal frames. */ |
341 | |
277 | 342 Lisp_Object Voverlay_arrow_string; |
343 | |
25012 | 344 /* Values of those variables at last redisplay. However, if |
345 Voverlay_arrow_position is a marker, last_arrow_position is its | |
346 numerical position. */ | |
347 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
348 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
349 |
25012 | 350 /* Like mode-line-format, but for the title bar on a visible frame. */ |
351 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
352 Lisp_Object Vframe_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
353 |
25012 | 354 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
355 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
356 Lisp_Object Vicon_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
357 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
358 /* List of functions to call when a window's size changes. These |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
359 functions get one arg, a frame on which one or more windows' sizes |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
360 have changed. */ |
25012 | 361 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
362 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
363 |
31845
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
364 Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook; |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
365 |
277 | 366 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 367 |
277 | 368 static int overlay_arrow_seen; |
369 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
370 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 371 |
372 int highlight_nonselected_windows; | |
373 | |
374 /* If cursor motion alone moves point off frame, try scrolling this | |
375 many lines up or down if that will bring it back. */ | |
376 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
377 static int scroll_step; |
277 | 378 |
25012 | 379 /* Non-0 means scroll just far enough to bring point back on the |
380 screen, when appropriate. */ | |
381 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
382 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
383 |
25012 | 384 /* Recenter the window whenever point gets within this many lines of |
385 the top or bottom of the window. This value is translated into a | |
386 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
387 there is really a fixed pixel height scroll margin. */ | |
388 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
389 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
390 |
25012 | 391 /* Number of windows showing the buffer of the selected window (or |
392 another buffer with the same base buffer). keyboard.c refers to | |
393 this. */ | |
394 | |
277 | 395 int buffer_shared; |
396 | |
25012 | 397 /* Vector containing glyphs for an ellipsis `...'. */ |
398 | |
399 static Lisp_Object default_invis_vector[3]; | |
400 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
401 /* Zero means display the mode-line/header-line/menu-bar in the default face |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
402 (this slightly odd definition is for compatibility with previous versions |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
403 of emacs), non-zero means display them using their respective faces. |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
404 |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
405 This variable is deprecated. */ |
25012 | 406 |
277 | 407 int mode_line_inverse_video; |
408 | |
25012 | 409 /* Prompt to display in front of the mini-buffer contents. */ |
410 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
411 Lisp_Object minibuf_prompt; |
277 | 412 |
25012 | 413 /* Width of current mini-buffer prompt. Only set after display_line |
414 of the line that contains the prompt. */ | |
415 | |
277 | 416 int minibuf_prompt_width; |
25012 | 417 int minibuf_prompt_pixel_width; |
418 | |
419 /* This is the window where the echo area message was displayed. It | |
420 is always a mini-buffer window, but it may not be the same window | |
421 currently active as a mini-buffer. */ | |
422 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
423 Lisp_Object echo_area_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
424 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
425 /* List of pairs (MESSAGE . MULTIBYTE). The function save_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
426 pushes the current message and the value of |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
427 message_enable_multibyte on the stack, the function restore_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
428 pops the stack and displays MESSAGE again. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
429 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
430 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
431 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
432 /* Nonzero means multibyte characters were enabled when the echo area |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
433 message was specified. */ |
25012 | 434 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
435 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
436 |
25012 | 437 /* True if we should redraw the mode lines on the next redisplay. */ |
438 | |
277 | 439 int update_mode_lines; |
440 | |
25012 | 441 /* Nonzero if window sizes or contents have changed since last |
442 redisplay that finished */ | |
443 | |
277 | 444 int windows_or_buffers_changed; |
445 | |
25012 | 446 /* Nonzero after display_mode_line if %l was used and it displayed a |
447 line number. */ | |
448 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
449 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
450 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
451 /* Maximum buffer size for which to display line numbers. */ |
25012 | 452 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
453 Lisp_Object Vline_number_display_limit; |
10393 | 454 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
455 /* line width to consider when repostioning for line number display */ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
456 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
457 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
458 |
25012 | 459 /* Number of lines to keep in the message log buffer. t means |
460 infinite. nil means don't log at all. */ | |
461 | |
10393 | 462 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
463 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
464 /* The name of the *Messages* buffer, a string. */ |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
465 |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
466 static Lisp_Object Vmessages_buffer_name; |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
467 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 /* Current, index 0, and last displayed echo area message. Either |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
469 buffers from echo_buffers, or nil to indicate no message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 Lisp_Object echo_area_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
472 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 /* The buffers referenced from echo_area_buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
474 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
475 static Lisp_Object echo_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
476 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
477 /* A vector saved used in with_area_buffer to reduce consing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
478 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
479 static Lisp_Object Vwith_echo_area_save_vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
480 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
481 /* Non-zero means display_echo_area should display the last echo area |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
482 message again. Set by redisplay_preserve_echo_area. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
483 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
484 static int display_last_displayed_message_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
485 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
486 /* Nonzero if echo area is being used by print; zero if being used by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
487 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
488 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
489 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
490 |
36194
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
491 /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
492 |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
493 Lisp_Object Qinhibit_menubar_update; |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
494 int inhibit_menubar_update; |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
495 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
496 /* 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
|
497 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
|
498 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
|
499 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
500 Lisp_Object Vmax_mini_window_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
501 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
502 /* 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
|
503 lines instead of being continued. */ |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
504 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
505 int message_truncate_lines; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
506 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
|
507 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
508 /* 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
|
509 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
|
510 |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
511 int cursor_in_non_selected_windows; |
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
512 |
25012 | 513 /* A scratch glyph row with contents used for generating truncation |
514 glyphs. Also used in direct_output_for_insert. */ | |
515 | |
516 #define MAX_SCRATCH_GLYPHS 100 | |
517 struct glyph_row scratch_glyph_row; | |
518 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
519 | |
520 /* Ascent and height of the last line processed by move_it_to. */ | |
521 | |
522 static int last_max_ascent, last_height; | |
523 | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
524 /* 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
|
525 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
526 int help_echo_showing_p; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
527 |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
528 /* If >= 0, computed, exact values of mode-line and header-line height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
529 to use in the macros CURRENT_MODE_LINE_HEIGHT and |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
530 CURRENT_HEADER_LINE_HEIGHT. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
531 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
532 int current_mode_line_height, current_header_line_height; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
533 |
25012 | 534 /* The maximum distance to look ahead for text properties. Values |
535 that are too small let us call compute_char_face and similar | |
536 functions too often which is expensive. Values that are too large | |
537 let us call compute_char_face and alike too often because we | |
538 might not be interested in text properties that far away. */ | |
539 | |
540 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
541 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
542 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
543 |
25012 | 544 /* Non-zero means print traces of redisplay if compiled with |
545 GLYPH_DEBUG != 0. */ | |
546 | |
547 int trace_redisplay_p; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
548 |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
549 #endif /* GLYPH_DEBUG */ |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
550 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
551 #ifdef DEBUG_TRACE_MOVE |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
552 /* 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
|
553 int trace_move; |
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
554 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
555 #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
|
556 #else |
30747
6c7afd50ec6a
(TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents:
30744
diff
changeset
|
557 #define TRACE_MOVE(x) (void) 0 |
25012 | 558 #endif |
31118
37c389d61cee
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30942
diff
changeset
|
559 |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
560 /* 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
|
561 point visible. */ |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
562 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
563 int automatic_hscrolling_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
564 |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
565 /* 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
|
566 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
567 Lisp_Object Vimage_types; |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
568 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
569 /* The variable `resize-mini-windows'. If nil, don't resize |
33453 | 570 mini-windows. If t, always resize them to fit the text they |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
571 display. If `grow-only', let mini-windows grow only until they |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
572 become empty. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
573 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
574 Lisp_Object Vresize_mini_windows; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
575 |
25012 | 576 /* Value returned from text property handlers (see below). */ |
577 | |
578 enum prop_handled | |
579 { | |
580 HANDLED_NORMALLY, | |
581 HANDLED_RECOMPUTE_PROPS, | |
582 HANDLED_OVERLAY_STRING_CONSUMED, | |
583 HANDLED_RETURN | |
584 }; | |
585 | |
586 /* A description of text properties that redisplay is interested | |
587 in. */ | |
588 | |
589 struct props | |
590 { | |
591 /* The name of the property. */ | |
592 Lisp_Object *name; | |
593 | |
594 /* A unique index for the property. */ | |
595 enum prop_idx idx; | |
596 | |
597 /* A handler function called to set up iterator IT from the property | |
598 at IT's current position. Value is used to steer handle_stop. */ | |
599 enum prop_handled (*handler) P_ ((struct it *it)); | |
600 }; | |
601 | |
602 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
603 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
604 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
|
605 static enum prop_handled handle_composition_prop P_ ((struct it *)); |
25012 | 606 static enum prop_handled handle_overlay_change P_ ((struct it *)); |
607 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
608 | |
609 /* Properties handled by iterators. */ | |
610 | |
611 static struct props it_props[] = | |
612 { | |
613 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
614 /* Handle `face' before `display' because some sub-properties of | |
615 `display' need to know the face. */ | |
616 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
617 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
618 {&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
|
619 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop}, |
25012 | 620 {NULL, 0, NULL} |
621 }; | |
622 | |
623 /* Value is the position described by X. If X is a marker, value is | |
624 the marker_position of X. Otherwise, value is X. */ | |
625 | |
626 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
627 | |
628 /* Enumeration returned by some move_it_.* functions internally. */ | |
629 | |
630 enum move_it_result | |
631 { | |
632 /* Not used. Undefined value. */ | |
633 MOVE_UNDEFINED, | |
634 | |
635 /* Move ended at the requested buffer position or ZV. */ | |
636 MOVE_POS_MATCH_OR_ZV, | |
637 | |
638 /* Move ended at the requested X pixel position. */ | |
639 MOVE_X_REACHED, | |
640 | |
641 /* Move within a line ended at the end of a line that must be | |
642 continued. */ | |
643 MOVE_LINE_CONTINUED, | |
644 | |
645 /* Move within a line ended at the end of a line that would | |
646 be displayed truncated. */ | |
647 MOVE_LINE_TRUNCATED, | |
648 | |
649 /* Move within a line ended at a line end. */ | |
650 MOVE_NEWLINE_OR_CR | |
651 }; | |
652 | |
653 | |
654 | |
655 /* Function prototypes. */ | |
656 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
657 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
|
658 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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 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
|
664 struct text_pos)); |
a1f02a10e391
(with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents:
30243
diff
changeset
|
665 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
|
666 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
|
667 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 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
|
673 static void ensure_echo_area_buffers P_ ((void)); |
25543 | 674 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
675 struct glyph_row *, | |
676 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
677 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 691 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
692 struct text_pos)); | |
693 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
|
694 static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); |
25012 | 695 static void insert_left_trunc_glyphs P_ ((struct it *)); |
696 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
697 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
|
698 static int append_space P_ ((struct it *, int)); |
25012 | 699 static void make_cursor_line_fully_visible P_ ((struct window *)); |
700 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
|
701 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); |
25012 | 702 static int trailing_whitespace_p P_ ((int)); |
703 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
704 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
705 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
706 static void push_it P_ ((struct it *)); | |
707 static void pop_it P_ ((struct it *)); | |
708 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
709 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
|
710 static int echo_area_display P_ ((int)); |
25012 | 711 static void redisplay_windows P_ ((Lisp_Object)); |
712 static void redisplay_window P_ ((Lisp_Object, int)); | |
713 static void update_menu_bar P_ ((struct frame *, int)); | |
714 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
715 static int try_window_id P_ ((struct window *)); | |
716 static int display_line P_ ((struct it *)); | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
717 static int display_mode_lines P_ ((struct window *)); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
718 static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object)); |
25012 | 719 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
|
720 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 721 static void display_menu_bar P_ ((struct window *)); |
722 static int display_count_lines P_ ((int, int, int, int, int *)); | |
723 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
724 int, int, struct it *, int, int, int, int)); | |
725 static void compute_line_metrics P_ ((struct it *)); | |
726 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
727 static int get_overlay_strings P_ ((struct it *)); | |
728 static void next_overlay_string P_ ((struct it *)); | |
729 static void reseat P_ ((struct it *, struct text_pos, int)); | |
730 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
731 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
732 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
|
733 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 734 static int next_element_from_display_vector P_ ((struct it *)); |
735 static int next_element_from_string P_ ((struct it *)); | |
736 static int next_element_from_c_string P_ ((struct it *)); | |
737 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
|
738 static int next_element_from_composition P_ ((struct it *)); |
25012 | 739 static int next_element_from_image P_ ((struct it *)); |
740 static int next_element_from_stretch P_ ((struct it *)); | |
741 static void load_overlay_strings P_ ((struct it *)); | |
742 static void init_from_display_pos P_ ((struct it *, struct window *, | |
743 struct display_pos *)); | |
744 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
745 Lisp_Object, int, int, int, int)); | |
746 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
747 int, int, int)); | |
748 void move_it_vertically_backward P_ ((struct it *, int)); | |
749 static void init_to_row_start P_ ((struct it *, struct window *, | |
750 struct glyph_row *)); | |
751 static void init_to_row_end P_ ((struct it *, struct window *, | |
752 struct glyph_row *)); | |
753 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
|
754 static int forward_to_next_line_start P_ ((struct it *, int *)); |
25012 | 755 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, |
756 Lisp_Object, int)); | |
757 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
758 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
759 static int number_of_chars P_ ((unsigned char *, int)); | |
760 static void compute_stop_pos P_ ((struct it *)); | |
761 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
762 Lisp_Object)); | |
763 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
764 static int next_overlay_change P_ ((int)); | |
765 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
766 Lisp_Object, struct text_pos *, |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
767 int)); |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
768 static int underlying_face_id P_ ((struct it *)); |
25012 | 769 |
770 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
771 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
772 | |
773 #ifdef HAVE_WINDOW_SYSTEM | |
774 | |
25543 | 775 static void update_tool_bar P_ ((struct frame *, int)); |
776 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
777 static int redisplay_tool_bar P_ ((struct frame *)); | |
778 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 779 |
780 #endif /* HAVE_WINDOW_SYSTEM */ | |
781 | |
782 | |
783 /*********************************************************************** | |
784 Window display dimensions | |
785 ***********************************************************************/ | |
786 | |
787 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
788 text in window W. This is the height of W minus the height of a | |
789 mode line, if any. */ | |
790 | |
791 INLINE int | |
792 window_text_bottom_y (w) | |
793 struct window *w; | |
794 { | |
795 struct frame *f = XFRAME (w->frame); | |
796 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
797 |
25012 | 798 if (WINDOW_WANTS_MODELINE_P (w)) |
799 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
800 return height; | |
801 } | |
802 | |
803 | |
804 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
805 means return the total width of W, not including bitmap areas to | |
806 the left and right of the window. */ | |
807 | |
808 INLINE int | |
809 window_box_width (w, area) | |
810 struct window *w; | |
811 int area; | |
812 { | |
813 struct frame *f = XFRAME (w->frame); | |
814 int width = XFASTINT (w->width); | |
815 | |
816 if (!w->pseudo_window_p) | |
817 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
818 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 819 |
820 if (area == TEXT_AREA) | |
821 { | |
822 if (INTEGERP (w->left_margin_width)) | |
823 width -= XFASTINT (w->left_margin_width); | |
824 if (INTEGERP (w->right_margin_width)) | |
825 width -= XFASTINT (w->right_margin_width); | |
826 } | |
827 else if (area == LEFT_MARGIN_AREA) | |
828 width = (INTEGERP (w->left_margin_width) | |
829 ? XFASTINT (w->left_margin_width) : 0); | |
830 else if (area == RIGHT_MARGIN_AREA) | |
831 width = (INTEGERP (w->right_margin_width) | |
832 ? XFASTINT (w->right_margin_width) : 0); | |
833 } | |
834 | |
835 return width * CANON_X_UNIT (f); | |
836 } | |
837 | |
838 | |
839 /* Return the pixel height of the display area of window W, not | |
840 including mode lines of W, if any.. */ | |
841 | |
842 INLINE int | |
843 window_box_height (w) | |
844 struct window *w; | |
845 { | |
846 struct frame *f = XFRAME (w->frame); | |
847 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
|
848 |
85c245edb7d7
(window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents:
31876
diff
changeset
|
849 xassert (height >= 0); |
25012 | 850 |
34582
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
851 /* Note: the code below that determines the mode-line/header-line |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
852 height is essentially the same as that contained in the macro |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
853 CURRENT_{MODE,HEADER}_LINE_HEIGHT, except that it checks whether |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
854 the appropriate glyph row has its `mode_line_p' flag set, |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
855 and if it doesn't, uses estimate_mode_line_height instead. */ |
4099c0fd33f4
(window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents:
34578
diff
changeset
|
856 |
25012 | 857 if (WINDOW_WANTS_MODELINE_P (w)) |
34578
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
858 { |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
859 struct glyph_row *ml_row |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
860 = (w->current_matrix && w->current_matrix->rows |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
861 ? MATRIX_MODE_LINE_ROW (w->current_matrix) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
862 : 0); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
863 if (ml_row && ml_row->mode_line_p) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
864 height -= ml_row->height; |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
865 else |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
866 height -= estimate_mode_line_height (f, MODE_LINE_FACE_ID); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
867 } |
25012 | 868 |
25546 | 869 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
34578
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
870 { |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
871 struct glyph_row *hl_row |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
872 = (w->current_matrix && w->current_matrix->rows |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
873 ? MATRIX_HEADER_LINE_ROW (w->current_matrix) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
874 : 0); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
875 if (hl_row && hl_row->mode_line_p) |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
876 height -= hl_row->height; |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
877 else |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
878 height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); |
cd90170bc811
(window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents:
34500
diff
changeset
|
879 } |
25012 | 880 |
881 return height; | |
882 } | |
883 | |
884 | |
885 /* Return the frame-relative coordinate of the left edge of display | |
886 area AREA of window W. AREA < 0 means return the left edge of the | |
887 whole window, to the right of any bitmap area at the left side of | |
888 W. */ | |
889 | |
890 INLINE int | |
891 window_box_left (w, area) | |
892 struct window *w; | |
893 int area; | |
894 { | |
895 struct frame *f = XFRAME (w->frame); | |
896 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
897 | |
898 if (!w->pseudo_window_p) | |
899 { | |
900 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
|
901 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 902 |
903 if (area == TEXT_AREA) | |
904 x += window_box_width (w, LEFT_MARGIN_AREA); | |
905 else if (area == RIGHT_MARGIN_AREA) | |
906 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
907 + window_box_width (w, TEXT_AREA)); | |
908 } | |
909 | |
910 return x; | |
911 } | |
912 | |
913 | |
914 /* Return the frame-relative coordinate of the right edge of display | |
915 area AREA of window W. AREA < 0 means return the left edge of the | |
916 whole window, to the left of any bitmap area at the right side of | |
917 W. */ | |
918 | |
919 INLINE int | |
920 window_box_right (w, area) | |
921 struct window *w; | |
922 int area; | |
923 { | |
924 return window_box_left (w, area) + window_box_width (w, area); | |
925 } | |
926 | |
927 | |
928 /* Get the bounding box of the display area AREA of window W, without | |
929 mode lines, in frame-relative coordinates. AREA < 0 means the | |
930 whole window, not including bitmap areas to the left and right of | |
931 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
932 coordinates of the upper-left corner of the box. Return in | |
933 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
934 | |
935 INLINE void | |
936 window_box (w, area, box_x, box_y, box_width, box_height) | |
937 struct window *w; | |
938 int area; | |
939 int *box_x, *box_y, *box_width, *box_height; | |
940 { | |
941 struct frame *f = XFRAME (w->frame); | |
942 | |
943 *box_width = window_box_width (w, area); | |
944 *box_height = window_box_height (w); | |
945 *box_x = window_box_left (w, area); | |
946 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
947 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 948 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
949 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 950 } |
951 | |
952 | |
953 /* Get the bounding box of the display area AREA of window W, without | |
954 mode lines. AREA < 0 means the whole window, not including bitmap | |
955 areas to the left and right of the window. Return in *TOP_LEFT_X | |
956 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
957 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
958 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
959 box. */ | |
960 | |
961 INLINE void | |
962 window_box_edges (w, area, top_left_x, top_left_y, | |
963 bottom_right_x, bottom_right_y) | |
964 struct window *w; | |
965 int area; | |
966 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
967 { | |
968 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
969 bottom_right_y); | |
970 *bottom_right_x += *top_left_x; | |
971 *bottom_right_y += *top_left_y; | |
972 } | |
973 | |
974 | |
975 | |
976 /*********************************************************************** | |
977 Utilities | |
978 ***********************************************************************/ | |
979 | |
36201
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
980 /* Return the bottom y-position of the line the iterator IT is in. |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
981 This can modify IT's settings. */ |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
982 |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
983 int |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
984 line_bottom_y (it) |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
985 struct it *it; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
986 { |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
987 int line_height = it->max_ascent + it->max_descent; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
988 int line_top_y = it->current_y; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
989 |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
990 if (line_height == 0) |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
991 { |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
992 if (last_height) |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
993 line_height = last_height; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
994 else if (IT_CHARPOS (*it) < ZV) |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
995 { |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
996 move_it_by_lines (it, 1, 1); |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
997 line_height = (it->max_ascent || it->max_descent |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
998 ? it->max_ascent + it->max_descent |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
999 : last_height); |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1000 } |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1001 else |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1002 { |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1003 struct glyph_row *row = it->glyph_row; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1004 |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1005 /* Use the default character height. */ |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1006 it->glyph_row = NULL; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1007 it->what = IT_CHARACTER; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1008 it->c = ' '; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1009 it->len = 1; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1010 PRODUCE_GLYPHS (it); |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1011 line_height = it->ascent + it->descent; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1012 it->glyph_row = row; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1013 } |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1014 } |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1015 |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1016 return line_top_y + line_height; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1017 } |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1018 |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1019 |
33510
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
1020 /* Return 1 if position CHARPOS is visible in window W. Set *FULLY to |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
1021 1 if POS is visible and the line containing POS is fully visible. |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
1022 EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line |
405f162f1fc7
(pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
33490
diff
changeset
|
1023 and header-lines heights. */ |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1024 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1025 int |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1026 pos_visible_p (w, charpos, fully, exact_mode_line_heights_p) |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1027 struct window *w; |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1028 int charpos, *fully, exact_mode_line_heights_p; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1029 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1030 struct it it; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1031 struct text_pos top; |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1032 int visible_p; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1033 struct buffer *old_buffer = NULL; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1034 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1035 if (XBUFFER (w->buffer) != current_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1036 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1037 old_buffer = current_buffer; |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1038 set_buffer_internal_1 (XBUFFER (w->buffer)); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1039 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1040 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1041 *fully = visible_p = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1042 SET_TEXT_POS_FROM_MARKER (top, w->start); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1043 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1044 /* Compute exact mode line heights, if requested. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1045 if (exact_mode_line_heights_p) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1046 { |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1047 if (WINDOW_WANTS_MODELINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1048 current_mode_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1049 = display_mode_line (w, MODE_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1050 current_buffer->mode_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1051 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1052 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1053 current_header_line_height |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1054 = display_mode_line (w, HEADER_LINE_FACE_ID, |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1055 current_buffer->header_line_format); |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1056 } |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1057 |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1058 start_display (&it, w, top); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1059 move_it_to (&it, charpos, 0, it.last_visible_y, -1, |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1060 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); |
34947
5854869b9445
(pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents:
34927
diff
changeset
|
1061 |
5854869b9445
(pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents:
34927
diff
changeset
|
1062 /* Note that we may overshoot because of invisible text. */ |
5854869b9445
(pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents:
34927
diff
changeset
|
1063 if (IT_CHARPOS (it) >= charpos) |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1064 { |
36201
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1065 int top_y = it.current_y; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1066 int bottom_y = line_bottom_y (&it); |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1067 int window_top_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1068 |
36201
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1069 if (top_y < window_top_y) |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1070 visible_p = bottom_y > window_top_y; |
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1071 else if (top_y < it.last_visible_y) |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1072 { |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1073 visible_p = 1; |
36201
32505f3d0441
(line_bottom_y): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
36194
diff
changeset
|
1074 *fully = bottom_y <= it.last_visible_y; |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1075 } |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1076 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1077 else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1078 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1079 move_it_by_lines (&it, 1, 0); |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1080 if (charpos < IT_CHARPOS (it)) |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1081 { |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1082 visible_p = 1; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1083 *fully = 0; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1084 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1085 } |
32912
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1086 |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1087 if (old_buffer) |
b55f99786a33
(pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32878
diff
changeset
|
1088 set_buffer_internal_1 (old_buffer); |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1089 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
1090 current_header_line_height = current_mode_line_height = -1; |
32873
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1091 return visible_p; |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1092 } |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1093 |
1dbdec58e580
(pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
1094 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1095 /* 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
|
1096 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
|
1097 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
|
1098 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
|
1099 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1100 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1101 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1102 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
|
1103 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
1104 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1105 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1106 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1107 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1108 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
|
1109 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1110 /* 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
|
1111 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
|
1112 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1113 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1114 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1115 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1116 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1117 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1118 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1119 |
25012 | 1120 /* Given a position POS containing a valid character and byte position |
1121 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
1122 | |
1123 static struct text_pos | |
1124 string_pos_nchars_ahead (pos, string, nchars) | |
1125 struct text_pos pos; | |
1126 Lisp_Object string; | |
1127 int nchars; | |
1128 { | |
1129 xassert (STRINGP (string) && nchars >= 0); | |
1130 | |
1131 if (STRING_MULTIBYTE (string)) | |
1132 { | |
1133 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
1134 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
1135 int len; | |
1136 | |
1137 while (nchars--) | |
1138 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1139 string_char_and_length (p, rest, &len); |
25012 | 1140 p += len, rest -= len; |
1141 xassert (rest >= 0); | |
1142 CHARPOS (pos) += 1; | |
1143 BYTEPOS (pos) += len; | |
1144 } | |
1145 } | |
1146 else | |
1147 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
1148 | |
1149 return pos; | |
1150 } | |
1151 | |
1152 | |
1153 /* Value is the text position, i.e. character and byte position, | |
1154 for character position CHARPOS in STRING. */ | |
1155 | |
1156 static INLINE struct text_pos | |
1157 string_pos (charpos, string) | |
1158 int charpos; | |
1159 Lisp_Object string; | |
1160 { | |
1161 struct text_pos pos; | |
1162 xassert (STRINGP (string)); | |
1163 xassert (charpos >= 0); | |
1164 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
1165 return pos; | |
1166 } | |
1167 | |
1168 | |
1169 /* Value is a text position, i.e. character and byte position, for | |
1170 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
1171 means recognize multibyte characters. */ | |
1172 | |
1173 static struct text_pos | |
1174 c_string_pos (charpos, s, multibyte_p) | |
1175 int charpos; | |
1176 unsigned char *s; | |
1177 int multibyte_p; | |
1178 { | |
1179 struct text_pos pos; | |
1180 | |
1181 xassert (s != NULL); | |
1182 xassert (charpos >= 0); | |
1183 | |
1184 if (multibyte_p) | |
1185 { | |
1186 int rest = strlen (s), len; | |
1187 | |
1188 SET_TEXT_POS (pos, 0, 0); | |
1189 while (charpos--) | |
1190 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1191 string_char_and_length (s, rest, &len); |
25012 | 1192 s += len, rest -= len; |
1193 xassert (rest >= 0); | |
1194 CHARPOS (pos) += 1; | |
1195 BYTEPOS (pos) += len; | |
1196 } | |
1197 } | |
1198 else | |
1199 SET_TEXT_POS (pos, charpos, charpos); | |
1200 | |
1201 return pos; | |
1202 } | |
1203 | |
1204 | |
1205 /* Value is the number of characters in C string S. MULTIBYTE_P | |
1206 non-zero means recognize multibyte characters. */ | |
1207 | |
1208 static int | |
1209 number_of_chars (s, multibyte_p) | |
1210 unsigned char *s; | |
1211 int multibyte_p; | |
1212 { | |
1213 int nchars; | |
1214 | |
1215 if (multibyte_p) | |
1216 { | |
1217 int rest = strlen (s), len; | |
1218 unsigned char *p = (unsigned char *) s; | |
1219 | |
1220 for (nchars = 0; rest > 0; ++nchars) | |
1221 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1222 string_char_and_length (p, rest, &len); |
25012 | 1223 rest -= len, p += len; |
1224 } | |
1225 } | |
1226 else | |
1227 nchars = strlen (s); | |
1228 | |
1229 return nchars; | |
1230 } | |
1231 | |
1232 | |
1233 /* Compute byte position NEWPOS->bytepos corresponding to | |
1234 NEWPOS->charpos. POS is a known position in string STRING. | |
1235 NEWPOS->charpos must be >= POS.charpos. */ | |
1236 | |
1237 static void | |
1238 compute_string_pos (newpos, pos, string) | |
1239 struct text_pos *newpos, pos; | |
1240 Lisp_Object string; | |
1241 { | |
1242 xassert (STRINGP (string)); | |
1243 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1244 | |
1245 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
|
1246 *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
|
1247 CHARPOS (*newpos) - CHARPOS (pos)); |
25012 | 1248 else |
1249 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1250 } | |
1251 | |
1252 | |
1253 | |
1254 /*********************************************************************** | |
1255 Lisp form evaluation | |
1256 ***********************************************************************/ | |
1257 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1258 /* Error handler for safe_eval and safe_call. */ |
25012 | 1259 |
1260 static Lisp_Object | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1261 safe_eval_handler (arg) |
25012 | 1262 Lisp_Object arg; |
1263 { | |
33072
176f2eb7a645
(safe_eval_handler): Call add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents:
33068
diff
changeset
|
1264 add_to_log ("Error during redisplay: %s", arg, Qnil); |
25012 | 1265 return Qnil; |
1266 } | |
1267 | |
1268 | |
1269 /* Evaluate SEXPR and return the result, or nil if something went | |
1270 wrong. */ | |
1271 | |
30202
bade676e0950
(eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
30159
diff
changeset
|
1272 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1273 safe_eval (sexpr) |
25012 | 1274 Lisp_Object sexpr; |
1275 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1276 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1277 struct gcpro gcpro1; |
25012 | 1278 Lisp_Object val; |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1279 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1280 GCPRO1 (sexpr); |
25012 | 1281 specbind (Qinhibit_redisplay, Qt); |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1282 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
|
1283 UNGCPRO; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1284 return unbind_to (count, val); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1285 } |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1286 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1287 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1288 /* 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
|
1289 Return the result, or nil if something went wrong. */ |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1290 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1291 Lisp_Object |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1292 safe_call (nargs, args) |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1293 int nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1294 Lisp_Object *args; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1295 { |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
1296 int count = BINDING_STACK_SIZE (); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1297 Lisp_Object val; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1298 struct gcpro gcpro1; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1299 |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1300 GCPRO1 (args[0]); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1301 gcpro1.nvars = nargs; |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1302 specbind (Qinhibit_redisplay, Qt); |
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1303 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
|
1304 safe_eval_handler); |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
1305 UNGCPRO; |
25012 | 1306 return unbind_to (count, val); |
1307 } | |
1308 | |
1309 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1310 /* Call function FN with one argument ARG. |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1311 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
|
1312 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1313 Lisp_Object |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1314 safe_call1 (fn, arg) |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1315 Lisp_Object fn, arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1316 { |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1317 Lisp_Object args[2]; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1318 args[0] = fn; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1319 args[1] = arg; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1320 return safe_call (2, args); |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1321 } |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1322 |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
1323 |
25012 | 1324 |
1325 /*********************************************************************** | |
1326 Debugging | |
1327 ***********************************************************************/ | |
1328 | |
1329 #if 0 | |
1330 | |
1331 /* Define CHECK_IT to perform sanity checks on iterators. | |
1332 This is for debugging. It is too slow to do unconditionally. */ | |
1333 | |
1334 static void | |
1335 check_it (it) | |
1336 struct it *it; | |
1337 { | |
1338 if (it->method == next_element_from_string) | |
1339 { | |
1340 xassert (STRINGP (it->string)); | |
1341 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1342 } | |
1343 else if (it->method == next_element_from_buffer) | |
1344 { | |
1345 /* Check that character and byte positions agree. */ | |
1346 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1347 } | |
1348 | |
1349 if (it->dpvec) | |
1350 xassert (it->current.dpvec_index >= 0); | |
1351 else | |
1352 xassert (it->current.dpvec_index < 0); | |
1353 } | |
1354 | |
1355 #define CHECK_IT(IT) check_it ((IT)) | |
1356 | |
1357 #else /* not 0 */ | |
1358 | |
1359 #define CHECK_IT(IT) (void) 0 | |
1360 | |
1361 #endif /* not 0 */ | |
1362 | |
1363 | |
1364 #if GLYPH_DEBUG | |
1365 | |
1366 /* Check that the window end of window W is what we expect it | |
1367 to be---the last row in the current matrix displaying text. */ | |
1368 | |
1369 static void | |
1370 check_window_end (w) | |
1371 struct window *w; | |
1372 { | |
1373 if (!MINI_WINDOW_P (w) | |
1374 && !NILP (w->window_end_valid)) | |
1375 { | |
1376 struct glyph_row *row; | |
1377 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1378 XFASTINT (w->window_end_vpos)), | |
1379 !row->enabled_p | |
1380 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1381 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1382 } | |
1383 } | |
1384 | |
1385 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1386 | |
1387 #else /* not GLYPH_DEBUG */ | |
1388 | |
1389 #define CHECK_WINDOW_END(W) (void) 0 | |
1390 | |
1391 #endif /* not GLYPH_DEBUG */ | |
1392 | |
1393 | |
1394 | |
1395 /*********************************************************************** | |
1396 Iterator initialization | |
1397 ***********************************************************************/ | |
1398 | |
1399 /* Initialize IT for displaying current_buffer in window W, starting | |
1400 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1401 position is specified which is useful when the iterator is assigned | |
1402 a position later. BYTEPOS is the byte position corresponding to | |
1403 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1404 | |
1405 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1406 will produce glyphs in that row. | |
1407 | |
1408 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1409 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1410 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1411 displaying the tool-bar. |
25012 | 1412 |
1413 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1414 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1415 corresponding mode line glyph row of the desired matrix of W. */ |
1416 | |
1417 void | |
1418 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1419 struct it *it; | |
1420 struct window *w; | |
1421 int charpos, bytepos; | |
1422 struct glyph_row *row; | |
1423 enum face_id base_face_id; | |
1424 { | |
1425 int highlight_region_p; | |
1426 | |
1427 /* Some precondition checks. */ | |
1428 xassert (w != NULL && it != NULL); | |
1429 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1430 | |
1431 /* If face attributes have been changed since the last redisplay, | |
1432 free realized faces now because they depend on face definitions | |
1433 that might have changed. */ | |
1434 if (face_change_count) | |
1435 { | |
1436 face_change_count = 0; | |
1437 free_all_realized_faces (Qnil); | |
1438 } | |
1439 | |
1440 /* Use one of the mode line rows of W's desired matrix if | |
1441 appropriate. */ | |
1442 if (row == NULL) | |
1443 { | |
1444 if (base_face_id == MODE_LINE_FACE_ID) | |
1445 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1446 else if (base_face_id == HEADER_LINE_FACE_ID) |
1447 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1448 } |
1449 | |
1450 /* Clear IT. */ | |
1451 bzero (it, sizeof *it); | |
1452 it->current.overlay_string_index = -1; | |
1453 it->current.dpvec_index = -1; | |
1454 it->base_face_id = base_face_id; | |
1455 | |
1456 /* The window in which we iterate over current_buffer: */ | |
1457 XSETWINDOW (it->window, w); | |
1458 it->w = w; | |
1459 it->f = XFRAME (w->frame); | |
1460 | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1461 /* 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
|
1462 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
|
1463 && FRAME_WINDOW_P (it->f)) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1464 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1465 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
|
1466 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
|
1467 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
|
1468 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
|
1469 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
1470 |
25012 | 1471 /* If realized faces have been removed, e.g. because of face |
34664
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1472 attribute changes of named faces, recompute them. When running |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1473 in batch mode, the face cache of Vterminal_frame is null. If |
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1474 we happen to get called, make a dummy face cache. */ |
35005
2b83125ab28b
(handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents:
34987
diff
changeset
|
1475 if ( |
2b83125ab28b
(handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents:
34987
diff
changeset
|
1476 #ifndef WINDOWSNT |
2b83125ab28b
(handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents:
34987
diff
changeset
|
1477 noninteractive && |
2b83125ab28b
(handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents:
34987
diff
changeset
|
1478 #endif |
2b83125ab28b
(handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents:
34987
diff
changeset
|
1479 FRAME_FACE_CACHE (it->f) == NULL) |
34664
acdda5d1ff29
(init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
34582
diff
changeset
|
1480 init_frame_faces (it->f); |
25012 | 1481 if (FRAME_FACE_CACHE (it->f)->used == 0) |
1482 recompute_basic_faces (it->f); | |
1483 | |
1484 /* Current value of the `space-width', and 'height' properties. */ | |
1485 it->space_width = Qnil; | |
1486 it->font_height = Qnil; | |
1487 | |
1488 /* Are control characters displayed as `^C'? */ | |
1489 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1490 | |
1491 /* -1 means everything between a CR and the following line end | |
1492 is invisible. >0 means lines indented more than this value are | |
1493 invisible. */ | |
1494 it->selective = (INTEGERP (current_buffer->selective_display) | |
1495 ? XFASTINT (current_buffer->selective_display) | |
1496 : (!NILP (current_buffer->selective_display) | |
1497 ? -1 : 0)); | |
1498 it->selective_display_ellipsis_p | |
1499 = !NILP (current_buffer->selective_display_ellipses); | |
1500 | |
1501 /* Display table to use. */ | |
1502 it->dp = window_display_table (w); | |
1503 | |
1504 /* Are multibyte characters enabled in current_buffer? */ | |
1505 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1506 | |
1507 /* Non-zero if we should highlight the region. */ | |
1508 highlight_region_p | |
1509 = (!NILP (Vtransient_mark_mode) | |
1510 && !NILP (current_buffer->mark_active) | |
1511 && XMARKER (current_buffer->mark)->buffer != 0); | |
1512 | |
1513 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1514 start and end of a visible region in window IT->w. Set both to | |
1515 -1 to indicate no region. */ | |
1516 if (highlight_region_p | |
1517 /* Maybe highlight only in selected window. */ | |
1518 && (/* Either show region everywhere. */ | |
1519 highlight_nonselected_windows | |
1520 /* Or show region in the selected window. */ | |
1521 || w == XWINDOW (selected_window) | |
1522 /* Or show the region if we are in the mini-buffer and W is | |
1523 the window the mini-buffer refers to. */ | |
1524 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1525 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1526 { | |
1527 int charpos = marker_position (current_buffer->mark); | |
1528 it->region_beg_charpos = min (PT, charpos); | |
1529 it->region_end_charpos = max (PT, charpos); | |
1530 } | |
1531 else | |
1532 it->region_beg_charpos = it->region_end_charpos = -1; | |
1533 | |
1534 /* Get the position at which the redisplay_end_trigger hook should | |
1535 be run, if it is to be run at all. */ | |
1536 if (MARKERP (w->redisplay_end_trigger) | |
1537 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1538 it->redisplay_end_trigger_charpos | |
1539 = marker_position (w->redisplay_end_trigger); | |
1540 else if (INTEGERP (w->redisplay_end_trigger)) | |
1541 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1542 | |
1543 /* Correct bogus values of tab_width. */ | |
1544 it->tab_width = XINT (current_buffer->tab_width); | |
1545 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1546 it->tab_width = 8; | |
1547 | |
1548 /* Are lines in the display truncated? */ | |
1549 it->truncate_lines_p | |
1550 = (base_face_id != DEFAULT_FACE_ID | |
1551 || XINT (it->w->hscroll) | |
1552 || (truncate_partial_width_windows | |
1553 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1554 || !NILP (current_buffer->truncate_lines)); | |
1555 | |
1556 /* Get dimensions of truncation and continuation glyphs. These are | |
1557 displayed as bitmaps under X, so we don't need them for such | |
1558 frames. */ | |
1559 if (!FRAME_WINDOW_P (it->f)) | |
1560 { | |
1561 if (it->truncate_lines_p) | |
1562 { | |
1563 /* We will need the truncation glyph. */ | |
1564 xassert (it->glyph_row == NULL); | |
1565 produce_special_glyphs (it, IT_TRUNCATION); | |
1566 it->truncation_pixel_width = it->pixel_width; | |
1567 } | |
1568 else | |
1569 { | |
1570 /* We will need the continuation glyph. */ | |
1571 xassert (it->glyph_row == NULL); | |
1572 produce_special_glyphs (it, IT_CONTINUATION); | |
1573 it->continuation_pixel_width = it->pixel_width; | |
1574 } | |
1575 | |
1576 /* Reset these values to zero becaue the produce_special_glyphs | |
1577 above has changed them. */ | |
1578 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
|
1579 it->phys_ascent = it->phys_descent = 0; |
25012 | 1580 } |
1581 | |
1582 /* Set this after getting the dimensions of truncation and | |
1583 continuation glyphs, so that we don't produce glyphs when calling | |
1584 produce_special_glyphs, above. */ | |
1585 it->glyph_row = row; | |
1586 it->area = TEXT_AREA; | |
1587 | |
1588 /* Get the dimensions of the display area. The display area | |
1589 consists of the visible window area plus a horizontally scrolled | |
1590 part to the left of the window. All x-values are relative to the | |
1591 start of this total display area. */ | |
1592 if (base_face_id != DEFAULT_FACE_ID) | |
1593 { | |
1594 /* Mode lines, menu bar in terminal frames. */ | |
1595 it->first_visible_x = 0; | |
1596 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1597 } | |
1598 else | |
1599 { | |
1600 it->first_visible_x | |
1601 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1602 it->last_visible_x = (it->first_visible_x | |
1603 + window_box_width (w, TEXT_AREA)); | |
1604 | |
1605 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1606 the right margin. Otherwise, leave room for the continuation | |
1607 glyph(s). Truncation and continuation glyphs are not inserted | |
1608 for window-based redisplay. */ | |
1609 if (!FRAME_WINDOW_P (it->f)) | |
1610 { | |
1611 if (it->truncate_lines_p) | |
1612 it->last_visible_x -= it->truncation_pixel_width; | |
1613 else | |
1614 it->last_visible_x -= it->continuation_pixel_width; | |
1615 } | |
1616 | |
25546 | 1617 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1618 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1619 } |
1620 | |
1621 /* Leave room for a border glyph. */ | |
1622 if (!FRAME_WINDOW_P (it->f) | |
1623 && !WINDOW_RIGHTMOST_P (it->w)) | |
1624 it->last_visible_x -= 1; | |
1625 | |
1626 it->last_visible_y = window_text_bottom_y (w); | |
1627 | |
1628 /* For mode lines and alike, arrange for the first glyph having a | |
1629 left box line if the face specifies a box. */ | |
1630 if (base_face_id != DEFAULT_FACE_ID) | |
1631 { | |
1632 struct face *face; | |
1633 | |
1634 it->face_id = base_face_id; | |
1635 | |
1636 /* If we have a boxed mode line, make the first character appear | |
1637 with a left box line. */ | |
1638 face = FACE_FROM_ID (it->f, base_face_id); | |
1639 if (face->box != FACE_NO_BOX) | |
1640 it->start_of_box_run_p = 1; | |
1641 } | |
1642 | |
1643 /* If a buffer position was specified, set the iterator there, | |
1644 getting overlays and face properties from that position. */ | |
1645 if (charpos > 0) | |
1646 { | |
1647 it->end_charpos = ZV; | |
1648 it->face_id = -1; | |
1649 IT_CHARPOS (*it) = charpos; | |
1650 | |
1651 /* Compute byte position if not specified. */ | |
1652 if (bytepos <= 0) | |
1653 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1654 else | |
1655 IT_BYTEPOS (*it) = bytepos; | |
1656 | |
1657 /* Compute faces etc. */ | |
1658 reseat (it, it->current.pos, 1); | |
1659 } | |
1660 | |
1661 CHECK_IT (it); | |
1662 } | |
1663 | |
1664 | |
1665 /* Initialize IT for the display of window W with window start POS. */ | |
1666 | |
1667 void | |
1668 start_display (it, w, pos) | |
1669 struct it *it; | |
1670 struct window *w; | |
1671 struct text_pos pos; | |
1672 { | |
1673 int start_at_line_beg_p; | |
1674 struct glyph_row *row; | |
25546 | 1675 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1676 int first_y; |
1677 | |
1678 row = w->desired_matrix->rows + first_vpos; | |
1679 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1680 first_y = it->current_y; | |
1681 | |
1682 /* If window start is not at a line start, move back to the line | |
1683 start. This makes sure that we take continuation lines into | |
1684 account. */ | |
1685 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1686 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1687 if (!start_at_line_beg_p) | |
1688 reseat_at_previous_visible_line_start (it); | |
1689 | |
1690 /* If window start is not at a line start, skip forward to POS to | |
1691 get the correct continuation_lines_width and current_x. */ | |
1692 if (!start_at_line_beg_p) | |
1693 { | |
1694 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1695 | |
1696 /* If lines are continued, this line may end in the middle of a | |
1697 multi-glyph character (e.g. a control character displayed as | |
1698 \003, or in the middle of an overlay string). In this case | |
1699 move_it_to above will not have taken us to the start of | |
1700 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
|
1701 if (!it->truncate_lines_p) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1702 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1703 if (it->current_x > 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1704 { |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1705 if (it->current.dpvec_index >= 0 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1706 || it->current.overlay_string_index >= 0) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1707 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1708 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
|
1709 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
|
1710 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1711 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1712 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
|
1713 } |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1714 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1715 /* 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
|
1716 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
|
1717 fields in the iterator structure. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
1718 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
|
1719 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 1720 } |
1721 | |
1722 it->current_y = first_y; | |
1723 it->vpos = 0; | |
1724 it->current_x = it->hpos = 0; | |
1725 } | |
1726 | |
1727 #if 0 /* Don't assert the following because start_display is sometimes | |
1728 called intentionally with a window start that is not at a | |
1729 line start. Please leave this code in as a comment. */ | |
1730 | |
1731 /* Window start should be on a line start, now. */ | |
1732 xassert (it->continuation_lines_width | |
1733 || IT_CHARPOS (it) == BEGV | |
1734 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1735 #endif /* 0 */ | |
1736 } | |
1737 | |
1738 | |
1739 /* Initialize IT for stepping through current_buffer in window W, | |
1740 starting at position POS that includes overlay string and display | |
1741 vector/ control character translation position information. */ | |
1742 | |
1743 static void | |
1744 init_from_display_pos (it, w, pos) | |
1745 struct it *it; | |
1746 struct window *w; | |
1747 struct display_pos *pos; | |
1748 { | |
1749 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1750 text, so we might end up at a position different from POS. This | |
1751 is only a problem when POS is a row start after a newline and an | |
1752 overlay starts there with an after-string, and the overlay has an | |
1753 invisible property. Since we don't skip invisible text in | |
1754 display_line and elsewhere immediately after consuming the | |
1755 newline before the row start, such a POS will not be in a string, | |
1756 but the call to init_iterator below will move us to the | |
1757 after-string. */ | |
1758 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1759 NULL, DEFAULT_FACE_ID); | |
1760 | |
1761 /* If position is within an overlay string, set up IT to | |
1762 the right overlay string. */ | |
1763 if (pos->overlay_string_index >= 0) | |
1764 { | |
1765 int relative_index; | |
1766 | |
1767 /* We already have the first chunk of overlay strings in | |
1768 IT->overlay_strings. Load more until the one for | |
1769 pos->overlay_string_index is in IT->overlay_strings. */ | |
1770 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1771 { | |
1772 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1773 it->current.overlay_string_index = 0; | |
1774 while (n--) | |
1775 { | |
1776 load_overlay_strings (it); | |
1777 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1778 } | |
1779 } | |
1780 | |
1781 it->current.overlay_string_index = pos->overlay_string_index; | |
1782 relative_index = (it->current.overlay_string_index | |
1783 % OVERLAY_STRING_CHUNK_SIZE); | |
1784 it->string = it->overlay_strings[relative_index]; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
1785 xassert (STRINGP (it->string)); |
25012 | 1786 it->current.string_pos = pos->string_pos; |
1787 it->method = next_element_from_string; | |
1788 } | |
33863
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1789 else if (it->current.overlay_string_index >= 0) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1790 { |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1791 /* If POS says we're already after an overlay string ending at |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1792 POS, make sure to pop the iterator because it will be in |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1793 front of that overlay string. When POS is ZV, we've thereby |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1794 also ``processed'' overlay strings at ZV. */ |
34851
452349a9192a
(init_from_display_pos): Pop until the iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
34847
diff
changeset
|
1795 while (it->sp) |
452349a9192a
(init_from_display_pos): Pop until the iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
34847
diff
changeset
|
1796 pop_it (it); |
33863
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1797 it->current.overlay_string_index = -1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1798 it->method = next_element_from_buffer; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1799 if (CHARPOS (pos->pos) == ZV) |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1800 it->overlay_strings_at_end_processed_p = 1; |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1801 } |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1802 |
2e449f784ca7
(init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents:
33840
diff
changeset
|
1803 if (CHARPOS (pos->string_pos) >= 0) |
25012 | 1804 { |
1805 /* Recorded position is not in an overlay string, but in another | |
1806 string. This can only be a string from a `display' property. | |
1807 IT should already be filled with that string. */ | |
1808 it->current.string_pos = pos->string_pos; | |
1809 xassert (STRINGP (it->string)); | |
1810 } | |
1811 | |
1812 /* Restore position in display vector translations or control | |
1813 character translations. */ | |
1814 if (pos->dpvec_index >= 0) | |
1815 { | |
1816 /* This fills IT->dpvec. */ | |
1817 get_next_display_element (it); | |
1818 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1819 it->current.dpvec_index = pos->dpvec_index; | |
1820 } | |
1821 | |
1822 CHECK_IT (it); | |
1823 } | |
1824 | |
1825 | |
1826 /* Initialize IT for stepping through current_buffer in window W | |
1827 starting at ROW->start. */ | |
1828 | |
1829 static void | |
1830 init_to_row_start (it, w, row) | |
1831 struct it *it; | |
1832 struct window *w; | |
1833 struct glyph_row *row; | |
1834 { | |
1835 init_from_display_pos (it, w, &row->start); | |
1836 it->continuation_lines_width = row->continuation_lines_width; | |
1837 CHECK_IT (it); | |
1838 } | |
1839 | |
1840 | |
1841 /* Initialize IT for stepping through current_buffer in window W | |
1842 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1843 | |
1844 static void | |
1845 init_to_row_end (it, w, row) | |
1846 struct it *it; | |
1847 struct window *w; | |
1848 struct glyph_row *row; | |
1849 { | |
1850 init_from_display_pos (it, w, &row->end); | |
1851 | |
1852 if (row->continued_p) | |
1853 it->continuation_lines_width = (row->continuation_lines_width | |
1854 + row->pixel_width); | |
1855 CHECK_IT (it); | |
1856 } | |
1857 | |
1858 | |
1859 | |
1860 | |
1861 /*********************************************************************** | |
1862 Text properties | |
1863 ***********************************************************************/ | |
1864 | |
1865 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1866 overlay changes. Set IT->stop_charpos to the next position where | |
1867 to stop. */ | |
1868 | |
1869 static void | |
1870 handle_stop (it) | |
1871 struct it *it; | |
1872 { | |
1873 enum prop_handled handled; | |
1874 int handle_overlay_change_p = 1; | |
1875 struct props *p; | |
1876 | |
1877 it->dpvec = NULL; | |
1878 it->current.dpvec_index = -1; | |
1879 | |
1880 do | |
1881 { | |
1882 handled = HANDLED_NORMALLY; | |
1883 | |
1884 /* Call text property handlers. */ | |
1885 for (p = it_props; p->handler; ++p) | |
1886 { | |
1887 handled = p->handler (it); | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
1888 |
25012 | 1889 if (handled == HANDLED_RECOMPUTE_PROPS) |
1890 break; | |
1891 else if (handled == HANDLED_RETURN) | |
1892 return; | |
1893 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1894 handle_overlay_change_p = 0; | |
1895 } | |
1896 | |
1897 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1898 { | |
1899 /* Don't check for overlay strings below when set to deliver | |
1900 characters from a display vector. */ | |
1901 if (it->method == next_element_from_display_vector) | |
1902 handle_overlay_change_p = 0; | |
1903 | |
1904 /* Handle overlay changes. */ | |
1905 if (handle_overlay_change_p) | |
1906 handled = handle_overlay_change (it); | |
1907 | |
1908 /* Determine where to stop next. */ | |
1909 if (handled == HANDLED_NORMALLY) | |
1910 compute_stop_pos (it); | |
1911 } | |
1912 } | |
1913 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1914 } | |
1915 | |
1916 | |
1917 /* Compute IT->stop_charpos from text property and overlay change | |
1918 information for IT's current position. */ | |
1919 | |
1920 static void | |
1921 compute_stop_pos (it) | |
1922 struct it *it; | |
1923 { | |
1924 register INTERVAL iv, next_iv; | |
1925 Lisp_Object object, limit, position; | |
1926 | |
1927 /* If nowhere else, stop at the end. */ | |
1928 it->stop_charpos = it->end_charpos; | |
1929 | |
1930 if (STRINGP (it->string)) | |
1931 { | |
1932 /* Strings are usually short, so don't limit the search for | |
1933 properties. */ | |
1934 object = it->string; | |
1935 limit = Qnil; | |
1936 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1937 } | |
1938 else | |
1939 { | |
1940 int charpos; | |
1941 | |
1942 /* If next overlay change is in front of the current stop pos | |
1943 (which is IT->end_charpos), stop there. Note: value of | |
1944 next_overlay_change is point-max if no overlay change | |
1945 follows. */ | |
1946 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1947 if (charpos < it->stop_charpos) | |
1948 it->stop_charpos = charpos; | |
1949 | |
1950 /* If showing the region, we have to stop at the region | |
1951 start or end because the face might change there. */ | |
1952 if (it->region_beg_charpos > 0) | |
1953 { | |
1954 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1955 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1956 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1957 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1958 } | |
1959 | |
1960 /* Set up variables for computing the stop position from text | |
1961 property changes. */ | |
1962 XSETBUFFER (object, current_buffer); | |
1963 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1964 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1965 | |
1966 } | |
1967 | |
1968 /* Get the interval containing IT's position. Value is a null | |
1969 interval if there isn't such an interval. */ | |
1970 iv = validate_interval_range (object, &position, &position, 0); | |
1971 if (!NULL_INTERVAL_P (iv)) | |
1972 { | |
1973 Lisp_Object values_here[LAST_PROP_IDX]; | |
1974 struct props *p; | |
1975 | |
1976 /* Get properties here. */ | |
1977 for (p = it_props; p->handler; ++p) | |
1978 values_here[p->idx] = textget (iv->plist, *p->name); | |
1979 | |
1980 /* Look for an interval following iv that has different | |
1981 properties. */ | |
1982 for (next_iv = next_interval (iv); | |
1983 (!NULL_INTERVAL_P (next_iv) | |
1984 && (NILP (limit) | |
1985 || XFASTINT (limit) > next_iv->position)); | |
1986 next_iv = next_interval (next_iv)) | |
1987 { | |
1988 for (p = it_props; p->handler; ++p) | |
1989 { | |
1990 Lisp_Object new_value; | |
1991 | |
1992 new_value = textget (next_iv->plist, *p->name); | |
1993 if (!EQ (values_here[p->idx], new_value)) | |
1994 break; | |
1995 } | |
1996 | |
1997 if (p->handler) | |
1998 break; | |
1999 } | |
2000 | |
2001 if (!NULL_INTERVAL_P (next_iv)) | |
2002 { | |
2003 if (INTEGERP (limit) | |
2004 && next_iv->position >= XFASTINT (limit)) | |
2005 /* No text property change up to limit. */ | |
2006 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
2007 else | |
2008 /* Text properties change in next_iv. */ | |
2009 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
2010 } | |
2011 } | |
2012 | |
2013 xassert (STRINGP (it->string) | |
2014 || (it->stop_charpos >= BEGV | |
2015 && it->stop_charpos >= IT_CHARPOS (*it))); | |
2016 } | |
2017 | |
2018 | |
2019 /* Return the position of the next overlay change after POS in | |
2020 current_buffer. Value is point-max if no overlay change | |
2021 follows. This is like `next-overlay-change' but doesn't use | |
2022 xmalloc. */ | |
2023 | |
2024 static int | |
2025 next_overlay_change (pos) | |
2026 int pos; | |
2027 { | |
2028 int noverlays; | |
2029 int endpos; | |
2030 Lisp_Object *overlays; | |
2031 int len; | |
2032 int i; | |
2033 | |
2034 /* Get all overlays at the given position. */ | |
2035 len = 10; | |
2036 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
|
2037 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 2038 if (noverlays > len) |
2039 { | |
2040 len = noverlays; | |
2041 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
|
2042 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1); |
25012 | 2043 } |
2044 | |
2045 /* If any of these overlays ends before endpos, | |
2046 use its ending point instead. */ | |
2047 for (i = 0; i < noverlays; ++i) | |
2048 { | |
2049 Lisp_Object oend; | |
2050 int oendpos; | |
2051 | |
2052 oend = OVERLAY_END (overlays[i]); | |
2053 oendpos = OVERLAY_POSITION (oend); | |
2054 endpos = min (endpos, oendpos); | |
2055 } | |
2056 | |
2057 return endpos; | |
2058 } | |
2059 | |
2060 | |
2061 | |
2062 /*********************************************************************** | |
2063 Fontification | |
2064 ***********************************************************************/ | |
2065 | |
2066 /* Handle changes in the `fontified' property of the current buffer by | |
2067 calling hook functions from Qfontification_functions to fontify | |
2068 regions of text. */ | |
2069 | |
2070 static enum prop_handled | |
2071 handle_fontified_prop (it) | |
2072 struct it *it; | |
2073 { | |
2074 Lisp_Object prop, pos; | |
2075 enum prop_handled handled = HANDLED_NORMALLY; | |
2076 | |
2077 /* Get the value of the `fontified' property at IT's current buffer | |
2078 position. (The `fontified' property doesn't have a special | |
2079 meaning in strings.) If the value is nil, call functions from | |
2080 Qfontification_functions. */ | |
2081 if (!STRINGP (it->string) | |
2082 && it->s == NULL | |
2083 && !NILP (Vfontification_functions) | |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2084 && !NILP (Vrun_hooks) |
25012 | 2085 && (pos = make_number (IT_CHARPOS (*it)), |
2086 prop = Fget_char_property (pos, Qfontified, Qnil), | |
2087 NILP (prop))) | |
2088 { | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2089 int count = BINDING_STACK_SIZE (); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2090 Lisp_Object val; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2091 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2092 val = Vfontification_functions; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2093 specbind (Qfontification_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2094 specbind (Qafter_change_functions, Qnil); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2095 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2096 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
|
2097 safe_call1 (val, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2098 else |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2099 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2100 Lisp_Object globals, fn; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2101 struct gcpro gcpro1, gcpro2; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2102 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2103 globals = Qnil; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2104 GCPRO2 (val, globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2105 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2106 for (; CONSP (val); val = XCDR (val)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2107 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2108 fn = XCAR (val); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2109 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2110 if (EQ (fn, Qt)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2111 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2112 /* 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
|
2113 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
|
2114 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
|
2115 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
|
2116 loop. */ |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2117 for (globals = Fdefault_value (Qfontification_functions); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2118 CONSP (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2119 globals = XCDR (globals)) |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2120 { |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2121 fn = XCAR (globals); |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2122 if (!EQ (fn, Qt)) |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2123 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2124 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2125 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2126 else |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2127 safe_call1 (fn, pos); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2128 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2129 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2130 UNGCPRO; |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2131 } |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2132 |
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
2133 unbind_to (count, Qnil); |
25012 | 2134 |
2135 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
2136 something. This avoids an endless loop if they failed to | |
2137 fontify the text for which reason ever. */ | |
2138 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
2139 handled = HANDLED_RECOMPUTE_PROPS; | |
2140 } | |
2141 | |
2142 return handled; | |
2143 } | |
2144 | |
2145 | |
2146 | |
2147 /*********************************************************************** | |
2148 Faces | |
2149 ***********************************************************************/ | |
2150 | |
2151 /* Set up iterator IT from face properties at its current position. | |
2152 Called from handle_stop. */ | |
2153 | |
2154 static enum prop_handled | |
2155 handle_face_prop (it) | |
2156 struct it *it; | |
2157 { | |
2158 int new_face_id, next_stop; | |
2159 | |
2160 if (!STRINGP (it->string)) | |
2161 { | |
2162 new_face_id | |
2163 = face_at_buffer_position (it->w, | |
2164 IT_CHARPOS (*it), | |
2165 it->region_beg_charpos, | |
2166 it->region_end_charpos, | |
2167 &next_stop, | |
2168 (IT_CHARPOS (*it) | |
2169 + TEXT_PROP_DISTANCE_LIMIT), | |
2170 0); | |
2171 | |
2172 /* Is this a start of a run of characters with box face? | |
2173 Caveat: this can be called for a freshly initialized | |
2174 iterator; face_id is -1 is this case. We know that the new | |
2175 face will not change until limit, i.e. if the new face has a | |
2176 box, all characters up to limit will have one. But, as | |
2177 usual, we don't know whether limit is really the end. */ | |
2178 if (new_face_id != it->face_id) | |
2179 { | |
2180 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2181 | |
2182 /* If new face has a box but old face has not, this is | |
2183 the start of a run of characters with box, i.e. it has | |
2184 a shadow on the left side. The value of face_id of the | |
2185 iterator will be -1 if this is the initial call that gets | |
2186 the face. In this case, we have to look in front of IT's | |
2187 position and see whether there is a face != new_face_id. */ | |
2188 it->start_of_box_run_p | |
2189 = (new_face->box != FACE_NO_BOX | |
2190 && (it->face_id >= 0 | |
2191 || IT_CHARPOS (*it) == BEG | |
2192 || new_face_id != face_before_it_pos (it))); | |
2193 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2194 } | |
2195 } | |
2196 else | |
2197 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2198 int base_face_id, bufpos; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2199 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2200 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2201 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2202 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2203 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2204 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2205 /* For strings from a buffer, i.e. overlay strings or strings |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2206 from a `display' property, use the face at IT's current |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2207 buffer position as the base face to merge with, so that |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2208 overlay strings appear in the same face as surrounding |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2209 text, unless they specify their own faces. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2210 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2211 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2212 new_face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2213 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2214 IT_STRING_CHARPOS (*it), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2215 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2216 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2217 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2218 &next_stop, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2219 base_face_id); |
25012 | 2220 |
2221 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
2222 /* If IT is used to display a mode line we would really like to | |
2223 use the mode line face instead of the frame's default face. */ | |
2224 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
2225 && new_face_id == DEFAULT_FACE_ID) | |
2226 new_face_id = MODE_LINE_FACE_ID; | |
2227 #endif | |
2228 | |
2229 /* Is this a start of a run of characters with box? Caveat: | |
2230 this can be called for a freshly allocated iterator; face_id | |
2231 is -1 is this case. We know that the new face will not | |
2232 change until the next check pos, i.e. if the new face has a | |
2233 box, all characters up to that position will have a | |
2234 box. But, as usual, we don't know whether that position | |
2235 is really the end. */ | |
2236 if (new_face_id != it->face_id) | |
2237 { | |
2238 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
2239 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
2240 | |
2241 /* If new face has a box but old face hasn't, this is the | |
2242 start of a run of characters with box, i.e. it has a | |
2243 shadow on the left side. */ | |
2244 it->start_of_box_run_p | |
2245 = new_face->box && (old_face == NULL || !old_face->box); | |
2246 it->face_box_p = new_face->box != FACE_NO_BOX; | |
2247 } | |
2248 } | |
2249 | |
2250 it->face_id = new_face_id; | |
2251 return HANDLED_NORMALLY; | |
2252 } | |
2253 | |
2254 | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2255 /* Return the ID of the face ``underlying'' IT's current position, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2256 which is in a string. If the iterator is associated with a |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2257 buffer, return the face at IT's current buffer position. |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2258 Otherwise, use the iterator's base_face_id. */ |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2259 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2260 static int |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2261 underlying_face_id (it) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2262 struct it *it; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2263 { |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2264 int face_id = it->base_face_id, i; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2265 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2266 xassert (STRINGP (it->string)); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2267 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2268 for (i = it->sp - 1; i >= 0; --i) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2269 if (NILP (it->stack[i].string)) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2270 face_id = it->stack[i].face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2271 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2272 return face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2273 } |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2274 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2275 |
25012 | 2276 /* Compute the face one character before or after the current position |
2277 of IT. BEFORE_P non-zero means get the face in front of IT's | |
2278 position. Value is the id of the face. */ | |
2279 | |
2280 static int | |
2281 face_before_or_after_it_pos (it, before_p) | |
2282 struct it *it; | |
2283 int before_p; | |
2284 { | |
2285 int face_id, limit; | |
2286 int next_check_charpos; | |
2287 struct text_pos pos; | |
2288 | |
2289 xassert (it->s == NULL); | |
2290 | |
2291 if (STRINGP (it->string)) | |
2292 { | |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2293 int bufpos, base_face_id; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2294 |
25012 | 2295 /* No face change past the end of the string (for the case |
2296 we are padding with spaces). No face change before the | |
2297 string start. */ | |
2298 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
2299 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
2300 return it->face_id; | |
2301 | |
2302 /* Set pos to the position before or after IT's current position. */ | |
2303 if (before_p) | |
2304 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
2305 else | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2306 /* 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
|
2307 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2308 pos = (it->what == IT_COMPOSITION |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2309 ? 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
|
2310 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string)); |
25012 | 2311 |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2312 if (it->current.overlay_string_index >= 0) |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2313 bufpos = IT_CHARPOS (*it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2314 else |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2315 bufpos = 0; |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2316 |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2317 base_face_id = underlying_face_id (it); |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2318 |
25012 | 2319 /* Get the face for ASCII, or unibyte. */ |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2320 face_id = face_at_string_position (it->w, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2321 it->string, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2322 CHARPOS (pos), |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2323 bufpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2324 it->region_beg_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2325 it->region_end_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2326 &next_check_charpos, |
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2327 base_face_id); |
25012 | 2328 |
2329 /* Correct the face for charsets different from ASCII. Do it | |
2330 for the multibyte case only. The face returned above is | |
2331 suitable for unibyte text if IT->string is unibyte. */ | |
2332 if (STRING_MULTIBYTE (it->string)) | |
2333 { | |
2334 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
2335 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
|
2336 int c, len; |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2337 struct face *face = FACE_FROM_ID (it->f, face_id); |
25012 | 2338 |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
2339 c = string_char_and_length (p, rest, &len); |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2340 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2341 } |
2342 } | |
2343 else | |
2344 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2345 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
|
2346 || (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
|
2347 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
2348 |
25012 | 2349 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
2350 pos = it->current.pos; | |
2351 | |
2352 if (before_p) | |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2353 DEC_TEXT_POS (pos, it->multibyte_p); |
25012 | 2354 else |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2355 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2356 if (it->what == IT_COMPOSITION) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2357 /* 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
|
2358 composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
2359 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
|
2360 else |
28362
a568b23317fe
(face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents:
28228
diff
changeset
|
2361 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
|
2362 } |
34288
28c3e736ae57
(underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34252
diff
changeset
|
2363 |
25012 | 2364 /* Determine face for CHARSET_ASCII, or unibyte. */ |
2365 face_id = face_at_buffer_position (it->w, | |
2366 CHARPOS (pos), | |
2367 it->region_beg_charpos, | |
2368 it->region_end_charpos, | |
2369 &next_check_charpos, | |
2370 limit, 0); | |
2371 | |
2372 /* Correct the face for charsets different from ASCII. Do it | |
2373 for the multibyte case only. The face returned above is | |
2374 suitable for unibyte text if current_buffer is unibyte. */ | |
2375 if (it->multibyte_p) | |
2376 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2377 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos)); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
2378 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
|
2379 face_id = FACE_FOR_CHAR (it->f, face, c); |
25012 | 2380 } |
2381 } | |
2382 | |
2383 return face_id; | |
2384 } | |
2385 | |
2386 | |
2387 | |
2388 /*********************************************************************** | |
2389 Invisible text | |
2390 ***********************************************************************/ | |
2391 | |
2392 /* Set up iterator IT from invisible properties at its current | |
2393 position. Called from handle_stop. */ | |
2394 | |
2395 static enum prop_handled | |
2396 handle_invisible_prop (it) | |
2397 struct it *it; | |
2398 { | |
2399 enum prop_handled handled = HANDLED_NORMALLY; | |
2400 | |
2401 if (STRINGP (it->string)) | |
2402 { | |
2403 extern Lisp_Object Qinvisible; | |
2404 Lisp_Object prop, end_charpos, limit, charpos; | |
2405 | |
2406 /* Get the value of the invisible text property at the | |
2407 current position. Value will be nil if there is no such | |
2408 property. */ | |
2409 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2410 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2411 | |
29191
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2412 if (!NILP (prop) |
3977c8167022
(handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents:
29185
diff
changeset
|
2413 && IT_STRING_CHARPOS (*it) < it->end_charpos) |
25012 | 2414 { |
2415 handled = HANDLED_RECOMPUTE_PROPS; | |
2416 | |
2417 /* Get the position at which the next change of the | |
2418 invisible text property can be found in IT->string. | |
2419 Value will be nil if the property value is the same for | |
2420 all the rest of IT->string. */ | |
2421 XSETINT (limit, XSTRING (it->string)->size); | |
2422 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2423 it->string, limit); | |
2424 | |
2425 /* Text at current position is invisible. The next | |
2426 change in the property is at position end_charpos. | |
2427 Move IT's current position to that position. */ | |
2428 if (INTEGERP (end_charpos) | |
2429 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2430 { | |
2431 struct text_pos old; | |
2432 old = it->current.string_pos; | |
2433 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2434 compute_string_pos (&it->current.string_pos, old, it->string); | |
2435 } | |
2436 else | |
2437 { | |
2438 /* The rest of the string is invisible. If this is an | |
2439 overlay string, proceed with the next overlay string | |
2440 or whatever comes and return a character from there. */ | |
2441 if (it->current.overlay_string_index >= 0) | |
2442 { | |
2443 next_overlay_string (it); | |
2444 /* Don't check for overlay strings when we just | |
2445 finished processing them. */ | |
2446 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2447 } | |
2448 else | |
2449 { | |
2450 struct Lisp_String *s = XSTRING (it->string); | |
2451 IT_STRING_CHARPOS (*it) = s->size; | |
2452 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2453 } | |
2454 } | |
2455 } | |
2456 } | |
2457 else | |
2458 { | |
2459 int visible_p, newpos, next_stop; | |
2460 Lisp_Object pos, prop; | |
2461 | |
2462 /* First of all, is there invisible text at this position? */ | |
2463 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2464 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2465 | |
2466 /* 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
|
2467 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
|
2468 && IT_CHARPOS (*it) < it->end_charpos) |
25012 | 2469 { |
2470 /* Record whether we have to display an ellipsis for the | |
2471 invisible text. */ | |
2472 int display_ellipsis_p | |
2473 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2474 | |
2475 handled = HANDLED_RECOMPUTE_PROPS; | |
2476 | |
2477 /* Loop skipping over invisible text. The loop is left at | |
2478 ZV or with IT on the first char being visible again. */ | |
2479 do | |
2480 { | |
2481 /* Try to skip some invisible text. Return value is the | |
2482 position reached which can be equal to IT's position | |
2483 if there is nothing invisible here. This skips both | |
2484 over invisible text properties and overlays with | |
2485 invisible property. */ | |
2486 newpos = skip_invisible (IT_CHARPOS (*it), | |
2487 &next_stop, ZV, it->window); | |
2488 | |
2489 /* If we skipped nothing at all we weren't at invisible | |
2490 text in the first place. If everything to the end of | |
2491 the buffer was skipped, end the loop. */ | |
2492 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2493 visible_p = 1; | |
2494 else | |
2495 { | |
2496 /* We skipped some characters but not necessarily | |
2497 all there are. Check if we ended up on visible | |
2498 text. Fget_char_property returns the property of | |
2499 the char before the given position, i.e. if we | |
2500 get visible_p = 1, this means that the char at | |
2501 newpos is visible. */ | |
2502 XSETFASTINT (pos, newpos); | |
2503 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2504 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2505 } | |
2506 | |
2507 /* If we ended up on invisible text, proceed to | |
2508 skip starting with next_stop. */ | |
2509 if (!visible_p) | |
2510 IT_CHARPOS (*it) = next_stop; | |
2511 } | |
2512 while (!visible_p); | |
2513 | |
2514 /* The position newpos is now either ZV or on visible text. */ | |
2515 IT_CHARPOS (*it) = newpos; | |
2516 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2517 | |
2518 /* Maybe return `...' next for the end of the invisible text. */ | |
2519 if (display_ellipsis_p) | |
2520 { | |
2521 if (it->dp | |
2522 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2523 { | |
2524 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2525 it->dpvec = v->contents; | |
2526 it->dpend = v->contents + v->size; | |
2527 } | |
2528 else | |
2529 { | |
2530 /* Default `...'. */ | |
2531 it->dpvec = default_invis_vector; | |
2532 it->dpend = default_invis_vector + 3; | |
2533 } | |
2534 | |
2535 /* The ellipsis display does not replace the display of | |
2536 the character at the new position. Indicate this by | |
2537 setting IT->dpvec_char_len to zero. */ | |
2538 it->dpvec_char_len = 0; | |
2539 | |
2540 it->current.dpvec_index = 0; | |
2541 it->method = next_element_from_display_vector; | |
2542 } | |
2543 } | |
2544 } | |
2545 | |
2546 return handled; | |
2547 } | |
2548 | |
2549 | |
277 | 2550 |
25012 | 2551 /*********************************************************************** |
2552 'display' property | |
2553 ***********************************************************************/ | |
2554 | |
2555 /* Set up iterator IT from `display' property at its current position. | |
2556 Called from handle_stop. */ | |
2557 | |
2558 static enum prop_handled | |
2559 handle_display_prop (it) | |
2560 struct it *it; | |
2561 { | |
2562 Lisp_Object prop, object; | |
2563 struct text_pos *position; | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2564 int display_replaced_p = 0; |
25012 | 2565 |
2566 if (STRINGP (it->string)) | |
2567 { | |
2568 object = it->string; | |
2569 position = &it->current.string_pos; | |
2570 } | |
2571 else | |
2572 { | |
2573 object = Qnil; | |
2574 position = &it->current.pos; | |
2575 } | |
2576 | |
2577 /* Reset those iterator values set from display property values. */ | |
2578 it->font_height = Qnil; | |
2579 it->space_width = Qnil; | |
2580 it->voffset = 0; | |
2581 | |
2582 /* We don't support recursive `display' properties, i.e. string | |
2583 values that have a string `display' property, that have a string | |
2584 `display' property etc. */ | |
2585 if (!it->string_from_display_prop_p) | |
2586 it->area = TEXT_AREA; | |
2587 | |
2588 prop = Fget_char_property (make_number (position->charpos), | |
2589 Qdisplay, object); | |
2590 if (NILP (prop)) | |
2591 return HANDLED_NORMALLY; | |
2592 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2593 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2594 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2595 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2596 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2597 /* A list of sub-properties. */ |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2598 for (; CONSP (prop); prop = XCDR (prop)) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2599 { |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2600 if (handle_single_display_prop (it, XCAR (prop), object, |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2601 position, display_replaced_p)) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2602 display_replaced_p = 1; |
25012 | 2603 } |
2604 } | |
2605 else if (VECTORP (prop)) | |
2606 { | |
2607 int i; | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2608 for (i = 0; i < ASIZE (prop); ++i) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2609 if (handle_single_display_prop (it, AREF (prop, i), object, |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2610 position, display_replaced_p)) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2611 display_replaced_p = 1; |
25012 | 2612 } |
2613 else | |
2614 { | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2615 if (handle_single_display_prop (it, prop, object, position, 0)) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2616 display_replaced_p = 1; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2617 } |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2618 |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2619 return display_replaced_p ? HANDLED_RETURN : HANDLED_NORMALLY; |
25012 | 2620 } |
2621 | |
2622 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2623 /* Value is the position of the end of the `display' property starting |
25012 | 2624 at START_POS in OBJECT. */ |
2625 | |
2626 static struct text_pos | |
2627 display_prop_end (it, object, start_pos) | |
2628 struct it *it; | |
2629 Lisp_Object object; | |
2630 struct text_pos start_pos; | |
2631 { | |
2632 Lisp_Object end; | |
2633 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2634 |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
2635 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
|
2636 Qdisplay, object, Qnil); |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2637 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2638 if (STRINGP (object)) |
25012 | 2639 compute_string_pos (&end_pos, start_pos, it->string); |
2640 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2641 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2642 |
2643 return end_pos; | |
2644 } | |
2645 | |
2646 | |
2647 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2648 is the object in which the `display' property was found. *POSITION | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2649 is the position at which it was found. DISPLAY_REPLACED_P non-zero |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2650 means that we previously saw a display sub-property which already |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2651 replaced text display with something else, for example an image; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2652 ignore such properties after the first one has been processed. |
25012 | 2653 |
2654 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2655 end position of the `display' property. | |
2656 | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2657 Value is non-zero something was found which replaces the display |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2658 of buffer or string text. */ |
25012 | 2659 |
2660 static int | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2661 handle_single_display_prop (it, prop, object, position, |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2662 display_replaced_before_p) |
25012 | 2663 struct it *it; |
2664 Lisp_Object prop; | |
2665 Lisp_Object object; | |
2666 struct text_pos *position; | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2667 int display_replaced_before_p; |
25012 | 2668 { |
2669 Lisp_Object value; | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2670 int replaces_text_display_p = 0; |
25012 | 2671 Lisp_Object form; |
2672 | |
25614 | 2673 /* 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
|
2674 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2675 form = Qt; |
25614 | 2676 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2677 { |
2678 prop = XCDR (prop); | |
2679 if (!CONSP (prop)) | |
2680 return 0; | |
2681 form = XCAR (prop); | |
2682 prop = XCDR (prop); | |
2683 } | |
2684 | |
2685 if (!NILP (form) && !EQ (form, Qt)) | |
2686 { | |
2687 struct gcpro gcpro1; | |
2688 struct text_pos end_pos, pt; | |
2689 | |
28869
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2690 GCPRO1 (form); |
25012 | 2691 end_pos = display_prop_end (it, object, *position); |
2692 | |
2693 /* Temporarily set point to the end position, and then evaluate | |
2694 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
|
2695 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2696 { |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2697 CHARPOS (pt) = PT; |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2698 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
|
2699 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
|
2700 } |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2701 |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2702 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
|
2703 |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2704 if (BUFFERP (object)) |
91b54118e73c
(handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents:
28804
diff
changeset
|
2705 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
25012 | 2706 UNGCPRO; |
2707 } | |
2708 | |
2709 if (NILP (form)) | |
2710 return 0; | |
2711 | |
2712 if (CONSP (prop) | |
2713 && EQ (XCAR (prop), Qheight) | |
2714 && CONSP (XCDR (prop))) | |
2715 { | |
35444
753acaaa2840
(handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents:
35412
diff
changeset
|
2716 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
25012 | 2717 return 0; |
2718 | |
2719 /* `(height HEIGHT)'. */ | |
2720 it->font_height = XCAR (XCDR (prop)); | |
2721 if (!NILP (it->font_height)) | |
2722 { | |
2723 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2724 int new_height = -1; | |
2725 | |
2726 if (CONSP (it->font_height) | |
2727 && (EQ (XCAR (it->font_height), Qplus) | |
2728 || EQ (XCAR (it->font_height), Qminus)) | |
2729 && CONSP (XCDR (it->font_height)) | |
2730 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2731 { | |
2732 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2733 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2734 if (EQ (XCAR (it->font_height), Qplus)) | |
2735 steps = - steps; | |
2736 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2737 } | |
30216
394c884dc496
(eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents:
30202
diff
changeset
|
2738 else if (FUNCTIONP (it->font_height)) |
25012 | 2739 { |
2740 /* Call function with current height as argument. | |
2741 Value is the new height. */ | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2742 Lisp_Object height; |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2743 height = safe_call1 (it->font_height, |
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
2744 face->lface[LFACE_HEIGHT_INDEX]); |
25012 | 2745 if (NUMBERP (height)) |
2746 new_height = XFLOATINT (height); | |
2747 } | |
2748 else if (NUMBERP (it->font_height)) | |
2749 { | |
2750 /* Value is a multiple of the canonical char height. */ | |
2751 struct face *face; | |
2752 | |
2753 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2754 new_height = (XFLOATINT (it->font_height) | |
2755 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2756 } | |
2757 else | |
2758 { | |
2759 /* Evaluate IT->font_height with `height' bound to the | |
2760 current specified height to get the new height. */ | |
2761 Lisp_Object value; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
2762 int count = BINDING_STACK_SIZE (); |
25012 | 2763 |
2764 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
|
2765 value = safe_eval (it->font_height); |
25012 | 2766 unbind_to (count, Qnil); |
2767 | |
2768 if (NUMBERP (value)) | |
2769 new_height = XFLOATINT (value); | |
2770 } | |
2771 | |
2772 if (new_height > 0) | |
2773 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2774 } | |
2775 } | |
2776 else if (CONSP (prop) | |
2777 && EQ (XCAR (prop), Qspace_width) | |
2778 && CONSP (XCDR (prop))) | |
2779 { | |
2780 /* `(space_width WIDTH)'. */ | |
35444
753acaaa2840
(handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents:
35412
diff
changeset
|
2781 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
35017
53c3e3f3949b
(try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents:
35005
diff
changeset
|
2782 return 0; |
25012 | 2783 |
2784 value = XCAR (XCDR (prop)); | |
2785 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2786 it->space_width = value; | |
2787 } | |
2788 else if (CONSP (prop) | |
2789 && EQ (XCAR (prop), Qraise) | |
2790 && CONSP (XCDR (prop))) | |
2791 { | |
2792 /* `(raise FACTOR)'. */ | |
35444
753acaaa2840
(handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents:
35412
diff
changeset
|
2793 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
35017
53c3e3f3949b
(try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents:
35005
diff
changeset
|
2794 return 0; |
25012 | 2795 |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2796 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 2797 value = XCAR (XCDR (prop)); |
2798 if (NUMBERP (value)) | |
2799 { | |
2800 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2801 it->voffset = - (XFLOATINT (value) | |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
2802 * (FONT_HEIGHT (face->font))); |
25012 | 2803 } |
2804 #endif /* HAVE_WINDOW_SYSTEM */ | |
2805 } | |
2806 else if (!it->string_from_display_prop_p) | |
2807 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2808 /* `((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
|
2809 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2810 Lisp_Object location, value; |
2811 struct text_pos start_pos; | |
2812 int valid_p; | |
2813 | |
2814 /* Characters having this form of property are not displayed, so | |
2815 we have to find the end of the property. */ | |
2816 start_pos = *position; | |
2817 *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
|
2818 value = Qnil; |
25012 | 2819 |
2820 /* Let's stop at the new position and assume that all | |
2821 text properties change there. */ | |
2822 it->stop_charpos = position->charpos; | |
2823 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2824 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2825 if (CONSP (prop) && CONSP (XCAR (prop))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2826 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2827 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2828 |
25012 | 2829 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2830 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2831 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2832 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2833 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2834 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2835 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2836 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2837 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2838 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2839 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2840 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2841 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2842 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2843 if (EQ (location, Qunbound)) |
25012 | 2844 { |
2845 location = Qnil; | |
2846 value = prop; | |
2847 } | |
2848 | |
2849 #ifdef HAVE_WINDOW_SYSTEM | |
27118
2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents:
27106
diff
changeset
|
2850 if (FRAME_TERMCAP_P (it->f)) |
25012 | 2851 valid_p = STRINGP (value); |
2852 else | |
2853 valid_p = (STRINGP (value) | |
2854 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2855 || valid_image_p (value)); | |
2856 #else /* not HAVE_WINDOW_SYSTEM */ | |
2857 valid_p = STRINGP (value); | |
2858 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2859 | |
2860 if ((EQ (location, Qleft_margin) | |
2861 || EQ (location, Qright_margin) | |
2862 || NILP (location)) | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2863 && valid_p |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2864 && !display_replaced_before_p) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2865 { |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2866 replaces_text_display_p = 1; |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2867 |
25012 | 2868 /* Save current settings of IT so that we can restore them |
2869 when we are finished with the glyph property value. */ | |
2870 push_it (it); | |
2871 | |
2872 if (NILP (location)) | |
2873 it->area = TEXT_AREA; | |
2874 else if (EQ (location, Qleft_margin)) | |
2875 it->area = LEFT_MARGIN_AREA; | |
2876 else | |
2877 it->area = RIGHT_MARGIN_AREA; | |
2878 | |
2879 if (STRINGP (value)) | |
2880 { | |
2881 it->string = value; | |
2882 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2883 it->current.overlay_string_index = -1; | |
2884 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2885 it->end_charpos = it->string_nchars | |
2886 = XSTRING (it->string)->size; | |
2887 it->method = next_element_from_string; | |
2888 it->stop_charpos = 0; | |
2889 it->string_from_display_prop_p = 1; | |
36114
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
2890 /* Say that we haven't consumed the characters with |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
2891 `display' property yet. The call to pop_it in |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
2892 set_iterator_to_next will clean this up. */ |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
2893 *position = start_pos; |
25012 | 2894 } |
2895 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2896 { | |
2897 it->method = next_element_from_stretch; | |
2898 it->object = value; | |
2899 it->current.pos = it->position = start_pos; | |
2900 } | |
2901 #ifdef HAVE_WINDOW_SYSTEM | |
2902 else | |
2903 { | |
2904 it->what = IT_IMAGE; | |
2905 it->image_id = lookup_image (it->f, value); | |
2906 it->position = start_pos; | |
2907 it->object = NILP (object) ? it->w->buffer : object; | |
2908 it->method = next_element_from_image; | |
2909 | |
29185
239420a3c60d
(Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents:
29023
diff
changeset
|
2910 /* Say that we haven't consumed the characters with |
25012 | 2911 `display' property yet. The call to pop_it in |
2912 set_iterator_to_next will clean this up. */ | |
2913 *position = start_pos; | |
2914 } | |
2915 #endif /* HAVE_WINDOW_SYSTEM */ | |
2916 } | |
28804
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2917 else |
ddc6811eb4c8
(handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents:
28754
diff
changeset
|
2918 /* 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
|
2919 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
|
2920 *position = start_pos; |
25012 | 2921 } |
2922 | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2923 return replaces_text_display_p; |
25012 | 2924 } |
2925 | |
2926 | |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2927 /* 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
|
2928 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2929 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2930 static int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2931 single_display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2932 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2933 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2934 /* Skip over `when FORM'. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2935 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2936 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2937 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2938 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2939 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2940 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2941 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2942 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2943 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2944 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2945 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2946 /* 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
|
2947 we don't need to treat text as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2948 if (EQ (XCAR (prop), Qmargin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2949 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2950 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2951 if (!CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2952 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2953 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2954 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2955 if (!CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2956 || EQ (XCAR (prop), Qleft_margin) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2957 || EQ (XCAR (prop), Qright_margin)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2958 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2959 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2960 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2961 return CONSP (prop) && EQ (XCAR (prop), Qimage); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2962 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2963 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2964 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2965 /* 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
|
2966 treated as intangible. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2967 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2968 int |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2969 display_prop_intangible_p (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2970 Lisp_Object prop; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2971 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2972 if (CONSP (prop) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2973 && CONSP (XCAR (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2974 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2975 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2976 /* A list of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2977 while (CONSP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2978 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2979 if (single_display_prop_intangible_p (XCAR (prop))) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2980 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2981 prop = XCDR (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2982 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2983 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2984 else if (VECTORP (prop)) |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2985 { |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2986 /* A vector of sub-properties. */ |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2987 int i; |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2988 for (i = 0; i < ASIZE (prop); ++i) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
2989 if (single_display_prop_intangible_p (AREF (prop, i))) |
29817
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2990 return 1; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2991 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2992 else |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2993 return single_display_prop_intangible_p (prop); |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2994 |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2995 return 0; |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2996 } |
6c3a17ddb763
(single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents:
29748
diff
changeset
|
2997 |
25012 | 2998 |
2999 /*********************************************************************** | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3000 `composition' property |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3001 ***********************************************************************/ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3002 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3003 /* 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
|
3004 position. Called from handle_stop. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3005 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3006 static enum prop_handled |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3007 handle_composition_prop (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3008 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3009 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3010 Lisp_Object prop, string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3011 int pos, pos_byte, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3012 enum prop_handled handled = HANDLED_NORMALLY; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3013 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3014 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3015 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3016 pos = IT_STRING_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3017 pos_byte = IT_STRING_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3018 string = it->string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3019 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3020 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3021 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3022 pos = IT_CHARPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3023 pos_byte = IT_BYTEPOS (*it); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3024 string = Qnil; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3025 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3026 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3027 /* 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
|
3028 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
|
3029 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
|
3030 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
|
3031 && COMPOSITION_VALID_P (pos, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3032 && (STRINGP (it->string) || (PT <= pos || PT >= end))) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3033 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3034 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
|
3035 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3036 if (id >= 0) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3037 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3038 it->method = next_element_from_composition; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3039 it->cmp_id = id; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3040 it->cmp_len = COMPOSITION_LENGTH (prop); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3041 /* 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
|
3042 components. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3043 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
|
3044 it->len = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3045 ? string_char_to_byte (it->string, end) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3046 : CHAR_TO_BYTE (end)) - pos_byte; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3047 it->stop_charpos = end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3048 handled = HANDLED_RETURN; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3049 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3050 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3051 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3052 return handled; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3053 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3054 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3055 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3056 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3057 /*********************************************************************** |
25012 | 3058 Overlay strings |
3059 ***********************************************************************/ | |
3060 | |
3061 /* The following structure is used to record overlay strings for | |
3062 later sorting in load_overlay_strings. */ | |
3063 | |
3064 struct overlay_entry | |
3065 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3066 Lisp_Object overlay; |
25012 | 3067 Lisp_Object string; |
3068 int priority; | |
3069 int after_string_p; | |
3070 }; | |
3071 | |
3072 | |
3073 /* Set up iterator IT from overlay strings at its current position. | |
3074 Called from handle_stop. */ | |
3075 | |
3076 static enum prop_handled | |
3077 handle_overlay_change (it) | |
3078 struct it *it; | |
3079 { | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3080 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
|
3081 return HANDLED_RECOMPUTE_PROPS; |
25012 | 3082 else |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3083 return HANDLED_NORMALLY; |
25012 | 3084 } |
3085 | |
3086 | |
3087 /* Set up the next overlay string for delivery by IT, if there is an | |
3088 overlay string to deliver. Called by set_iterator_to_next when the | |
3089 end of the current overlay string is reached. If there are more | |
3090 overlay strings to display, IT->string and | |
3091 IT->current.overlay_string_index are set appropriately here. | |
3092 Otherwise IT->string is set to nil. */ | |
3093 | |
3094 static void | |
3095 next_overlay_string (it) | |
3096 struct it *it; | |
3097 { | |
3098 ++it->current.overlay_string_index; | |
3099 if (it->current.overlay_string_index == it->n_overlay_strings) | |
3100 { | |
3101 /* No more overlay strings. Restore IT's settings to what | |
3102 they were before overlay strings were processed, and | |
3103 continue to deliver from current_buffer. */ | |
3104 pop_it (it); | |
3105 xassert (it->stop_charpos >= BEGV | |
3106 && it->stop_charpos <= it->end_charpos); | |
3107 it->string = Qnil; | |
3108 it->current.overlay_string_index = -1; | |
3109 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
3110 it->n_overlay_strings = 0; | |
3111 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
|
3112 |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3113 /* 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
|
3114 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
|
3115 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
|
3116 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
|
3117 it->overlay_strings_at_end_processed_p = 1; |
25012 | 3118 } |
3119 else | |
3120 { | |
3121 /* There are more overlay strings to process. If | |
3122 IT->current.overlay_string_index has advanced to a position | |
3123 where we must load IT->overlay_strings with more strings, do | |
3124 it. */ | |
3125 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
3126 | |
3127 if (it->current.overlay_string_index && i == 0) | |
3128 load_overlay_strings (it); | |
3129 | |
3130 /* Initialize IT to deliver display elements from the overlay | |
3131 string. */ | |
3132 it->string = it->overlay_strings[i]; | |
3133 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3134 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
3135 it->method = next_element_from_string; | |
3136 it->stop_charpos = 0; | |
3137 } | |
3138 | |
3139 CHECK_IT (it); | |
3140 } | |
3141 | |
3142 | |
3143 /* Compare two overlay_entry structures E1 and E2. Used as a | |
3144 comparison function for qsort in load_overlay_strings. Overlay | |
3145 strings for the same position are sorted so that | |
3146 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3147 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
|
3148 when they come from the same overlay. |
25012 | 3149 |
3150 2. Within after-strings, strings are sorted so that overlay strings | |
3151 from overlays with higher priorities come first. | |
3152 | |
3153 2. Within before-strings, strings are sorted so that overlay | |
3154 strings from overlays with higher priorities come last. | |
3155 | |
3156 Value is analogous to strcmp. */ | |
3157 | |
3158 | |
3159 static int | |
3160 compare_overlay_entries (e1, e2) | |
3161 void *e1, *e2; | |
3162 { | |
3163 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
3164 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
3165 int result; | |
3166 | |
3167 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
|
3168 { |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3169 /* 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
|
3170 they come from different overlays. */ |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3171 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
|
3172 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
|
3173 else |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3174 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
|
3175 } |
25012 | 3176 else if (entry1->after_string_p) |
3177 /* After-strings sorted in order of decreasing priority. */ | |
3178 result = entry2->priority - entry1->priority; | |
3179 else | |
3180 /* Before-strings sorted in order of increasing priority. */ | |
3181 result = entry1->priority - entry2->priority; | |
3182 | |
3183 return result; | |
3184 } | |
3185 | |
3186 | |
3187 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
3188 current buffer position. Set IT->n_overlays to the total number of | |
3189 overlay strings found. | |
3190 | |
3191 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
3192 a time. On entry into load_overlay_strings, | |
3193 IT->current.overlay_string_index gives the number of overlay | |
3194 strings that have already been loaded by previous calls to this | |
3195 function. | |
3196 | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3197 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
|
3198 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
|
3199 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
|
3200 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
|
3201 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
|
3202 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
|
3203 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
|
3204 in this case. |
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3205 |
25012 | 3206 Overlay strings are sorted so that after-string strings come in |
3207 front of before-string strings. Within before and after-strings, | |
3208 strings are sorted by overlay priority. See also function | |
3209 compare_overlay_entries. */ | |
3210 | |
3211 static void | |
3212 load_overlay_strings (it) | |
3213 struct it *it; | |
3214 { | |
3215 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
|
3216 Lisp_Object ov, overlay, window, str, invisible; |
25012 | 3217 int start, end; |
3218 int size = 20; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3219 int n = 0, i, j, invis_p; |
25012 | 3220 struct overlay_entry *entries |
3221 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3222 int charpos = IT_CHARPOS (*it); |
25012 | 3223 |
3224 /* Append the overlay string STRING of overlay OVERLAY to vector | |
3225 `entries' which has size `size' and currently contains `n' | |
3226 elements. AFTER_P non-zero means STRING is an after-string of | |
3227 OVERLAY. */ | |
3228 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
3229 do \ | |
3230 { \ | |
3231 Lisp_Object priority; \ | |
3232 \ | |
3233 if (n == size) \ | |
3234 { \ | |
3235 int new_size = 2 * size; \ | |
3236 struct overlay_entry *old = entries; \ | |
3237 entries = \ | |
3238 (struct overlay_entry *) alloca (new_size \ | |
3239 * sizeof *entries); \ | |
3240 bcopy (old, entries, size * sizeof *entries); \ | |
3241 size = new_size; \ | |
3242 } \ | |
3243 \ | |
3244 entries[n].string = (STRING); \ | |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3245 entries[n].overlay = (OVERLAY); \ |
25012 | 3246 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
|
3247 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \ |
25012 | 3248 entries[n].after_string_p = (AFTER_P); \ |
3249 ++n; \ | |
3250 } \ | |
3251 while (0) | |
3252 | |
3253 /* 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
|
3254 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
|
3255 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3256 overlay = XCAR (ov); |
25012 | 3257 xassert (OVERLAYP (overlay)); |
3258 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3259 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3260 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3261 if (end < charpos) |
25012 | 3262 break; |
3263 | |
3264 /* Skip this overlay if it doesn't start or end at IT's current | |
3265 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3266 if (end != charpos && start != charpos) |
25012 | 3267 continue; |
3268 | |
3269 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3270 window = Foverlay_get (overlay, Qwindow); | |
3271 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3272 continue; | |
3273 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3274 /* 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
|
3275 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
|
3276 end position are indistinguishable. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3277 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3278 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3279 |
25012 | 3280 /* 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
|
3281 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3282 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3283 && XSTRING (str)->size) | |
3284 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3285 | |
3286 /* 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
|
3287 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3288 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3289 && XSTRING (str)->size) | |
3290 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3291 } | |
3292 | |
3293 /* 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
|
3294 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
|
3295 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
3296 overlay = XCAR (ov); |
25012 | 3297 xassert (OVERLAYP (overlay)); |
3298 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
3299 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
3300 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3301 if (start > charpos) |
25012 | 3302 break; |
3303 | |
3304 /* Skip this overlay if it doesn't start or end at IT's current | |
3305 position. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3306 if (end != charpos && start != charpos) |
25012 | 3307 continue; |
3308 | |
3309 /* Skip this overlay if it doesn't apply to IT->w. */ | |
3310 window = Foverlay_get (overlay, Qwindow); | |
3311 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
3312 continue; | |
3313 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3314 /* 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
|
3315 dimension, and both before- and after-strings apply. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3316 invisible = Foverlay_get (overlay, Qinvisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3317 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3318 |
25012 | 3319 /* 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
|
3320 if ((start == charpos || (end == charpos && invis_p)) |
25012 | 3321 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) |
3322 && XSTRING (str)->size) | |
3323 RECORD_OVERLAY_STRING (overlay, str, 0); | |
3324 | |
3325 /* 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
|
3326 if ((end == charpos || (start == charpos && invis_p)) |
25012 | 3327 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) |
3328 && XSTRING (str)->size) | |
3329 RECORD_OVERLAY_STRING (overlay, str, 1); | |
3330 } | |
3331 | |
3332 #undef RECORD_OVERLAY_STRING | |
3333 | |
3334 /* Sort entries. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3335 if (n > 1) |
29858
54f927c5f436
(handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents:
29817
diff
changeset
|
3336 qsort (entries, n, sizeof *entries, compare_overlay_entries); |
25012 | 3337 |
3338 /* Record the total number of strings to process. */ | |
3339 it->n_overlay_strings = n; | |
3340 | |
3341 /* IT->current.overlay_string_index is the number of overlay strings | |
3342 that have already been consumed by IT. Copy some of the | |
3343 remaining overlay strings to IT->overlay_strings. */ | |
3344 i = 0; | |
3345 j = it->current.overlay_string_index; | |
3346 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
3347 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
|
3348 |
25012 | 3349 CHECK_IT (it); |
3350 } | |
3351 | |
3352 | |
3353 /* Get the first chunk of overlay strings at IT's current buffer | |
3354 position. Value is non-zero if at least one overlay string was | |
3355 found. */ | |
3356 | |
3357 static int | |
3358 get_overlay_strings (it) | |
3359 struct it *it; | |
3360 { | |
3361 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
3362 process. This fills IT->overlay_strings with strings, and sets | |
3363 IT->n_overlay_strings to the total number of strings to process. | |
3364 IT->pos.overlay_string_index has to be set temporarily to zero | |
3365 because load_overlay_strings needs this; it must be set to -1 | |
3366 when no overlay strings are found because a zero value would | |
3367 indicate a position in the first overlay string. */ | |
3368 it->current.overlay_string_index = 0; | |
3369 load_overlay_strings (it); | |
3370 | |
3371 /* If we found overlay strings, set up IT to deliver display | |
3372 elements from the first one. Otherwise set up IT to deliver | |
3373 from current_buffer. */ | |
3374 if (it->n_overlay_strings) | |
3375 { | |
3376 /* Make sure we know settings in current_buffer, so that we can | |
3377 restore meaningful values when we're done with the overlay | |
3378 strings. */ | |
3379 compute_stop_pos (it); | |
3380 xassert (it->face_id >= 0); | |
3381 | |
3382 /* Save IT's settings. They are restored after all overlay | |
3383 strings have been processed. */ | |
3384 xassert (it->sp == 0); | |
3385 push_it (it); | |
3386 | |
3387 /* Set up IT to deliver display elements from the first overlay | |
3388 string. */ | |
3389 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
3390 it->stop_charpos = 0; | |
3391 it->string = it->overlay_strings[0]; | |
3392 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
3393 xassert (STRINGP (it->string)); | |
3394 it->method = next_element_from_string; | |
3395 } | |
3396 else | |
3397 { | |
3398 it->string = Qnil; | |
3399 it->current.overlay_string_index = -1; | |
3400 it->method = next_element_from_buffer; | |
3401 } | |
3402 | |
3403 CHECK_IT (it); | |
3404 | |
3405 /* Value is non-zero if we found at least one overlay string. */ | |
3406 return STRINGP (it->string); | |
3407 } | |
3408 | |
3409 | |
3410 | |
3411 /*********************************************************************** | |
3412 Saving and restoring state | |
3413 ***********************************************************************/ | |
3414 | |
3415 /* Save current settings of IT on IT->stack. Called, for example, | |
3416 before setting up IT for an overlay string, to be able to restore | |
3417 IT's settings to what they were after the overlay string has been | |
3418 processed. */ | |
3419 | |
3420 static void | |
3421 push_it (it) | |
3422 struct it *it; | |
3423 { | |
3424 struct iterator_stack_entry *p; | |
3425 | |
3426 xassert (it->sp < 2); | |
3427 p = it->stack + it->sp; | |
3428 | |
3429 p->stop_charpos = it->stop_charpos; | |
3430 xassert (it->face_id >= 0); | |
3431 p->face_id = it->face_id; | |
3432 p->string = it->string; | |
3433 p->pos = it->current; | |
3434 p->end_charpos = it->end_charpos; | |
3435 p->string_nchars = it->string_nchars; | |
3436 p->area = it->area; | |
3437 p->multibyte_p = it->multibyte_p; | |
3438 p->space_width = it->space_width; | |
3439 p->font_height = it->font_height; | |
3440 p->voffset = it->voffset; | |
3441 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
3442 ++it->sp; | |
3443 } | |
3444 | |
3445 | |
3446 /* Restore IT's settings from IT->stack. Called, for example, when no | |
3447 more overlay strings must be processed, and we return to delivering | |
3448 display elements from a buffer, or when the end of a string from a | |
3449 `display' property is reached and we return to delivering display | |
3450 elements from an overlay string, or from a buffer. */ | |
3451 | |
3452 static void | |
3453 pop_it (it) | |
3454 struct it *it; | |
3455 { | |
3456 struct iterator_stack_entry *p; | |
3457 | |
3458 xassert (it->sp > 0); | |
3459 --it->sp; | |
3460 p = it->stack + it->sp; | |
3461 it->stop_charpos = p->stop_charpos; | |
3462 it->face_id = p->face_id; | |
3463 it->string = p->string; | |
3464 it->current = p->pos; | |
3465 it->end_charpos = p->end_charpos; | |
3466 it->string_nchars = p->string_nchars; | |
3467 it->area = p->area; | |
3468 it->multibyte_p = p->multibyte_p; | |
3469 it->space_width = p->space_width; | |
3470 it->font_height = p->font_height; | |
3471 it->voffset = p->voffset; | |
3472 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
3473 } | |
3474 | |
3475 | |
3476 | |
3477 /*********************************************************************** | |
3478 Moving over lines | |
3479 ***********************************************************************/ | |
3480 | |
3481 /* Set IT's current position to the previous line start. */ | |
3482 | |
3483 static void | |
3484 back_to_previous_line_start (it) | |
3485 struct it *it; | |
3486 { | |
3487 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
3488 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
3489 } | |
3490 | |
3491 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3492 /* Move IT to the next line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3493 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3494 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
|
3495 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
|
3496 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
|
3497 of *SKIPPED_P. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3498 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3499 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
|
3500 displayed via the `display' property. That's the reason we can't |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3501 simply use find_next_newline_no_quit. |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3502 |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3503 Note that this function may not skip over invisible text that is so |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3504 because of text properties and immediately follows a newline. If |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3505 it would, function reseat_at_next_visible_line_start, when called |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3506 from set_iterator_to_next, would effectively make invisible |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3507 characters following a newline part of the wrong glyph row, which |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3508 leads to wrong cursor motion. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3509 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3510 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3511 forward_to_next_line_start (it, skipped_p) |
25012 | 3512 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3513 int *skipped_p; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3514 { |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3515 int old_selective, newline_found_p, n; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3516 const int MAX_NEWLINE_DISTANCE = 500; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3517 |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3518 /* If already on a newline, just consume it to avoid unintended |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3519 skipping over invisible text below. */ |
36290
ce84015c0c41
(forward_to_next_line_start): When taking the shortcut
Gerd Moellmann <gerd@gnu.org>
parents:
36285
diff
changeset
|
3520 if (it->what == IT_CHARACTER |
ce84015c0c41
(forward_to_next_line_start): When taking the shortcut
Gerd Moellmann <gerd@gnu.org>
parents:
36285
diff
changeset
|
3521 && it->c == '\n' |
ce84015c0c41
(forward_to_next_line_start): When taking the shortcut
Gerd Moellmann <gerd@gnu.org>
parents:
36285
diff
changeset
|
3522 && CHARPOS (it->position) == IT_CHARPOS (*it)) |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3523 { |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3524 set_iterator_to_next (it, 0); |
35029
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3525 it->c = 0; |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3526 return 1; |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3527 } |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3528 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3529 /* Don't handle selective display in the following. It's (a) |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3530 unnecessary because it's done by the caller, and (b) leads to an |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3531 infinite recursion because next_element_from_ellipsis indirectly |
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
3532 calls this function. */ |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3533 old_selective = it->selective; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3534 it->selective = 0; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3535 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3536 /* 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
|
3537 from buffer text. */ |
35379
4bdad7b6d6dc
(forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents:
35361
diff
changeset
|
3538 for (n = newline_found_p = 0; |
4bdad7b6d6dc
(forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents:
35361
diff
changeset
|
3539 !newline_found_p && n < MAX_NEWLINE_DISTANCE; |
4bdad7b6d6dc
(forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents:
35361
diff
changeset
|
3540 n += STRINGP (it->string) ? 0 : 1) |
4bdad7b6d6dc
(forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents:
35361
diff
changeset
|
3541 { |
35389
6fa1f816cb97
(forward_to_next_line_start): Stop at end of buffer
Gerd Moellmann <gerd@gnu.org>
parents:
35388
diff
changeset
|
3542 if (!get_next_display_element (it)) |
6fa1f816cb97
(forward_to_next_line_start): Stop at end of buffer
Gerd Moellmann <gerd@gnu.org>
parents:
35388
diff
changeset
|
3543 break; |
33950
a036721cfe80
(forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents:
33916
diff
changeset
|
3544 newline_found_p = it->what == IT_CHARACTER && it->c == '\n'; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3545 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3546 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3547 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3548 /* 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
|
3549 short-cut. */ |
35379
4bdad7b6d6dc
(forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents:
35361
diff
changeset
|
3550 if (n == MAX_NEWLINE_DISTANCE) |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3551 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3552 int start = IT_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3553 int limit = find_next_newline_no_quit (start, 1); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3554 Lisp_Object pos; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3555 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3556 xassert (!STRINGP (it->string)); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3557 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3558 /* 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
|
3559 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
|
3560 buffer text. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3561 if (it->stop_charpos >= limit |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3562 || ((pos = Fnext_single_property_change (make_number (start), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3563 Qdisplay, |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3564 Qnil, make_number (limit)), |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3565 NILP (pos)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3566 && next_overlay_change (start) == ZV)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3567 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3568 IT_CHARPOS (*it) = limit; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3569 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3570 *skipped_p = newline_found_p = 1; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3571 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3572 else |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3573 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3574 while (get_next_display_element (it) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3575 && !newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3576 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3577 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
|
3578 set_iterator_to_next (it, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3579 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3580 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3581 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3582 |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
3583 it->selective = old_selective; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3584 return newline_found_p; |
25012 | 3585 } |
3586 | |
3587 | |
3588 /* Set IT's current position to the previous visible line start. Skip | |
3589 invisible text that is so either due to text properties or due to | |
3590 selective display. Caution: this does not change IT->current_x and | |
3591 IT->hpos. */ | |
3592 | |
3593 static void | |
3594 back_to_previous_visible_line_start (it) | |
3595 struct it *it; | |
3596 { | |
3597 int visible_p = 0; | |
3598 | |
3599 /* Go back one newline if not on BEGV already. */ | |
3600 if (IT_CHARPOS (*it) > BEGV) | |
3601 back_to_previous_line_start (it); | |
3602 | |
3603 /* Move over lines that are invisible because of selective display | |
3604 or text properties. */ | |
3605 while (IT_CHARPOS (*it) > BEGV | |
3606 && !visible_p) | |
3607 { | |
3608 visible_p = 1; | |
3609 | |
3610 /* If selective > 0, then lines indented more than that values | |
3611 are invisible. */ | |
3612 if (it->selective > 0 | |
3613 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3614 it->selective)) | |
3615 visible_p = 0; | |
3616 else | |
3617 { | |
3618 Lisp_Object prop; | |
3619 | |
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
|
3620 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
|
3621 Qinvisible, it->window); |
25012 | 3622 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
3623 visible_p = 0; | |
3624 } | |
3625 | |
3626 /* Back one more newline if the current one is invisible. */ | |
3627 if (!visible_p) | |
3628 back_to_previous_line_start (it); | |
3629 } | |
3630 | |
3631 xassert (IT_CHARPOS (*it) >= BEGV); | |
3632 xassert (IT_CHARPOS (*it) == BEGV | |
3633 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3634 CHECK_IT (it); | |
3635 } | |
3636 | |
3637 | |
3638 /* Reseat iterator IT at the previous visible line start. Skip | |
3639 invisible text that is so either due to text properties or due to | |
3640 selective display. At the end, update IT's overlay information, | |
3641 face information etc. */ | |
3642 | |
3643 static void | |
3644 reseat_at_previous_visible_line_start (it) | |
3645 struct it *it; | |
3646 { | |
3647 back_to_previous_visible_line_start (it); | |
3648 reseat (it, it->current.pos, 1); | |
3649 CHECK_IT (it); | |
3650 } | |
3651 | |
3652 | |
3653 /* 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
|
3654 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
|
3655 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
|
3656 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
|
3657 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
|
3658 is invisible because of text properties. */ |
25012 | 3659 |
3660 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3661 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3662 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3663 int on_newline_p; |
25012 | 3664 { |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3665 int newline_found_p, skipped_p = 0; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3666 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3667 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
|
3668 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3669 /* 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
|
3670 more than the value of IT->selective. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3671 if (it->selective > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3672 while (IT_CHARPOS (*it) < ZV |
35029
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3673 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3674 it->selective)) |
35029
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3675 { |
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3676 xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); |
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3677 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
e02de3bdd349
(forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents:
35023
diff
changeset
|
3678 } |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3679 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3680 /* 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
|
3681 if (on_newline_p && newline_found_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3682 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3683 if (STRINGP (it->string)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3684 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3685 if (IT_STRING_CHARPOS (*it) > 0) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3686 { |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3687 --IT_STRING_CHARPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3688 --IT_STRING_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3689 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3690 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3691 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
|
3692 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3693 --IT_CHARPOS (*it); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3694 --IT_BYTEPOS (*it); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3695 reseat (it, it->current.pos, 0); |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3696 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3697 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3698 else if (skipped_p) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
3699 reseat (it, it->current.pos, 0); |
25012 | 3700 |
3701 CHECK_IT (it); | |
3702 } | |
3703 | |
3704 | |
3705 | |
3706 /*********************************************************************** | |
3707 Changing an iterator's position | |
3708 ***********************************************************************/ | |
3709 | |
3710 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3711 is non-zero, always check for text properties at the new position. | |
3712 Otherwise, text properties are only looked up if POS >= | |
3713 IT->check_charpos of a property. */ | |
3714 | |
3715 static void | |
3716 reseat (it, pos, force_p) | |
3717 struct it *it; | |
3718 struct text_pos pos; | |
3719 int force_p; | |
3720 { | |
3721 int original_pos = IT_CHARPOS (*it); | |
3722 | |
3723 reseat_1 (it, pos, 0); | |
3724 | |
3725 /* Determine where to check text properties. Avoid doing it | |
3726 where possible because text property lookup is very expensive. */ | |
3727 if (force_p | |
3728 || CHARPOS (pos) > it->stop_charpos | |
3729 || CHARPOS (pos) < original_pos) | |
3730 handle_stop (it); | |
3731 | |
3732 CHECK_IT (it); | |
3733 } | |
3734 | |
3735 | |
3736 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3737 IT->stop_pos to POS, also. */ | |
3738 | |
3739 static void | |
3740 reseat_1 (it, pos, set_stop_p) | |
3741 struct it *it; | |
3742 struct text_pos pos; | |
3743 int set_stop_p; | |
3744 { | |
3745 /* Don't call this function when scanning a C string. */ | |
3746 xassert (it->s == NULL); | |
3747 | |
3748 /* POS must be a reasonable value. */ | |
3749 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3750 | |
3751 it->current.pos = it->position = pos; | |
3752 XSETBUFFER (it->object, current_buffer); | |
36078
ce9ce37af2cb
(reseat_1): Set iterator's end_charpos to ZV.
Gerd Moellmann <gerd@gnu.org>
parents:
35893
diff
changeset
|
3753 it->end_charpos = ZV; |
25012 | 3754 it->dpvec = NULL; |
3755 it->current.dpvec_index = -1; | |
3756 it->current.overlay_string_index = -1; | |
3757 IT_STRING_CHARPOS (*it) = -1; | |
3758 IT_STRING_BYTEPOS (*it) = -1; | |
3759 it->string = Qnil; | |
3760 it->method = next_element_from_buffer; | |
3761 it->sp = 0; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
3762 it->face_before_selective_p = 0; |
25012 | 3763 |
3764 if (set_stop_p) | |
3765 it->stop_charpos = CHARPOS (pos); | |
3766 } | |
3767 | |
3768 | |
3769 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3770 If S is non-null, it is a C string to iterate over. Otherwise, | |
3771 STRING gives a Lisp string to iterate over. | |
3772 | |
3773 If PRECISION > 0, don't return more then PRECISION number of | |
3774 characters from the string. | |
3775 | |
3776 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3777 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3778 field width. | |
3779 | |
3780 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3781 MULTIBYTE > 0 means enable it, | |
3782 MULTIBYTE < 0 means use IT->multibyte_p. | |
3783 | |
3784 IT must be initialized via a prior call to init_iterator before | |
3785 calling this function. */ | |
3786 | |
3787 static void | |
3788 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3789 struct it *it; | |
3790 unsigned char *s; | |
3791 Lisp_Object string; | |
3792 int charpos; | |
3793 int precision, field_width, multibyte; | |
3794 { | |
3795 /* No region in strings. */ | |
3796 it->region_beg_charpos = it->region_end_charpos = -1; | |
3797 | |
3798 /* No text property checks performed by default, but see below. */ | |
3799 it->stop_charpos = -1; | |
3800 | |
3801 /* Set iterator position and end position. */ | |
3802 bzero (&it->current, sizeof it->current); | |
3803 it->current.overlay_string_index = -1; | |
3804 it->current.dpvec_index = -1; | |
3805 xassert (charpos >= 0); | |
3806 | |
3807 /* Use the setting of MULTIBYTE if specified. */ | |
3808 if (multibyte >= 0) | |
3809 it->multibyte_p = multibyte > 0; | |
3810 | |
3811 if (s == NULL) | |
3812 { | |
3813 xassert (STRINGP (string)); | |
3814 it->string = string; | |
3815 it->s = NULL; | |
3816 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3817 it->method = next_element_from_string; | |
3818 it->current.string_pos = string_pos (charpos, string); | |
3819 } | |
3820 else | |
3821 { | |
3822 it->s = s; | |
3823 it->string = Qnil; | |
3824 | |
3825 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3826 for displaying C strings. */ | |
3827 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3828 if (it->multibyte_p) | |
3829 { | |
3830 it->current.pos = c_string_pos (charpos, s, 1); | |
3831 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3832 } | |
3833 else | |
3834 { | |
3835 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3836 it->end_charpos = it->string_nchars = strlen (s); | |
3837 } | |
3838 | |
3839 it->method = next_element_from_c_string; | |
3840 } | |
3841 | |
3842 /* PRECISION > 0 means don't return more than PRECISION characters | |
3843 from the string. */ | |
3844 if (precision > 0 && it->end_charpos - charpos > precision) | |
3845 it->end_charpos = it->string_nchars = charpos + precision; | |
3846 | |
3847 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3848 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3849 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3850 padding with `-' at the end of a mode line. */ | |
3851 if (field_width < 0) | |
3852 field_width = INFINITY; | |
3853 if (field_width > it->end_charpos - charpos) | |
3854 it->end_charpos = charpos + field_width; | |
3855 | |
3856 /* Use the standard display table for displaying strings. */ | |
3857 if (DISP_TABLE_P (Vstandard_display_table)) | |
3858 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3859 | |
3860 it->stop_charpos = charpos; | |
3861 CHECK_IT (it); | |
3862 } | |
3863 | |
3864 | |
3865 | |
3866 /*********************************************************************** | |
3867 Iteration | |
3868 ***********************************************************************/ | |
3869 | |
3870 /* Load IT's display element fields with information about the next | |
3871 display element from the current position of IT. Value is zero if | |
3872 end of buffer (or C string) is reached. */ | |
3873 | |
3874 int | |
3875 get_next_display_element (it) | |
3876 struct it *it; | |
3877 { | |
3878 /* Non-zero means that we found an display element. Zero means that | |
3879 we hit the end of what we iterate over. Performance note: the | |
3880 function pointer `method' used here turns out to be faster than | |
3881 using a sequence of if-statements. */ | |
3882 int success_p = (*it->method) (it); | |
3883 | |
3884 if (it->what == IT_CHARACTER) | |
3885 { | |
3886 /* Map via display table or translate control characters. | |
3887 IT->c, IT->len etc. have been set to the next character by | |
3888 the function call above. If we have a display table, and it | |
3889 contains an entry for IT->c, translate it. Don't do this if | |
3890 IT->c itself comes from a display table, otherwise we could | |
3891 end up in an infinite recursion. (An alternative could be to | |
3892 count the recursion depth of this function and signal an | |
3893 error when a certain maximum depth is reached.) Is it worth | |
3894 it? */ | |
3895 if (success_p && it->dpvec == NULL) | |
3896 { | |
3897 Lisp_Object dv; | |
3898 | |
3899 if (it->dp | |
3900 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3901 VECTORP (dv))) | |
3902 { | |
3903 struct Lisp_Vector *v = XVECTOR (dv); | |
3904 | |
3905 /* Return the first character from the display table | |
3906 entry, if not empty. If empty, don't display the | |
3907 current character. */ | |
3908 if (v->size) | |
3909 { | |
3910 it->dpvec_char_len = it->len; | |
3911 it->dpvec = v->contents; | |
3912 it->dpend = v->contents + v->size; | |
3913 it->current.dpvec_index = 0; | |
3914 it->method = next_element_from_display_vector; | |
35848
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3915 success_p = get_next_display_element (it); |
25012 | 3916 } |
35848
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3917 else |
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3918 { |
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3919 set_iterator_to_next (it, 0); |
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3920 success_p = get_next_display_element (it); |
9ed4465d634c
(get_next_display_element): Fix case of empty
Gerd Moellmann <gerd@gnu.org>
parents:
35734
diff
changeset
|
3921 } |
25012 | 3922 } |
3923 | |
3924 /* Translate control characters into `\003' or `^C' form. | |
3925 Control characters coming from a display table entry are | |
3926 currently not translated because we use IT->dpvec to hold | |
3927 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
|
3928 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
|
3929 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3930 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3931 octal form. */ |
25012 | 3932 else if ((it->c < ' ' |
3933 && (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
|
3934 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3935 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3936 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3937 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3938 { |
3939 /* IT->c is a control character which must be displayed | |
3940 either as '\003' or as `^C' where the '\\' and '^' | |
3941 can be defined in the display table. Fill | |
3942 IT->ctl_chars with glyphs for what we have to | |
3943 display. Then, set IT->dpvec to these glyphs. */ | |
3944 GLYPH g; | |
3945 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3946 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3947 { |
3948 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3949 if (it->dp | |
3950 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3951 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3952 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3953 else | |
3954 g = FAST_MAKE_GLYPH ('^', 0); | |
3955 XSETINT (it->ctl_chars[0], g); | |
3956 | |
3957 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3958 XSETINT (it->ctl_chars[1], g); | |
3959 | |
3960 /* Set up IT->dpvec and return first character from it. */ | |
3961 it->dpvec_char_len = it->len; | |
3962 it->dpvec = it->ctl_chars; | |
3963 it->dpend = it->dpvec + 2; | |
3964 it->current.dpvec_index = 0; | |
3965 it->method = next_element_from_display_vector; | |
3966 get_next_display_element (it); | |
3967 } | |
3968 else | |
3969 { | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
3970 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
|
3971 int len; |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3972 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3973 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3974 |
25012 | 3975 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3976 if (it->dp | |
3977 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3978 && 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
|
3979 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3980 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3981 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3982 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3983 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
|
3984 str[0] = it->c, len = 1; |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3985 else |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3986 len = CHAR_STRING (it->c, str); |
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
3987 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3988 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3989 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3990 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
|
3991 /* 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
|
3992 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3993 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
|
3994 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
|
3995 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
|
3996 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
|
3997 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
|
3998 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
|
3999 } |
25012 | 4000 |
4001 /* Set up IT->dpvec and return the first character | |
4002 from it. */ | |
4003 it->dpvec_char_len = it->len; | |
4004 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
4005 it->dpend = it->dpvec + len * 4; |
25012 | 4006 it->current.dpvec_index = 0; |
4007 it->method = next_element_from_display_vector; | |
4008 get_next_display_element (it); | |
4009 } | |
4010 } | |
4011 } | |
4012 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4013 /* 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
|
4014 multibyte character in unibyte text. */ |
25012 | 4015 if (it->multibyte_p |
4016 && success_p | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4017 && FRAME_WINDOW_P (it->f)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4018 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4019 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
|
4020 it->face_id = FACE_FOR_CHAR (it->f, face, it->c); |
25012 | 4021 } |
4022 } | |
4023 | |
4024 /* Is this character the last one of a run of characters with | |
4025 box? If yes, set IT->end_of_box_run_p to 1. */ | |
4026 if (it->face_box_p | |
4027 && it->s == NULL) | |
4028 { | |
4029 int face_id; | |
4030 struct face *face; | |
4031 | |
4032 it->end_of_box_run_p | |
4033 = ((face_id = face_after_it_pos (it), | |
4034 face_id != it->face_id) | |
4035 && (face = FACE_FROM_ID (it->f, face_id), | |
4036 face->box == FACE_NO_BOX)); | |
4037 } | |
4038 | |
4039 /* Value is 0 if end of buffer or string reached. */ | |
4040 return success_p; | |
4041 } | |
4042 | |
4043 | |
4044 /* Move IT to the next display element. | |
4045 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4046 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
|
4047 skip to the next visible line start. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4048 |
25012 | 4049 Functions get_next_display_element and set_iterator_to_next are |
4050 separate because I find this arrangement easier to handle than a | |
4051 get_next_display_element function that also increments IT's | |
4052 position. The way it is we can first look at an iterator's current | |
4053 display element, decide whether it fits on a line, and if it does, | |
4054 increment the iterator position. The other way around we probably | |
4055 would either need a flag indicating whether the iterator has to be | |
4056 incremented the next time, or we would have to implement a | |
4057 decrement position function which would not be easy to write. */ | |
4058 | |
4059 void | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4060 set_iterator_to_next (it, reseat_p) |
25012 | 4061 struct it *it; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4062 int reseat_p; |
25012 | 4063 { |
32553
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4064 /* Reset flags indicating start and end of a sequence of characters |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4065 with box. Reset them at the start of this function because |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4066 moving the iterator to a new position might set them. */ |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4067 it->start_of_box_run_p = it->end_of_box_run_p = 0; |
2bd19f54cd7a
(set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents:
32539
diff
changeset
|
4068 |
25012 | 4069 if (it->method == next_element_from_buffer) |
4070 { | |
4071 /* The current display element of IT is a character from | |
4072 current_buffer. Advance in the buffer, and maybe skip over | |
4073 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
|
4074 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
|
4075 reseat_at_next_visible_line_start (it, 0); |
25012 | 4076 else |
4077 { | |
4078 xassert (it->len != 0); | |
4079 IT_BYTEPOS (*it) += it->len; | |
4080 IT_CHARPOS (*it) += 1; | |
4081 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
4082 } | |
4083 } | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4084 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
|
4085 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4086 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
|
4087 if (STRINGP (it->string)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4088 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4089 IT_STRING_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4090 IT_STRING_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4091 it->method = next_element_from_string; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4092 goto consider_string_end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4093 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4094 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4095 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4096 IT_BYTEPOS (*it) += it->len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4097 IT_CHARPOS (*it) += it->cmp_len; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4098 it->method = next_element_from_buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4099 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4100 } |
25012 | 4101 else if (it->method == next_element_from_c_string) |
4102 { | |
4103 /* Current display element of IT is from a C string. */ | |
4104 IT_BYTEPOS (*it) += it->len; | |
4105 IT_CHARPOS (*it) += 1; | |
4106 } | |
4107 else if (it->method == next_element_from_display_vector) | |
4108 { | |
4109 /* Current display element of IT is from a display table entry. | |
4110 Advance in the display table definition. Reset it to null if | |
4111 end reached, and continue with characters from buffers/ | |
4112 strings. */ | |
4113 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
4114 |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
4115 /* 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
|
4116 display vector entry (these entries may contain faces). */ |
25012 | 4117 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
|
4118 |
25012 | 4119 if (it->dpvec + it->current.dpvec_index == it->dpend) |
4120 { | |
4121 if (it->s) | |
4122 it->method = next_element_from_c_string; | |
4123 else if (STRINGP (it->string)) | |
4124 it->method = next_element_from_string; | |
4125 else | |
4126 it->method = next_element_from_buffer; | |
4127 | |
4128 it->dpvec = NULL; | |
4129 it->current.dpvec_index = -1; | |
4130 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4131 /* 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
|
4132 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
|
4133 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
|
4134 else if (it->dpvec_char_len > 0) |
25012 | 4135 { |
4136 it->len = it->dpvec_char_len; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4137 set_iterator_to_next (it, reseat_p); |
25012 | 4138 } |
4139 } | |
4140 } | |
4141 else if (it->method == next_element_from_string) | |
4142 { | |
4143 /* Current display element is a character from a Lisp string. */ | |
4144 xassert (it->s == NULL && STRINGP (it->string)); | |
4145 IT_STRING_BYTEPOS (*it) += it->len; | |
4146 IT_STRING_CHARPOS (*it) += 1; | |
4147 | |
4148 consider_string_end: | |
4149 | |
4150 if (it->current.overlay_string_index >= 0) | |
4151 { | |
4152 /* IT->string is an overlay string. Advance to the | |
4153 next, if there is one. */ | |
4154 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4155 next_overlay_string (it); | |
4156 } | |
4157 else | |
4158 { | |
4159 /* IT->string is not an overlay string. If we reached | |
4160 its end, and there is something on IT->stack, proceed | |
4161 with what is on the stack. This can be either another | |
4162 string, this time an overlay string, or a buffer. */ | |
4163 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
4164 && it->sp > 0) | |
4165 { | |
4166 pop_it (it); | |
4167 if (!STRINGP (it->string)) | |
4168 it->method = next_element_from_buffer; | |
4169 } | |
4170 } | |
4171 } | |
4172 else if (it->method == next_element_from_image | |
4173 || it->method == next_element_from_stretch) | |
4174 { | |
4175 /* The position etc with which we have to proceed are on | |
4176 the stack. The position may be at the end of a string, | |
4177 if the `display' property takes up the whole string. */ | |
4178 pop_it (it); | |
4179 it->image_id = 0; | |
4180 if (STRINGP (it->string)) | |
4181 { | |
4182 it->method = next_element_from_string; | |
4183 goto consider_string_end; | |
4184 } | |
4185 else | |
4186 it->method = next_element_from_buffer; | |
4187 } | |
4188 else | |
4189 /* There are no other methods defined, so this should be a bug. */ | |
4190 abort (); | |
4191 | |
4192 xassert (it->method != next_element_from_string | |
4193 || (STRINGP (it->string) | |
4194 && IT_STRING_CHARPOS (*it) >= 0)); | |
4195 } | |
4196 | |
4197 | |
4198 /* Load IT's display element fields with information about the next | |
4199 display element which comes from a display table entry or from the | |
4200 result of translating a control character to one of the forms `^C' | |
4201 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
4202 | |
4203 static int | |
4204 next_element_from_display_vector (it) | |
4205 struct it *it; | |
4206 { | |
4207 /* Precondition. */ | |
4208 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
4209 | |
4210 /* Remember the current face id in case glyphs specify faces. | |
4211 IT's face is restored in set_iterator_to_next. */ | |
4212 it->saved_face_id = it->face_id; | |
4213 | |
4214 if (INTEGERP (*it->dpvec) | |
4215 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
4216 { | |
4217 int lface_id; | |
4218 GLYPH g; | |
4219 | |
4220 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
4221 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
|
4222 it->len = CHAR_BYTES (it->c); |
25012 | 4223 |
4224 /* The entry may contain a face id to use. Such a face id is | |
4225 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
|
4226 zero means no face is specified. */ |
25012 | 4227 lface_id = FAST_GLYPH_FACE (g); |
4228 if (lface_id) | |
4229 { | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4230 /* The function returns -1 if lface_id is invalid. */ |
25012 | 4231 int face_id = ascii_face_of_lisp_face (it->f, lface_id); |
4232 if (face_id >= 0) | |
30448
92e758e908a2
(next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents:
30413
diff
changeset
|
4233 it->face_id = face_id; |
25012 | 4234 } |
4235 } | |
4236 else | |
4237 /* Display table entry is invalid. Return a space. */ | |
4238 it->c = ' ', it->len = 1; | |
4239 | |
4240 /* Don't change position and object of the iterator here. They are | |
4241 still the values of the character that had this display table | |
4242 entry or was translated, and that's what we want. */ | |
4243 it->what = IT_CHARACTER; | |
4244 return 1; | |
4245 } | |
4246 | |
4247 | |
4248 /* Load IT with the next display element from Lisp string IT->string. | |
4249 IT->current.string_pos is the current position within the string. | |
4250 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
4251 overlay string. */ | |
4252 | |
4253 static int | |
4254 next_element_from_string (it) | |
4255 struct it *it; | |
4256 { | |
4257 struct text_pos position; | |
4258 | |
4259 xassert (STRINGP (it->string)); | |
4260 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
4261 position = it->current.string_pos; | |
4262 | |
4263 /* Time to check for invisible text? */ | |
4264 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
4265 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
4266 { | |
4267 handle_stop (it); | |
4268 | |
4269 /* Since a handler may have changed IT->method, we must | |
4270 recurse here. */ | |
4271 return get_next_display_element (it); | |
4272 } | |
4273 | |
4274 if (it->current.overlay_string_index >= 0) | |
4275 { | |
4276 /* Get the next character from an overlay string. In overlay | |
4277 strings, There is no field width or padding with spaces to | |
4278 do. */ | |
4279 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
4280 { | |
4281 it->what = IT_EOB; | |
4282 return 0; | |
4283 } | |
4284 else if (STRING_MULTIBYTE (it->string)) | |
4285 { | |
4286 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
4287 - IT_STRING_BYTEPOS (*it)); | |
4288 unsigned char *s = (XSTRING (it->string)->data | |
4289 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4290 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 4291 } |
4292 else | |
4293 { | |
4294 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4295 it->len = 1; | |
4296 } | |
4297 } | |
4298 else | |
4299 { | |
4300 /* Get the next character from a Lisp string that is not an | |
4301 overlay string. Such strings come from the mode line, for | |
4302 example. We may have to pad with spaces, or truncate the | |
4303 string. See also next_element_from_c_string. */ | |
4304 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
4305 { | |
4306 it->what = IT_EOB; | |
4307 return 0; | |
4308 } | |
4309 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
4310 { | |
4311 /* Pad with spaces. */ | |
4312 it->c = ' ', it->len = 1; | |
4313 CHARPOS (position) = BYTEPOS (position) = -1; | |
4314 } | |
4315 else if (STRING_MULTIBYTE (it->string)) | |
4316 { | |
4317 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
4318 - IT_STRING_BYTEPOS (*it)); | |
4319 unsigned char *s = (XSTRING (it->string)->data | |
4320 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4321 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 4322 } |
4323 else | |
4324 { | |
4325 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
4326 it->len = 1; | |
4327 } | |
4328 } | |
4329 | |
4330 /* Record what we have and where it came from. Note that we store a | |
4331 buffer position in IT->position although it could arguably be a | |
4332 string position. */ | |
4333 it->what = IT_CHARACTER; | |
4334 it->object = it->string; | |
4335 it->position = position; | |
4336 return 1; | |
4337 } | |
4338 | |
4339 | |
4340 /* Load IT with next display element from C string IT->s. | |
4341 IT->string_nchars is the maximum number of characters to return | |
4342 from the string. IT->end_charpos may be greater than | |
4343 IT->string_nchars when this function is called, in which case we | |
4344 may have to return padding spaces. Value is zero if end of string | |
4345 reached, including padding spaces. */ | |
4346 | |
4347 static int | |
4348 next_element_from_c_string (it) | |
4349 struct it *it; | |
4350 { | |
4351 int success_p = 1; | |
4352 | |
4353 xassert (it->s); | |
4354 it->what = IT_CHARACTER; | |
4355 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
4356 it->object = Qnil; | |
4357 | |
4358 /* IT's position can be greater IT->string_nchars in case a field | |
4359 width or precision has been specified when the iterator was | |
4360 initialized. */ | |
4361 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4362 { | |
4363 /* End of the game. */ | |
4364 it->what = IT_EOB; | |
4365 success_p = 0; | |
4366 } | |
4367 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
4368 { | |
4369 /* Pad with spaces. */ | |
4370 it->c = ' ', it->len = 1; | |
4371 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
4372 } | |
4373 else if (it->multibyte_p) | |
4374 { | |
4375 /* Implementation note: The calls to strlen apparently aren't a | |
4376 performance problem because there is no noticeable performance | |
4377 difference between Emacs running in unibyte or multibyte mode. */ | |
4378 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
|
4379 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
|
4380 maxlen, &it->len); |
25012 | 4381 } |
4382 else | |
4383 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
4384 | |
4385 return success_p; | |
4386 } | |
4387 | |
4388 | |
4389 /* Set up IT to return characters from an ellipsis, if appropriate. | |
4390 The definition of the ellipsis glyphs may come from a display table | |
4391 entry. This function Fills IT with the first glyph from the | |
4392 ellipsis if an ellipsis is to be displayed. */ | |
4393 | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4394 static int |
25012 | 4395 next_element_from_ellipsis (it) |
4396 struct it *it; | |
4397 { | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4398 if (it->selective_display_ellipsis_p) |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4399 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4400 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
|
4401 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4402 /* 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
|
4403 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
|
4404 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
|
4405 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4406 it->dpvec = v->contents; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4407 it->dpend = v->contents + v->size; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4408 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4409 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
|
4410 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4411 else |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4412 { |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4413 /* 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
|
4414 it->dpvec_char_len = it->len; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4415 it->dpvec = default_invis_vector; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4416 it->dpend = default_invis_vector + 3; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4417 it->current.dpvec_index = 0; |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4418 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
|
4419 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4420 } |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4421 else |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4422 { |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4423 /* The face at the current position may be different from the |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4424 face we find after the invisible text. Remember what it |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4425 was in IT->saved_face_id, and signal that it's there by |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4426 setting face_before_selective_p. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4427 it->saved_face_id = it->face_id; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4428 it->method = next_element_from_buffer; |
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4429 reseat_at_next_visible_line_start (it, 1); |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
4430 it->face_before_selective_p = 1; |
32585
bf84251f474b
(forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents:
32553
diff
changeset
|
4431 } |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4432 |
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4433 return get_next_display_element (it); |
25012 | 4434 } |
4435 | |
4436 | |
4437 /* Deliver an image display element. The iterator IT is already | |
4438 filled with image information (done in handle_display_prop). Value | |
4439 is always 1. */ | |
4440 | |
4441 | |
4442 static int | |
4443 next_element_from_image (it) | |
4444 struct it *it; | |
4445 { | |
4446 it->what = IT_IMAGE; | |
4447 return 1; | |
4448 } | |
4449 | |
4450 | |
4451 /* Fill iterator IT with next display element from a stretch glyph | |
4452 property. IT->object is the value of the text property. Value is | |
4453 always 1. */ | |
4454 | |
4455 static int | |
4456 next_element_from_stretch (it) | |
4457 struct it *it; | |
4458 { | |
4459 it->what = IT_STRETCH; | |
4460 return 1; | |
4461 } | |
4462 | |
4463 | |
4464 /* Load IT with the next display element from current_buffer. Value | |
4465 is zero if end of buffer reached. IT->stop_charpos is the next | |
4466 position at which to stop and check for text properties or buffer | |
4467 end. */ | |
4468 | |
4469 static int | |
4470 next_element_from_buffer (it) | |
4471 struct it *it; | |
4472 { | |
4473 int success_p = 1; | |
4474 | |
4475 /* Check this assumption, otherwise, we would never enter the | |
4476 if-statement, below. */ | |
4477 xassert (IT_CHARPOS (*it) >= BEGV | |
4478 && IT_CHARPOS (*it) <= it->stop_charpos); | |
4479 | |
4480 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
4481 { | |
4482 if (IT_CHARPOS (*it) >= it->end_charpos) | |
4483 { | |
4484 int overlay_strings_follow_p; | |
4485 | |
4486 /* End of the game, except when overlay strings follow that | |
4487 haven't been returned yet. */ | |
4488 if (it->overlay_strings_at_end_processed_p) | |
4489 overlay_strings_follow_p = 0; | |
4490 else | |
4491 { | |
4492 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
|
4493 overlay_strings_follow_p = get_overlay_strings (it); |
25012 | 4494 } |
4495 | |
4496 if (overlay_strings_follow_p) | |
4497 success_p = get_next_display_element (it); | |
4498 else | |
4499 { | |
4500 it->what = IT_EOB; | |
4501 it->position = it->current.pos; | |
4502 success_p = 0; | |
4503 } | |
4504 } | |
4505 else | |
4506 { | |
4507 handle_stop (it); | |
4508 return get_next_display_element (it); | |
4509 } | |
4510 } | |
4511 else | |
4512 { | |
4513 /* No face changes, overlays etc. in sight, so just return a | |
4514 character from current_buffer. */ | |
4515 unsigned char *p; | |
4516 | |
4517 /* Maybe run the redisplay end trigger hook. Performance note: | |
4518 This doesn't seem to cost measurable time. */ | |
4519 if (it->redisplay_end_trigger_charpos | |
4520 && it->glyph_row | |
4521 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
4522 run_redisplay_end_trigger_hook (it); | |
4523 | |
4524 /* Get the next character, maybe multibyte. */ | |
4525 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
|
4526 if (it->multibyte_p && !ASCII_BYTE_P (*p)) |
25012 | 4527 { |
4528 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
4529 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4530 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 4531 } |
4532 else | |
4533 it->c = *p, it->len = 1; | |
4534 | |
4535 /* Record what we have and where it came from. */ | |
4536 it->what = IT_CHARACTER;; | |
4537 it->object = it->w->buffer; | |
4538 it->position = it->current.pos; | |
4539 | |
4540 /* Normally we return the character found above, except when we | |
4541 really want to return an ellipsis for selective display. */ | |
4542 if (it->selective) | |
4543 { | |
4544 if (it->c == '\n') | |
4545 { | |
4546 /* A value of selective > 0 means hide lines indented more | |
4547 than that number of columns. */ | |
4548 if (it->selective > 0 | |
4549 && IT_CHARPOS (*it) + 1 < ZV | |
4550 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
4551 IT_BYTEPOS (*it) + 1, | |
4552 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4553 { |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4554 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
|
4555 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4556 } |
25012 | 4557 } |
4558 else if (it->c == '\r' && it->selective == -1) | |
4559 { | |
4560 /* A value of selective == -1 means that everything from the | |
4561 CR to the end of the line is invisible, with maybe an | |
4562 ellipsis displayed for it. */ | |
27106
0f307c7f49ba
(reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents:
27056
diff
changeset
|
4563 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
|
4564 it->dpvec_char_len = -1; |
25012 | 4565 } |
4566 } | |
4567 } | |
4568 | |
4569 /* 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
|
4570 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
25012 | 4571 return success_p; |
4572 } | |
4573 | |
4574 | |
4575 /* Run the redisplay end trigger hook for IT. */ | |
4576 | |
4577 static void | |
4578 run_redisplay_end_trigger_hook (it) | |
4579 struct it *it; | |
4580 { | |
4581 Lisp_Object args[3]; | |
4582 | |
4583 /* IT->glyph_row should be non-null, i.e. we should be actually | |
4584 displaying something, or otherwise we should not run the hook. */ | |
4585 xassert (it->glyph_row); | |
4586 | |
4587 /* Set up hook arguments. */ | |
4588 args[0] = Qredisplay_end_trigger_functions; | |
4589 args[1] = it->window; | |
4590 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
4591 it->redisplay_end_trigger_charpos = 0; | |
4592 | |
4593 /* Since we are *trying* to run these functions, don't try to run | |
4594 them again, even if they get an error. */ | |
4595 it->w->redisplay_end_trigger = Qnil; | |
4596 Frun_hook_with_args (3, args); | |
4597 | |
4598 /* Notice if it changed the face of the character we are on. */ | |
4599 handle_face_prop (it); | |
4600 } | |
4601 | |
4602 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4603 /* 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
|
4604 filled with composition information (done in |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4605 handle_composition_prop). Value is always 1. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4606 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4607 static int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4608 next_element_from_composition (it) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4609 struct it *it; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4610 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4611 it->what = IT_COMPOSITION; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4612 it->position = (STRINGP (it->string) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4613 ? it->current.string_pos |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4614 : it->current.pos); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4615 return 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4616 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4617 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
4618 |
25012 | 4619 |
4620 /*********************************************************************** | |
4621 Moving an iterator without producing glyphs | |
4622 ***********************************************************************/ | |
4623 | |
4624 /* Move iterator IT to a specified buffer or X position within one | |
4625 line on the display without producing glyphs. | |
4626 | |
4627 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
4628 whichever is reached first. | |
4629 | |
4630 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
4631 | |
4632 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
4633 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
4634 TO_X includes the amount by which a window is horizontally | |
4635 scrolled. | |
4636 | |
4637 Value is | |
4638 | |
4639 MOVE_POS_MATCH_OR_ZV | |
4640 - when TO_POS or ZV was reached. | |
4641 | |
4642 MOVE_X_REACHED | |
4643 -when TO_X was reached before TO_POS or ZV were reached. | |
4644 | |
4645 MOVE_LINE_CONTINUED | |
4646 - when we reached the end of the display area and the line must | |
4647 be continued. | |
4648 | |
4649 MOVE_LINE_TRUNCATED | |
4650 - when we reached the end of the display area and the line is | |
4651 truncated. | |
4652 | |
4653 MOVE_NEWLINE_OR_CR | |
4654 - when we stopped at a line end, i.e. a newline or a CR and selective | |
4655 display is on. */ | |
4656 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
4657 static enum move_it_result |
25012 | 4658 move_it_in_display_line_to (it, to_charpos, to_x, op) |
4659 struct it *it; | |
4660 int to_charpos, to_x, op; | |
4661 { | |
4662 enum move_it_result result = MOVE_UNDEFINED; | |
4663 struct glyph_row *saved_glyph_row; | |
4664 | |
4665 /* Don't produce glyphs in produce_glyphs. */ | |
4666 saved_glyph_row = it->glyph_row; | |
4667 it->glyph_row = NULL; | |
4668 | |
4669 while (1) | |
4670 { | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
4671 int x, i, ascent = 0, descent = 0; |
25012 | 4672 |
4673 /* Stop when ZV or TO_CHARPOS reached. */ | |
4674 if (!get_next_display_element (it) | |
4675 || ((op & MOVE_TO_POS) != 0 | |
4676 && BUFFERP (it->object) | |
4677 && IT_CHARPOS (*it) >= to_charpos)) | |
4678 { | |
4679 result = MOVE_POS_MATCH_OR_ZV; | |
4680 break; | |
4681 } | |
4682 | |
4683 /* The call to produce_glyphs will get the metrics of the | |
4684 display element IT is loaded with. We record in x the | |
4685 x-position before this display element in case it does not | |
4686 fit on the line. */ | |
4687 x = it->current_x; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4688 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4689 /* 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
|
4690 fit on the line. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4691 if (!it->truncate_lines_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4692 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4693 ascent = it->max_ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4694 descent = it->max_descent; |
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 |
25012 | 4697 PRODUCE_GLYPHS (it); |
4698 | |
4699 if (it->area != TEXT_AREA) | |
4700 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4701 set_iterator_to_next (it, 1); |
25012 | 4702 continue; |
4703 } | |
4704 | |
4705 /* The number of glyphs we get back in IT->nglyphs will normally | |
4706 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4707 character on a terminal frame, or (iii) a line end. For the | |
4708 second case, IT->nglyphs - 1 padding glyphs will be present | |
4709 (on X frames, there is only one glyph produced for a | |
4710 composite character. | |
4711 | |
4712 The behavior implemented below means, for continuation lines, | |
4713 that as many spaces of a TAB as fit on the current line are | |
4714 displayed there. For terminal frames, as many glyphs of a | |
4715 multi-glyph character are displayed in the current line, too. | |
4716 This is what the old redisplay code did, and we keep it that | |
4717 way. Under X, the whole shape of a complex character must | |
4718 fit on the line or it will be completely displayed in the | |
4719 next line. | |
4720 | |
4721 Note that both for tabs and padding glyphs, all glyphs have | |
4722 the same width. */ | |
4723 if (it->nglyphs) | |
4724 { | |
4725 /* More than one glyph or glyph doesn't fit on line. All | |
4726 glyphs have the same width. */ | |
4727 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4728 int new_x; | |
4729 | |
4730 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4731 { | |
4732 new_x = x + single_glyph_width; | |
4733 | |
4734 /* We want to leave anything reaching TO_X to the caller. */ | |
4735 if ((op & MOVE_TO_X) && new_x > to_x) | |
4736 { | |
4737 it->current_x = x; | |
4738 result = MOVE_X_REACHED; | |
4739 break; | |
4740 } | |
4741 else if (/* Lines are continued. */ | |
4742 !it->truncate_lines_p | |
4743 && (/* And glyph doesn't fit on the line. */ | |
4744 new_x > it->last_visible_x | |
4745 /* Or it fits exactly and we're on a window | |
4746 system frame. */ | |
4747 || (new_x == it->last_visible_x | |
4748 && FRAME_WINDOW_P (it->f)))) | |
4749 { | |
4750 if (/* IT->hpos == 0 means the very first glyph | |
4751 doesn't fit on the line, e.g. a wide image. */ | |
4752 it->hpos == 0 | |
4753 || (new_x == it->last_visible_x | |
4754 && FRAME_WINDOW_P (it->f))) | |
4755 { | |
4756 ++it->hpos; | |
4757 it->current_x = new_x; | |
4758 if (i == it->nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4759 set_iterator_to_next (it, 1); |
25012 | 4760 } |
4761 else | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4762 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4763 it->current_x = x; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4764 it->max_ascent = ascent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4765 it->max_descent = descent; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4766 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4767 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4768 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
|
4769 IT_CHARPOS (*it))); |
25012 | 4770 result = MOVE_LINE_CONTINUED; |
4771 break; | |
4772 } | |
4773 else if (new_x > it->first_visible_x) | |
4774 { | |
4775 /* Glyph is visible. Increment number of glyphs that | |
4776 would be displayed. */ | |
4777 ++it->hpos; | |
4778 } | |
4779 else | |
4780 { | |
4781 /* Glyph is completely off the left margin of the display | |
4782 area. Nothing to do. */ | |
4783 } | |
4784 } | |
4785 | |
4786 if (result != MOVE_UNDEFINED) | |
4787 break; | |
4788 } | |
4789 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4790 { | |
4791 /* Stop when TO_X specified and reached. This check is | |
4792 necessary here because of lines consisting of a line end, | |
4793 only. The line end will not produce any glyphs and we | |
4794 would never get MOVE_X_REACHED. */ | |
4795 xassert (it->nglyphs == 0); | |
4796 result = MOVE_X_REACHED; | |
4797 break; | |
4798 } | |
4799 | |
4800 /* Is this a line end? If yes, we're done. */ | |
4801 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4802 { | |
4803 result = MOVE_NEWLINE_OR_CR; | |
4804 break; | |
4805 } | |
4806 | |
4807 /* The current display element has been consumed. Advance | |
4808 to the next. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4809 set_iterator_to_next (it, 1); |
25012 | 4810 |
4811 /* Stop if lines are truncated and IT's current x-position is | |
4812 past the right edge of the window now. */ | |
4813 if (it->truncate_lines_p | |
4814 && it->current_x >= it->last_visible_x) | |
4815 { | |
4816 result = MOVE_LINE_TRUNCATED; | |
4817 break; | |
4818 } | |
4819 } | |
4820 | |
4821 /* Restore the iterator settings altered at the beginning of this | |
4822 function. */ | |
4823 it->glyph_row = saved_glyph_row; | |
4824 return result; | |
4825 } | |
4826 | |
4827 | |
4828 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4829 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4830 the description of enum move_operation_enum. | |
4831 | |
4832 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4833 screen line, this function will set IT to the next position > | |
4834 TO_CHARPOS. */ | |
4835 | |
4836 void | |
4837 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4838 struct it *it; | |
4839 int to_charpos, to_x, to_y, to_vpos; | |
4840 int op; | |
4841 { | |
4842 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4843 int line_height; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4844 int reached = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4845 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4846 for (;;) |
25012 | 4847 { |
4848 if (op & MOVE_TO_VPOS) | |
4849 { | |
4850 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4851 start of the line TO_VPOS. */ | |
4852 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4853 { | |
4854 if (it->vpos == to_vpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4855 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4856 reached = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4857 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4858 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4859 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4860 skip = move_it_in_display_line_to (it, -1, -1, 0); |
25012 | 4861 } |
4862 else | |
4863 { | |
4864 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4865 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
|
4866 if (it->vpos == to_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4867 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4868 reached = 2; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4869 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4870 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4871 |
25012 | 4872 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); |
4873 | |
4874 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
|
4875 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4876 reached = 3; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4877 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4878 } |
25012 | 4879 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) |
4880 { | |
4881 /* We have reached TO_X but not in the line we want. */ | |
4882 skip = move_it_in_display_line_to (it, to_charpos, | |
4883 -1, MOVE_TO_POS); | |
4884 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4885 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4886 reached = 4; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4887 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4888 } |
25012 | 4889 } |
4890 } | |
4891 } | |
4892 else if (op & MOVE_TO_Y) | |
4893 { | |
4894 struct it it_backup; | |
4895 | |
4896 /* TO_Y specified means stop at TO_X in the line containing | |
4897 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4898 problem is that we can't really tell whether the line | |
4899 contains TO_Y before we have completely scanned it, and | |
4900 this may skip past TO_X. What we do is to first scan to | |
4901 TO_X. | |
4902 | |
4903 If TO_X is not specified, use a TO_X of zero. The reason | |
4904 is to make the outcome of this function more predictable. | |
4905 If we didn't use TO_X == 0, we would stop at the end of | |
4906 the line which is probably not what a caller would expect | |
4907 to happen. */ | |
4908 skip = move_it_in_display_line_to (it, to_charpos, | |
4909 ((op & MOVE_TO_X) | |
4910 ? to_x : 0), | |
4911 (MOVE_TO_X | |
4912 | (op & MOVE_TO_POS))); | |
4913 | |
4914 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4915 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4916 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4917 reached = 5; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4918 break; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4919 } |
25012 | 4920 |
4921 /* If TO_X was reached, we would like to know whether TO_Y | |
4922 is in the line. This can only be said if we know the | |
4923 total line height which requires us to scan the rest of | |
4924 the line. */ | |
4925 if (skip == MOVE_X_REACHED) | |
4926 { | |
4927 it_backup = *it; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4928 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it))); |
25012 | 4929 skip2 = move_it_in_display_line_to (it, to_charpos, -1, |
4930 op & MOVE_TO_POS); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4931 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it))); |
25012 | 4932 } |
4933 | |
4934 /* Now, decide whether TO_Y is in this line. */ | |
4935 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
|
4936 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height)); |
25012 | 4937 |
4938 if (to_y >= it->current_y | |
4939 && to_y < it->current_y + line_height) | |
4940 { | |
4941 if (skip == MOVE_X_REACHED) | |
4942 /* If TO_Y is in this line and TO_X was reached above, | |
4943 we scanned too far. We have to restore IT's settings | |
4944 to the ones before skipping. */ | |
4945 *it = it_backup; | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4946 reached = 6; |
25012 | 4947 } |
4948 else if (skip == MOVE_X_REACHED) | |
4949 { | |
4950 skip = skip2; | |
4951 if (skip == MOVE_POS_MATCH_OR_ZV) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4952 reached = 7; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4953 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4954 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4955 if (reached) |
25012 | 4956 break; |
4957 } | |
4958 else | |
4959 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4960 | |
4961 switch (skip) | |
4962 { | |
4963 case MOVE_POS_MATCH_OR_ZV: | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4964 reached = 8; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4965 goto out; |
25012 | 4966 |
4967 case MOVE_NEWLINE_OR_CR: | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
4968 set_iterator_to_next (it, 1); |
25012 | 4969 it->continuation_lines_width = 0; |
4970 break; | |
4971 | |
4972 case MOVE_LINE_TRUNCATED: | |
4973 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
|
4974 reseat_at_next_visible_line_start (it, 0); |
25012 | 4975 if ((op & MOVE_TO_POS) != 0 |
4976 && IT_CHARPOS (*it) > to_charpos) | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4977 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4978 reached = 9; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4979 goto out; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
4980 } |
25012 | 4981 break; |
4982 | |
4983 case MOVE_LINE_CONTINUED: | |
4984 it->continuation_lines_width += it->current_x; | |
4985 break; | |
4986 | |
4987 default: | |
4988 abort (); | |
4989 } | |
4990 | |
4991 /* Reset/increment for the next run. */ | |
4992 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4993 it->current_x = it->hpos = 0; | |
4994 it->current_y += it->max_ascent + it->max_descent; | |
4995 ++it->vpos; | |
4996 last_height = it->max_ascent + it->max_descent; | |
4997 last_max_ascent = it->max_ascent; | |
4998 it->max_ascent = it->max_descent = 0; | |
4999 } | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5000 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5001 out: |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5002 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5003 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached)); |
25012 | 5004 } |
5005 | |
5006 | |
5007 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
5008 | |
5009 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
5010 means move IT backward to the preceding line start or BEGV. This | |
5011 function may move over more than DY pixels if IT->current_y - DY | |
5012 ends up in the middle of a line; in this case IT->current_y will be | |
5013 set to the top of the line moved to. */ | |
5014 | |
5015 void | |
5016 move_it_vertically_backward (it, dy) | |
5017 struct it *it; | |
5018 int dy; | |
5019 { | |
5020 int nlines, h, line_height; | |
5021 struct it it2; | |
5022 int start_pos = IT_CHARPOS (*it); | |
5023 | |
5024 xassert (dy >= 0); | |
5025 | |
5026 /* Estimate how many newlines we must move back. */ | |
5027 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
5028 | |
5029 /* Set the iterator's position that many lines back. */ | |
5030 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
5031 back_to_previous_visible_line_start (it); | |
5032 | |
5033 /* Reseat the iterator here. When moving backward, we don't want | |
5034 reseat to skip forward over invisible text, set up the iterator | |
5035 to deliver from overlay strings at the new position etc. So, | |
5036 use reseat_1 here. */ | |
5037 reseat_1 (it, it->current.pos, 1); | |
5038 | |
5039 /* We are now surely at a line start. */ | |
5040 it->current_x = it->hpos = 0; | |
5041 | |
5042 /* Move forward and see what y-distance we moved. First move to the | |
5043 start of the next line so that we get its height. We need this | |
5044 height to be able to tell whether we reached the specified | |
5045 y-distance. */ | |
5046 it2 = *it; | |
5047 it2.max_ascent = it2.max_descent = 0; | |
5048 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
5049 MOVE_TO_POS | MOVE_TO_VPOS); | |
5050 xassert (IT_CHARPOS (*it) >= BEGV); | |
5051 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
|
5052 |
25012 | 5053 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); |
5054 xassert (IT_CHARPOS (*it) >= BEGV); | |
5055 h = it2.current_y - it->current_y; | |
5056 nlines = it2.vpos - it->vpos; | |
5057 | |
5058 /* Correct IT's y and vpos position. */ | |
5059 it->vpos -= nlines; | |
5060 it->current_y -= h; | |
5061 | |
5062 if (dy == 0) | |
5063 { | |
5064 /* DY == 0 means move to the start of the screen line. The | |
5065 value of nlines is > 0 if continuation lines were involved. */ | |
5066 if (nlines > 0) | |
5067 move_it_by_lines (it, nlines, 1); | |
5068 xassert (IT_CHARPOS (*it) <= start_pos); | |
5069 } | |
5070 else if (nlines) | |
5071 { | |
5072 /* The y-position we try to reach. Note that h has been | |
5073 subtracted in front of the if-statement. */ | |
5074 int target_y = it->current_y + h - dy; | |
5075 | |
5076 /* If we did not reach target_y, try to move further backward if | |
5077 we can. If we moved too far backward, try to move forward. */ | |
5078 if (target_y < it->current_y | |
5079 && IT_CHARPOS (*it) > BEGV) | |
5080 { | |
5081 move_it_vertically (it, target_y - it->current_y); | |
5082 xassert (IT_CHARPOS (*it) >= BEGV); | |
5083 } | |
5084 else if (target_y >= it->current_y + line_height | |
5085 && IT_CHARPOS (*it) < ZV) | |
5086 { | |
5087 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
5088 xassert (IT_CHARPOS (*it) >= BEGV); | |
5089 } | |
5090 } | |
5091 } | |
5092 | |
5093 | |
5094 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
5095 move backwards. DY = 0 means move to start of screen line. At the | |
5096 end, IT will be on the start of a screen line. */ | |
5097 | |
5098 void | |
5099 move_it_vertically (it, dy) | |
5100 struct it *it; | |
5101 int dy; | |
5102 { | |
5103 if (dy <= 0) | |
5104 move_it_vertically_backward (it, -dy); | |
5105 else if (dy > 0) | |
5106 { | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5107 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy)); |
25012 | 5108 move_it_to (it, ZV, -1, it->current_y + dy, -1, |
5109 MOVE_TO_POS | MOVE_TO_Y); | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
5110 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it))); |
25012 | 5111 |
5112 /* If buffer ends in ZV without a newline, move to the start of | |
5113 the line to satisfy the post-condition. */ | |
5114 if (IT_CHARPOS (*it) == ZV | |
5115 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
5116 move_it_by_lines (it, 0, 0); | |
5117 } | |
5118 } | |
5119 | |
5120 | |
35023
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5121 /* Move iterator IT past the end of the text line it is in. */ |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5122 |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5123 void |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5124 move_it_past_eol (it) |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5125 struct it *it; |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5126 { |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5127 enum move_it_result rc; |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5128 |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5129 rc = move_it_in_display_line_to (it, Z, 0, MOVE_TO_POS); |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5130 if (rc == MOVE_NEWLINE_OR_CR) |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5131 set_iterator_to_next (it, 0); |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5132 } |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5133 |
6016a947974c
(move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35017
diff
changeset
|
5134 |
34924
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5135 #if 0 /* Currently not used. */ |
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5136 |
25012 | 5137 /* Return non-zero if some text between buffer positions START_CHARPOS |
5138 and END_CHARPOS is invisible. IT->window is the window for text | |
5139 property lookup. */ | |
5140 | |
5141 static int | |
5142 invisible_text_between_p (it, start_charpos, end_charpos) | |
5143 struct it *it; | |
5144 int start_charpos, end_charpos; | |
5145 { | |
5146 Lisp_Object prop, limit; | |
5147 int invisible_found_p; | |
5148 | |
5149 xassert (it != NULL && start_charpos <= end_charpos); | |
5150 | |
5151 /* Is text at START invisible? */ | |
5152 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
5153 it->window); | |
5154 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
5155 invisible_found_p = 1; | |
5156 else | |
5157 { | |
30243
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5158 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
|
5159 Qinvisible, Qnil, |
c56062542bae
(display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents:
30216
diff
changeset
|
5160 make_number (end_charpos)); |
25012 | 5161 invisible_found_p = XFASTINT (limit) < end_charpos; |
5162 } | |
5163 | |
5164 return invisible_found_p; | |
5165 } | |
5166 | |
34924
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5167 #endif /* 0 */ |
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5168 |
25012 | 5169 |
5170 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
5171 negative means move up. DVPOS == 0 means move to the start of the | |
5172 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
5173 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
5174 | |
5175 Further optimization ideas: If we would know that IT->f doesn't use | |
5176 a face with proportional font, we could be faster for | |
5177 truncate-lines nil. */ | |
5178 | |
5179 void | |
5180 move_it_by_lines (it, dvpos, need_y_p) | |
5181 struct it *it; | |
5182 int dvpos, need_y_p; | |
5183 { | |
5184 struct position pos; | |
5185 | |
5186 if (!FRAME_WINDOW_P (it->f)) | |
5187 { | |
5188 struct text_pos textpos; | |
5189 | |
5190 /* We can use vmotion on frames without proportional fonts. */ | |
5191 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
5192 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
5193 reseat (it, textpos, 1); | |
5194 it->vpos += pos.vpos; | |
5195 it->current_y += pos.vpos; | |
5196 } | |
5197 else if (dvpos == 0) | |
5198 { | |
5199 /* DVPOS == 0 means move to the start of the screen line. */ | |
5200 move_it_vertically_backward (it, 0); | |
5201 xassert (it->current_x == 0 && it->hpos == 0); | |
5202 } | |
5203 else if (dvpos > 0) | |
34924
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5204 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); |
25012 | 5205 else |
5206 { | |
5207 struct it it2; | |
5208 int start_charpos, i; | |
34924
db558893a42c
(move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents:
34900
diff
changeset
|
5209 |
25012 | 5210 /* Go back -DVPOS visible lines and reseat the iterator there. */ |
5211 start_charpos = IT_CHARPOS (*it); | |
5212 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
5213 back_to_previous_visible_line_start (it); | |
5214 reseat (it, it->current.pos, 1); | |
5215 it->current_x = it->hpos = 0; | |
5216 | |
5217 /* Above call may have moved too far if continuation lines | |
5218 are involved. Scan forward and see if it did. */ | |
5219 it2 = *it; | |
5220 it2.vpos = it2.current_y = 0; | |
5221 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
5222 it->vpos -= it2.vpos; | |
5223 it->current_y -= it2.current_y; | |
5224 it->current_x = it->hpos = 0; | |
5225 | |
5226 /* If we moved too far, move IT some lines forward. */ | |
5227 if (it2.vpos > -dvpos) | |
5228 { | |
5229 int delta = it2.vpos + dvpos; | |
5230 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
5231 } | |
5232 } | |
5233 } | |
5234 | |
5235 | |
5236 | |
5237 /*********************************************************************** | |
5238 Messages | |
5239 ***********************************************************************/ | |
5240 | |
5241 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5242 /* 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
|
5243 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5244 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5245 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5246 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
|
5247 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5248 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5249 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5250 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5251 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5252 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5253 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5254 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
|
5255 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5256 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5257 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5258 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5259 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
|
5260 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5261 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
|
5262 msg = Fformat (3, args); |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5263 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5264 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
|
5265 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5266 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5267 |
28876
04cbb0510d7e
(add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents:
28869
diff
changeset
|
5268 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
|
5269 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5270 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5271 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
5272 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5273 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5274 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5275 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5276 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5277 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5278 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5279 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
|
5280 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5281 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
5282 |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5283 /* Add a string M of length NBYTES to the message log, optionally |
25012 | 5284 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if |
5285 nonzero, means interpret the contents of M as multibyte. This | |
5286 function calls low-level routines in order to bypass text property | |
5287 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
|
5288 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5289 void |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5290 message_dolog (m, nbytes, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5291 char *m; |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5292 int nbytes, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5293 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5294 if (!NILP (Vmessage_log_max)) |
10393 | 5295 { |
5296 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5297 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
|
5298 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
|
5299 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
|
5300 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
|
5301 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
|
5302 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
|
5303 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5304 old_deactivate_mark = Vdeactivate_mark; |
10393 | 5305 oldbuf = current_buffer; |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
5306 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
|
5307 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5308 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5309 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5310 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5311 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5312 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5313 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5314 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
|
5315 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5316 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
|
5317 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5318 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5319 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5320 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5321 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5322 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5323 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
|
5324 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5325 /* 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
|
5326 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
|
5327 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
|
5328 && 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
|
5329 { |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5330 int i, c, char_bytes; |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5331 unsigned char work[1]; |
25012 | 5332 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5333 /* 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
|
5334 for the *Message* buffer. */ |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5335 for (i = 0; i < nbytes; i += nbytes) |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5336 { |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5337 c = string_char_and_length (m + i, nbytes - i, &char_bytes); |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5338 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
|
5339 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5340 : 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
|
5341 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
|
5342 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5343 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5344 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
|
5345 && ! 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
|
5346 { |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5347 int i, c, char_bytes; |
20786
49d68bf8f34b
(message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents:
20703
diff
changeset
|
5348 unsigned char *msg = (unsigned char *) m; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
5349 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
|
5350 /* 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
|
5351 for the *Message* buffer. */ |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5352 for (i = 0; i < nbytes; i++) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5353 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5354 c = unibyte_char_to_multibyte (msg[i]); |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5355 char_bytes = CHAR_STRING (c, str); |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5356 insert_1_both (str, 1, char_bytes, 1, 0, 0); |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5357 } |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5358 } |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5359 else if (nbytes) |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5360 insert_1 (m, 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
|
5361 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5362 if (nlflag) |
10393 | 5363 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5364 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
|
5365 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5366 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5367 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
|
5368 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5369 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5370 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5371 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5372 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
5373 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
|
5374 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5375 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5376 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
5377 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
|
5378 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5379 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5380 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5381 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5382 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5383 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5384 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5385 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5386 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5387 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5388 /* 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
|
5389 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5390 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5391 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5392 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
|
5393 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5394 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5395 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5396 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5397 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5398 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5399 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5400 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5401 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
5402 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
|
5403 } |
10393 | 5404 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5405 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5406 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5407 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5408 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5409 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5410 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5411 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5412 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5413 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5414 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5415 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5416 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5417 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5418 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
5419 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5420 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
|
5421 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5422 /* 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
|
5423 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
5424 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
|
5425 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5426 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
5427 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5428 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5429 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5430 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5431 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5432 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 5433 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5434 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
5435 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
|
5436 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
5437 Vdeactivate_mark = old_deactivate_mark; |
10393 | 5438 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5439 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5440 |
25012 | 5441 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5442 /* 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
|
5443 (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
|
5444 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
|
5445 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
|
5446 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
|
5447 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5448 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5449 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
|
5450 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5451 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5452 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5453 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
5454 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
|
5455 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5456 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
|
5457 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
|
5458 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5459 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5460 { |
33594
a4cd4c93196b
(message_log_check_duplicate): Let "..."-detection match
Miles Bader <miles@gnu.org>
parents:
33591
diff
changeset
|
5461 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.') |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5462 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5463 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5464 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5465 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5466 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5467 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5468 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5469 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5470 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5471 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5472 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5473 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5474 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5475 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5476 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5477 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
5478 } |
25012 | 5479 |
5480 | |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5481 /* Display an echo area message M with a specified length of NBYTES |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5482 bytes. The string may include null characters. If M is 0, clear |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5483 out any existing message, and let the mini-buffer text show |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5484 through. |
25012 | 5485 |
5486 The buffer M must continue to exist until after the echo area gets | |
5487 cleared or some other message gets displayed there. This means do | |
5488 not pass text that is stored in a Lisp string; do not pass text in | |
5489 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5490 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5491 void |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5492 message2 (m, nbytes, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5493 char *m; |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5494 int nbytes; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5495 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5496 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5497 /* 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
|
5498 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
5499 if (m) |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5500 message_dolog (m, nbytes, 1, multibyte); |
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5501 message2_nolog (m, nbytes, multibyte); |
10393 | 5502 } |
5503 | |
5504 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5505 /* The non-logging counterpart of message2. */ |
10393 | 5506 |
5507 void | |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5508 message2_nolog (m, nbytes, multibyte) |
10393 | 5509 char *m; |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5510 int nbytes; |
10393 | 5511 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5512 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
5513 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5514 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5515 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5516 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5517 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5518 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5519 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
|
5520 if (m) |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5521 fwrite (m, nbytes, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5522 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5523 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5524 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5525 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5526 /* 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
|
5527 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5528 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 5529 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5530 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5531 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5532 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5533 Lisp_Object mini_window; |
25012 | 5534 struct frame *f; |
5535 | |
5536 /* 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
|
5537 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5538 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
|
5539 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
|
5540 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5541 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5542 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
|
5543 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5544 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
|
5545 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5546 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5547 { |
35412
acdbc148953f
(message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents:
35410
diff
changeset
|
5548 set_message (m, Qnil, nbytes, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5549 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
5550 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5551 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5552 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5553 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5554 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5555 do_pending_window_change (0); |
25012 | 5556 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
|
5557 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
|
5558 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
|
5559 (*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
|
5560 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5561 } |
25012 | 5562 |
5563 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5564 /* 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
|
5565 bytes. The string may include null characters. If M is not a |
25012 | 5566 string, clear out any existing message, and let the mini-buffer |
5567 text show through. */ | |
5568 | |
5569 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5570 message3 (m, nbytes, multibyte) |
25012 | 5571 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5572 int nbytes; |
25012 | 5573 int multibyte; |
5574 { | |
5575 struct gcpro gcpro1; | |
5576 | |
5577 GCPRO1 (m); | |
5578 | |
5579 /* First flush out any partial line written with print. */ | |
5580 message_log_maybe_newline (); | |
5581 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5582 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
|
5583 message3_nolog (m, nbytes, multibyte); |
25012 | 5584 |
5585 UNGCPRO; | |
5586 } | |
5587 | |
5588 | |
5589 /* The non-logging version of message3. */ | |
5590 | |
5591 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5592 message3_nolog (m, nbytes, multibyte) |
25012 | 5593 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5594 int nbytes, multibyte; |
25012 | 5595 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5596 struct frame *sf = SELECTED_FRAME (); |
25012 | 5597 message_enable_multibyte = multibyte; |
5598 | |
5599 if (noninteractive) | |
5600 { | |
5601 if (noninteractive_need_newline) | |
5602 putc ('\n', stderr); | |
5603 noninteractive_need_newline = 0; | |
5604 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5605 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 5606 if (cursor_in_echo_area == 0) |
5607 fprintf (stderr, "\n"); | |
5608 fflush (stderr); | |
5609 } | |
5610 /* A null message buffer means that the frame hasn't really been | |
5611 initialized yet. Error messages get reported properly by | |
5612 cmd_error, so this must be just an informative message; toss it. */ | |
5613 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5614 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5615 && FRAME_MESSAGE_BUF (sf)) |
25012 | 5616 { |
5617 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
|
5618 Lisp_Object frame; |
25012 | 5619 struct frame *f; |
5620 | |
5621 /* Get the frame containing the mini-buffer | |
5622 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5623 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
|
5624 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
|
5625 f = XFRAME (frame); |
25012 | 5626 |
5627 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5628 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
|
5629 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5630 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5631 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5632 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
|
5633 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5634 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
|
5635 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
5636 Fraise_frame (frame); |
25012 | 5637 } |
5638 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5639 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5640 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5641 do_pending_window_change (0); |
25012 | 5642 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
|
5643 do_pending_window_change (0); |
25012 | 5644 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
5645 (*frame_up_to_date_hook) (f); | |
5646 } | |
5647 } | |
5648 | |
5649 | |
5650 /* Display a null-terminated echo area message M. If M is 0, clear | |
5651 out any existing message, and let the mini-buffer text show through. | |
5652 | |
5653 The buffer M must continue to exist until after the echo area gets | |
5654 cleared or some other message gets displayed there. Do not pass | |
5655 text that is stored in a Lisp string. Do not pass text in a buffer | |
5656 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
|
5657 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5658 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5659 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5660 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5661 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5662 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
|
5663 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
5664 |
25012 | 5665 |
5666 /* The non-logging counterpart of message1. */ | |
5667 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5668 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5669 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5670 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5671 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5672 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
|
5673 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5674 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5675 /* 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
|
5676 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5677 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5678 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5679 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5680 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5681 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5682 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5683 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5684 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5685 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5686 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5687 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5688 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5689 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5690 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5691 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5692 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5693 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5694 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5695 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5696 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5697 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5698 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5699 /* 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
|
5700 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
|
5701 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
|
5702 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5703 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5704 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5705 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5706 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5707 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5708 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5709 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5710 /* 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
|
5711 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
|
5712 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
|
5713 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5714 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5715 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5716 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5717 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5718 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5719 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5720 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
|
5721 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5722 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5723 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5724 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5725 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5726 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5727 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5728 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5729 /* 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
|
5730 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5731 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5732 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5733 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5734 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5735 |
25012 | 5736 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5737 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5738 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
|
5739 |
277 | 5740 /* VARARGS 1 */ |
5741 void | |
5742 message (m, a1, a2, a3) | |
5743 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5744 EMACS_INT a1, a2, a3; |
277 | 5745 { |
5746 if (noninteractive) | |
5747 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5748 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5749 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5750 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
|
5751 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
|
5752 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
|
5753 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5754 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5755 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
|
5756 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5757 } |
277 | 5758 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5759 else if (INTERACTIVE) |
277 | 5760 { |
25012 | 5761 /* The frame whose mini-buffer we're going to display the message |
5762 on. It may be larger than the selected frame, so we need to | |
5763 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
|
5764 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5765 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5766 |
5767 /* 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
|
5768 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5769 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
|
5770 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5771 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5772 /* 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
|
5773 initialized yet. Error messages get reported properly by |
25012 | 5774 cmd_error, so this must be just an informative message; toss |
5775 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5776 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
|
5777 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5778 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5779 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5780 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
|
5781 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5782 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5783 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5784 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5785 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5786 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5787 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5788 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
|
5789 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5790 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5791 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
|
5792 (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
|
5793 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5794 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5795 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
|
5796 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5797 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5798 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5799 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5800 /* 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
|
5801 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
|
5802 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
|
5803 } |
277 | 5804 } |
5805 } | |
5806 | |
25012 | 5807 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5808 /* The non-logging version of message. */ |
25012 | 5809 |
11193 | 5810 void |
5811 message_nolog (m, a1, a2, a3) | |
5812 char *m; | |
5813 EMACS_INT a1, a2, a3; | |
5814 { | |
5815 Lisp_Object old_log_max; | |
5816 old_log_max = Vmessage_log_max; | |
5817 Vmessage_log_max = Qnil; | |
5818 message (m, a1, a2, a3); | |
5819 Vmessage_log_max = old_log_max; | |
5820 } | |
5821 | |
25012 | 5822 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5823 /* 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
|
5824 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
|
5825 critical. */ |
25012 | 5826 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5827 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5828 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5829 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5830 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
|
5831 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5832 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5833 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5834 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
|
5835 !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
|
5836 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5837 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5838 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5839 |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5840 /* 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
|
5841 aren't, make new ones. */ |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5842 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5843 static void |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5844 ensure_echo_area_buffers () |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5845 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5846 int i; |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5847 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5848 for (i = 0; i < 2; ++i) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5849 if (!BUFFERP (echo_buffer[i]) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5850 || NILP (XBUFFER (echo_buffer[i])->name)) |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5851 { |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5852 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
|
5853 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
|
5854 int j; |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5855 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5856 old_buffer = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5857 sprintf (name, " *Echo Area %d*", i); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5858 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
|
5859 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
|
5860 |
0c3f7d0ebb82
(ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents:
30448
diff
changeset
|
5861 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
|
5862 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
|
5863 echo_area_buffer[j] = echo_buffer[i]; |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5864 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5865 } |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5866 |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5867 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5868 /* 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
|
5869 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
|
5870 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5871 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
|
5872 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
|
5873 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
|
5874 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5875 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
|
5876 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
|
5877 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5878 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
|
5879 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
|
5880 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
|
5881 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5882 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
|
5883 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5884 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5885 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
|
5886 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5887 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
|
5888 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
|
5889 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
|
5890 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
|
5891 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
|
5892 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5893 Lisp_Object buffer; |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
5894 int this_one, the_other, clear_buffer_p, rc; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
5895 int count = BINDING_STACK_SIZE (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5896 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5897 /* If buffers aren't life, make new ones. */ |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
5898 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
|
5899 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5900 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5901 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5902 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5903 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
|
5904 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5905 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
|
5906 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5907 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5908 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
|
5909 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5910 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5911 /* 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
|
5912 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
|
5913 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
|
5914 && 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
|
5915 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
|
5916 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5917 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5918 /* 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
|
5919 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5920 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
|
5921 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5922 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
|
5923 = (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
|
5924 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5925 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5926 clear_buffer_p = 1; |
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 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5929 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
|
5930 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5931 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
|
5932 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
|
5933 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5934 /* 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
|
5935 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
|
5936 == 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
|
5937 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
|
5938 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
|
5939 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
|
5940 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5941 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
|
5942 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5943 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5944 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5945 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
|
5946 } |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
5947 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5948 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
|
5949 current_buffer->read_only = Qnil; |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
5950 specbind (Qinhibit_read_only, Qt); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5951 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5952 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
|
5953 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5954 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5955 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5956 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
|
5957 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
5958 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
|
5959 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5960 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5961 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
|
5962 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5963 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5964 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5965 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5966 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5967 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5968 /* 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
|
5969 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
|
5970 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5971 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5972 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
|
5973 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5974 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5975 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5976 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5977 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5978 /* 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
|
5979 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
|
5980 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
|
5981 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
|
5982 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5983 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5984 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
|
5985 |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5986 XSETBUFFER (AREF (vector, i), current_buffer); ++i; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5987 AREF (vector, i) = Vdeactivate_mark, ++i; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5988 AREF (vector, i) = make_number (windows_or_buffers_changed), ++i; |
25358
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 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5991 { |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5992 XSETWINDOW (AREF (vector, i), w); ++i; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5993 AREF (vector, i) = w->buffer; ++i; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5994 AREF (vector, i) = make_number (XMARKER (w->pointm)->charpos); ++i; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
5995 AREF (vector, i) = make_number (XMARKER (w->pointm)->bytepos); ++i; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5996 } |
25012 | 5997 else |
25358
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 int end = i + 4; |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
6000 for (; i < end; ++i) |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
6001 AREF (vector, i) = Qnil; |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
6002 } |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
6003 |
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
6004 xassert (i == ASIZE (vector)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6005 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6006 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6007 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6008 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6009 /* 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
|
6010 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
|
6011 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6012 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6013 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
|
6014 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6015 { |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6016 set_buffer_internal_1 (XBUFFER (AREF (vector, 0))); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6017 Vdeactivate_mark = AREF (vector, 1); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6018 windows_or_buffers_changed = XFASTINT (AREF (vector, 2)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6019 |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6020 if (WINDOWP (AREF (vector, 3))) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6021 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6022 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6023 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
|
6024 |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6025 w = XWINDOW (AREF (vector, 3)); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6026 buffer = AREF (vector, 4); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6027 charpos = AREF (vector, 5); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6028 bytepos = AREF (vector, 6); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6029 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6030 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6031 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
|
6032 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6033 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6034 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6035 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
|
6036 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6037 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6038 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6039 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6040 /* 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
|
6041 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
|
6042 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6043 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6044 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
|
6045 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6046 { |
26447
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6047 ensure_echo_area_buffers (); |
2360d692254c
(ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents:
26374
diff
changeset
|
6048 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6049 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6050 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6051 /* 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
|
6052 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
|
6053 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
|
6054 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
|
6055 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6056 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
|
6057 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6058 /* 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
|
6059 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
36227
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6060 current_buffer->truncate_lines = Qnil; |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6061 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6062 if (Z > BEG) |
34479
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6063 { |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6064 int count = BINDING_STACK_SIZE (); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6065 specbind (Qinhibit_read_only, Qt); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6066 del_range (BEG, Z); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6067 unbind_to (count, Qnil); |
aab24f62ad6b
(setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
34448
diff
changeset
|
6068 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6069 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
|
6070 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6071 /* 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
|
6072 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6073 != !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
|
6074 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
|
6075 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6076 /* 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
|
6077 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6078 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6079 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
|
6080 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6081 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
|
6082 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
|
6083 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6084 |
29643
77f1e8db4147
(setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents:
29634
diff
changeset
|
6085 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
|
6086 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6087 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6088 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6089 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6090 if (NILP (echo_area_buffer[0])) |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6091 { |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6092 if (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
|
6093 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
|
6094 else |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6095 echo_area_buffer[0] = echo_buffer[0]; |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6096 } |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6097 |
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6098 if (current_buffer != XBUFFER (echo_area_buffer[0])) |
36227
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6099 { |
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6100 /* Someone switched buffers between print requests. */ |
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6101 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6102 current_buffer->truncate_lines = Qnil; |
aced2f7101b9
(setup_echo_area_for_printing): Set truncate_lines to
Gerd Moellmann <gerd@gnu.org>
parents:
36201
diff
changeset
|
6103 } |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6104 } |
25358
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 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6108 /* 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
|
6109 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
|
6110 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
|
6111 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
|
6112 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6113 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6114 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6115 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6116 { |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6117 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
|
6118 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6119 /* 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
|
6120 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
|
6121 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
|
6122 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
|
6123 redisplay. */ |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6124 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
|
6125 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6126 /* 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
|
6127 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
|
6128 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
|
6129 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
|
6130 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
|
6131 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
|
6132 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6133 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6134 = 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
|
6135 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
|
6136 (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
|
6137 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6138 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6139 echo_area_buffer[i] = Qnil; |
28047
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6140 |
91d9cd696b80
(display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents:
28002
diff
changeset
|
6141 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
|
6142 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
|
6143 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6144 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6145 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6146 /* 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
|
6147 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
|
6148 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
|
6149 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
|
6150 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
|
6151 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6152 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6153 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
|
6154 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
|
6155 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
|
6156 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6157 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6158 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
|
6159 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6160 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6161 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
|
6162 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6163 /* 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
|
6164 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6165 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
|
6166 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6167 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6168 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
|
6169 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6170 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
|
6171 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6172 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6173 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
|
6174 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6175 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6176 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6177 /* 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
|
6178 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
|
6179 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6180 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6181 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6182 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6183 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6184 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6185 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6186 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
|
6187 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6188 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6189 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
|
6190 (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
|
6191 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6192 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6193 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6194 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6195 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6196 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6197 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6198 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6199 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6200 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6201 /* 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
|
6202 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
|
6203 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
|
6204 returns. */ |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6205 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6206 static int |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6207 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
|
6208 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
|
6209 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
|
6210 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6211 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6212 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
|
6213 } |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6214 |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6215 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6216 /* 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
|
6217 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
|
6218 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
|
6219 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
|
6220 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6221 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6222 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
|
6223 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6224 int exact_p; |
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 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
|
6227 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
|
6228 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6229 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6230 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6231 /* Nil means don't try to resize. */ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6232 if (NILP (Vresize_mini_windows) |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
6233 || (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
|
6234 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6235 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6236 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
|
6237 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6238 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6239 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
|
6240 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
|
6241 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6242 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
|
6243 struct text_pos start; |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6244 struct buffer *old_current_buffer = NULL; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6245 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6246 if (current_buffer != XBUFFER (w->buffer)) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6247 { |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6248 old_current_buffer = current_buffer; |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6249 set_buffer_internal (XBUFFER (w->buffer)); |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6250 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6251 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6252 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
|
6253 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6254 /* 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
|
6255 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
|
6256 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
|
6257 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
|
6258 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
|
6259 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
6260 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
|
6261 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6262 /* 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
|
6263 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
|
6264 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
|
6265 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6266 /* 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
|
6267 if (it.truncate_lines_p) |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6268 height = 1; |
26374
e3e89fd28459
Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26301
diff
changeset
|
6269 else |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6270 { |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6271 last_height = 0; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6272 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
|
6273 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
|
6274 height = it.current_y + last_height; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6275 else |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6276 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
|
6277 height -= it.extra_line_spacing; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6278 height = (height + unit - 1) / unit; |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6279 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6280 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6281 /* 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
|
6282 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6283 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6284 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6285 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
|
6286 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
|
6287 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6288 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6289 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
6290 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
|
6291 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
|
6292 |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6293 if (EQ (Vresize_mini_windows, Qgrow_only)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6294 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6295 /* Let it grow only, until we display an empty message, in which |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6296 case the window shrinks again. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6297 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6298 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6299 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6300 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6301 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6302 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6303 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6304 else if (height < XFASTINT (w->height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6305 && (exact_p || BEGV == ZV)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6306 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6307 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6308 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6309 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6310 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6311 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6312 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6313 else |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6314 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6315 /* Always resize to exact size needed. */ |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6316 if (height > XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6317 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6318 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6319 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6320 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6321 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6322 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6323 else if (height < XFASTINT (w->height)) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6324 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6325 int old_height = XFASTINT (w->height); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6326 freeze_window_starts (f, 0); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6327 shrink_mini_window (w); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6328 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6329 if (height) |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6330 { |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6331 freeze_window_starts (f, 1); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6332 grow_mini_window (w, height - XFASTINT (w->height)); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6333 } |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6334 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6335 window_height_changed_p = XFASTINT (w->height) != old_height; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
6336 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6337 } |
33591
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6338 |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6339 if (old_current_buffer) |
b501918e1c9d
(resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents:
33568
diff
changeset
|
6340 set_buffer_internal (old_current_buffer); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6341 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6342 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6343 return window_height_changed_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6344 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6345 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6346 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6347 /* 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
|
6348 current message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6349 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6350 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6351 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6352 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6353 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6354 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6355 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
|
6356 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6357 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6358 { |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6359 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
|
6360 (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
|
6361 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6362 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
|
6363 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6364 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6365 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6366 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6367 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6368 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6369 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6370 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
|
6371 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
|
6372 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
|
6373 EMACS_INT a3, a4; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6374 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6375 Lisp_Object *msg = (Lisp_Object *) a1; |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6376 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6377 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6378 *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
|
6379 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6380 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6381 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6382 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6383 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6384 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6385 /* 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
|
6386 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
|
6387 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
|
6388 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6389 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6390 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6391 push_message () |
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 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6394 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6395 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
|
6396 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6397 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6398 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6399 |
35174
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6400 /* Handler for record_unwind_protect calling pop_message. */ |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6401 |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6402 Lisp_Object |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6403 push_message_unwind (dummy) |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6404 Lisp_Object dummy; |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6405 { |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6406 pop_message (); |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6407 return Qnil; |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6408 } |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6409 |
96c7c0a356aa
(push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35029
diff
changeset
|
6410 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6411 /* 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
|
6412 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6413 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6414 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6415 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6416 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6417 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6418 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6419 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6420 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6421 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
|
6422 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6423 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
|
6424 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6425 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6426 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6427 /* 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
|
6428 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6429 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6430 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6431 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6432 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6433 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
|
6434 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6435 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6436 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6437 /* 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
|
6438 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
|
6439 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6440 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6441 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6442 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6443 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6444 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6445 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6446 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6447 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6448 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6449 /* 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
|
6450 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
|
6451 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6452 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6453 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6454 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6455 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6456 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6457 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
|
6458 /* 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
|
6459 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
|
6460 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
|
6461 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6462 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6463 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6464 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6465 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6466 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
|
6467 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
|
6468 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6469 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6470 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6471 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6472 /* 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
|
6473 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
|
6474 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6475 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6476 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
|
6477 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
|
6478 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
|
6479 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
|
6480 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6481 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6482 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
|
6483 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6484 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
|
6485 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6486 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6487 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6488 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6489 /* 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
|
6490 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6491 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
|
6492 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
|
6493 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
|
6494 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6495 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
|
6496 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
|
6497 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
|
6498 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6499 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6500 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
|
6501 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6502 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6503 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6504 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6505 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6506 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6507 || (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
|
6508 |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6509 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
|
6510 (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
|
6511 message_buf_print = 0; |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
6512 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
|
6513 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6514 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6515 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6516 /* 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
|
6517 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
|
6518 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
|
6519 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6520 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6521 static int |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6522 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
|
6523 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
|
6524 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
|
6525 EMACS_INT nbytes, multibyte_p; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6526 { |
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6527 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
|
6528 Lisp_Object string = a2; |
30413
d5335ebcf501
(with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents:
30320
diff
changeset
|
6529 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6530 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6531 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6532 /* 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
|
6533 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6534 != !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
|
6535 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
|
6536 |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
6537 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
|
6538 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6539 /* 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
|
6540 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
|
6541 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6542 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6543 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6544 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6545 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6546 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6547 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
|
6548 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
|
6549 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6550 /* 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
|
6551 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
|
6552 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
|
6553 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
|
6554 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6555 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6556 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6557 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6558 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6559 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6560 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
|
6561 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6562 /* 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
|
6563 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6564 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6565 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6566 /* 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
|
6567 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
|
6568 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6569 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
|
6570 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
|
6571 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6572 : 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
|
6573 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
|
6574 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6575 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6576 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6577 && !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
|
6578 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6579 /* 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
|
6580 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6581 unsigned char *msg = (unsigned char *) s; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6582 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
|
6583 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6584 /* 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
|
6585 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
|
6586 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6587 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
|
6588 n = CHAR_STRING (c, str); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
6589 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
|
6590 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6591 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6592 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6593 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
|
6594 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6595 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6596 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6597 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6598 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6599 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6600 /* 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
|
6601 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
|
6602 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6603 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6604 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6605 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
|
6606 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
|
6607 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6608 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6609 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
|
6610 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6611 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6612 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
|
6613 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6614 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6615 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6616 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6617 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6618 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6619 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
|
6620 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
|
6621 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
|
6622 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
|
6623 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
|
6624 and ensure a complete redisplay of all windows. */ |
25012 | 6625 |
277 | 6626 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6627 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6628 { |
769 | 6629 if (frame_garbaged) |
277 | 6630 { |
25012 | 6631 Lisp_Object tail, frame; |
6632 | |
6633 FOR_EACH_FRAME (tail, frame) | |
6634 { | |
6635 struct frame *f = XFRAME (frame); | |
6636 | |
6637 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
6638 { | |
6639 clear_current_matrices (f); | |
6640 f->garbaged = 0; | |
6641 } | |
6642 } | |
6643 | |
769 | 6644 frame_garbaged = 0; |
25012 | 6645 ++windows_or_buffers_changed; |
6646 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6647 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6648 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6649 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6650 /* 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
|
6651 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
|
6652 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
|
6653 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6654 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6655 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
|
6656 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6657 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6658 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6659 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6660 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6661 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6662 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6663 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6664 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
|
6665 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6666 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
|
6667 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6668 /* 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
|
6669 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
|
6670 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6671 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6672 /* The terminal frame is used as the first Emacs frame on the Mac OS. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6673 #ifndef macintosh |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6674 #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
|
6675 /* 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
|
6676 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
|
6677 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
|
6678 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
|
6679 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6680 return 0; |
27897
a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents:
27843
diff
changeset
|
6681 #endif /* HAVE_WINDOW_SYSTEM */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
6682 #endif |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6683 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6684 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6685 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6686 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6687 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6688 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
|
6689 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6690 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
|
6691 window_height_changed_p = display_echo_area (w); |
25012 | 6692 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
|
6693 |
33068
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6694 /* Update the display, unless called from redisplay_internal. |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6695 Also don't update the screen during redisplay itself. The |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6696 update will happen at the end of redisplay, and an update |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6697 here could cause confusion. */ |
a31c3787231b
(echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents:
32912
diff
changeset
|
6698 if (update_frame_p && !redisplaying_p) |
25012 | 6699 { |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6700 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6701 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6702 /* If the display update has been interrupted by pending |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6703 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
|
6704 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
|
6705 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
|
6706 garbaged. This looks odd, so we prevent it here. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6707 if (!display_completed) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6708 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6709 |
35598
c332de00af36
(echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
35596
diff
changeset
|
6710 if (window_height_changed_p |
c332de00af36
(echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
35596
diff
changeset
|
6711 /* Don't do this if Emacs is shutting down. Redisplay |
c332de00af36
(echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
35596
diff
changeset
|
6712 needs to run hooks. */ |
c332de00af36
(echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
35596
diff
changeset
|
6713 && !NILP (Vrun_hooks)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6714 { |
34900
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6715 /* Must update other windows. Likewise as in other |
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6716 cases, don't let this update be interrupted by |
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6717 pending input. */ |
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6718 int count = BINDING_STACK_SIZE (); |
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6719 specbind (Qredisplay_dont_pause, Qt); |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6720 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
|
6721 redisplay_internal (0); |
34900
9ccc4efae7d4
(echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents:
34851
diff
changeset
|
6722 unbind_to (count, Qnil); |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6723 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6724 else if (FRAME_WINDOW_P (f) && n == 0) |
25012 | 6725 { |
31294
52f31a08e52f
(echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents:
31170
diff
changeset
|
6726 /* Window configuration is the same as before. |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
6727 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
|
6728 unless we displayed some mode lines. */ |
25012 | 6729 update_single_window (w, 1); |
6730 rif->flush_display (f); | |
6731 } | |
6732 else | |
6733 update_frame (f, 1, 1); | |
34068
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6734 |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6735 /* If cursor is in the echo area, make sure that the next |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6736 redisplay displays the minibuffer, so that the cursor will |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6737 be replaced with what the minibuffer wants. */ |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6738 if (cursor_in_echo_area) |
4a200b2a343b
(echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents:
33950
diff
changeset
|
6739 ++windows_or_buffers_changed; |
25012 | 6740 } |
277 | 6741 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
6742 else if (!EQ (mini_window, selected_window)) |
277 | 6743 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
|
6744 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
6745 /* 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
|
6746 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
|
6747 |
25012 | 6748 /* Prevent redisplay optimization in redisplay_internal by resetting |
6749 this_line_start_pos. This is done because the mini-buffer now | |
6750 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
|
6751 if (EQ (mini_window, selected_window)) |
25012 | 6752 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
|
6753 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
6754 return window_height_changed_p; |
25012 | 6755 } |
6756 | |
6757 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
6758 |
25012 | 6759 /*********************************************************************** |
6760 Frame Titles | |
6761 ***********************************************************************/ | |
6762 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6763 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6764 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 6765 |
6766 /* A buffer for constructing frame titles in it; allocated from the | |
6767 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
6768 | |
6769 static char *frame_title_buf; | |
6770 | |
6771 /* The buffer's end, and a current output position in it. */ | |
6772 | |
6773 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
|
6774 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
|
6775 |
25012 | 6776 |
6777 /* Store a single character C for the frame title in frame_title_buf. | |
6778 Re-allocate frame_title_buf if necessary. */ | |
6779 | |
6780 static void | |
6781 store_frame_title_char (c) | |
6782 char c; | |
6783 { | |
6784 /* If output position has reached the end of the allocated buffer, | |
6785 double the buffer's size. */ | |
6786 if (frame_title_ptr == frame_title_buf_end) | |
6787 { | |
6788 int len = frame_title_ptr - frame_title_buf; | |
6789 int new_size = 2 * len * sizeof *frame_title_buf; | |
6790 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
6791 frame_title_buf_end = frame_title_buf + new_size; | |
6792 frame_title_ptr = frame_title_buf + len; | |
6793 } | |
6794 | |
6795 *frame_title_ptr++ = c; | |
6796 } | |
6797 | |
6798 | |
6799 /* Store part of a frame title in frame_title_buf, beginning at | |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6800 frame_title_ptr. STR is the string to store. Do not copy |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6801 characters that yield more columns than PRECISION; PRECISION <= 0 |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6802 means copy the whole string. Pad with spaces until FIELD_WIDTH |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6803 number of characters have been copied; FIELD_WIDTH <= 0 means don't |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6804 pad. Called from display_mode_element when it is used to build a |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6805 frame title. */ |
25012 | 6806 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6807 static int |
25012 | 6808 store_frame_title (str, field_width, precision) |
6809 unsigned char *str; | |
6810 int field_width, precision; | |
6811 { | |
6812 int n = 0; | |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6813 int dummy, nbytes, width; |
25012 | 6814 |
6815 /* Copy at most PRECISION chars from STR. */ | |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6816 nbytes = strlen (str); |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6817 n+= c_string_width (str, nbytes, precision, &dummy, &nbytes); |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6818 while (nbytes--) |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6819 store_frame_title_char (*str++); |
25012 | 6820 |
6821 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
6822 while (field_width > 0 | |
6823 && n < field_width) | |
6824 { | |
6825 store_frame_title_char (' '); | |
6826 ++n; | |
6827 } | |
6828 | |
6829 return n; | |
6830 } | |
6831 | |
6832 | |
6833 /* Set the title of FRAME, if it has changed. The title format is | |
6834 Vicon_title_format if FRAME is iconified, otherwise it is | |
6835 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
6836 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6837 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6838 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
|
6839 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
6840 { |
25012 | 6841 struct frame *f = XFRAME (frame); |
6842 | |
6843 if (FRAME_WINDOW_P (f) | |
6844 || FRAME_MINIBUF_ONLY_P (f) | |
6845 || f->explicit_name) | |
6846 { | |
6847 /* Do we have more than one visible frame on this X display? */ | |
6848 Lisp_Object tail; | |
6849 Lisp_Object fmt; | |
6850 struct buffer *obuf; | |
6851 int len; | |
6852 struct it it; | |
6853 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6854 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
|
6855 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6856 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6857 |
6858 if (tf != f | |
6859 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6860 && !FRAME_MINIBUF_ONLY_P (tf) | |
6861 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6862 break; | |
6863 } | |
6864 | |
6865 /* Set global variable indicating that multiple frames exist. */ | |
6866 multiple_frames = CONSP (tail); | |
6867 | |
6868 /* Switch to the buffer of selected window of the frame. Set up | |
6869 frame_title_ptr so that display_mode_element will output into it; | |
6870 then display the title. */ | |
6871 obuf = current_buffer; | |
6872 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6873 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6874 frame_title_ptr = frame_title_buf; | |
6875 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6876 NULL, DEFAULT_FACE_ID); | |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6877 display_mode_element (&it, 0, -1, -1, fmt); |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
6878 len = frame_title_ptr - frame_title_buf; |
25012 | 6879 frame_title_ptr = NULL; |
6880 set_buffer_internal (obuf); | |
6881 | |
6882 /* Set the title only if it's changed. This avoids consing in | |
6883 the common case where it hasn't. (If it turns out that we've | |
6884 already wasted too much time by walking through the list with | |
6885 display_mode_element, then we might need to optimize at a | |
6886 higher level than this.) */ | |
6887 if (! STRINGP (f->name) | |
6888 || STRING_BYTES (XSTRING (f->name)) != len | |
6889 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6890 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6891 } | |
6892 } | |
6893 | |
6894 #else /* not HAVE_WINDOW_SYSTEM */ | |
6895 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6896 #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
|
6897 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6898 |
6899 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6900 | |
6901 | |
6902 | |
277 | 6903 |
25012 | 6904 /*********************************************************************** |
6905 Menu Bars | |
6906 ***********************************************************************/ | |
6907 | |
6908 | |
6909 /* Prepare for redisplay by updating menu-bar item lists when | |
6910 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6911 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6912 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6913 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6914 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6915 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6916 struct gcpro gcpro1, gcpro2; |
25012 | 6917 struct frame *f; |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6918 Lisp_Object tooltip_frame; |
25012 | 6919 |
6920 #ifdef HAVE_X_WINDOWS | |
6921 tooltip_frame = tip_frame; | |
6922 #else | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6923 tooltip_frame = Qnil; |
25012 | 6924 #endif |
6925 | |
6926 /* Update all frame titles based on their buffer names, etc. We do | |
6927 this before the menu bars so that the buffer-menu will show the | |
6928 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6929 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6930 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
|
6931 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6932 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6933 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6934 FOR_EACH_FRAME (tail, frame) |
25012 | 6935 { |
6936 f = XFRAME (frame); | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6937 if (!EQ (frame, tooltip_frame) |
25012 | 6938 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) |
6939 x_consider_frame_title (frame); | |
6940 } | |
6941 } | |
6942 #endif /* HAVE_WINDOW_SYSTEM */ | |
6943 | |
6944 /* Update the menu bar item lists, if appropriate. This has to be | |
6945 done before any actual redisplay or generation of display lines. */ | |
6946 all_windows = (update_mode_lines | |
6947 || buffer_shared > 1 | |
6948 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6949 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6950 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6951 Lisp_Object tail, frame; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
6952 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6953 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6954 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
|
6955 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6956 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6957 { |
25012 | 6958 f = XFRAME (frame); |
6959 | |
6960 /* Ignore tooltip frame. */ | |
34448
8f8d6aa6af8b
(prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents:
34440
diff
changeset
|
6961 if (EQ (frame, tooltip_frame)) |
25012 | 6962 continue; |
6963 | |
6964 /* If a window on this frame changed size, report that to | |
6965 the user and clear the size-change flag. */ | |
6966 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6967 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6968 Lisp_Object functions; |
25012 | 6969 |
6970 /* Clear flag first in case we get an error below. */ | |
6971 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6972 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6973 GCPRO2 (tail, functions); |
25012 | 6974 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6975 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6976 { |
25012 | 6977 call1 (XCAR (functions), frame); |
6978 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6979 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6980 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6981 } |
25012 | 6982 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6983 GCPRO1 (tail); |
25012 | 6984 update_menu_bar (f, 0); |
6985 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6986 update_tool_bar (f, 0); |
25012 | 6987 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6988 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6989 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6990 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6991 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6992 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6993 else |
25012 | 6994 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6995 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6996 update_menu_bar (sf, 1); |
25012 | 6997 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6998 update_tool_bar (sf, 1); |
25012 | 6999 #endif |
7000 } | |
7001 | |
7002 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
7003 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
7004 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
7005 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
7006 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7007 } |
25012 | 7008 |
7009 | |
7010 /* Update the menu bar item list for frame F. This has to be done | |
7011 before we start to fill in any display lines, because it can call | |
7012 eval. | |
7013 | |
7014 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
|
7015 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7016 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7017 update_menu_bar (f, save_match_data) |
25012 | 7018 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7019 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7020 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7021 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7022 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
|
7023 |
36194
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7024 /* If called recursively during a menu update, do nothing. This can |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7025 happen when, for instance, an activate-menubar-hook causes a |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7026 redisplay. */ |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7027 if (inhibit_menubar_update) |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7028 return; |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7029 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7030 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
7031 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7032 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7033 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7034 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7035 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
7036 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
|
7037 ? |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7038 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
7039 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
|
7040 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
7041 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
|
7042 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
7043 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7044 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7045 /* 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
|
7046 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
|
7047 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
|
7048 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
|
7049 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
|
7050 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
|
7051 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7052 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
|
7053 || !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
|
7054 || ((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
|
7055 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7056 != !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
|
7057 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
7058 && !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
|
7059 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7060 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7061 struct buffer *prev = current_buffer; |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7062 int count = BINDING_STACK_SIZE (); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7063 |
36194
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7064 specbind (Qinhibit_menubar_update, Qt); |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
7065 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
7066 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
|
7067 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
7068 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
|
7069 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7070 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7071 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7072 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
7073 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7074 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7075 /* Run the Lucid hook. */ |
36192
e3f902bbc767
(update_menu_bar): Run activate-menu-bar-hook with
Gerd Moellmann <gerd@gnu.org>
parents:
36114
diff
changeset
|
7076 safe_run_hooks (Qactivate_menubar_hook); |
25012 | 7077 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7078 /* If it has changed current-menubar from previous value, |
25012 | 7079 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
|
7080 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
7081 call0 (Qrecompute_lucid_menubar); |
25012 | 7082 |
14299 | 7083 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
|
7084 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 7085 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7086 /* Redisplay the menu bar in case we changed it. */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7087 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7088 if (FRAME_WINDOW_P (f) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7089 #if defined (macintosh) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7090 /* All frames on Mac OS share the same menubar. So only the |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7091 selected frame should be allowed to set it. */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7092 && f == SELECTED_FRAME () |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7093 #endif |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
7094 ) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
7095 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
|
7096 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7097 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 7098 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
|
7099 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7100 #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
|
7101 /* 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
|
7102 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
|
7103 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
7104 #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
|
7105 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
7106 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
|
7107 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7108 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7109 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7110 } |
25012 | 7111 |
7112 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7113 |
25012 | 7114 /*********************************************************************** |
25543 | 7115 Tool-bars |
25012 | 7116 ***********************************************************************/ |
7117 | |
7118 #ifdef HAVE_WINDOW_SYSTEM | |
7119 | |
25543 | 7120 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 7121 before we start to fill in any display lines. Called from |
7122 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
7123 and restore it here. */ | |
7124 | |
7125 static void | |
25543 | 7126 update_tool_bar (f, save_match_data) |
25012 | 7127 struct frame *f; |
7128 int save_match_data; | |
7129 { | |
25543 | 7130 if (WINDOWP (f->tool_bar_window) |
7131 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 7132 { |
7133 Lisp_Object window; | |
7134 struct window *w; | |
7135 | |
7136 window = FRAME_SELECTED_WINDOW (f); | |
7137 w = XWINDOW (window); | |
7138 | |
7139 /* If the user has switched buffers or windows, we need to | |
7140 recompute to reflect the new bindings. But we'll | |
7141 recompute when update_mode_lines is set too; that means | |
7142 that people can use force-mode-line-update to request | |
7143 that the menu bar be recomputed. The adverse effect on | |
7144 the rest of the redisplay algorithm is about the same as | |
7145 windows_or_buffers_changed anyway. */ | |
7146 if (windows_or_buffers_changed | |
7147 || !NILP (w->update_mode_line) | |
7148 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
7149 < BUF_MODIFF (XBUFFER (w->buffer))) | |
7150 != !NILP (w->last_had_star)) | |
7151 || ((!NILP (Vtransient_mark_mode) | |
7152 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7153 != !NILP (w->region_showing))) | |
7154 { | |
7155 struct buffer *prev = current_buffer; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
7156 int count = BINDING_STACK_SIZE (); |
25012 | 7157 |
7158 /* Set current_buffer to the buffer of the selected | |
7159 window of the frame, so that we get the right local | |
7160 keymaps. */ | |
7161 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
7162 | |
7163 /* Save match data, if we must. */ | |
7164 if (save_match_data) | |
7165 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
7166 | |
7167 /* Make sure that we don't accidentally use bogus keymaps. */ | |
7168 if (NILP (Voverriding_local_map_menu_flag)) | |
7169 { | |
7170 specbind (Qoverriding_terminal_local_map, Qnil); | |
7171 specbind (Qoverriding_local_map, Qnil); | |
7172 } | |
7173 | |
25543 | 7174 /* Build desired tool-bar items from keymaps. */ |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7175 f->tool_bar_items |
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7176 = tool_bar_items (f->tool_bar_items, &f->n_tool_bar_items); |
25012 | 7177 |
25543 | 7178 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 7179 w->update_mode_line = Qt; |
7180 | |
7181 unbind_to (count, Qnil); | |
7182 set_buffer_internal_1 (prev); | |
7183 } | |
7184 } | |
7185 } | |
7186 | |
7187 | |
25543 | 7188 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7189 F's desired tool-bar contents. F->tool_bar_items must have |
25012 | 7190 been set up previously by calling prepare_menu_bars. */ |
7191 | |
7192 static void | |
25543 | 7193 build_desired_tool_bar_string (f) |
25012 | 7194 struct frame *f; |
7195 { | |
35246
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7196 int i, size, size_needed; |
25012 | 7197 struct gcpro gcpro1, gcpro2, gcpro3; |
7198 Lisp_Object image, plist, props; | |
7199 | |
7200 image = plist = props = Qnil; | |
7201 GCPRO3 (image, plist, props); | |
7202 | |
25543 | 7203 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 7204 Otherwise, make a new string. */ |
7205 | |
7206 /* The size of the string we might be able to reuse. */ | |
25543 | 7207 size = (STRINGP (f->desired_tool_bar_string) |
7208 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 7209 : 0); |
7210 | |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
7211 /* We need one space in the string for each image. */ |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
7212 size_needed = f->n_tool_bar_items; |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
7213 |
25543 | 7214 /* Reuse f->desired_tool_bar_string, if possible. */ |
35474
1859c648801a
(build_desired_tool_bar_string): Make sure we have
Gerd Moellmann <gerd@gnu.org>
parents:
35465
diff
changeset
|
7215 if (size < size_needed || NILP (f->desired_tool_bar_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
|
7216 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
|
7217 make_number (' ')); |
25012 | 7218 else |
7219 { | |
7220 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
7221 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 7222 props, f->desired_tool_bar_string); |
25012 | 7223 } |
7224 | |
7225 /* Put a `display' property on the string for the images to display, | |
25543 | 7226 put a `menu_item' property on tool-bar items with a value that |
7227 is the index of the item in F's tool-bar item vector. */ | |
35246
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7228 for (i = 0; i < f->n_tool_bar_items; ++i) |
25012 | 7229 { |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7230 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) |
25543 | 7231 |
7232 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
7233 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7234 int hmargin, vmargin, relief, idx, end; |
35361
1b5e3bc8ce89
* xdisp.c (build_desired_tool_bar_string): Use :conversion instead
Gerd Moellmann <gerd@gnu.org>
parents:
35357
diff
changeset
|
7235 extern Lisp_Object QCrelief, QCmargin, QCconversion, Qimage; |
25012 | 7236 extern Lisp_Object Qlaplace; |
7237 | |
7238 /* If image is a vector, choose the image according to the | |
7239 button state. */ | |
25543 | 7240 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 7241 if (VECTORP (image)) |
7242 { | |
7243 if (enabled_p) | |
7244 idx = (selected_p | |
25543 | 7245 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
7246 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 7247 else |
7248 idx = (selected_p | |
25543 | 7249 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
7250 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 7251 |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7252 xassert (ASIZE (image) >= idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7253 image = AREF (image, idx); |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7254 } |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7255 else |
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7256 idx = -1; |
25012 | 7257 |
7258 /* Ignore invalid image specifications. */ | |
7259 if (!valid_image_p (image)) | |
7260 continue; | |
7261 | |
25543 | 7262 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 7263 plist = Fcopy_sequence (XCDR (image)); |
7264 | |
7265 /* Compute margin and relief to draw. */ | |
35734
8c0eef9f8f5c
(build_desired_tool_bar_string, syms_of_xdisp): Use
Gerd Moellmann <gerd@gnu.org>
parents:
35692
diff
changeset
|
7266 relief = (tool_bar_button_relief > 0 |
8c0eef9f8f5c
(build_desired_tool_bar_string, syms_of_xdisp): Use
Gerd Moellmann <gerd@gnu.org>
parents:
35692
diff
changeset
|
7267 ? tool_bar_button_relief |
8c0eef9f8f5c
(build_desired_tool_bar_string, syms_of_xdisp): Use
Gerd Moellmann <gerd@gnu.org>
parents:
35692
diff
changeset
|
7268 : DEFAULT_TOOL_BAR_BUTTON_RELIEF); |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7269 hmargin = vmargin = relief; |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7270 |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7271 if (INTEGERP (Vtool_bar_button_margin) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7272 && XINT (Vtool_bar_button_margin) > 0) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7273 { |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7274 hmargin += XFASTINT (Vtool_bar_button_margin); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7275 vmargin += XFASTINT (Vtool_bar_button_margin); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7276 } |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7277 else if (CONSP (Vtool_bar_button_margin)) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7278 { |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7279 if (INTEGERP (XCAR (Vtool_bar_button_margin)) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7280 && XINT (XCAR (Vtool_bar_button_margin)) > 0) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7281 hmargin += XFASTINT (XCAR (Vtool_bar_button_margin)); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7282 |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7283 if (INTEGERP (XCDR (Vtool_bar_button_margin)) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7284 && XINT (XCDR (Vtool_bar_button_margin)) > 0) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7285 vmargin += XFASTINT (XCDR (Vtool_bar_button_margin)); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7286 } |
25543 | 7287 |
7288 if (auto_raise_tool_bar_buttons_p) | |
25012 | 7289 { |
7290 /* Add a `:relief' property to the image spec if the item is | |
7291 selected. */ | |
7292 if (selected_p) | |
7293 { | |
7294 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7295 hmargin -= relief; |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7296 vmargin -= relief; |
25012 | 7297 } |
7298 } | |
7299 else | |
7300 { | |
7301 /* If image is selected, display it pressed, i.e. with a | |
7302 negative relief. If it's not selected, display it with a | |
7303 raised relief. */ | |
7304 plist = Fplist_put (plist, QCrelief, | |
7305 (selected_p | |
7306 ? make_number (-relief) | |
7307 : make_number (relief))); | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7308 hmargin -= relief; |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7309 vmargin -= relief; |
25012 | 7310 } |
7311 | |
7312 /* Put a margin around the image. */ | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7313 if (hmargin || vmargin) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7314 { |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7315 if (hmargin == vmargin) |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7316 plist = Fplist_put (plist, QCmargin, make_number (hmargin)); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7317 else |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7318 plist = Fplist_put (plist, QCmargin, |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7319 Fcons (make_number (hmargin), |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7320 make_number (vmargin))); |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
7321 } |
25012 | 7322 |
31650
8b3846ae64fe
(build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents:
31610
diff
changeset
|
7323 /* 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
|
7324 for the disabled state, make the image appear disabled by |
25012 | 7325 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
|
7326 if (!enabled_p && idx < 0) |
35361
1b5e3bc8ce89
* xdisp.c (build_desired_tool_bar_string): Use :conversion instead
Gerd Moellmann <gerd@gnu.org>
parents:
35357
diff
changeset
|
7327 plist = Fplist_put (plist, QCconversion, Qdisabled); |
25012 | 7328 |
7329 /* Put a `display' text property on the string for the image to | |
7330 display. Put a `menu-item' property on the string that gives | |
25543 | 7331 the start of this item's properties in the tool-bar items |
25012 | 7332 vector. */ |
7333 image = Fcons (Qimage, plist); | |
7334 props = list4 (Qdisplay, image, | |
35246
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7335 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)); |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7336 |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7337 /* Let the last image hide all remaining spaces in the tool bar |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7338 string. The string can be longer than needed when we reuse a |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7339 previous string. */ |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7340 if (i + 1 == f->n_tool_bar_items) |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7341 end = XSTRING (f->desired_tool_bar_string)->size; |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7342 else |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7343 end = i + 1; |
4e6bbe9c1780
(build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents:
35200
diff
changeset
|
7344 Fadd_text_properties (make_number (i), make_number (end), |
25543 | 7345 props, f->desired_tool_bar_string); |
25012 | 7346 #undef PROP |
7347 } | |
7348 | |
7349 UNGCPRO; | |
7350 } | |
7351 | |
7352 | |
25543 | 7353 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 7354 |
7355 static void | |
25543 | 7356 display_tool_bar_line (it) |
25012 | 7357 struct it *it; |
7358 { | |
7359 struct glyph_row *row = it->glyph_row; | |
7360 int max_x = it->last_visible_x; | |
7361 struct glyph *last; | |
7362 | |
7363 prepare_desired_row (row); | |
7364 row->y = it->current_y; | |
34500
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7365 |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7366 /* Note that this isn't made use of if the face hasn't a box, |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7367 so there's no need to check the face here. */ |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7368 it->start_of_box_run_p = 1; |
25012 | 7369 |
7370 while (it->current_x < max_x) | |
7371 { | |
7372 int x_before, x, n_glyphs_before, i, nglyphs; | |
7373 | |
7374 /* Get the next display element. */ | |
7375 if (!get_next_display_element (it)) | |
7376 break; | |
7377 | |
7378 /* Produce glyphs. */ | |
7379 x_before = it->current_x; | |
7380 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
7381 PRODUCE_GLYPHS (it); | |
7382 | |
7383 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
7384 i = 0; | |
7385 x = x_before; | |
7386 while (i < nglyphs) | |
7387 { | |
7388 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
7389 | |
7390 if (x + glyph->pixel_width > max_x) | |
7391 { | |
7392 /* Glyph doesn't fit on line. */ | |
7393 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
7394 it->current_x = x; | |
7395 goto out; | |
7396 } | |
7397 | |
7398 ++it->hpos; | |
7399 x += glyph->pixel_width; | |
7400 ++i; | |
7401 } | |
7402 | |
7403 /* Stop at line ends. */ | |
7404 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
7405 break; | |
7406 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
7407 set_iterator_to_next (it, 1); |
25012 | 7408 } |
7409 | |
7410 out:; | |
7411 | |
7412 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
7413 extend_face_to_end_of_line (it); | |
7414 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
7415 last->right_box_line_p = 1; | |
34500
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7416 if (last == row->glyphs[TEXT_AREA]) |
41ad2cf8ccb8
(display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
34479
diff
changeset
|
7417 last->left_box_line_p = 1; |
25012 | 7418 compute_line_metrics (it); |
7419 | |
25543 | 7420 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 7421 if (!row->displays_text_p) |
7422 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
7423 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
|
7424 row->ascent = row->phys_ascent = 0; |
25012 | 7425 } |
7426 | |
7427 row->full_width_p = 1; | |
7428 row->continued_p = 0; | |
7429 row->truncated_on_left_p = 0; | |
7430 row->truncated_on_right_p = 0; | |
7431 | |
7432 it->current_x = it->hpos = 0; | |
7433 it->current_y += row->height; | |
7434 ++it->vpos; | |
7435 ++it->glyph_row; | |
7436 } | |
7437 | |
7438 | |
25543 | 7439 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 7440 items of frame F visible. */ |
7441 | |
7442 static int | |
25543 | 7443 tool_bar_lines_needed (f) |
25012 | 7444 struct frame *f; |
7445 { | |
25543 | 7446 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 7447 struct it it; |
7448 | |
25543 | 7449 /* Initialize an iterator for iteration over |
7450 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
7451 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7452 it.first_visible_x = 0; |
7453 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 7454 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 7455 |
7456 while (!ITERATOR_AT_END_P (&it)) | |
7457 { | |
7458 it.glyph_row = w->desired_matrix->rows; | |
7459 clear_glyph_row (it.glyph_row); | |
25543 | 7460 display_tool_bar_line (&it); |
25012 | 7461 } |
7462 | |
7463 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
7464 } | |
7465 | |
7466 | |
35465
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7467 DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed, |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7468 0, 1, 0, |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7469 "Return the number of lines occupied by the tool bar of FRAME.") |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7470 (frame) |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7471 Lisp_Object frame; |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7472 { |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7473 struct frame *f; |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7474 struct window *w; |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7475 int nlines = 0; |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7476 |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7477 if (NILP (frame)) |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7478 frame = selected_frame; |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7479 else |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7480 CHECK_FRAME (frame, 0); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7481 f = XFRAME (frame); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7482 |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7483 if (WINDOWP (f->tool_bar_window) |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7484 || (w = XWINDOW (f->tool_bar_window), |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7485 XFASTINT (w->height) > 0)) |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7486 { |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7487 update_tool_bar (f, 1); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7488 if (f->n_tool_bar_items) |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7489 { |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7490 build_desired_tool_bar_string (f); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7491 nlines = tool_bar_lines_needed (f); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7492 } |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7493 } |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7494 |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7495 return make_number (nlines); |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7496 } |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7497 |
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
7498 |
25543 | 7499 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 7500 height should be changed. */ |
7501 | |
7502 static int | |
25543 | 7503 redisplay_tool_bar (f) |
25012 | 7504 struct frame *f; |
7505 { | |
7506 struct window *w; | |
7507 struct it it; | |
7508 struct glyph_row *row; | |
7509 int change_height_p = 0; | |
7510 | |
25543 | 7511 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
7512 do anything. This means you must start with tool-bar-lines | |
25012 | 7513 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 7514 can turn off tool-bars by specifying tool-bar-lines zero. */ |
7515 if (!WINDOWP (f->tool_bar_window) | |
7516 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 7517 XFASTINT (w->height) == 0)) |
7518 return 0; | |
7519 | |
25543 | 7520 /* Set up an iterator for the tool-bar window. */ |
7521 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 7522 it.first_visible_x = 0; |
7523 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
7524 row = it.glyph_row; | |
7525 | |
25543 | 7526 /* Build a string that represents the contents of the tool-bar. */ |
7527 build_desired_tool_bar_string (f); | |
7528 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
7529 | |
7530 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 7531 while (it.current_y < it.last_visible_y) |
25543 | 7532 display_tool_bar_line (&it); |
7533 | |
7534 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 7535 window, so don't do it. */ |
7536 w->desired_matrix->no_scrolling_p = 1; | |
7537 w->must_be_updated_p = 1; | |
7538 | |
25543 | 7539 if (auto_resize_tool_bars_p) |
25012 | 7540 { |
7541 int nlines; | |
35357
bc6d69d139c6
(redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents:
35334
diff
changeset
|
7542 |
bc6d69d139c6
(redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents:
35334
diff
changeset
|
7543 /* If we couldn't display everything, change the tool-bar's |
bc6d69d139c6
(redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents:
35334
diff
changeset
|
7544 height. */ |
bc6d69d139c6
(redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents:
35334
diff
changeset
|
7545 if (IT_STRING_CHARPOS (it) < it.end_charpos) |
bc6d69d139c6
(redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents:
35334
diff
changeset
|
7546 change_height_p = 1; |
25012 | 7547 |
7548 /* If there are blank lines at the end, except for a partially | |
7549 visible blank line at the end that is smaller than | |
25543 | 7550 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 7551 row = it.glyph_row - 1; |
7552 if (!row->displays_text_p | |
7553 && row->height >= CANON_Y_UNIT (f)) | |
7554 change_height_p = 1; | |
7555 | |
25543 | 7556 /* If row displays tool-bar items, but is partially visible, |
7557 change the tool-bar's height. */ | |
25012 | 7558 if (row->displays_text_p |
7559 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
7560 change_height_p = 1; | |
7561 | |
25543 | 7562 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 7563 frame parameter. */ |
7564 if (change_height_p | |
25543 | 7565 && (nlines = tool_bar_lines_needed (f), |
25012 | 7566 nlines != XFASTINT (w->height))) |
7567 { | |
25543 | 7568 extern Lisp_Object Qtool_bar_lines; |
25012 | 7569 Lisp_Object frame; |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7570 int old_height = XFASTINT (w->height); |
25012 | 7571 |
7572 XSETFRAME (frame, f); | |
7573 clear_glyph_matrix (w->desired_matrix); | |
7574 Fmodify_frame_parameters (frame, | |
25543 | 7575 Fcons (Fcons (Qtool_bar_lines, |
25012 | 7576 make_number (nlines)), |
7577 Qnil)); | |
33099
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7578 if (XFASTINT (w->height) != old_height) |
006a1f5b5f43
(redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents:
33074
diff
changeset
|
7579 fonts_changed_p = 1; |
25012 | 7580 } |
7581 } | |
7582 | |
7583 return change_height_p; | |
7584 } | |
7585 | |
7586 | |
25543 | 7587 /* Get information about the tool-bar item which is displayed in GLYPH |
7588 on frame F. Return in *PROP_IDX the index where tool-bar item | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7589 properties start in F->tool_bar_items. Value is zero if |
25543 | 7590 GLYPH doesn't display a tool-bar item. */ |
25012 | 7591 |
7592 int | |
25543 | 7593 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 7594 struct frame *f; |
7595 struct glyph *glyph; | |
7596 int *prop_idx; | |
7597 { | |
7598 Lisp_Object prop; | |
7599 int success_p; | |
7600 | |
7601 /* Get the text property `menu-item' at pos. The value of that | |
7602 property is the start index of this item's properties in | |
33762
07c6230bc933
(update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents:
33757
diff
changeset
|
7603 F->tool_bar_items. */ |
25012 | 7604 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 7605 Qmenu_item, f->current_tool_bar_string); |
25012 | 7606 if (INTEGERP (prop)) |
7607 { | |
7608 *prop_idx = XINT (prop); | |
7609 success_p = 1; | |
7610 } | |
7611 else | |
7612 success_p = 0; | |
7613 | |
7614 return success_p; | |
7615 } | |
7616 | |
7617 #endif /* HAVE_WINDOW_SYSTEM */ | |
7618 | |
7619 | |
7620 | |
7621 /************************************************************************ | |
7622 Horizontal scrolling | |
7623 ************************************************************************/ | |
7624 | |
7625 static int hscroll_window_tree P_ ((Lisp_Object)); | |
7626 static int hscroll_windows P_ ((Lisp_Object)); | |
7627 | |
7628 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
7629 hscroll value so that PT is (i) visible in the window, and (ii) so | |
7630 that it is not within a certain margin at the window's left and | |
7631 right border. Value is non-zero if any window's hscroll has been | |
7632 changed. */ | |
7633 | |
7634 static int | |
7635 hscroll_window_tree (window) | |
7636 Lisp_Object window; | |
7637 { | |
7638 int hscrolled_p = 0; | |
7639 | |
7640 while (WINDOWP (window)) | |
7641 { | |
7642 struct window *w = XWINDOW (window); | |
7643 | |
7644 if (WINDOWP (w->hchild)) | |
7645 hscrolled_p |= hscroll_window_tree (w->hchild); | |
7646 else if (WINDOWP (w->vchild)) | |
7647 hscrolled_p |= hscroll_window_tree (w->vchild); | |
7648 else if (w->cursor.vpos >= 0) | |
7649 { | |
7650 int hscroll_margin, text_area_x, text_area_y; | |
7651 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
|
7652 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7653 = 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
|
7654 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7655 = 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
|
7656 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7657 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7658 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7659 : current_cursor_row); |
25012 | 7660 |
7661 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
7662 &text_area_width, &text_area_height); | |
7663 | |
7664 /* Scroll when cursor is inside this scroll margin. */ | |
7665 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
7666 | |
7667 if ((XFASTINT (w->hscroll) | |
7668 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7669 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7670 && cursor_row->truncated_on_right_p |
25012 | 7671 && (w->cursor.x > text_area_width - hscroll_margin))) |
7672 { | |
7673 struct it it; | |
7674 int hscroll; | |
7675 struct buffer *saved_current_buffer; | |
7676 int pt; | |
7677 | |
7678 /* Find point in a display of infinite width. */ | |
7679 saved_current_buffer = current_buffer; | |
7680 current_buffer = XBUFFER (w->buffer); | |
7681 | |
7682 if (w == XWINDOW (selected_window)) | |
7683 pt = BUF_PT (current_buffer); | |
7684 else | |
7685 { | |
7686 pt = marker_position (w->pointm); | |
7687 pt = max (BEGV, pt); | |
7688 pt = min (ZV, pt); | |
7689 } | |
7690 | |
7691 /* Move iterator to pt starting at cursor_row->start in | |
7692 a line with infinite width. */ | |
7693 init_to_row_start (&it, w, cursor_row); | |
7694 it.last_visible_x = INFINITY; | |
7695 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
7696 current_buffer = saved_current_buffer; | |
7697 | |
7698 /* Center cursor in window. */ | |
7699 hscroll = (max (0, it.current_x - text_area_width / 2) | |
7700 / CANON_X_UNIT (it.f)); | |
34748
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7701 hscroll = max (hscroll, XFASTINT (w->min_hscroll)); |
25012 | 7702 |
7703 /* Don't call Fset_window_hscroll if value hasn't | |
7704 changed because it will prevent redisplay | |
7705 optimizations. */ | |
7706 if (XFASTINT (w->hscroll) != hscroll) | |
7707 { | |
34748
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7708 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
e978a3fb2690
(hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
34743
diff
changeset
|
7709 w->hscroll = make_number (hscroll); |
25012 | 7710 hscrolled_p = 1; |
7711 } | |
7712 } | |
7713 } | |
7714 | |
7715 window = w->next; | |
7716 } | |
7717 | |
7718 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
7719 return hscrolled_p; | |
7720 } | |
7721 | |
7722 | |
7723 /* Set hscroll so that cursor is visible and not inside horizontal | |
7724 scroll margins for all windows in the tree rooted at WINDOW. See | |
7725 also hscroll_window_tree above. Value is non-zero if any window's | |
7726 hscroll has been changed. If it has, desired matrices on the frame | |
7727 of WINDOW are cleared. */ | |
7728 | |
7729 static int | |
7730 hscroll_windows (window) | |
7731 Lisp_Object window; | |
7732 { | |
28692
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7733 int hscrolled_p; |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7734 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7735 if (automatic_hscrolling_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7736 { |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7737 hscrolled_p = hscroll_window_tree (window); |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7738 if (hscrolled_p) |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7739 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
|
7740 } |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7741 else |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
7742 hscrolled_p = 0; |
25012 | 7743 return hscrolled_p; |
7744 } | |
7745 | |
7746 | |
7747 | |
7748 /************************************************************************ | |
7749 Redisplay | |
7750 ************************************************************************/ | |
7751 | |
7752 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
7753 to a non-zero value. This is sometimes handy to have in a debugger | |
7754 session. */ | |
7755 | |
7756 #if GLYPH_DEBUG | |
7757 | |
7758 /* First and last unchanged row for try_window_id. */ | |
7759 | |
7760 int debug_first_unchanged_at_end_vpos; | |
7761 int debug_last_unchanged_at_beg_vpos; | |
7762 | |
7763 /* Delta vpos and y. */ | |
7764 | |
7765 int debug_dvpos, debug_dy; | |
7766 | |
7767 /* Delta in characters and bytes for try_window_id. */ | |
7768 | |
7769 int debug_delta, debug_delta_bytes; | |
7770 | |
7771 /* Values of window_end_pos and window_end_vpos at the end of | |
7772 try_window_id. */ | |
7773 | |
7774 int debug_end_pos, debug_end_vpos; | |
7775 | |
7776 /* Append a string to W->desired_matrix->method. FMT is a printf | |
7777 format string. A1...A9 are a supplement for a variable-length | |
7778 argument list. If trace_redisplay_p is non-zero also printf the | |
7779 resulting string to stderr. */ | |
7780 | |
7781 static void | |
7782 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
7783 struct window *w; | |
7784 char *fmt; | |
7785 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
7786 { | |
7787 char buffer[512]; | |
7788 char *method = w->desired_matrix->method; | |
7789 int len = strlen (method); | |
7790 int size = sizeof w->desired_matrix->method; | |
7791 int remaining = size - len - 1; | |
7792 | |
7793 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
7794 if (len && remaining) | |
7795 { | |
7796 method[len] = '|'; | |
7797 --remaining, ++len; | |
7798 } | |
7799 | |
7800 strncpy (method + len, buffer, remaining); | |
7801 | |
7802 if (trace_redisplay_p) | |
7803 fprintf (stderr, "%p (%s): %s\n", | |
7804 w, | |
7805 ((BUFFERP (w->buffer) | |
7806 && STRINGP (XBUFFER (w->buffer)->name)) | |
7807 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
7808 : "no buffer"), | |
7809 buffer); | |
7810 } | |
7811 | |
7812 #endif /* GLYPH_DEBUG */ | |
7813 | |
7814 | |
7815 /* This counter is used to clear the face cache every once in a while | |
7816 in redisplay_internal. It is incremented for each redisplay. | |
7817 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
7818 cleared. */ | |
7819 | |
7820 #define CLEAR_FACE_CACHE_COUNT 10000 | |
7821 static int clear_face_cache_count; | |
7822 | |
7823 /* Record the previous terminal frame we displayed. */ | |
7824 | |
7825 static struct frame *previous_terminal_frame; | |
7826 | |
7827 /* Non-zero while redisplay_internal is in progress. */ | |
7828 | |
7829 int redisplaying_p; | |
7830 | |
7831 | |
7832 /* Value is non-zero if all changes in window W, which displays | |
7833 current_buffer, are in the text between START and END. START is a | |
7834 buffer position, END is given as a distance from Z. Used in | |
7835 redisplay_internal for display optimization. */ | |
7836 | |
7837 static INLINE int | |
7838 text_outside_line_unchanged_p (w, start, end) | |
7839 struct window *w; | |
7840 int start, end; | |
7841 { | |
7842 int unchanged_p = 1; | |
7843 | |
7844 /* If text or overlays have changed, see where. */ | |
7845 if (XFASTINT (w->last_modified) < MODIFF | |
7846 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
7847 { | |
7848 /* Gap in the line? */ | |
7849 if (GPT < start || Z - GPT < end) | |
7850 unchanged_p = 0; | |
7851 | |
7852 /* Changes start in front of the line, or end after it? */ | |
7853 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7854 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7855 || END_UNCHANGED < end)) |
25012 | 7856 unchanged_p = 0; |
7857 | |
7858 /* If selective display, can't optimize if changes start at the | |
7859 beginning of the line. */ | |
7860 if (unchanged_p | |
7861 && INTEGERP (current_buffer->selective_display) | |
7862 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7863 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 7864 unchanged_p = 0; |
7865 } | |
7866 | |
7867 return unchanged_p; | |
7868 } | |
7869 | |
7870 | |
7871 /* Do a frame update, taking possible shortcuts into account. This is | |
7872 the main external entry point for redisplay. | |
7873 | |
7874 If the last redisplay displayed an echo area message and that message | |
7875 is no longer requested, we clear the echo area or bring back the | |
7876 mini-buffer if that is in use. */ | |
7877 | |
7878 void | |
7879 redisplay () | |
7880 { | |
7881 redisplay_internal (0); | |
7882 } | |
7883 | |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7884 /* 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
|
7885 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
|
7886 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
|
7887 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7888 int |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7889 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
|
7890 struct buffer *prev_buf, *buf; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7891 int prev_pt, pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7892 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7893 int start, end; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7894 Lisp_Object prop; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7895 Lisp_Object buffer; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7896 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7897 XSETBUFFER (buffer, buf); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7898 /* 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
|
7899 same buffer. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7900 if (prev_buf == buf) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7901 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7902 if (prev_pt == pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7903 /* Point didn't move. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7904 return 0; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7905 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7906 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
|
7907 && 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
|
7908 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7909 && start < prev_pt && end > prev_pt) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7910 /* 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
|
7911 point moved out of the composition. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7912 return (pt <= start || pt >= end); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7913 } |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7914 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7915 /* Check a composition at the current point. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7916 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
|
7917 && 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
|
7918 && COMPOSITION_VALID_P (start, end, prop) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7919 && start < pt && end > pt); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7920 } |
25012 | 7921 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7922 /* 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
|
7923 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7924 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7925 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7926 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7927 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7928 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7929 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7930 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7931 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7932 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7933 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7934 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7935 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7936 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7937 b->clip_changed = 0; |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7938 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7939 /* 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
|
7940 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
|
7941 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
|
7942 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
|
7943 check. */ |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7944 if (!b->clip_changed |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7945 && 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
|
7946 { |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7947 int pt; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7948 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7949 if (w == XWINDOW (selected_window)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7950 pt = BUF_PT (current_buffer); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7951 else |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7952 pt = marker_position (w->pointm); |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7953 |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7954 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
|
7955 || pt != XINT (w->last_point)) |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7956 && 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
|
7957 XINT (w->last_point), |
26874
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7958 XBUFFER (w->buffer), pt)) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7959 b->clip_changed = 1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
7960 } |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7961 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7962 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7963 |
25012 | 7964 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
7965 response to any user action; therefore, we should preserve the echo | |
7966 area. (Actually, our caller does that job.) Perhaps in the future | |
7967 avoid recentering windows if it is not necessary; currently that | |
7968 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7969 |
277 | 7970 static void |
25012 | 7971 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
7972 int preserve_echo_area; |
277 | 7973 { |
25012 | 7974 struct window *w = XWINDOW (selected_window); |
7975 struct frame *f = XFRAME (w->frame); | |
7976 int pause; | |
7977 int must_finish = 0; | |
7978 struct text_pos tlbufpos, tlendpos; | |
7979 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7980 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7981 struct frame *sf = SELECTED_FRAME (); |
25012 | 7982 |
7983 /* Non-zero means redisplay has to consider all windows on all | |
7984 frames. Zero means, only selected_window is considered. */ | |
7985 int consider_all_windows_p; | |
7986 | |
7987 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
7988 | |
7989 /* No redisplay if running in batch mode or frame is not yet fully | |
7990 initialized, or redisplay is explicitly turned off by setting | |
7991 Vinhibit_redisplay. */ | |
7992 if (noninteractive | |
7993 || !NILP (Vinhibit_redisplay) | |
7994 || !f->glyphs_initialized_p) | |
7995 return; | |
7996 | |
7997 /* The flag redisplay_performed_directly_p is set by | |
7998 direct_output_for_insert when it already did the whole screen | |
7999 update necessary. */ | |
8000 if (redisplay_performed_directly_p) | |
8001 { | |
8002 redisplay_performed_directly_p = 0; | |
8003 if (!hscroll_windows (selected_window)) | |
8004 return; | |
8005 } | |
8006 | |
8007 #ifdef USE_X_TOOLKIT | |
8008 if (popup_activated ()) | |
8009 return; | |
8010 #endif | |
8011 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8012 /* I don't think this happens but let's be paranoid. */ |
25012 | 8013 if (redisplaying_p) |
8014 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8015 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8016 /* 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
|
8017 when we leave this function. */ |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
8018 count = BINDING_STACK_SIZE (); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8019 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 8020 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8021 |
25012 | 8022 retry: |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8023 pause = 0; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8024 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8025 |
25012 | 8026 /* If new fonts have been loaded that make a glyph matrix adjustment |
8027 necessary, do it. */ | |
8028 if (fonts_changed_p) | |
8029 { | |
8030 adjust_glyphs (NULL); | |
8031 ++windows_or_buffers_changed; | |
8032 fonts_changed_p = 0; | |
8033 } | |
8034 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8035 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8036 && previous_terminal_frame != sf) |
25012 | 8037 { |
8038 /* Since frames on an ASCII terminal share the same display | |
8039 area, displaying a different frame means redisplay the whole | |
8040 thing. */ | |
8041 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8042 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8043 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8044 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8045 previous_terminal_frame = sf; |
25012 | 8046 |
8047 /* Set the visible flags for all frames. Do this before checking | |
8048 for resized or garbaged frames; they want to know if their frames | |
8049 are visible. See the comment in frame.h for | |
8050 FRAME_SAMPLE_VISIBILITY. */ | |
8051 { | |
8052 Lisp_Object tail, frame; | |
8053 | |
8054 number_of_visible_frames = 0; | |
8055 | |
8056 FOR_EACH_FRAME (tail, frame) | |
8057 { | |
8058 struct frame *f = XFRAME (frame); | |
8059 | |
8060 FRAME_SAMPLE_VISIBILITY (f); | |
8061 if (FRAME_VISIBLE_P (f)) | |
8062 ++number_of_visible_frames; | |
8063 clear_desired_matrices (f); | |
8064 } | |
8065 } | |
8066 | |
8067 /* 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
|
8068 do_pending_window_change (1); |
25012 | 8069 |
8070 /* Clear frames marked as garbaged. */ | |
8071 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8072 clear_garbaged_frames (); |
25012 | 8073 |
25543 | 8074 /* Build menubar and tool-bar items. */ |
25012 | 8075 prepare_menu_bars (); |
8076 | |
8077 if (windows_or_buffers_changed) | |
8078 update_mode_lines++; | |
8079 | |
8080 /* Detect case that we need to write or remove a star in the mode line. */ | |
8081 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
8082 { | |
8083 w->update_mode_line = Qt; | |
8084 if (buffer_shared > 1) | |
8085 update_mode_lines++; | |
8086 } | |
8087 | |
8088 /* If %c is in the mode line, update it if needed. */ | |
8089 if (!NILP (w->column_number_displayed) | |
8090 /* This alternative quickly identifies a common case | |
8091 where no change is needed. */ | |
8092 && !(PT == XFASTINT (w->last_point) | |
8093 && XFASTINT (w->last_modified) >= MODIFF | |
8094 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
8095 && XFASTINT (w->column_number_displayed) != current_column ()) | |
8096 w->update_mode_line = Qt; | |
8097 | |
8098 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
8099 | |
8100 /* The variable buffer_shared is set in redisplay_window and | |
8101 indicates that we redisplay a buffer in different windows. See | |
8102 there. */ | |
8103 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
8104 | |
8105 /* If specs for an arrow have changed, do thorough redisplay | |
8106 to ensure we remove any arrow that should no longer exist. */ | |
8107 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
8108 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
8109 consider_all_windows_p = windows_or_buffers_changed = 1; | |
8110 | |
8111 /* Normally the message* functions will have already displayed and | |
8112 updated the echo area, but the frame may have been trashed, or | |
8113 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
|
8114 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
|
8115 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
|
8116 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
|
8117 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8118 int window_height_changed_p = echo_area_display (0); |
25012 | 8119 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8120 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8121 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8122 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8123 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
|
8124 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8125 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
|
8126 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8127 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8128 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8129 /* 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
|
8130 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8131 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8132 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8133 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8134 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8135 } |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8136 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
|
8137 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8138 || 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
|
8139 || 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
|
8140 && 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
|
8141 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8142 /* 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
|
8143 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
|
8144 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
8145 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
|
8146 ++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
|
8147 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8148 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8149 /* 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
|
8150 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8151 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8152 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8153 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8154 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8155 |
25012 | 8156 |
8157 /* If showing the region, and mark has changed, we must redisplay | |
8158 the whole window. The assignment to this_line_start_pos prevents | |
8159 the optimization directly below this if-statement. */ | |
8160 if (((!NILP (Vtransient_mark_mode) | |
8161 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
8162 != !NILP (w->region_showing)) | |
8163 || (!NILP (w->region_showing) | |
8164 && !EQ (w->region_showing, | |
8165 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
8166 CHARPOS (this_line_start_pos) = 0; | |
8167 | |
8168 /* Optimize the case that only the line containing the cursor in the | |
8169 selected window has changed. Variables starting with this_ are | |
8170 set in display_line and record information about the line | |
8171 containing the cursor. */ | |
8172 tlbufpos = this_line_start_pos; | |
8173 tlendpos = this_line_end_pos; | |
8174 if (!consider_all_windows_p | |
8175 && CHARPOS (tlbufpos) > 0 | |
8176 && NILP (w->update_mode_line) | |
8177 && !current_buffer->clip_changed | |
8178 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
8179 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
8180 /* Make sure recorded data applies to current buffer, etc. */ | |
8181 && this_line_buffer == current_buffer | |
8182 && current_buffer == XBUFFER (w->buffer) | |
8183 && NILP (w->force_start) | |
8184 /* Point must be on the line that we have info recorded about. */ | |
8185 && PT >= CHARPOS (tlbufpos) | |
8186 && PT <= Z - CHARPOS (tlendpos) | |
8187 /* All text outside that line, including its final newline, | |
8188 must be unchanged */ | |
8189 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
8190 CHARPOS (tlendpos))) | |
8191 { | |
8192 if (CHARPOS (tlbufpos) > BEGV | |
8193 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
8194 && (CHARPOS (tlbufpos) == ZV | |
8195 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
8196 /* Former continuation line has disappeared by becoming empty */ | |
8197 goto cancel; | |
8198 else if (XFASTINT (w->last_modified) < MODIFF | |
8199 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
8200 || MINI_WINDOW_P (w)) | |
8201 { | |
8202 /* We have to handle the case of continuation around a | |
8203 wide-column character (See the comment in indent.c around | |
8204 line 885). | |
8205 | |
8206 For instance, in the following case: | |
8207 | |
8208 -------- Insert -------- | |
8209 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
8210 J_I_ ==> J_I_ `^^' are cursors. | |
8211 ^^ ^^ | |
8212 -------- -------- | |
8213 | |
8214 As we have to redraw the line above, we should goto cancel. */ | |
8215 | |
8216 struct it it; | |
8217 int line_height_before = this_line_pixel_height; | |
8218 | |
8219 /* Note that start_display will handle the case that the | |
8220 line starting at tlbufpos is a continuation lines. */ | |
8221 start_display (&it, w, tlbufpos); | |
8222 | |
8223 /* Implementation note: It this still necessary? */ | |
8224 if (it.current_x != this_line_start_x) | |
8225 goto cancel; | |
8226 | |
8227 TRACE ((stderr, "trying display optimization 1\n")); | |
8228 w->cursor.vpos = -1; | |
8229 overlay_arrow_seen = 0; | |
8230 it.vpos = this_line_vpos; | |
8231 it.current_y = this_line_y; | |
8232 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
8233 display_line (&it); | |
8234 | |
8235 /* If line contains point, is not continued, | |
8236 and ends at same distance from eob as before, we win */ | |
8237 if (w->cursor.vpos >= 0 | |
8238 /* Line is not continued, otherwise this_line_start_pos | |
8239 would have been set to 0 in display_line. */ | |
8240 && CHARPOS (this_line_start_pos) | |
8241 /* Line ends as before. */ | |
8242 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
8243 /* Line has same height as before. Otherwise other lines | |
8244 would have to be shifted up or down. */ | |
8245 && this_line_pixel_height == line_height_before) | |
8246 { | |
8247 /* If this is not the window's last line, we must adjust | |
8248 the charstarts of the lines below. */ | |
8249 if (it.current_y < it.last_visible_y) | |
8250 { | |
8251 struct glyph_row *row | |
8252 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
8253 int delta, delta_bytes; | |
8254 | |
8255 if (Z - CHARPOS (tlendpos) == ZV) | |
8256 { | |
8257 /* This line ends at end of (accessible part of) | |
8258 buffer. There is no newline to count. */ | |
8259 delta = (Z | |
8260 - CHARPOS (tlendpos) | |
8261 - MATRIX_ROW_START_CHARPOS (row)); | |
8262 delta_bytes = (Z_BYTE | |
8263 - BYTEPOS (tlendpos) | |
8264 - MATRIX_ROW_START_BYTEPOS (row)); | |
8265 } | |
8266 else | |
8267 { | |
8268 /* This line ends in a newline. Must take | |
8269 account of the newline and the rest of the | |
8270 text that follows. */ | |
8271 delta = (Z | |
8272 - CHARPOS (tlendpos) | |
8273 - MATRIX_ROW_START_CHARPOS (row)); | |
8274 delta_bytes = (Z_BYTE | |
8275 - BYTEPOS (tlendpos) | |
8276 - MATRIX_ROW_START_BYTEPOS (row)); | |
8277 } | |
8278 | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8279 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
|
8280 this_line_vpos + 1, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8281 w->current_matrix->nrows, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
8282 delta, delta_bytes); |
25012 | 8283 } |
8284 | |
8285 /* If this row displays text now but previously didn't, | |
8286 or vice versa, w->window_end_vpos may have to be | |
8287 adjusted. */ | |
8288 if ((it.glyph_row - 1)->displays_text_p) | |
8289 { | |
8290 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
8291 XSETINT (w->window_end_vpos, this_line_vpos); | |
8292 } | |
8293 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
8294 && this_line_vpos > 0) | |
8295 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
8296 w->window_end_valid = Qnil; | |
8297 | |
8298 /* Update hint: No need to try to scroll in update_window. */ | |
8299 w->desired_matrix->no_scrolling_p = 1; | |
8300 | |
8301 #if GLYPH_DEBUG | |
8302 *w->desired_matrix->method = 0; | |
8303 debug_method_add (w, "optimization 1"); | |
8304 #endif | |
8305 goto update; | |
8306 } | |
8307 else | |
8308 goto cancel; | |
8309 } | |
8310 else if (/* Cursor position hasn't changed. */ | |
8311 PT == XFASTINT (w->last_point) | |
8312 /* Make sure the cursor was last displayed | |
8313 in this window. Otherwise we have to reposition it. */ | |
8314 && 0 <= w->cursor.vpos | |
8315 && XINT (w->height) > w->cursor.vpos) | |
8316 { | |
8317 if (!must_finish) | |
8318 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8319 do_pending_window_change (1); |
25012 | 8320 |
8321 /* We used to always goto end_of_redisplay here, but this | |
8322 isn't enough if we have a blinking cursor. */ | |
8323 if (w->cursor_off_p == w->last_cursor_off_p) | |
8324 goto end_of_redisplay; | |
8325 } | |
8326 goto update; | |
8327 } | |
8328 /* If highlighting the region, or if the cursor is in the echo area, | |
8329 then we can't just move the cursor. */ | |
8330 else if (! (!NILP (Vtransient_mark_mode) | |
8331 && !NILP (current_buffer->mark_active)) | |
30942
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8332 && (EQ (selected_window, current_buffer->last_selected_window) |
25012 | 8333 || highlight_nonselected_windows) |
8334 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8335 && NILP (Vshow_trailing_whitespace) |
25012 | 8336 && !cursor_in_echo_area) |
8337 { | |
8338 struct it it; | |
8339 struct glyph_row *row; | |
8340 | |
8341 /* Skip from tlbufpos to PT and see where it is. Note that | |
8342 PT may be in invisible text. If so, we will end at the | |
8343 next visible position. */ | |
8344 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
8345 NULL, DEFAULT_FACE_ID); | |
8346 it.current_x = this_line_start_x; | |
8347 it.current_y = this_line_y; | |
8348 it.vpos = this_line_vpos; | |
8349 | |
8350 /* The call to move_it_to stops in front of PT, but | |
8351 moves over before-strings. */ | |
8352 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
8353 | |
8354 if (it.vpos == this_line_vpos | |
8355 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
8356 row->enabled_p)) | |
8357 { | |
8358 xassert (this_line_vpos == it.vpos); | |
8359 xassert (this_line_y == it.current_y); | |
8360 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8361 goto update; | |
8362 } | |
8363 else | |
8364 goto cancel; | |
8365 } | |
8366 | |
8367 cancel: | |
8368 /* Text changed drastically or point moved off of line. */ | |
8369 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
8370 } | |
8371 | |
8372 CHARPOS (this_line_start_pos) = 0; | |
8373 consider_all_windows_p |= buffer_shared > 1; | |
8374 ++clear_face_cache_count; | |
8375 | |
8376 | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8377 /* 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
|
8378 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
|
8379 frames. Otherwise do it for selected_window, only. */ |
25012 | 8380 |
8381 if (consider_all_windows_p) | |
8382 { | |
8383 Lisp_Object tail, frame; | |
36265
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8384 int i, n = 0, size = 50; |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8385 struct frame **updated |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8386 = (struct frame **) alloca (size * sizeof *updated); |
25012 | 8387 |
8388 /* Clear the face cache eventually. */ | |
8389 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
8390 { | |
8391 clear_face_cache (0); | |
8392 clear_face_cache_count = 0; | |
8393 } | |
8394 | |
8395 /* Recompute # windows showing selected buffer. This will be | |
8396 incremented each time such a window is displayed. */ | |
8397 buffer_shared = 0; | |
8398 | |
8399 FOR_EACH_FRAME (tail, frame) | |
8400 { | |
8401 struct frame *f = XFRAME (frame); | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8402 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8403 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 8404 { |
8405 /* Mark all the scroll bars to be removed; we'll redeem | |
8406 the ones we want when we redisplay their windows. */ | |
8407 if (condemn_scroll_bars_hook) | |
34844 | 8408 condemn_scroll_bars_hook (f); |
25012 | 8409 |
8410 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
8411 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
8412 | |
8413 /* Any scroll bars which redisplay_windows should have | |
8414 nuked should now go away. */ | |
8415 if (judge_scroll_bars_hook) | |
34844 | 8416 judge_scroll_bars_hook (f); |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8417 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8418 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8419 if (fonts_changed_p) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8420 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8421 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8422 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
|
8423 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8424 /* See if we have to hscroll. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8425 if (hscroll_windows (f->root_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8426 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8427 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8428 /* 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
|
8429 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
|
8430 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
|
8431 error. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8432 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8433 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8434 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8435 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8436 /* Update the display. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8437 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
|
8438 pause |= update_frame (f, 0, 0); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8439 if (pause) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8440 break; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8441 |
36265
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8442 if (n == size) |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8443 { |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8444 int nbytes = size * sizeof *updated; |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8445 struct frame **p = (struct frame **) alloca (2 * nbytes); |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8446 bcopy (updated, p, nbytes); |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8447 size *= 2; |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8448 } |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8449 |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8450 updated[n++] = f; |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8451 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8452 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8453 } |
36265
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8454 |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8455 /* Do the mark_window_display_accurate after all windows have |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8456 been redisplayed because this call resets flags in buffers |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8457 which are needed for proper redisplay. */ |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8458 for (i = 0; i < n; ++i) |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8459 { |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8460 struct frame *f = updated[i]; |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8461 mark_window_display_accurate (f->root_window, 1); |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8462 if (frame_up_to_date_hook) |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8463 frame_up_to_date_hook (f); |
54f26d21b7a7
(redisplay_internal): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
36227
diff
changeset
|
8464 } |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8465 } |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8466 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
|
8467 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8468 Lisp_Object mini_window; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8469 struct frame *mini_frame; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8470 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8471 redisplay_window (selected_window, 1); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8472 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8473 /* 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
|
8474 update: |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8475 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8476 /* If fonts changed, display again. */ |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8477 if (fonts_changed_p) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8478 goto retry; |
25012 | 8479 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8480 /* 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
|
8481 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
|
8482 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
|
8483 if (interrupt_input) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8484 unrequest_sigio (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8485 stop_polling (); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8486 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8487 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) |
25012 | 8488 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8489 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8490 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
8491 |
25012 | 8492 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
|
8493 pause = update_frame (sf, 0, 0); |
25012 | 8494 } |
8495 | |
8496 /* We may have called echo_area_display at the top of this | |
8497 function. If the echo area is on another frame, that may | |
8498 have put text on a frame other than the selected one, so the | |
8499 above call to update_frame would not have caught it. Catch | |
8500 it here. */ | |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8501 mini_window = FRAME_MINIBUF_WINDOW (sf); |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8502 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
25012 | 8503 |
31170
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8504 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
|
8505 { |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8506 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
|
8507 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
|
8508 if (!pause && hscroll_windows (mini_window)) |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8509 goto retry; |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
8510 } |
25012 | 8511 } |
8512 | |
8513 /* If display was paused because of pending input, make sure we do a | |
8514 thorough update the next time. */ | |
8515 if (pause) | |
8516 { | |
8517 /* Prevent the optimization at the beginning of | |
8518 redisplay_internal that tries a single-line update of the | |
8519 line containing the cursor in the selected window. */ | |
8520 CHARPOS (this_line_start_pos) = 0; | |
8521 | |
8522 /* Let the overlay arrow be updated the next time. */ | |
8523 if (!NILP (last_arrow_position)) | |
8524 { | |
8525 last_arrow_position = Qt; | |
8526 last_arrow_string = Qt; | |
8527 } | |
8528 | |
8529 /* If we pause after scrolling, some rows in the current | |
8530 matrices of some windows are not valid. */ | |
8531 if (!WINDOW_FULL_WIDTH_P (w) | |
8532 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
8533 update_mode_lines = 1; | |
8534 } | |
8535 | |
8536 /* Now text on frame agrees with windows, so put info into the | |
8537 windows for partial redisplay to follow. */ | |
8538 if (!pause) | |
8539 { | |
8540 register struct buffer *b = XBUFFER (w->buffer); | |
8541 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8542 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8543 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
|
8544 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
|
8545 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 8546 |
8547 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8548 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 8549 else |
8550 { | |
8551 XSETFASTINT (w->last_point, BUF_PT (b)); | |
8552 w->last_cursor = w->cursor; | |
8553 w->last_cursor_off_p = w->cursor_off_p; | |
8554 | |
8555 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8556 b->prevent_redisplay_optimizations_p = 0; |
25012 | 8557 w->update_mode_line = Qnil; |
8558 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
8559 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
8560 w->last_had_star | |
8561 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
8562 ? Qt : Qnil); | |
8563 | |
8564 /* Record if we are showing a region, so can make sure to | |
8565 update it fully at next redisplay. */ | |
8566 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
|
8567 && (EQ (selected_window, |
8f6621d33f0b
(redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents:
30761
diff
changeset
|
8568 current_buffer->last_selected_window) |
25012 | 8569 || highlight_nonselected_windows) |
8570 && !NILP (XBUFFER (w->buffer)->mark_active) | |
8571 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
8572 : Qnil); | |
8573 | |
8574 w->window_end_valid = w->buffer; | |
8575 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8576 last_arrow_string = Voverlay_arrow_string; | |
8577 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
8578 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8579 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8580 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8581 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8582 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8583 } |
28206
07ac059dece0
(handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents:
28047
diff
changeset
|
8584 |
25012 | 8585 update_mode_lines = 0; |
8586 windows_or_buffers_changed = 0; | |
8587 } | |
8588 | |
8589 /* Start SIGIO interrupts coming again. Having them off during the | |
8590 code above makes it less likely one will discard output, but not | |
8591 impossible, since there might be stuff in the system buffer here. | |
8592 But it is much hairier to try to do anything about that. */ | |
8593 if (interrupt_input) | |
8594 request_sigio (); | |
8595 start_polling (); | |
8596 | |
8597 /* If a frame has become visible which was not before, redisplay | |
8598 again, so that we display it. Expose events for such a frame | |
8599 (which it gets when becoming visible) don't call the parts of | |
8600 redisplay constructing glyphs, so simply exposing a frame won't | |
8601 display anything in this case. So, we have to display these | |
8602 frames here explicitly. */ | |
8603 if (!pause) | |
8604 { | |
8605 Lisp_Object tail, frame; | |
8606 int new_count = 0; | |
8607 | |
8608 FOR_EACH_FRAME (tail, frame) | |
8609 { | |
8610 int this_is_visible = 0; | |
8611 | |
8612 if (XFRAME (frame)->visible) | |
8613 this_is_visible = 1; | |
8614 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
8615 if (XFRAME (frame)->visible) | |
8616 this_is_visible = 1; | |
8617 | |
8618 if (this_is_visible) | |
8619 new_count++; | |
8620 } | |
8621 | |
8622 if (new_count != number_of_visible_frames) | |
8623 windows_or_buffers_changed++; | |
8624 } | |
8625 | |
8626 /* 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
|
8627 do_pending_window_change (1); |
25012 | 8628 |
8629 /* If we just did a pending size change, or have additional | |
8630 visible frames, redisplay again. */ | |
8631 if (windows_or_buffers_changed && !pause) | |
8632 goto retry; | |
8633 | |
8634 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8635 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8636 unbind_to (count, Qnil); |
25012 | 8637 } |
8638 | |
8639 | |
8640 /* Redisplay, but leave alone any recent echo area message unless | |
8641 another message has been requested in its place. | |
8642 | |
8643 This is useful in situations where you need to redisplay but no | |
8644 user action has occurred, making it inappropriate for the message | |
8645 area to be cleared. See tracking_off and | |
35334
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8646 wait_reading_process_input for examples of these situations. |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8647 |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8648 FROM_WHERE is an integer saying from where this function was |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8649 called. This is useful for debugging. */ |
25012 | 8650 |
8651 void | |
35334
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8652 redisplay_preserve_echo_area (from_where) |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8653 int from_where; |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8654 { |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8655 TRACE ((stderr, "redisplay_preserve_echo_area (%d)\n", from_where)); |
7cf24bda5ab7
(redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
35301
diff
changeset
|
8656 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8657 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
|
8658 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8659 /* 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
|
8660 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
|
8661 display_last_displayed_message_p = 1; |
25012 | 8662 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8663 display_last_displayed_message_p = 0; |
25012 | 8664 } |
8665 else | |
8666 redisplay_internal (1); | |
8667 } | |
8668 | |
8669 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8670 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8671 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
|
8672 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8673 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8674 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8675 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8676 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8677 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8678 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
|
8679 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8680 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8681 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
8682 |
25012 | 8683 /* Mark the display of windows in the window tree rooted at WINDOW as |
8684 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
8685 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
8686 the next time redisplay_internal is called. */ | |
8687 | |
8688 void | |
8689 mark_window_display_accurate (window, accurate_p) | |
8690 Lisp_Object window; | |
8691 int accurate_p; | |
8692 { | |
8693 struct window *w; | |
8694 | |
8695 for (; !NILP (window); window = w->next) | |
8696 { | |
8697 w = XWINDOW (window); | |
8698 | |
8699 if (BUFFERP (w->buffer)) | |
8700 { | |
8701 struct buffer *b = XBUFFER (w->buffer); | |
8702 | |
8703 XSETFASTINT (w->last_modified, | |
8704 accurate_p ? BUF_MODIFF (b) : 0); | |
8705 XSETFASTINT (w->last_overlay_modified, | |
8706 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
8707 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
8708 ? Qt : Qnil); | |
8709 | |
8710 #if 0 /* I don't think this is necessary because display_line does it. | |
8711 Let's check it. */ | |
8712 /* Record if we are showing a region, so can make sure to | |
8713 update it fully at next redisplay. */ | |
8714 w->region_showing | |
8715 = (!NILP (Vtransient_mark_mode) | |
8716 && (w == XWINDOW (current_buffer->last_selected_window) | |
8717 || highlight_nonselected_windows) | |
8718 && (!NILP (b->mark_active) | |
8719 ? Fmarker_position (b->mark) | |
8720 : Qnil)); | |
8721 #endif | |
8722 | |
8723 if (accurate_p) | |
8724 { | |
8725 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8726 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8727 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8728 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8729 w->current_matrix->zv = BUF_ZV (b); |
25012 | 8730 w->last_cursor = w->cursor; |
8731 w->last_cursor_off_p = w->cursor_off_p; | |
8732 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
|
8733 w->last_point = make_number (BUF_PT (b)); |
25012 | 8734 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
|
8735 w->last_point = make_number (XMARKER (w->pointm)->charpos); |
25012 | 8736 } |
8737 } | |
8738 | |
8739 w->window_end_valid = w->buffer; | |
8740 w->update_mode_line = Qnil; | |
8741 | |
8742 if (!NILP (w->vchild)) | |
8743 mark_window_display_accurate (w->vchild, accurate_p); | |
8744 if (!NILP (w->hchild)) | |
8745 mark_window_display_accurate (w->hchild, accurate_p); | |
8746 } | |
8747 | |
8748 if (accurate_p) | |
8749 { | |
8750 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
8751 last_arrow_string = Voverlay_arrow_string; | |
8752 } | |
8753 else | |
8754 { | |
8755 /* Force a thorough redisplay the next time by setting | |
8756 last_arrow_position and last_arrow_string to t, which is | |
8757 unequal to any useful value of Voverlay_arrow_... */ | |
8758 last_arrow_position = Qt; | |
8759 last_arrow_string = Qt; | |
8760 } | |
8761 } | |
8762 | |
277 | 8763 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8764 /* 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
|
8765 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
|
8766 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
|
8767 macro DISP_CHAR_VECTOR. */ |
25012 | 8768 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8769 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8770 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
|
8771 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
|
8772 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8773 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8774 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8775 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8776 |
25012 | 8777 if (SINGLE_BYTE_CHAR_P (c)) |
8778 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
|
8779 |
29023
af50e87cc257
(get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents:
28984
diff
changeset
|
8780 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
|
8781 if (code[1] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8782 code[1] = -1; |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8783 else if (code[2] < 32) |
e45f9a84fca0
(it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents:
26570
diff
changeset
|
8784 code[2] = -1; |
25012 | 8785 |
8786 /* Here, the possible range of code[0] (== charset ID) is | |
8787 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
|
8788 for multibyte characters after 256th element, we must increment |
25012 | 8789 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
|
8790 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8791 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8792 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8793 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
|
8794 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8795 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
|
8796 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
|
8797 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
|
8798 } |
25012 | 8799 |
8800 /* Here, val is a sub char table. We return the default value of | |
8801 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8802 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8803 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
8804 |
25012 | 8805 |
8806 | |
8807 /*********************************************************************** | |
8808 Window Redisplay | |
8809 ***********************************************************************/ | |
8810 | |
8811 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
8812 | |
8813 static void | |
8814 redisplay_windows (window) | |
8815 Lisp_Object window; | |
8816 { | |
8817 while (!NILP (window)) | |
8818 { | |
8819 struct window *w = XWINDOW (window); | |
8820 | |
8821 if (!NILP (w->hchild)) | |
8822 redisplay_windows (w->hchild); | |
8823 else if (!NILP (w->vchild)) | |
8824 redisplay_windows (w->vchild); | |
8825 else | |
8826 redisplay_window (window, 0); | |
8827 | |
8828 window = w->next; | |
8829 } | |
8830 } | |
8831 | |
8832 | |
8833 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
8834 DELTA is the number of bytes by which positions recorded in ROW | |
8835 differ from current buffer positions. */ | |
8836 | |
8837 void | |
8838 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
8839 struct window *w; | |
8840 struct glyph_row *row; | |
8841 struct glyph_matrix *matrix; | |
8842 int delta, delta_bytes, dy, dvpos; | |
8843 { | |
8844 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
8845 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
8846 int x = row->x; | |
8847 int pt_old = PT - delta; | |
8848 | |
8849 /* Skip over glyphs not having an object at the start of the row. | |
8850 These are special glyphs like truncation marks on terminal | |
8851 frames. */ | |
8852 if (row->displays_text_p) | |
8853 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
|
8854 && INTEGERP (glyph->object) |
25012 | 8855 && glyph->charpos < 0) |
8856 { | |
8857 x += glyph->pixel_width; | |
8858 ++glyph; | |
8859 } | |
8860 | |
8861 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
|
8862 && !INTEGERP (glyph->object) |
25012 | 8863 && (!BUFFERP (glyph->object) |
8864 || glyph->charpos < pt_old)) | |
8865 { | |
8866 x += glyph->pixel_width; | |
8867 ++glyph; | |
8868 } | |
8869 | |
8870 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
8871 w->cursor.x = x; | |
8872 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
8873 w->cursor.y = row->y + dy; | |
8874 | |
8875 if (w == XWINDOW (selected_window)) | |
8876 { | |
8877 if (!row->continued_p | |
8878 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
8879 && row->x == 0) | |
8880 { | |
8881 this_line_buffer = XBUFFER (w->buffer); | |
8882 | |
8883 CHARPOS (this_line_start_pos) | |
8884 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
8885 BYTEPOS (this_line_start_pos) | |
8886 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
8887 | |
8888 CHARPOS (this_line_end_pos) | |
8889 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
8890 BYTEPOS (this_line_end_pos) | |
8891 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
8892 | |
8893 this_line_y = w->cursor.y; | |
8894 this_line_pixel_height = row->height; | |
8895 this_line_vpos = w->cursor.vpos; | |
8896 this_line_start_x = row->x; | |
8897 } | |
8898 else | |
8899 CHARPOS (this_line_start_pos) = 0; | |
8900 } | |
8901 } | |
8902 | |
8903 | |
8904 /* 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
|
8905 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
|
8906 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8907 We assume that the window's buffer is really current. */ |
25012 | 8908 |
8909 static INLINE struct text_pos | |
8910 run_window_scroll_functions (window, startp) | |
8911 Lisp_Object window; | |
8912 struct text_pos startp; | |
8913 { | |
8914 struct window *w = XWINDOW (window); | |
8915 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
|
8916 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8917 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
|
8918 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
8919 |
25012 | 8920 if (!NILP (Vwindow_scroll_functions)) |
8921 { | |
8922 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
8923 make_number (CHARPOS (startp))); | |
8924 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
|
8925 /* 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
|
8926 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
|
8927 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8928 } |
8929 | |
8930 return startp; | |
8931 } | |
8932 | |
8933 | |
8934 /* Modify the desired matrix of window W and W->vscroll so that the | |
8935 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8936 |
277 | 8937 static void |
25012 | 8938 make_cursor_line_fully_visible (w) |
8939 struct window *w; | |
8940 { | |
8941 struct glyph_matrix *matrix; | |
8942 struct glyph_row *row; | |
34987
cf1115a9c758
(make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34947
diff
changeset
|
8943 int window_height; |
25012 | 8944 |
8945 /* It's not always possible to find the cursor, e.g, when a window | |
8946 is full of overlay strings. Don't do anything in that case. */ | |
8947 if (w->cursor.vpos < 0) | |
8948 return; | |
8949 | |
8950 matrix = w->desired_matrix; | |
8951 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
8952 | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8953 /* 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
|
8954 to do. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8955 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
|
8956 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8957 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8958 /* 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
|
8959 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
|
8960 window_height = window_box_height (w); |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8961 if (row->height >= window_height) |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8962 return; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8963 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8964 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) |
25012 | 8965 { |
8966 int dy = row->height - row->visible_height; | |
8967 w->vscroll = 0; | |
8968 w->cursor.y += dy; | |
8969 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8970 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8971 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */ |
25012 | 8972 { |
8973 int dy = - (row->height - row->visible_height); | |
8974 w->vscroll = dy; | |
8975 w->cursor.y += dy; | |
8976 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
8977 } | |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
8978 |
25012 | 8979 /* When we change the cursor y-position of the selected window, |
8980 change this_line_y as well so that the display optimization for | |
8981 the cursor line of the selected window in redisplay_internal uses | |
8982 the correct y-position. */ | |
8983 if (w == XWINDOW (selected_window)) | |
8984 this_line_y = w->cursor.y; | |
8985 } | |
8986 | |
8987 | |
8988 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
8989 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
8990 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
8991 in redisplay_window to bring a partially visible line into view in | |
8992 the case that only the cursor has moved. | |
8993 | |
8994 Value is | |
8995 | |
8996 1 if scrolling succeeded | |
8997 | |
8998 0 if scrolling didn't find point. | |
8999 | |
9000 -1 if new fonts have been loaded so that we must interrupt | |
9001 redisplay, adjust glyph matrices, and try again. */ | |
9002 | |
9003 static int | |
9004 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
9005 scroll_step, temp_scroll_step) | |
277 | 9006 Lisp_Object window; |
25012 | 9007 int just_this_one_p; |
9008 int scroll_conservatively, scroll_step; | |
9009 int temp_scroll_step; | |
9010 { | |
9011 struct window *w = XWINDOW (window); | |
9012 struct frame *f = XFRAME (w->frame); | |
9013 struct text_pos scroll_margin_pos; | |
9014 struct text_pos pos; | |
9015 struct text_pos startp; | |
9016 struct it it; | |
9017 Lisp_Object window_end; | |
9018 int this_scroll_margin; | |
9019 int dy = 0; | |
9020 int scroll_max; | |
32532
61d4de9a4e35
(try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents:
32460
diff
changeset
|
9021 int rc; |
25012 | 9022 int amount_to_scroll = 0; |
9023 Lisp_Object aggressive; | |
277 | 9024 int height; |
25012 | 9025 |
9026 #if GLYPH_DEBUG | |
9027 debug_method_add (w, "try_scrolling"); | |
9028 #endif | |
9029 | |
9030 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
9031 | |
9032 /* Compute scroll margin height in pixels. We scroll when point is | |
9033 within this distance from the top or bottom of the window. */ | |
9034 if (scroll_margin > 0) | |
9035 { | |
9036 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
9037 this_scroll_margin *= CANON_Y_UNIT (f); | |
9038 } | |
9039 else | |
9040 this_scroll_margin = 0; | |
9041 | |
9042 /* Compute how much we should try to scroll maximally to bring point | |
9043 into view. */ | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9044 if (scroll_step || scroll_conservatively || temp_scroll_step) |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9045 scroll_max = max (scroll_step, |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9046 max (scroll_conservatively, temp_scroll_step)); |
25012 | 9047 else if (NUMBERP (current_buffer->scroll_down_aggressively) |
9048 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
9049 /* We're trying to scroll because of aggressive scrolling | |
9050 but no scroll_step is set. Choose an arbitrary one. Maybe | |
9051 there should be a variable for this. */ | |
9052 scroll_max = 10; | |
9053 else | |
9054 scroll_max = 0; | |
9055 scroll_max *= CANON_Y_UNIT (f); | |
9056 | |
9057 /* Decide whether we have to scroll down. Start at the window end | |
9058 and move this_scroll_margin up to find the position of the scroll | |
9059 margin. */ | |
9060 window_end = Fwindow_end (window, Qt); | |
9061 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
9062 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
9063 if (this_scroll_margin) | |
9064 { | |
9065 start_display (&it, w, scroll_margin_pos); | |
9066 move_it_vertically (&it, - this_scroll_margin); | |
9067 scroll_margin_pos = it.current.pos; | |
9068 } | |
9069 | |
9070 if (PT >= CHARPOS (scroll_margin_pos)) | |
9071 { | |
9072 int y0; | |
9073 | |
9074 /* Point is in the scroll margin at the bottom of the window, or | |
9075 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
|
9076 |
25012 | 9077 /* Compute the distance from the scroll margin to PT. |
9078 Give up if the distance is greater than scroll_max. */ | |
9079 start_display (&it, w, scroll_margin_pos); | |
9080 y0 = it.current_y; | |
9081 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9082 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
35893
ce76268f843e
(try_scrolling): If point is in the line below the
Gerd Moellmann <gerd@gnu.org>
parents:
35848
diff
changeset
|
9083 |
33074
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9084 /* With a scroll_margin of 0, scroll_margin_pos is at the window |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9085 end, which is one line below the window. The iterator's |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9086 current_y will be same as y0 in that case, but we have to |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9087 scroll a line to make PT visible. That's the reason why 1 is |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9088 added below. */ |
77c2d2616983
(try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents:
33072
diff
changeset
|
9089 dy = 1 + it.current_y - y0; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9090 |
25012 | 9091 if (dy > scroll_max) |
9092 return 0; | |
9093 | |
9094 /* Move the window start down. If scrolling conservatively, | |
9095 move it just enough down to make point visible. If | |
9096 scroll_step is set, move it down by scroll_step. */ | |
9097 start_display (&it, w, startp); | |
9098 | |
9099 if (scroll_conservatively) | |
35893
ce76268f843e
(try_scrolling): If point is in the line below the
Gerd Moellmann <gerd@gnu.org>
parents:
35848
diff
changeset
|
9100 amount_to_scroll |
ce76268f843e
(try_scrolling): If point is in the line below the
Gerd Moellmann <gerd@gnu.org>
parents:
35848
diff
changeset
|
9101 = max (max (dy, CANON_Y_UNIT (f)), |
ce76268f843e
(try_scrolling): If point is in the line below the
Gerd Moellmann <gerd@gnu.org>
parents:
35848
diff
changeset
|
9102 CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 9103 else if (scroll_step || temp_scroll_step) |
9104 amount_to_scroll = scroll_max; | |
9105 else | |
9106 { | |
9107 aggressive = current_buffer->scroll_down_aggressively; | |
9108 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 9109 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 9110 if (NUMBERP (aggressive)) |
9111 amount_to_scroll = XFLOATINT (aggressive) * height; | |
9112 } | |
9113 | |
9114 if (amount_to_scroll <= 0) | |
9115 return 0; | |
9116 | |
9117 move_it_vertically (&it, amount_to_scroll); | |
9118 startp = it.current.pos; | |
9119 } | |
9120 else | |
9121 { | |
9122 /* See if point is inside the scroll margin at the top of the | |
9123 window. */ | |
9124 scroll_margin_pos = startp; | |
9125 if (this_scroll_margin) | |
9126 { | |
9127 start_display (&it, w, startp); | |
9128 move_it_vertically (&it, this_scroll_margin); | |
9129 scroll_margin_pos = it.current.pos; | |
9130 } | |
9131 | |
9132 if (PT < CHARPOS (scroll_margin_pos)) | |
9133 { | |
9134 /* Point is in the scroll margin at the top of the window or | |
9135 above what is displayed in the window. */ | |
9136 int y0; | |
9137 | |
9138 /* Compute the vertical distance from PT to the scroll | |
9139 margin position. Give up if distance is greater than | |
9140 scroll_max. */ | |
9141 SET_TEXT_POS (pos, PT, PT_BYTE); | |
9142 start_display (&it, w, pos); | |
9143 y0 = it.current_y; | |
9144 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
9145 it.last_visible_y, -1, | |
9146 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9147 dy = it.current_y - y0; | |
9148 if (dy > scroll_max) | |
9149 return 0; | |
9150 | |
9151 /* Compute new window start. */ | |
9152 start_display (&it, w, startp); | |
9153 | |
9154 if (scroll_conservatively) | |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9155 amount_to_scroll = |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
9156 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)); |
25012 | 9157 else if (scroll_step || temp_scroll_step) |
9158 amount_to_scroll = scroll_max; | |
9159 else | |
9160 { | |
9161 aggressive = current_buffer->scroll_up_aggressively; | |
9162 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 9163 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 9164 if (NUMBERP (aggressive)) |
9165 amount_to_scroll = XFLOATINT (aggressive) * height; | |
9166 } | |
9167 | |
9168 if (amount_to_scroll <= 0) | |
9169 return 0; | |
9170 | |
9171 move_it_vertically (&it, - amount_to_scroll); | |
9172 startp = it.current.pos; | |
9173 } | |
9174 } | |
9175 | |
9176 /* Run window scroll functions. */ | |
9177 startp = run_window_scroll_functions (window, startp); | |
9178 | |
9179 /* Display the window. Give up if new fonts are loaded, or if point | |
9180 doesn't appear. */ | |
9181 if (!try_window (window, startp)) | |
9182 rc = -1; | |
9183 else if (w->cursor.vpos < 0) | |
9184 { | |
9185 clear_glyph_matrix (w->desired_matrix); | |
9186 rc = 0; | |
9187 } | |
9188 else | |
9189 { | |
9190 /* Maybe forget recorded base line for line number display. */ | |
9191 if (!just_this_one_p | |
9192 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9193 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 9194 w->base_line_number = Qnil; |
9195 | |
9196 /* If cursor ends up on a partially visible line, shift display | |
9197 lines up or down. */ | |
9198 make_cursor_line_fully_visible (w); | |
9199 rc = 1; | |
9200 } | |
9201 | |
9202 return rc; | |
9203 } | |
9204 | |
9205 | |
9206 /* Compute a suitable window start for window W if display of W starts | |
9207 on a continuation line. Value is non-zero if a new window start | |
9208 was computed. | |
9209 | |
9210 The new window start will be computed, based on W's width, starting | |
9211 from the start of the continued line. It is the start of the | |
9212 screen line with the minimum distance from the old start W->start. */ | |
9213 | |
9214 static int | |
9215 compute_window_start_on_continuation_line (w) | |
9216 struct window *w; | |
9217 { | |
9218 struct text_pos pos, start_pos; | |
9219 int window_start_changed_p = 0; | |
9220 | |
9221 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
9222 | |
9223 /* If window start is on a continuation line... Window start may be | |
9224 < BEGV in case there's invisible text at the start of the | |
9225 buffer (M-x rmail, for example). */ | |
9226 if (CHARPOS (start_pos) > BEGV | |
9227 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
9228 { | |
9229 struct it it; | |
9230 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9231 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9232 /* 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
|
9233 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9234 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
|
9235 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
9236 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 9237 |
9238 /* Find the start of the continued line. This should be fast | |
9239 because scan_buffer is fast (newline cache). */ | |
25546 | 9240 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 9241 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
9242 row, DEFAULT_FACE_ID); | |
9243 reseat_at_previous_visible_line_start (&it); | |
9244 | |
9245 /* If the line start is "too far" away from the window start, | |
9246 say it takes too much time to compute a new window start. */ | |
9247 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
9248 < XFASTINT (w->height) * XFASTINT (w->width)) | |
9249 { | |
9250 int min_distance, distance; | |
9251 | |
9252 /* Move forward by display lines to find the new window | |
9253 start. If window width was enlarged, the new start can | |
9254 be expected to be > the old start. If window width was | |
9255 decreased, the new window start will be < the old start. | |
9256 So, we're looking for the display line start with the | |
9257 minimum distance from the old window start. */ | |
9258 pos = it.current.pos; | |
9259 min_distance = INFINITY; | |
9260 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
9261 distance < min_distance) | |
9262 { | |
9263 min_distance = distance; | |
9264 pos = it.current.pos; | |
9265 move_it_by_lines (&it, 1, 0); | |
9266 } | |
9267 | |
9268 /* Set the window start there. */ | |
9269 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
9270 window_start_changed_p = 1; | |
9271 } | |
9272 } | |
9273 | |
9274 return window_start_changed_p; | |
9275 } | |
9276 | |
9277 | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9278 /* 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
|
9279 with window start STARTP. Value is |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9280 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9281 1 if successful |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9282 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9283 0 if this method cannot be used |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9284 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9285 -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
|
9286 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
|
9287 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
|
9288 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9289 static int |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9290 try_cursor_movement (window, startp, scroll_step) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9291 Lisp_Object window; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9292 struct text_pos startp; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9293 int *scroll_step; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9294 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9295 struct window *w = XWINDOW (window); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9296 struct frame *f = XFRAME (w->frame); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9297 int rc = 0; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9298 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9299 /* 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
|
9300 not moved off the frame. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9301 if (/* Point may be in this window. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9302 PT >= CHARPOS (startp) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9303 /* Selective display hasn't changed. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9304 && !current_buffer->clip_changed |
34440
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9305 /* Function force-mode-line-update is used to force a thorough |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9306 redisplay. It sets either windows_or_buffers_changed or |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9307 update_mode_lines. So don't take a shortcut here for these |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9308 cases. */ |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9309 && !update_mode_lines |
6fff04f818fa
(try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34438
diff
changeset
|
9310 && !windows_or_buffers_changed |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9311 /* 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
|
9312 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
|
9313 set the cursor. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9314 && !(!NILP (Vtransient_mark_mode) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9315 && !NILP (current_buffer->mark_active)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9316 && NILP (w->region_showing) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9317 && NILP (Vshow_trailing_whitespace) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9318 /* 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
|
9319 && INTEGERP (w->last_point) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9320 /* 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
|
9321 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
|
9322 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
|
9323 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
|
9324 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
|
9325 handles the same cases. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9326 && !EQ (window, minibuf_window) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9327 /* 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
|
9328 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
|
9329 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
|
9330 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
|
9331 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
|
9332 && INTEGERP (w->window_end_vpos) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9333 && 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
|
9334 && (FRAME_WINDOW_P (f) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9335 || !MARKERP (Voverlay_arrow_position) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9336 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9337 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9338 int this_scroll_margin; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9339 struct glyph_row *row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9340 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9341 #if GLYPH_DEBUG |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9342 debug_method_add (w, "cursor movement"); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9343 #endif |
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 /* 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
|
9346 of the window. This is a pixel value. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9347 this_scroll_margin = max (0, scroll_margin); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9348 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
|
9349 this_scroll_margin *= CANON_Y_UNIT (f); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9350 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9351 /* 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
|
9352 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
|
9353 if (w->last_cursor.vpos < 0 |
84ec8b66d634
(redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents:
31118
diff
changeset
|
9354 || 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
|
9355 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9356 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9357 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9358 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
|
9359 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9360 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9361 if (!row->enabled_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9362 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9363 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9364 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9365 if (rc == 0) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9366 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9367 int scroll_p = 0; |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9368 int last_y = window_text_bottom_y (w) - this_scroll_margin; |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9369 |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9370 if (PT > XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9371 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9372 /* Point has moved forward. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9373 while (MATRIX_ROW_END_CHARPOS (row) < PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9374 && MATRIX_ROW_BOTTOM_Y (row) < last_y) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9375 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9376 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9377 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9378 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9379 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9380 /* 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
|
9381 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
|
9382 display it in the next line. */ |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9383 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9384 && MATRIX_ROW_END_CHARPOS (row) == PT |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9385 && !cursor_row_p (w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
9386 ++row; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9387 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9388 /* If within the scroll margin, scroll. Note that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9389 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
|
9390 the next line would be drawn, and that |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9391 this_scroll_margin can be zero. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9392 if (MATRIX_ROW_BOTTOM_Y (row) > last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9393 || PT > MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9394 /* Line is completely visible last line in window |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9395 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
|
9396 || (MATRIX_ROW_BOTTOM_Y (row) == last_y |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9397 && PT == MATRIX_ROW_END_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9398 && !row->ends_at_zv_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9399 && !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
|
9400 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9401 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9402 else if (PT < XFASTINT (w->last_point)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9403 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9404 /* 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
|
9405 CHARPOS (startp) because of the outer |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9406 if-statement. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9407 while (!row->mode_line_p |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9408 && (MATRIX_ROW_START_CHARPOS (row) > PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9409 || (MATRIX_ROW_START_CHARPOS (row) == PT |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9410 && 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
|
9411 && (row->y > this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9412 || CHARPOS (startp) == BEGV)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9413 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9414 xassert (row->enabled_p); |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9415 --row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9416 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9417 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9418 /* Consider the following case: Window starts at BEGV, |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9419 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
|
9420 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
|
9421 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
|
9422 BEGV and START. Try to handle that case. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9423 if (row < w->current_matrix->rows |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9424 || row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9425 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9426 row = w->current_matrix->rows; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9427 if (row->mode_line_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9428 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9429 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9430 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9431 /* 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
|
9432 skip forward over overlay strings. */ |
32592
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9433 while (MATRIX_ROW_BOTTOM_Y (row) < last_y |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9434 && MATRIX_ROW_END_CHARPOS (row) == PT |
b15e9539194b
(try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents:
32590
diff
changeset
|
9435 && !cursor_row_p (w, row)) |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9436 ++row; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9437 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9438 /* If within the scroll margin, scroll. */ |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9439 if (row->y < this_scroll_margin |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9440 && CHARPOS (startp) != BEGV) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9441 scroll_p = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9442 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9443 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9444 if (PT < MATRIX_ROW_START_CHARPOS (row) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9445 || PT > MATRIX_ROW_END_CHARPOS (row)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9446 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9447 /* 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
|
9448 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9449 } |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9450 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
|
9451 { |
34743
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9452 if (PT == MATRIX_ROW_END_CHARPOS (row) |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9453 && !row->ends_at_zv_p |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9454 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
34737
84f309395a36
(try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents:
34664
diff
changeset
|
9455 rc = -1; |
84f309395a36
(try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents:
34664
diff
changeset
|
9456 else if (row->height > window_box_height (w)) |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9457 { |
34743
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9458 /* If we end up in a partially visible line, let's |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9459 make it fully visible, except when it's taller |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9460 than the window, in which case we can't do much |
c105f9abf6b5
(try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents:
34737
diff
changeset
|
9461 about it. */ |
30761
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9462 *scroll_step = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9463 rc = -1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9464 } |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9465 else |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9466 { |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9467 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
|
9468 try_window (window, startp); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9469 make_cursor_line_fully_visible (w); |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9470 rc = 1; |
8218291cc912
(try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
30747
diff
changeset
|
9471 } |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9472 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9473 else if (scroll_p) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9474 rc = -1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9475 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9476 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9477 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
|
9478 rc = 1; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9479 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9480 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9481 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9482 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9483 return rc; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9484 } |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9485 |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9486 |
25012 | 9487 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only |
9488 selected_window is redisplayed. */ | |
9489 | |
9490 static void | |
9491 redisplay_window (window, just_this_one_p) | |
9492 Lisp_Object window; | |
9493 int just_this_one_p; | |
9494 { | |
9495 struct window *w = XWINDOW (window); | |
9496 struct frame *f = XFRAME (w->frame); | |
9497 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 9498 struct buffer *old = current_buffer; |
25012 | 9499 struct text_pos lpoint, opoint, startp; |
9500 int update_mode_line; | |
277 | 9501 int tem; |
25012 | 9502 struct it it; |
9503 /* Record it now because it's overwritten. */ | |
9504 int current_matrix_up_to_date_p = 0; | |
9505 int temp_scroll_step = 0; | |
33600
c5f64497e92c
Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents:
33594
diff
changeset
|
9506 int count = BINDING_STACK_SIZE (); |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9507 int rc; |
277 | 9508 |
25012 | 9509 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
9510 opoint = lpoint; | |
9511 | |
9512 /* W must be a leaf window here. */ | |
9513 xassert (!NILP (w->buffer)); | |
9514 #if GLYPH_DEBUG | |
9515 *w->desired_matrix->method = 0; | |
9516 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9517 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9518 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9519 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9520 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9521 |
25012 | 9522 /* Has the mode line to be updated? */ |
9523 update_mode_line = (!NILP (w->update_mode_line) | |
9524 || update_mode_lines | |
9525 || buffer->clip_changed); | |
433 | 9526 |
9527 if (MINI_WINDOW_P (w)) | |
9528 { | |
25012 | 9529 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
|
9530 && !NILP (echo_area_buffer[0])) |
25012 | 9531 { |
9532 if (update_mode_line) | |
9533 /* We may have to update a tty frame's menu bar or a | |
25543 | 9534 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 9535 goto finish_menu_bars; |
9536 else | |
9537 /* We've already displayed the echo area glyphs in this window. */ | |
9538 goto finish_scroll_bars; | |
9539 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
9540 else if (w != XWINDOW (minibuf_window)) |
433 | 9541 { |
25012 | 9542 /* W is a mini-buffer window, but it's not the currently |
9543 active one, so clear it. */ | |
9544 int yb = window_text_bottom_y (w); | |
9545 struct glyph_row *row; | |
9546 int y; | |
9547 | |
9548 for (y = 0, row = w->desired_matrix->rows; | |
9549 y < yb; | |
9550 y += row->height, ++row) | |
9551 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
|
9552 goto finish_scroll_bars; |
433 | 9553 } |
9554 } | |
277 | 9555 |
25012 | 9556 /* Otherwise set up data on this window; select its buffer and point |
9557 value. */ | |
29445
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9558 /* 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
|
9559 variables. */ |
cb3ad8f8f0ed
(redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents:
29433
diff
changeset
|
9560 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 9561 SET_TEXT_POS (opoint, PT, PT_BYTE); |
9562 | |
9563 current_matrix_up_to_date_p | |
9564 = (!NILP (w->window_end_valid) | |
9565 && !current_buffer->clip_changed | |
9566 && XFASTINT (w->last_modified) >= MODIFF | |
9567 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
9568 | |
9569 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
9570 the window end being valid, so set it to nil there. */ | |
9571 if (windows_or_buffers_changed) | |
9572 { | |
9573 /* If window starts on a continuation line, maybe adjust the | |
9574 window start in case the window's width changed. */ | |
9575 if (XMARKER (w->start)->buffer == current_buffer) | |
9576 compute_window_start_on_continuation_line (w); | |
9577 | |
9578 w->window_end_valid = Qnil; | |
9579 } | |
9580 | |
9581 /* Some sanity checks. */ | |
9582 CHECK_WINDOW_END (w); | |
9583 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
|
9584 abort (); |
25012 | 9585 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9586 abort (); |
277 | 9587 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9588 /* 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
|
9589 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9590 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9591 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9592 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9593 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9594 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9595 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9596 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
9597 |
25012 | 9598 /* Count number of windows showing the selected buffer. An indirect |
9599 buffer counts as its base buffer. */ | |
9600 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9601 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9602 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9603 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9604 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
|
9605 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9606 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9607 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9608 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9609 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9610 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
9611 } |
277 | 9612 |
25012 | 9613 /* Point refers normally to the selected window. For any other |
9614 window, set up appropriate value. */ | |
277 | 9615 if (!EQ (window, selected_window)) |
9616 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9617 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9618 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
|
9619 if (new_pt < BEGV) |
277 | 9620 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9621 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9622 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9623 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 9624 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9625 else if (new_pt > (ZV - 1)) |
277 | 9626 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9627 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9628 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9629 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 9630 } |
25012 | 9631 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
9632 /* 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
|
9633 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 9634 } |
9635 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9636 /* If any of the character widths specified in the display table |
25012 | 9637 have changed, invalidate the width run cache. It's true that |
9638 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
|
9639 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
|
9640 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
|
9641 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
|
9642 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
9643 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
|
9644 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9645 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
|
9646 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
|
9647 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9648 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
|
9649 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
|
9650 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9651 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
|
9652 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9653 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
9654 |
277 | 9655 /* If window-start is screwed up, choose a new one. */ |
9656 if (XMARKER (w->start)->buffer != current_buffer) | |
9657 goto recenter; | |
9658 | |
25012 | 9659 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 9660 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9661 /* 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
|
9662 check whether it can be used. */ |
26908
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9663 if (!NILP (w->optional_new_start) |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9664 && CHARPOS (startp) >= BEGV |
c5079639cac1
(redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents:
26874
diff
changeset
|
9665 && CHARPOS (startp) <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9666 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9667 w->optional_new_start = Qnil; |
25012 | 9668 start_display (&it, w, startp); |
9669 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
9670 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
9671 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9672 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9673 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
9674 |
433 | 9675 /* 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
|
9676 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
|
9677 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9678 || w->frozen_window_start_p) |
277 | 9679 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9680 w->force_start = Qnil; |
25012 | 9681 w->vscroll = 0; |
9682 w->window_end_valid = Qnil; | |
9683 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9684 /* Forget any recorded base line for line number display. */ |
25012 | 9685 if (!current_matrix_up_to_date_p |
9686 || current_buffer->clip_changed) | |
9687 w->base_line_number = Qnil; | |
9688 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9689 /* 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
|
9690 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
|
9691 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
9692 /* 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
|
9693 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
|
9694 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
|
9695 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
|
9696 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
9697 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9698 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9699 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9700 w->update_mode_line = Qt; |
25012 | 9701 startp = run_window_scroll_functions (window, startp); |
9702 } | |
9703 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9704 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9705 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9706 if (CHARPOS (startp) < BEGV) |
9707 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
9708 else if (CHARPOS (startp) > ZV) | |
9709 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
9710 | |
9711 /* Redisplay, then check if cursor has been set during the | |
9712 redisplay. Give up if new fonts were loaded. */ | |
9713 if (!try_window (window, startp)) | |
9714 { | |
9715 w->force_start = Qt; | |
9716 clear_glyph_matrix (w->desired_matrix); | |
34844 | 9717 goto finish_scroll_bars; |
25012 | 9718 } |
9719 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
9720 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 9721 { |
30652
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9722 /* 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
|
9723 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
|
9724 can use it here. */ |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9725 int window_height; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9726 struct glyph_row *row; |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9727 |
4ed1978642cb
(start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents:
30631
diff
changeset
|
9728 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
|
9729 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
|
9730 while (MATRIX_ROW_BOTTOM_Y (row) < window_height) |
25012 | 9731 ++row; |
9732 | |
9733 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
9734 MATRIX_ROW_START_BYTEPOS (row)); | |
9735 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
9736 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
9737 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 9738 else if (current_buffer == old) |
9739 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
9740 | |
9741 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
9742 | |
9743 /* If we are highlighting the region, then we just changed | |
9744 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
|
9745 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
|
9746 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9747 { |
25012 | 9748 clear_glyph_matrix (w->desired_matrix); |
9749 if (!try_window (window, startp)) | |
34844 | 9750 goto finish_scroll_bars; |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
9751 } |
277 | 9752 } |
25012 | 9753 |
9754 make_cursor_line_fully_visible (w); | |
9755 #if GLYPH_DEBUG | |
9756 debug_method_add (w, "forced window start"); | |
9757 #endif | |
277 | 9758 goto done; |
9759 } | |
9760 | |
25012 | 9761 /* Handle case where text has not changed, only point, and it has |
9762 not moved off the frame. */ | |
9763 if (current_matrix_up_to_date_p | |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9764 && (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
|
9765 rc != 0)) |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9766 { |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9767 if (rc == -1) |
25012 | 9768 goto try_to_scroll; |
30744
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9769 else |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9770 goto done; |
6181f12f7f51
(trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30728
diff
changeset
|
9771 } |
277 | 9772 /* If current starting point was originally the beginning of a line |
9773 but no longer is, find a new starting point. */ | |
485 | 9774 else if (!NILP (w->start_at_line_beg) |
25012 | 9775 && !(CHARPOS (startp) <= BEGV |
9776 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
9777 { | |
9778 #if GLYPH_DEBUG | |
9779 debug_method_add (w, "recenter 1"); | |
9780 #endif | |
277 | 9781 goto recenter; |
9782 } | |
25012 | 9783 |
9784 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9785 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9786 !windows_or_buffers_changed |
25012 | 9787 /* Window must be either use window-based redisplay or |
9788 be full width. */ | |
9789 && (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
|
9790 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 9791 && !MINI_WINDOW_P (w) |
9792 /* Point is not known NOT to appear in window. */ | |
9793 && PT >= CHARPOS (startp) | |
277 | 9794 && XFASTINT (w->last_modified) |
25012 | 9795 /* Window is not hscrolled. */ |
9796 && XFASTINT (w->hscroll) == 0 | |
9797 /* Selective display has not changed. */ | |
9798 && !current_buffer->clip_changed | |
9799 /* Current matrix is up to date. */ | |
9800 && !NILP (w->window_end_valid) | |
9801 /* Can't use this case if highlighting a region because | |
9802 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
|
9803 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9804 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
9805 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9806 && NILP (Vshow_trailing_whitespace) |
25012 | 9807 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
9808 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 9809 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 9810 /* Value is > 0 if update has been done, it is -1 if we |
9811 know that the same window start will not work. It is 0 | |
9812 if unsuccessful for some other reason. */ | |
9813 && (tem = try_window_id (w)) != 0) | |
9814 { | |
9815 #if GLYPH_DEBUG | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9816 debug_method_add (w, "try_window_id %d", tem); |
25012 | 9817 #endif |
9818 | |
9819 if (fonts_changed_p) | |
34844 | 9820 goto finish_scroll_bars; |
277 | 9821 if (tem > 0) |
9822 goto done; | |
30136
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
9823 |
25012 | 9824 /* Otherwise try_window_id has returned -1 which means that we |
9825 don't want the alternative below this comment to execute. */ | |
9826 } | |
9827 else if (CHARPOS (startp) >= BEGV | |
9828 && CHARPOS (startp) <= ZV | |
9829 && PT >= CHARPOS (startp) | |
9830 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
9831 /* Avoid starting at end of buffer. */ |
25012 | 9832 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9833 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9834 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 9835 { |
25012 | 9836 #if GLYPH_DEBUG |
9837 debug_method_add (w, "same window start"); | |
9838 #endif | |
9839 | |
9840 /* Try to redisplay starting at same place as before. | |
9841 If point has not moved off frame, accept the results. */ | |
9842 if (!current_matrix_up_to_date_p | |
9843 /* 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
|
9844 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
|
9845 buffer. */ |
25012 | 9846 || !NILP (Vwindow_scroll_functions) |
9847 || MINI_WINDOW_P (w) | |
9848 || !try_window_reusing_current_matrix (w)) | |
9849 { | |
9850 IF_DEBUG (debug_method_add (w, "1")); | |
9851 try_window (window, startp); | |
9852 } | |
9853 | |
9854 if (fonts_changed_p) | |
34844 | 9855 goto finish_scroll_bars; |
25012 | 9856 |
9857 if (w->cursor.vpos >= 0) | |
9858 { | |
9859 if (!just_this_one_p | |
9860 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9861 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9862 /* 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
|
9863 w->base_line_number = Qnil; |
25012 | 9864 |
9865 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9866 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9867 } |
277 | 9868 else |
25012 | 9869 clear_glyph_matrix (w->desired_matrix); |
9870 } | |
9871 | |
9872 try_to_scroll: | |
277 | 9873 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
9874 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
9875 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 9876 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9877 /* 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
|
9878 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9879 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9880 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9881 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9882 } |
277 | 9883 |
25012 | 9884 /* Try to scroll by specified few lines. */ |
9885 if ((scroll_conservatively | |
9886 || scroll_step | |
9887 || temp_scroll_step | |
9888 || NUMBERP (current_buffer->scroll_up_aggressively) | |
9889 || 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
|
9890 && !current_buffer->clip_changed |
25012 | 9891 && CHARPOS (startp) >= BEGV |
9892 && CHARPOS (startp) <= ZV) | |
9893 { | |
9894 /* The function returns -1 if new fonts were loaded, 1 if | |
9895 successful, 0 if not successful. */ | |
9896 int rc = try_scrolling (window, just_this_one_p, | |
9897 scroll_conservatively, | |
9898 scroll_step, | |
9899 temp_scroll_step); | |
9900 if (rc > 0) | |
9901 goto done; | |
9902 else if (rc < 0) | |
34844 | 9903 goto finish_scroll_bars; |
25012 | 9904 } |
9905 | |
9906 /* Finally, just choose place to start which centers point */ | |
9907 | |
9908 recenter: | |
9909 | |
9910 #if GLYPH_DEBUG | |
9911 debug_method_add (w, "recenter"); | |
9912 #endif | |
9913 | |
9914 /* w->vscroll = 0; */ | |
9915 | |
9916 /* Forget any previously recorded base line for line number display. */ | |
9917 if (!current_matrix_up_to_date_p | |
9918 || current_buffer->clip_changed) | |
9919 w->base_line_number = Qnil; | |
9920 | |
9921 /* Move backward half the height of the window. */ | |
9922 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9923 it.current_y = it.last_visible_y; | |
9924 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
9925 xassert (IT_CHARPOS (it) >= BEGV); | |
9926 | |
9927 /* The function move_it_vertically_backward may move over more | |
9928 than the specified y-distance. If it->w is small, e.g. a | |
9929 mini-buffer window, we may end up in front of the window's | |
9930 display area. Start displaying at the start of the line | |
9931 containing PT in this case. */ | |
9932 if (it.current_y <= 0) | |
9933 { | |
9934 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
9935 move_it_vertically (&it, 0); | |
9936 xassert (IT_CHARPOS (it) <= PT); | |
9937 it.current_y = 0; | |
9938 } | |
9939 | |
9940 it.current_x = it.hpos = 0; | |
9941 | |
9942 /* Set startp here explicitly in case that helps avoid an infinite loop | |
9943 in case the window-scroll-functions functions get errors. */ | |
9944 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
9945 | |
9946 /* Run scroll hooks. */ | |
9947 startp = run_window_scroll_functions (window, it.current.pos); | |
9948 | |
9949 /* Redisplay the window. */ | |
9950 if (!current_matrix_up_to_date_p | |
9951 || windows_or_buffers_changed | |
9952 /* Don't use try_window_reusing_current_matrix in this case | |
9953 because it can have changed the buffer. */ | |
9954 || !NILP (Vwindow_scroll_functions) | |
9955 || !just_this_one_p | |
9956 || MINI_WINDOW_P (w) | |
9957 || !try_window_reusing_current_matrix (w)) | |
9958 try_window (window, startp); | |
9959 | |
9960 /* If new fonts have been loaded (due to fontsets), give up. We | |
9961 have to start a new redisplay since we need to re-adjust glyph | |
9962 matrices. */ | |
9963 if (fonts_changed_p) | |
34844 | 9964 goto finish_scroll_bars; |
25012 | 9965 |
9966 /* If cursor did not appear assume that the middle of the window is | |
9967 in the first line of the window. Do it again with the next line. | |
9968 (Imagine a window of height 100, displaying two lines of height | |
9969 60. Moving back 50 from it->last_visible_y will end in the first | |
9970 line.) */ | |
9971 if (w->cursor.vpos < 0) | |
9972 { | |
9973 if (!NILP (w->window_end_valid) | |
9974 && PT >= Z - XFASTINT (w->window_end_pos)) | |
9975 { | |
9976 clear_glyph_matrix (w->desired_matrix); | |
9977 move_it_by_lines (&it, 1, 0); | |
9978 try_window (window, it.current.pos); | |
9979 } | |
9980 else if (PT < IT_CHARPOS (it)) | |
9981 { | |
9982 clear_glyph_matrix (w->desired_matrix); | |
9983 move_it_by_lines (&it, -1, 0); | |
9984 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
|
9985 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
9986 else |
25012 | 9987 { |
9988 /* Not much we can do about it. */ | |
9989 } | |
9990 } | |
9991 | |
9992 /* Consider the following case: Window starts at BEGV, there is | |
9993 invisible, intangible text at BEGV, so that display starts at | |
9994 some point START > BEGV. It can happen that we are called with | |
9995 PT somewhere between BEGV and START. Try to handle that case. */ | |
9996 if (w->cursor.vpos < 0) | |
9997 { | |
9998 struct glyph_row *row = w->current_matrix->rows; | |
9999 if (row->mode_line_p) | |
10000 ++row; | |
10001 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
10002 } | |
10003 | |
10004 make_cursor_line_fully_visible (w); | |
10005 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
10006 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
10007 |
25012 | 10008 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
10009 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
10010 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
10011 ? Qt : Qnil); | |
10012 | |
10013 /* 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
|
10014 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
10015 /* If window not full width, must redo its mode line |
25012 | 10016 if (a) the window to its side is being redone and |
10017 (b) we do a frame-based redisplay. This is a consequence | |
10018 of how inverted lines are drawn in frame-based redisplay. */ | |
10019 || (!just_this_one_p | |
10020 && !FRAME_WINDOW_P (f) | |
10021 && !WINDOW_FULL_WIDTH_P (w)) | |
10022 /* 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
|
10023 || INTEGERP (w->base_line_pos) |
25012 | 10024 /* 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
|
10025 || (!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
|
10026 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 10027 /* This means that the window has a mode line. */ |
10028 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 10029 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 10030 { |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10031 Lisp_Object old_selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10032 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10033 old_selected_frame = selected_frame; |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10034 |
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10035 XSETFRAME (selected_frame, f); |
25012 | 10036 display_mode_lines (w); |
29291
4849a9a666ab
(redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents:
29191
diff
changeset
|
10037 selected_frame = old_selected_frame; |
25012 | 10038 |
10039 /* If mode line height has changed, arrange for a thorough | |
10040 immediate redisplay using the correct mode line height. */ | |
10041 if (WINDOW_WANTS_MODELINE_P (w) | |
10042 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
10043 { | |
10044 fonts_changed_p = 1; | |
10045 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
10046 = DESIRED_MODE_LINE_HEIGHT (w); | |
10047 } | |
10048 | |
10049 /* If top line height has changed, arrange for a thorough | |
10050 immediate redisplay using the correct mode line height. */ | |
25546 | 10051 if (WINDOW_WANTS_HEADER_LINE_P (w) |
10052 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 10053 { |
10054 fonts_changed_p = 1; | |
25546 | 10055 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
10056 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 10057 } |
10058 | |
10059 if (fonts_changed_p) | |
34844 | 10060 goto finish_scroll_bars; |
25012 | 10061 } |
10062 | |
10063 if (!line_number_displayed | |
10064 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
10065 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
10066 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
10067 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
10068 } |
277 | 10069 |
25012 | 10070 finish_menu_bars: |
10071 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
10072 /* 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
|
10073 if (update_mode_line |
25012 | 10074 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
10075 { | |
10076 int redisplay_menu_p = 0; | |
10077 | |
10078 if (FRAME_WINDOW_P (f)) | |
10079 { | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
10080 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh) |
25012 | 10081 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
|
10082 #else |
25012 | 10083 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
|
10084 #endif |
25012 | 10085 } |
10086 else | |
10087 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
10088 | |
10089 if (redisplay_menu_p) | |
10090 display_menu_bar (w); | |
10091 | |
10092 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 10093 if (WINDOWP (f->tool_bar_window) |
10094 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
10095 || auto_resize_tool_bars_p)) | |
10096 redisplay_tool_bar (f); | |
25012 | 10097 #endif |
10098 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
10099 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
10100 finish_scroll_bars: |
25012 | 10101 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
10102 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
|
10103 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10104 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10105 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10106 /* 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
|
10107 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
|
10108 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
|
10109 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
|
10110 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
10111 |
25012 | 10112 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
|
10113 if (!MINI_WINDOW_P (w) |
25012 | 10114 || (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
|
10115 && 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
|
10116 { |
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
|
10117 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
10118 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
|
10119 /* 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
|
10120 moment, we'll pretend it is. */ |
25012 | 10121 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
10122 | |
10123 if (end < start) | |
10124 end = start; | |
10125 if (whole < (end - start)) | |
10126 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10127 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10128 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10129 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
10130 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
10131 /* Indicate what this scroll bar ought to be displaying now. */ |
34844 | 10132 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
|
10133 |
25012 | 10134 /* Note that we actually used the scroll bar attached to this |
10135 window, so it shouldn't be deleted at the end of redisplay. */ | |
34844 | 10136 redeem_scroll_bar_hook (w); |
10137 } | |
25012 | 10138 |
10139 /* Restore current_buffer and value of point in it. */ | |
10140 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
|
10141 set_buffer_internal_1 (old); |
25012 | 10142 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
|
10143 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
10144 unbind_to (count, Qnil); |
277 | 10145 } |
25012 | 10146 |
10147 | |
10148 /* Build the complete desired matrix of WINDOW with a window start | |
10149 buffer position POS. Value is non-zero if successful. It is zero | |
10150 if fonts were loaded during redisplay which makes re-adjusting | |
10151 glyph matrices necessary. */ | |
10152 | |
10153 int | |
277 | 10154 try_window (window, pos) |
10155 Lisp_Object window; | |
25012 | 10156 struct text_pos pos; |
10157 { | |
10158 struct window *w = XWINDOW (window); | |
10159 struct it it; | |
10160 struct glyph_row *last_text_row = NULL; | |
10161 | |
10162 /* Make POS the new window start. */ | |
10163 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
10164 | |
10165 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
10166 w->cursor.vpos = -1; | |
277 | 10167 overlay_arrow_seen = 0; |
25012 | 10168 |
10169 /* Initialize iterator and info to start at POS. */ | |
10170 start_display (&it, w, pos); | |
10171 | |
10172 /* Display all lines of W. */ | |
10173 while (it.current_y < it.last_visible_y) | |
10174 { | |
10175 if (display_line (&it)) | |
10176 last_text_row = it.glyph_row - 1; | |
10177 if (fonts_changed_p) | |
10178 return 0; | |
10179 } | |
10180 | |
10181 /* If bottom moved off end of frame, change mode line percentage. */ | |
10182 if (XFASTINT (w->window_end_pos) <= 0 | |
10183 && Z != IT_CHARPOS (it)) | |
277 | 10184 w->update_mode_line = Qt; |
10185 | |
25012 | 10186 /* Set window_end_pos to the offset of the last character displayed |
10187 on the window from the end of current_buffer. Set | |
10188 window_end_vpos to its row number. */ | |
10189 if (last_text_row) | |
10190 { | |
10191 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
10192 w->window_end_bytepos | |
10193 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10194 XSETFASTINT (w->window_end_pos, | |
10195 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10196 XSETFASTINT (w->window_end_vpos, | |
10197 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10198 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
10199 ->displays_text_p); | |
10200 } | |
10201 else | |
10202 { | |
10203 w->window_end_bytepos = 0; | |
10204 XSETFASTINT (w->window_end_pos, 0); | |
10205 XSETFASTINT (w->window_end_vpos, 0); | |
10206 } | |
10207 | |
277 | 10208 /* But that is not valid info until redisplay finishes. */ |
10209 w->window_end_valid = Qnil; | |
25012 | 10210 return 1; |
10211 } | |
10212 | |
10213 | |
277 | 10214 |
25012 | 10215 /************************************************************************ |
10216 Window redisplay reusing current matrix when buffer has not changed | |
10217 ************************************************************************/ | |
10218 | |
10219 /* Try redisplay of window W showing an unchanged buffer with a | |
10220 different window start than the last time it was displayed by | |
10221 reusing its current matrix. Value is non-zero if successful. | |
10222 W->start is the new window start. */ | |
10223 | |
10224 static int | |
10225 try_window_reusing_current_matrix (w) | |
10226 struct window *w; | |
10227 { | |
10228 struct frame *f = XFRAME (w->frame); | |
10229 struct glyph_row *row, *bottom_row; | |
10230 struct it it; | |
10231 struct run run; | |
10232 struct text_pos start, new_start; | |
10233 int nrows_scrolled, i; | |
10234 struct glyph_row *last_text_row; | |
10235 struct glyph_row *last_reused_text_row; | |
10236 struct glyph_row *start_row; | |
10237 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
|
10238 |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10239 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
|
10240 !FRAME_WINDOW_P (f) |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10241 /* 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
|
10242 or such. */ |
e4256ac89b92
(try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents:
29960
diff
changeset
|
10243 || windows_or_buffers_changed) |
25012 | 10244 return 0; |
10245 | |
10246 /* Can't do this if region may have changed. */ | |
10247 if ((!NILP (Vtransient_mark_mode) | |
10248 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10249 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10250 || !NILP (Vshow_trailing_whitespace)) |
25012 | 10251 return 0; |
10252 | |
10253 /* If top-line visibility has changed, give up. */ | |
25546 | 10254 if (WINDOW_WANTS_HEADER_LINE_P (w) |
10255 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 10256 return 0; |
10257 | |
10258 /* Give up if old or new display is scrolled vertically. We could | |
10259 make this function handle this, but right now it doesn't. */ | |
10260 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10261 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
10262 return 0; | |
10263 | |
10264 /* The variable new_start now holds the new window start. The old | |
10265 start `start' can be determined from the current matrix. */ | |
10266 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
10267 start = start_row->start.pos; | |
10268 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
10269 | |
10270 /* Clear the desired matrix for the display below. */ | |
10271 clear_glyph_matrix (w->desired_matrix); | |
10272 | |
10273 if (CHARPOS (new_start) <= CHARPOS (start)) | |
10274 { | |
10275 int first_row_y; | |
10276 | |
10277 IF_DEBUG (debug_method_add (w, "twu1")); | |
10278 | |
10279 /* Display up to a row that can be reused. The variable | |
10280 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
|
10281 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
|
10282 header-line; it's not the same as the MATRIX_ROW_VPOS! */ |
25012 | 10283 start_display (&it, w, new_start); |
10284 first_row_y = it.current_y; | |
10285 w->cursor.vpos = -1; | |
10286 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
|
10287 |
25012 | 10288 while (it.current_y < it.last_visible_y |
10289 && IT_CHARPOS (it) < CHARPOS (start) | |
10290 && !fonts_changed_p) | |
10291 if (display_line (&it)) | |
10292 last_text_row = it.glyph_row - 1; | |
10293 | |
10294 /* A value of current_y < last_visible_y means that we stopped | |
10295 at the previous window start, which in turn means that we | |
10296 have at least one reusable row. */ | |
10297 if (it.current_y < it.last_visible_y) | |
10298 { | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10299 /* IT.vpos always starts from 0; it counts text lines. */ |
25012 | 10300 nrows_scrolled = it.vpos; |
10301 | |
10302 /* Find PT if not already found in the lines displayed. */ | |
10303 if (w->cursor.vpos < 0) | |
10304 { | |
10305 int dy = it.current_y - first_row_y; | |
10306 | |
10307 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10308 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10309 { | |
10310 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
10311 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10312 { | |
10313 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
10314 dy, nrows_scrolled); | |
10315 break; | |
10316 } | |
10317 | |
10318 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
10319 break; | |
10320 | |
10321 ++row; | |
10322 } | |
10323 | |
10324 /* Give up if point was not found. This shouldn't | |
10325 happen often; not more often than with try_window | |
10326 itself. */ | |
10327 if (w->cursor.vpos < 0) | |
10328 { | |
10329 clear_glyph_matrix (w->desired_matrix); | |
10330 return 0; | |
10331 } | |
10332 } | |
10333 | |
10334 /* Scroll the display. Do it before the current matrix is | |
10335 changed. The problem here is that update has not yet | |
10336 run, i.e. part of the current matrix is not up to date. | |
10337 scroll_run_hook will clear the cursor, and use the | |
10338 current matrix to get the height of the row the cursor is | |
10339 in. */ | |
10340 run.current_y = first_row_y; | |
10341 run.desired_y = it.current_y; | |
10342 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
|
10343 |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10344 if (run.height > 0 && run.current_y != run.desired_y) |
25012 | 10345 { |
10346 update_begin (f); | |
10347 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
|
10348 rif->clear_mouse_face (w); |
25012 | 10349 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
|
10350 rif->update_window_end_hook (w, 0, 0); |
25012 | 10351 update_end (f); |
10352 } | |
10353 | |
10354 /* Shift current matrix down by nrows_scrolled lines. */ | |
10355 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
10356 rotate_matrix (w->current_matrix, | |
10357 start_vpos, | |
10358 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10359 nrows_scrolled); | |
10360 | |
34927
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10361 /* Disable lines that must be updated. */ |
25012 | 10362 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
|
10363 (start_row + i)->enabled_p = 0; |
34927
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10364 |
25012 | 10365 /* Re-compute Y positions. */ |
25546 | 10366 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10367 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10368 for (row = start_row + nrows_scrolled; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10369 row < bottom_row; |
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10370 ++row) |
25012 | 10371 { |
10372 row->y = it.current_y; | |
10373 | |
10374 if (row->y < min_y) | |
10375 row->visible_height = row->height - (min_y - row->y); | |
10376 else if (row->y + row->height > max_y) | |
10377 row->visible_height | |
10378 = row->height - (row->y + row->height - max_y); | |
10379 else | |
10380 row->visible_height = row->height; | |
10381 | |
10382 it.current_y += row->height; | |
10383 | |
10384 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10385 last_reused_text_row = row; | |
10386 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
10387 break; | |
10388 } | |
34927
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10389 |
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10390 /* Disable lines in the current matrix which are now |
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10391 below the window. */ |
35017
53c3e3f3949b
(try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents:
35005
diff
changeset
|
10392 for (++row; row < bottom_row; ++row) |
34927
2470fec0dd92
(try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34924
diff
changeset
|
10393 row->enabled_p = 0; |
25012 | 10394 } |
10395 | |
10396 /* Update window_end_pos etc.; last_reused_text_row is the last | |
10397 reused row from the current matrix containing text, if any. | |
10398 The value of last_text_row is the last displayed line | |
10399 containing text. */ | |
10400 if (last_reused_text_row) | |
10401 { | |
10402 w->window_end_bytepos | |
10403 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
10404 XSETFASTINT (w->window_end_pos, | |
10405 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
10406 XSETFASTINT (w->window_end_vpos, | |
10407 MATRIX_ROW_VPOS (last_reused_text_row, | |
10408 w->current_matrix)); | |
10409 } | |
10410 else if (last_text_row) | |
10411 { | |
10412 w->window_end_bytepos | |
10413 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10414 XSETFASTINT (w->window_end_pos, | |
10415 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10416 XSETFASTINT (w->window_end_vpos, | |
10417 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10418 } | |
10419 else | |
10420 { | |
10421 /* This window must be completely empty. */ | |
10422 w->window_end_bytepos = 0; | |
10423 XSETFASTINT (w->window_end_pos, 0); | |
10424 XSETFASTINT (w->window_end_vpos, 0); | |
10425 } | |
10426 w->window_end_valid = Qnil; | |
10427 | |
10428 /* Update hint: don't try scrolling again in update_window. */ | |
10429 w->desired_matrix->no_scrolling_p = 1; | |
10430 | |
10431 #if GLYPH_DEBUG | |
10432 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
10433 #endif | |
10434 return 1; | |
10435 } | |
10436 else if (CHARPOS (new_start) > CHARPOS (start)) | |
10437 { | |
10438 struct glyph_row *pt_row, *row; | |
10439 struct glyph_row *first_reusable_row; | |
10440 struct glyph_row *first_row_to_display; | |
10441 int dy; | |
10442 int yb = window_text_bottom_y (w); | |
10443 | |
10444 IF_DEBUG (debug_method_add (w, "twu2")); | |
10445 | |
10446 /* Find the row starting at new_start, if there is one. Don't | |
10447 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
|
10448 first_reusable_row = start_row; |
25012 | 10449 while (first_reusable_row->enabled_p |
10450 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
10451 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
10452 < CHARPOS (new_start))) | |
10453 ++first_reusable_row; | |
10454 | |
10455 /* Give up if there is no row to reuse. */ | |
10456 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
|
10457 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10458 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
10459 != CHARPOS (new_start))) |
25012 | 10460 return 0; |
10461 | |
10462 /* We can reuse fully visible rows beginning with | |
10463 first_reusable_row to the end of the window. Set | |
10464 first_row_to_display to the first row that cannot be reused. | |
10465 Set pt_row to the row containing point, if there is any. */ | |
10466 first_row_to_display = first_reusable_row; | |
10467 pt_row = NULL; | |
10468 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
10469 { | |
10470 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
10471 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
10472 pt_row = first_row_to_display; | |
10473 | |
10474 ++first_row_to_display; | |
10475 } | |
10476 | |
10477 /* Start displaying at the start of first_row_to_display. */ | |
10478 xassert (first_row_to_display->y < yb); | |
10479 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
|
10480 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
|
10481 - start_vpos); |
25012 | 10482 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) |
10483 - nrows_scrolled); | |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10484 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
|
10485 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 10486 |
10487 /* Display lines beginning with first_row_to_display in the | |
10488 desired matrix. Set last_text_row to the last row displayed | |
10489 that displays text. */ | |
10490 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
10491 if (pt_row == NULL) | |
10492 w->cursor.vpos = -1; | |
10493 last_text_row = NULL; | |
10494 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
10495 if (display_line (&it)) | |
10496 last_text_row = it.glyph_row - 1; | |
10497 | |
10498 /* Give up If point isn't in a row displayed or reused. */ | |
10499 if (w->cursor.vpos < 0) | |
10500 { | |
10501 clear_glyph_matrix (w->desired_matrix); | |
10502 return 0; | |
10503 } | |
10504 | |
10505 /* If point is in a reused row, adjust y and vpos of the cursor | |
10506 position. */ | |
10507 if (pt_row) | |
10508 { | |
10509 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
10510 w->current_matrix); | |
10511 w->cursor.y -= first_reusable_row->y; | |
10512 } | |
10513 | |
10514 /* Scroll the display. */ | |
10515 run.current_y = first_reusable_row->y; | |
25546 | 10516 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10517 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
|
10518 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
|
10519 |
25012 | 10520 if (run.height) |
10521 { | |
10522 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10523 update_begin (f); | |
10524 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
|
10525 rif->clear_mouse_face (w); |
25012 | 10526 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
|
10527 rif->update_window_end_hook (w, 0, 0); |
25012 | 10528 update_end (f); |
10529 } | |
10530 | |
10531 /* Adjust Y positions of reused rows. */ | |
10532 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
25546 | 10533 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 10534 max_y = it.last_visible_y; |
31849
07bedd9c5bdd
(try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents:
31845
diff
changeset
|
10535 for (row = first_reusable_row; row < first_row_to_display; ++row) |
25012 | 10536 { |
10537 row->y -= dy; | |
10538 if (row->y < min_y) | |
10539 row->visible_height = row->height - (min_y - row->y); | |
10540 else if (row->y + row->height > max_y) | |
10541 row->visible_height | |
10542 = row->height - (row->y + row->height - max_y); | |
10543 else | |
10544 row->visible_height = row->height; | |
10545 } | |
10546 | |
10547 /* Disable rows not reused. */ | |
10548 while (row < bottom_row) | |
10549 { | |
10550 row->enabled_p = 0; | |
10551 ++row; | |
10552 } | |
10553 | |
10554 /* Scroll the current matrix. */ | |
10555 xassert (nrows_scrolled > 0); | |
10556 rotate_matrix (w->current_matrix, | |
10557 start_vpos, | |
10558 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
10559 -nrows_scrolled); | |
10560 | |
10561 /* Adjust window end. A null value of last_text_row means that | |
10562 the window end is in reused rows which in turn means that | |
10563 only its vpos can have changed. */ | |
10564 if (last_text_row) | |
10565 { | |
10566 w->window_end_bytepos | |
10567 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10568 XSETFASTINT (w->window_end_pos, | |
10569 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10570 XSETFASTINT (w->window_end_vpos, | |
10571 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
10572 } | |
10573 else | |
10574 { | |
10575 XSETFASTINT (w->window_end_vpos, | |
10576 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
10577 } | |
10578 | |
10579 w->window_end_valid = Qnil; | |
10580 w->desired_matrix->no_scrolling_p = 1; | |
10581 | |
10582 #if GLYPH_DEBUG | |
10583 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
10584 #endif | |
10585 return 1; | |
10586 } | |
10587 | |
10588 return 0; | |
10589 } | |
10590 | |
10591 | |
10592 | |
10593 /************************************************************************ | |
10594 Window redisplay reusing current matrix when buffer has changed | |
10595 ************************************************************************/ | |
10596 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10597 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
|
10598 static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, |
25012 | 10599 int *, int *)); |
10600 static struct glyph_row * | |
10601 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
10602 struct glyph_row *)); | |
10603 | |
10604 | |
10605 /* Return the last row in MATRIX displaying text. If row START is | |
10606 non-null, start searching with that row. IT gives the dimensions | |
10607 of the display. Value is null if matrix is empty; otherwise it is | |
10608 a pointer to the row found. */ | |
10609 | |
10610 static struct glyph_row * | |
10611 find_last_row_displaying_text (matrix, it, start) | |
10612 struct glyph_matrix *matrix; | |
10613 struct it *it; | |
10614 struct glyph_row *start; | |
10615 { | |
10616 struct glyph_row *row, *row_found; | |
10617 | |
10618 /* Set row_found to the last row in IT->w's current matrix | |
10619 displaying text. The loop looks funny but think of partially | |
10620 visible lines. */ | |
10621 row_found = NULL; | |
10622 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
10623 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10624 { | |
10625 xassert (row->enabled_p); | |
10626 row_found = row; | |
10627 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
10628 break; | |
10629 ++row; | |
10630 } | |
10631 | |
10632 return row_found; | |
10633 } | |
10634 | |
10635 | |
10636 /* Return the last row in the current matrix of W that is not affected | |
10637 by changes at the start of current_buffer that occurred since the | |
10638 last time W was redisplayed. Value is null if no such row exists. | |
10639 | |
10640 The global variable beg_unchanged has to contain the number of | |
10641 bytes unchanged at the start of current_buffer. BEG + | |
10642 beg_unchanged is the buffer position of the first changed byte in | |
10643 current_buffer. Characters at positions < BEG + beg_unchanged are | |
10644 at the same buffer positions as they were when the current matrix | |
10645 was built. */ | |
10646 | |
10647 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10648 find_last_unchanged_at_beg_row (w) |
25012 | 10649 struct window *w; |
10650 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10651 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 10652 struct glyph_row *row; |
10653 struct glyph_row *row_found = NULL; | |
10654 int yb = window_text_bottom_y (w); | |
10655 | |
10656 /* Find the last row displaying unchanged text. */ | |
10657 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10658 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
10659 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
10660 { | |
10661 if (/* If row ends before first_changed_pos, it is unchanged, | |
10662 except in some case. */ | |
10663 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
10664 /* When row ends in ZV and we write at ZV it is not | |
10665 unchanged. */ | |
10666 && !row->ends_at_zv_p | |
10667 /* When first_changed_pos is the end of a continued line, | |
10668 row is not unchanged because it may be no longer | |
10669 continued. */ | |
10670 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
10671 && row->continued_p)) | |
10672 row_found = row; | |
10673 | |
10674 /* Stop if last visible row. */ | |
10675 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
10676 break; | |
10677 | |
10678 ++row; | |
10679 } | |
10680 | |
10681 return row_found; | |
10682 } | |
10683 | |
10684 | |
10685 /* Find the first glyph row in the current matrix of W that is not | |
10686 affected by changes at the end of current_buffer since the last | |
10687 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
|
10688 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
|
10689 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
|
10690 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
|
10691 exists, i.e. all rows are affected by changes. */ |
25012 | 10692 |
10693 static struct glyph_row * | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10694 find_first_unchanged_at_end_row (w, delta, delta_bytes) |
25012 | 10695 struct window *w; |
10696 int *delta, *delta_bytes; | |
10697 { | |
10698 struct glyph_row *row; | |
10699 struct glyph_row *row_found = NULL; | |
10700 | |
10701 *delta = *delta_bytes = 0; | |
10702 | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10703 /* 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
|
10704 is not up to date. */ |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10705 if (NILP (w->window_end_valid)) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10706 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10707 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10708 /* A value of window_end_pos >= END_UNCHANGED means that the window |
25012 | 10709 end is in the range of changed text. If so, there is no |
10710 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
|
10711 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 10712 return NULL; |
10713 | |
10714 /* Set row to the last row in W's current matrix displaying text. */ | |
10715 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
10716 | |
10717 /* If matrix is entirely empty, no unchanged row exists. */ | |
10718 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
10719 { | |
10720 /* The value of row is the last glyph row in the matrix having a | |
10721 meaningful buffer position in it. The end position of row | |
10722 corresponds to window_end_pos. This allows us to translate | |
10723 buffer positions in the current matrix to current buffer | |
10724 positions for characters not in changed text. */ | |
10725 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
10726 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
10727 int last_unchanged_pos, last_unchanged_pos_old; | |
10728 struct glyph_row *first_text_row | |
10729 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10730 | |
10731 *delta = Z - Z_old; | |
10732 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
10733 | |
10734 /* Set last_unchanged_pos to the buffer position of the last | |
10735 character in the buffer that has not been changed. Z is the | |
10736 index + 1 of the last byte in current_buffer, i.e. by | |
10737 subtracting end_unchanged we get the index of the last | |
10738 unchanged character, and we have to add BEG to get its buffer | |
10739 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10740 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 10741 last_unchanged_pos_old = last_unchanged_pos - *delta; |
10742 | |
10743 /* Search backward from ROW for a row displaying a line that | |
10744 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
|
10745 for (; row > first_text_row; --row) |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10746 { |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10747 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
|
10748 abort (); |
25012 | 10749 |
10750 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
10751 row_found = row; | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10752 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10753 } |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10754 |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10755 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
|
10756 abort (); |
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
10757 |
25012 | 10758 return row_found; |
10759 } | |
10760 | |
10761 | |
10762 /* Make sure that glyph rows in the current matrix of window W | |
10763 reference the same glyph memory as corresponding rows in the | |
10764 frame's frame matrix. This function is called after scrolling W's | |
10765 current matrix on a terminal frame in try_window_id and | |
10766 try_window_reusing_current_matrix. */ | |
10767 | |
10768 static void | |
10769 sync_frame_with_window_matrix_rows (w) | |
10770 struct window *w; | |
10771 { | |
10772 struct frame *f = XFRAME (w->frame); | |
10773 struct glyph_row *window_row, *window_row_end, *frame_row; | |
10774 | |
10775 /* Preconditions: W must be a leaf window and full-width. Its frame | |
10776 must have a frame matrix. */ | |
10777 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
10778 xassert (WINDOW_FULL_WIDTH_P (w)); | |
10779 xassert (!FRAME_WINDOW_P (f)); | |
10780 | |
10781 /* If W is a full-width window, glyph pointers in W's current matrix | |
10782 have, by definition, to be the same as glyph pointers in the | |
10783 corresponding frame matrix. */ | |
10784 window_row = w->current_matrix->rows; | |
10785 window_row_end = window_row + w->current_matrix->nrows; | |
10786 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
10787 while (window_row < window_row_end) | |
10788 { | |
10789 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10790 |
25012 | 10791 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
10792 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
|
10793 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10794 /* 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
|
10795 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
|
10796 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10797 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
10798 |
25012 | 10799 ++window_row, ++frame_row; |
10800 } | |
10801 } | |
10802 | |
10803 | |
25543 | 10804 /* Find the glyph row in window W containing CHARPOS. Consider all |
10805 rows between START and END (not inclusive). END null means search | |
10806 all rows to the end of the display area of W. Value is the row | |
10807 containing CHARPOS or null. */ | |
10808 | |
10809 static struct glyph_row * | |
10810 row_containing_pos (w, charpos, start, end) | |
10811 struct window *w; | |
10812 int charpos; | |
10813 struct glyph_row *start, *end; | |
10814 { | |
10815 struct glyph_row *row = start; | |
10816 int last_y; | |
10817 | |
10818 /* If we happen to start on a header-line, skip that. */ | |
10819 if (row->mode_line_p) | |
10820 ++row; | |
10821 | |
10822 if ((end && row >= end) || !row->enabled_p) | |
10823 return NULL; | |
10824 | |
10825 last_y = window_text_bottom_y (w); | |
10826 | |
10827 while ((end == NULL || row < end) | |
10828 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
10829 /* The end position of a row equals the start | |
10830 position of the next row. If CHARPOS is there, we | |
10831 would rather display it in the next line, except | |
10832 when this line ends in ZV. */ | |
10833 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
10834 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
10835 || !row->ends_at_zv_p))) | |
10836 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
10837 ++row; | |
10838 | |
10839 /* Give up if CHARPOS not found. */ | |
10840 if ((end && row >= end) | |
10841 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
10842 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
10843 row = NULL; | |
10844 | |
10845 return row; | |
10846 } | |
10847 | |
10848 | |
25012 | 10849 /* Try to redisplay window W by reusing its existing display. W's |
10850 current matrix must be up to date when this function is called, | |
10851 i.e. window_end_valid must not be nil. | |
10852 | |
10853 Value is | |
10854 | |
10855 1 if display has been updated | |
10856 0 if otherwise unsuccessful | |
10857 -1 if redisplay with same window start is known not to succeed | |
10858 | |
10859 The following steps are performed: | |
10860 | |
10861 1. Find the last row in the current matrix of W that is not | |
10862 affected by changes at the start of current_buffer. If no such row | |
10863 is found, give up. | |
10864 | |
10865 2. Find the first row in W's current matrix that is not affected by | |
10866 changes at the end of current_buffer. Maybe there is no such row. | |
10867 | |
10868 3. Display lines beginning with the row + 1 found in step 1 to the | |
10869 row found in step 2 or, if step 2 didn't find a row, to the end of | |
10870 the window. | |
10871 | |
10872 4. If cursor is not known to appear on the window, give up. | |
10873 | |
10874 5. If display stopped at the row found in step 2, scroll the | |
10875 display and current matrix as needed. | |
10876 | |
10877 6. Maybe display some lines at the end of W, if we must. This can | |
10878 happen under various circumstances, like a partially visible line | |
10879 becoming fully visible, or because newly displayed lines are displayed | |
10880 in smaller font sizes. | |
10881 | |
10882 7. Update W's window end information. */ | |
10883 | |
10884 /* Check that window end is what we expect it to be. */ | |
277 | 10885 |
10886 static int | |
25012 | 10887 try_window_id (w) |
10888 struct window *w; | |
10889 { | |
10890 struct frame *f = XFRAME (w->frame); | |
10891 struct glyph_matrix *current_matrix = w->current_matrix; | |
10892 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
10893 struct glyph_row *last_unchanged_at_beg_row; | |
10894 struct glyph_row *first_unchanged_at_end_row; | |
10895 struct glyph_row *row; | |
10896 struct glyph_row *bottom_row; | |
10897 int bottom_vpos; | |
10898 struct it it; | |
10899 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
10900 struct text_pos start_pos; | |
10901 struct run run; | |
10902 int first_unchanged_at_end_vpos = 0; | |
10903 struct glyph_row *last_text_row, *last_text_row_at_end; | |
10904 struct text_pos start; | |
10905 | |
10906 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
10907 | |
10908 /* Check pre-conditions. Window end must be valid, otherwise | |
10909 the current matrix would not be up to date. */ | |
10910 xassert (!NILP (w->window_end_valid)); | |
10911 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
10912 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
10913 | |
10914 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
10915 only if buffer has really changed. The reason is that the gap is | |
10916 initially at Z for freshly visited files. The code below would | |
10917 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
|
10918 if (MODIFF > SAVE_MODIFF |
723662ab7db4
(try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents:
27897
diff
changeset
|
10919 /* 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
|
10920 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) |
25012 | 10921 { |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10922 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10923 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10924 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10925 END_UNCHANGED = Z - GPT; |
25012 | 10926 } |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
10927 |
25012 | 10928 /* If window starts after a line end, and the last change is in |
10929 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
|
10930 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
|
10931 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
|
10932 be adjusted, of course. */ |
25012 | 10933 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); |
10934 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
10935 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 10936 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
10937 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
10938 { | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10939 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
|
10940 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
|
10941 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10942 if (delta) |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10943 { |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10944 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
|
10945 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
|
10946 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10947 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
|
10948 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
|
10949 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
|
10950 delta, delta_bytes); |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10951 } |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10952 |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10953 #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
|
10954 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
|
10955 changed. */ |
25012 | 10956 w->window_end_pos |
10957 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10958 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
|
10959 = 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
|
10960 #endif |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
10961 |
34438
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10962 row = row_containing_pos (w, PT, r0, NULL); |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10963 if (row == NULL) |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10964 return 0; |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10965 |
524c7ecc8ef4
(try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents:
34288
diff
changeset
|
10966 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 10967 return 1; |
10968 } | |
10969 | |
10970 /* Return quickly if changes are all below what is displayed in the | |
10971 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
|
10972 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 10973 && PT < MATRIX_ROW_END_CHARPOS (row)) |
10974 { | |
10975 /* We have to update window end positions because the buffer's | |
10976 size has changed. */ | |
10977 w->window_end_pos | |
10978 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
10979 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
|
10980 = 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
|
10981 |
8dc78ef485a4
(try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents:
29981
diff
changeset
|
10982 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
|
10983 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
|
10984 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
|
10985 return 2; |
25012 | 10986 } |
10987 | |
10988 /* Check that window start agrees with the start of the first glyph | |
10989 row in its current matrix. Check this after we know the window | |
10990 start is not in changed text, otherwise positions would not be | |
10991 comparable. */ | |
10992 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
10993 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
10994 return 0; | |
10995 | |
10996 /* Compute the position at which we have to start displaying new | |
10997 lines. Some of the lines at the top of the window might be | |
10998 reusable because they are not displaying changed text. Find the | |
10999 last row in W's current matrix not affected by changes at the | |
11000 start of current_buffer. Value is null if changes start in the | |
11001 first line of window. */ | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
11002 last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); |
25012 | 11003 if (last_unchanged_at_beg_row) |
11004 { | |
33898
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11005 /* Avoid starting to display in the moddle of a character, a TAB |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11006 for instance. This is easier than to set up the iterator |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11007 exactly, and it's not a frequent case, so the additional |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11008 effort wouldn't really pay off. */ |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11009 while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11010 && last_unchanged_at_beg_row > w->current_matrix->rows) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11011 --last_unchanged_at_beg_row; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11012 |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11013 if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)) |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11014 return 0; |
93b22ccc23e2
(try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents:
33863
diff
changeset
|
11015 |
25012 | 11016 init_to_row_end (&it, w, last_unchanged_at_beg_row); |
11017 start_pos = it.current.pos; | |
11018 | |
11019 /* Start displaying new lines in the desired matrix at the same | |
11020 vpos we would use in the current matrix, i.e. below | |
11021 last_unchanged_at_beg_row. */ | |
11022 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
11023 current_matrix); | |
11024 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
11025 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
11026 | |
11027 xassert (it.hpos == 0 && it.current_x == 0); | |
11028 } | |
277 | 11029 else |
25012 | 11030 { |
11031 /* There are no reusable lines at the start of the window. | |
11032 Start displaying in the first line. */ | |
11033 start_display (&it, w, start); | |
11034 start_pos = it.current.pos; | |
11035 } | |
11036 | |
11037 /* Find the first row that is not affected by changes at the end of | |
11038 the buffer. Value will be null if there is no unchanged row, in | |
11039 which case we must redisplay to the end of the window. delta | |
11040 will be set to the value by which buffer positions beginning with | |
11041 first_unchanged_at_end_row have to be adjusted due to text | |
11042 changes. */ | |
11043 first_unchanged_at_end_row | |
32539
dd4c7d5e1599
(find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
32532
diff
changeset
|
11044 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes); |
25012 | 11045 IF_DEBUG (debug_delta = delta); |
11046 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
11047 | |
11048 /* Set stop_pos to the buffer position up to which we will have to | |
11049 display new lines. If first_unchanged_at_end_row != NULL, this | |
11050 is the buffer position of the start of the line displayed in that | |
11051 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
11052 that we don't stop at a buffer position. */ | |
11053 stop_pos = 0; | |
11054 if (first_unchanged_at_end_row) | |
11055 { | |
11056 xassert (last_unchanged_at_beg_row == NULL | |
11057 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
11058 | |
11059 /* If this is a continuation line, move forward to the next one | |
11060 that isn't. Changes in lines above affect this line. | |
11061 Caution: this may move first_unchanged_at_end_row to a row | |
11062 not displaying text. */ | |
11063 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
11064 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
11065 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
11066 < it.last_visible_y)) | |
11067 ++first_unchanged_at_end_row; | |
11068 | |
11069 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
11070 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
11071 >= it.last_visible_y)) | |
11072 first_unchanged_at_end_row = NULL; | |
11073 else | |
11074 { | |
11075 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
11076 + delta); | |
11077 first_unchanged_at_end_vpos | |
11078 = 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
|
11079 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 11080 } |
11081 } | |
11082 else if (last_unchanged_at_beg_row == NULL) | |
11083 return 0; | |
11084 | |
11085 | |
11086 #if GLYPH_DEBUG | |
11087 | |
11088 /* Either there is no unchanged row at the end, or the one we have | |
11089 now displays text. This is a necessary condition for the window | |
11090 end pos calculation at the end of this function. */ | |
11091 xassert (first_unchanged_at_end_row == NULL | |
11092 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
11093 | |
11094 debug_last_unchanged_at_beg_vpos | |
11095 = (last_unchanged_at_beg_row | |
11096 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
11097 : -1); | |
11098 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
11099 | |
11100 #endif /* GLYPH_DEBUG != 0 */ | |
11101 | |
11102 | |
11103 /* Display new lines. Set last_text_row to the last new line | |
11104 displayed which has text on it, i.e. might end up as being the | |
11105 line where the window_end_vpos is. */ | |
11106 w->cursor.vpos = -1; | |
11107 last_text_row = NULL; | |
277 | 11108 overlay_arrow_seen = 0; |
25012 | 11109 while (it.current_y < it.last_visible_y |
11110 && !fonts_changed_p | |
11111 && (first_unchanged_at_end_row == NULL | |
11112 || IT_CHARPOS (it) < stop_pos)) | |
11113 { | |
11114 if (display_line (&it)) | |
11115 last_text_row = it.glyph_row - 1; | |
11116 } | |
11117 | |
11118 if (fonts_changed_p) | |
11119 return -1; | |
11120 | |
11121 | |
11122 /* Compute differences in buffer positions, y-positions etc. for | |
11123 lines reused at the bottom of the window. Compute what we can | |
11124 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11125 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
|
11126 /* 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
|
11127 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11128 && it.current_y < it.last_visible_y) |
25012 | 11129 { |
11130 dvpos = (it.vpos | |
11131 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
11132 current_matrix)); | |
11133 dy = it.current_y - first_unchanged_at_end_row->y; | |
11134 run.current_y = first_unchanged_at_end_row->y; | |
11135 run.desired_y = run.current_y + dy; | |
11136 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
11137 } | |
11138 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11139 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11140 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
|
11141 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
|
11142 } |
25012 | 11143 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
11144 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
11145 |
25012 | 11146 /* Find the cursor if not already found. We have to decide whether |
11147 PT will appear on this window (it sometimes doesn't, but this is | |
11148 not a very frequent case.) This decision has to be made before | |
11149 the current matrix is altered. A value of cursor.vpos < 0 means | |
11150 that PT is either in one of the lines beginning at | |
11151 first_unchanged_at_end_row or below the window. Don't care for | |
11152 lines that might be displayed later at the window end; as | |
11153 mentioned, this is not a frequent case. */ | |
11154 if (w->cursor.vpos < 0) | |
11155 { | |
11156 /* Cursor in unchanged rows at the top? */ | |
11157 if (PT < CHARPOS (start_pos) | |
11158 && last_unchanged_at_beg_row) | |
11159 { | |
25543 | 11160 row = row_containing_pos (w, PT, |
11161 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
11162 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
|
11163 if (row) |
900897103eb2
(try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents:
31338
diff
changeset
|
11164 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
25012 | 11165 } |
11166 | |
11167 /* Start from first_unchanged_at_end_row looking for PT. */ | |
11168 else if (first_unchanged_at_end_row) | |
11169 { | |
25543 | 11170 row = row_containing_pos (w, PT - delta, |
11171 first_unchanged_at_end_row, NULL); | |
11172 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
11173 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
|
11174 delta_bytes, dy, dvpos); |
25012 | 11175 } |
11176 | |
11177 /* Give up if cursor was not found. */ | |
11178 if (w->cursor.vpos < 0) | |
11179 { | |
11180 clear_glyph_matrix (w->desired_matrix); | |
11181 return -1; | |
11182 } | |
11183 } | |
11184 | |
11185 /* Don't let the cursor end in the scroll margins. */ | |
11186 { | |
11187 int this_scroll_margin, cursor_height; | |
11188 | |
11189 this_scroll_margin = max (0, scroll_margin); | |
11190 this_scroll_margin = min (this_scroll_margin, | |
11191 XFASTINT (w->height) / 4); | |
11192 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
11193 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
11194 | |
11195 if ((w->cursor.y < this_scroll_margin | |
11196 && CHARPOS (start) > BEGV) | |
11197 /* Don't take scroll margin into account at the bottom because | |
11198 old redisplay didn't do it either. */ | |
11199 || w->cursor.y + cursor_height > it.last_visible_y) | |
11200 { | |
11201 w->cursor.vpos = -1; | |
11202 clear_glyph_matrix (w->desired_matrix); | |
11203 return -1; | |
11204 } | |
11205 } | |
11206 | |
11207 /* Scroll the display. Do it before changing the current matrix so | |
11208 that xterm.c doesn't get confused about where the cursor glyph is | |
11209 found. */ | |
28539
918f12c5c8e3
(setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
11210 if (dy && run.height) |
25012 | 11211 { |
11212 update_begin (f); | |
11213 | |
11214 if (FRAME_WINDOW_P (f)) | |
11215 { | |
11216 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
|
11217 rif->clear_mouse_face (w); |
25012 | 11218 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
|
11219 rif->update_window_end_hook (w, 0, 0); |
25012 | 11220 } |
11221 else | |
11222 { | |
11223 /* Terminal frame. In this case, dvpos gives the number of | |
11224 lines to scroll by; dvpos < 0 means scroll up. */ | |
11225 int first_unchanged_at_end_vpos | |
11226 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
11227 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
11228 int end = XFASTINT (w->top) + window_internal_height (w); | |
11229 | |
11230 /* Perform the operation on the screen. */ | |
11231 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
11232 { |
25012 | 11233 /* Scroll last_unchanged_at_beg_row to the end of the |
11234 window down dvpos lines. */ | |
11235 set_terminal_window (end); | |
11236 | |
11237 /* On dumb terminals delete dvpos lines at the end | |
11238 before inserting dvpos empty lines. */ | |
11239 if (!scroll_region_ok) | |
11240 ins_del_lines (end - dvpos, -dvpos); | |
11241 | |
11242 /* Insert dvpos empty lines in front of | |
11243 last_unchanged_at_beg_row. */ | |
11244 ins_del_lines (from, dvpos); | |
11245 } | |
11246 else if (dvpos < 0) | |
11247 { | |
11248 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
11249 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
11250 set_terminal_window (end); | |
11251 | |
11252 /* Delete dvpos lines in front of | |
11253 last_unchanged_at_beg_vpos. ins_del_lines will set | |
11254 the cursor to the given vpos and emit |dvpos| delete | |
11255 line sequences. */ | |
11256 ins_del_lines (from + dvpos, dvpos); | |
11257 | |
11258 /* On a dumb terminal insert dvpos empty lines at the | |
11259 end. */ | |
11260 if (!scroll_region_ok) | |
11261 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
|
11262 } |
25012 | 11263 |
11264 set_terminal_window (0); | |
11265 } | |
11266 | |
11267 update_end (f); | |
11268 } | |
11269 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11270 /* 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
|
11271 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
|
11272 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
11273 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
|
11274 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 11275 if (dvpos < 0) |
11276 { | |
11277 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
11278 bottom_vpos, dvpos); | |
11279 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
11280 bottom_vpos, 0); | |
11281 } | |
11282 else if (dvpos > 0) | |
11283 { | |
11284 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
11285 bottom_vpos, dvpos); | |
11286 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
11287 first_unchanged_at_end_vpos + dvpos, 0); | |
11288 } | |
11289 | |
11290 /* For frame-based redisplay, make sure that current frame and window | |
11291 matrix are in sync with respect to glyph memory. */ | |
11292 if (!FRAME_WINDOW_P (f)) | |
11293 sync_frame_with_window_matrix_rows (w); | |
11294 | |
11295 /* Adjust buffer positions in reused rows. */ | |
11296 if (delta) | |
28709
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11297 increment_matrix_positions (current_matrix, |
7606937fa891
(try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents:
28692
diff
changeset
|
11298 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
|
11299 bottom_vpos, delta, delta_bytes); |
25012 | 11300 |
11301 /* Adjust Y positions. */ | |
11302 if (dy) | |
11303 shift_glyph_matrix (w, current_matrix, | |
11304 first_unchanged_at_end_vpos + dvpos, | |
11305 bottom_vpos, dy); | |
11306 | |
11307 if (first_unchanged_at_end_row) | |
11308 first_unchanged_at_end_row += dvpos; | |
11309 | |
11310 /* If scrolling up, there may be some lines to display at the end of | |
11311 the window. */ | |
11312 last_text_row_at_end = NULL; | |
11313 if (dy < 0) | |
11314 { | |
11315 /* Set last_row to the glyph row in the current matrix where the | |
11316 window end line is found. It has been moved up or down in | |
11317 the matrix by dvpos. */ | |
11318 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
11319 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
11320 | |
11321 /* If last_row is the window end line, it should display text. */ | |
11322 xassert (last_row->displays_text_p); | |
11323 | |
11324 /* If window end line was partially visible before, begin | |
11325 displaying at that line. Otherwise begin displaying with the | |
11326 line following it. */ | |
11327 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
11328 { | |
11329 init_to_row_start (&it, w, last_row); | |
11330 it.vpos = last_vpos; | |
11331 it.current_y = last_row->y; | |
11332 } | |
11333 else | |
11334 { | |
11335 init_to_row_end (&it, w, last_row); | |
11336 it.vpos = 1 + last_vpos; | |
11337 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
11338 ++last_row; | |
11339 } | |
11340 | |
11341 /* We may start in a continuation line. If so, we have to get | |
11342 the right continuation_lines_width and current_x. */ | |
11343 it.continuation_lines_width = last_row->continuation_lines_width; | |
11344 it.hpos = it.current_x = 0; | |
11345 | |
11346 /* Display the rest of the lines at the window end. */ | |
11347 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
11348 while (it.current_y < it.last_visible_y | |
11349 && !fonts_changed_p) | |
11350 { | |
11351 /* Is it always sure that the display agrees with lines in | |
11352 the current matrix? I don't think so, so we mark rows | |
11353 displayed invalid in the current matrix by setting their | |
11354 enabled_p flag to zero. */ | |
11355 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
11356 if (display_line (&it)) | |
11357 last_text_row_at_end = it.glyph_row - 1; | |
11358 } | |
11359 } | |
11360 | |
11361 /* Update window_end_pos and window_end_vpos. */ | |
11362 if (first_unchanged_at_end_row | |
11363 && first_unchanged_at_end_row->y < it.last_visible_y | |
11364 && !last_text_row_at_end) | |
11365 { | |
11366 /* Window end line if one of the preserved rows from the current | |
11367 matrix. Set row to the last row displaying text in current | |
11368 matrix starting at first_unchanged_at_end_row, after | |
11369 scrolling. */ | |
11370 xassert (first_unchanged_at_end_row->displays_text_p); | |
11371 row = find_last_row_displaying_text (w->current_matrix, &it, | |
11372 first_unchanged_at_end_row); | |
11373 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
11374 | |
11375 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
11376 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
11377 XSETFASTINT (w->window_end_vpos, | |
11378 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
11379 } | |
11380 else if (last_text_row_at_end) | |
11381 { | |
11382 XSETFASTINT (w->window_end_pos, | |
11383 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
11384 w->window_end_bytepos | |
11385 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
11386 XSETFASTINT (w->window_end_vpos, | |
11387 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
11388 } | |
11389 else if (last_text_row) | |
11390 { | |
11391 /* We have displayed either to the end of the window or at the | |
11392 end of the window, i.e. the last row with text is to be found | |
11393 in the desired matrix. */ | |
11394 XSETFASTINT (w->window_end_pos, | |
11395 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
11396 w->window_end_bytepos | |
11397 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
11398 XSETFASTINT (w->window_end_vpos, | |
11399 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
11400 } | |
11401 else if (first_unchanged_at_end_row == NULL | |
11402 && last_text_row == NULL | |
11403 && last_text_row_at_end == NULL) | |
11404 { | |
11405 /* Displayed to end of window, but no line containing text was | |
11406 displayed. Lines were deleted at the end of the window. */ | |
11407 int vpos; | |
25546 | 11408 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 11409 |
11410 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 11411 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
11412 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
11413 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
11414 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 11415 break; |
11416 | |
11417 w->window_end_vpos = make_number (vpos); | |
11418 } | |
11419 else | |
11420 abort (); | |
11421 | |
11422 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
11423 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
11424 | |
11425 /* Record that display has not been completed. */ | |
277 | 11426 w->window_end_valid = Qnil; |
25012 | 11427 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
|
11428 return 3; |
277 | 11429 } |
25012 | 11430 |
11431 | |
11432 | |
11433 /*********************************************************************** | |
11434 More debugging support | |
11435 ***********************************************************************/ | |
11436 | |
11437 #if GLYPH_DEBUG | |
11438 | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11439 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11440 void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); |
36114
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11441 void dump_glyph P_ ((struct glyph_row *, struct glyph *, int)); |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11442 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11443 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11444 /* Dump the contents of glyph matrix MATRIX on stderr. |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11445 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11446 GLYPHS 0 means don't show glyph contents. |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11447 GLYPHS 1 means show glyphs in short form |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11448 GLYPHS > 1 means show glyphs in long form. */ |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11449 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11450 void |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11451 dump_glyph_matrix (matrix, glyphs) |
25012 | 11452 struct glyph_matrix *matrix; |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11453 int glyphs; |
25012 | 11454 { |
11455 int i; | |
11456 for (i = 0; i < matrix->nrows; ++i) | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11457 dump_glyph_row (matrix, i, glyphs); |
25012 | 11458 } |
11459 | |
11460 | |
36114
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11461 /* Dump contents of glyph GLYPH to stderr. ROW and AREA are |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11462 the glyph row and area where the glyph comes from. */ |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11463 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11464 void |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11465 dump_glyph (row, glyph, area) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11466 struct glyph_row *row; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11467 struct glyph *glyph; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11468 int area; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11469 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11470 if (glyph->type == CHAR_GLYPH) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11471 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11472 fprintf (stderr, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11473 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11474 glyph - row->glyphs[TEXT_AREA], |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11475 'C', |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11476 glyph->charpos, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11477 (BUFFERP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11478 ? 'B' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11479 : (STRINGP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11480 ? 'S' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11481 : '-')), |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11482 glyph->pixel_width, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11483 glyph->u.ch, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11484 (glyph->u.ch < 0x80 && glyph->u.ch >= ' ' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11485 ? glyph->u.ch |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11486 : '.'), |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11487 glyph->face_id, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11488 glyph->left_box_line_p, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11489 glyph->right_box_line_p); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11490 } |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11491 else if (glyph->type == STRETCH_GLYPH) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11492 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11493 fprintf (stderr, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11494 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11495 glyph - row->glyphs[TEXT_AREA], |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11496 'S', |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11497 glyph->charpos, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11498 (BUFFERP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11499 ? 'B' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11500 : (STRINGP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11501 ? 'S' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11502 : '-')), |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11503 glyph->pixel_width, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11504 0, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11505 '.', |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11506 glyph->face_id, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11507 glyph->left_box_line_p, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11508 glyph->right_box_line_p); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11509 } |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11510 else if (glyph->type == IMAGE_GLYPH) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11511 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11512 fprintf (stderr, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11513 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11514 glyph - row->glyphs[TEXT_AREA], |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11515 'I', |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11516 glyph->charpos, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11517 (BUFFERP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11518 ? 'B' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11519 : (STRINGP (glyph->object) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11520 ? 'S' |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11521 : '-')), |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11522 glyph->pixel_width, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11523 glyph->u.img_id, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11524 '.', |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11525 glyph->face_id, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11526 glyph->left_box_line_p, |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11527 glyph->right_box_line_p); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11528 } |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11529 } |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11530 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11531 |
25012 | 11532 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11533 GLYPHS 0 means don't show glyph contents. |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11534 GLYPHS 1 means show glyphs in short form |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11535 GLYPHS > 1 means show glyphs in long form. */ |
25012 | 11536 |
11537 void | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11538 dump_glyph_row (matrix, vpos, glyphs) |
25012 | 11539 struct glyph_matrix *matrix; |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11540 int vpos, glyphs; |
25012 | 11541 { |
11542 struct glyph_row *row; | |
11543 | |
11544 if (vpos < 0 || vpos >= matrix->nrows) | |
11545 return; | |
11546 | |
11547 row = MATRIX_ROW (matrix, vpos); | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11548 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11549 if (glyphs != 1) |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11550 { |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11551 fprintf (stderr, "Row Start End Used oEI><O\\CTZFesm X Y W H V A P\n"); |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11552 fprintf (stderr, "=======================================================================\n"); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11553 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11554 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\ |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11555 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11556 row - matrix->rows, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11557 MATRIX_ROW_START_CHARPOS (row), |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11558 MATRIX_ROW_END_CHARPOS (row), |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11559 row->used[TEXT_AREA], |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11560 row->contains_overlapping_glyphs_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11561 row->enabled_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11562 row->inverse_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11563 row->truncated_on_left_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11564 row->truncated_on_right_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11565 row->overlay_arrow_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11566 row->continued_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11567 MATRIX_ROW_CONTINUATION_LINE_P (row), |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11568 row->displays_text_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11569 row->ends_at_zv_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11570 row->fill_line_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11571 row->ends_in_middle_of_char_p, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11572 row->starts_in_middle_of_char_p, |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11573 row->mouse_face_p, |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11574 row->x, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11575 row->y, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11576 row->pixel_width, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11577 row->height, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11578 row->visible_height, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11579 row->ascent, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11580 row->phys_ascent); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11581 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11582 row->end.overlay_string_index); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11583 fprintf (stderr, "%9d %5d\n", |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11584 CHARPOS (row->start.string_pos), |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11585 CHARPOS (row->end.string_pos)); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11586 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11587 row->end.dpvec_index); |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11588 } |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11589 |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11590 if (glyphs > 1) |
25012 | 11591 { |
36114
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11592 int area; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11593 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11594 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11595 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11596 struct glyph *glyph, *glyph_end; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11597 glyph = row->glyphs[area]; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11598 glyph_end = glyph + row->used[area]; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11599 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11600 /* Glyph for a line end in text. */ |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11601 if (glyph == glyph_end && glyph->charpos > 0) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11602 ++glyph_end; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11603 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11604 if (glyph < glyph_end) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11605 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n"); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11606 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11607 for (; glyph < glyph_end; ++glyph) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11608 dump_glyph (row, glyph, area); |
25012 | 11609 } |
11610 } | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11611 else if (glyphs == 1) |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11612 { |
36114
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11613 int area; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11614 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11615 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11616 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11617 char *s = (char *) alloca (row->used[area] + 1); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11618 int i; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11619 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11620 for (i = 0; i < row->used[area]; ++i) |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11621 { |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11622 struct glyph *glyph = row->glyphs[area] + i; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11623 if (glyph->type == CHAR_GLYPH |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11624 && glyph->u.ch < 0x80 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11625 && glyph->u.ch >= ' ') |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11626 s[i] = glyph->u.ch; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11627 else |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11628 s[i] = '.'; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11629 } |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11630 |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11631 s[i] = '\0'; |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11632 fprintf (stderr, "%3d: (%d) '%s'\n", vpos, row->enabled_p, s); |
df2b74b0a766
(handle_single_display_prop): Set iterator's position
Gerd Moellmann <gerd@gnu.org>
parents:
36078
diff
changeset
|
11633 } |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11634 } |
25012 | 11635 } |
11636 | |
11637 | |
11638 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
11639 Sdump_glyph_matrix, 0, 1, "p", | |
11640 "Dump the current matrix of the selected window to stderr.\n\ | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11641 Shows contents of glyph row structures. With non-nil\n\ |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11642 parameter GLYPHS, dump glyphs as well. If GLYPHS is 1 show\n\ |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11643 glyphs in short form, otherwise show glyphs in long form.") |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11644 (glyphs) |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11645 Lisp_Object glyphs; |
25012 | 11646 { |
11647 struct window *w = XWINDOW (selected_window); | |
11648 struct buffer *buffer = XBUFFER (w->buffer); | |
11649 | |
11650 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
11651 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
11652 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
11653 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
11654 fprintf (stderr, "=============================================\n"); | |
34789
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11655 dump_glyph_matrix (w->current_matrix, |
7ebf09eda05e
(dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents:
34748
diff
changeset
|
11656 NILP (glyphs) ? 0 : XINT (glyphs)); |
25012 | 11657 return Qnil; |
11658 } | |
11659 | |
11660 | |
34801
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11661 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "", |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11662 "Dump glyph row ROW to stderr.\n\ |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11663 GLYPH 0 means don't dump glyphs.\n\ |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11664 GLYPH 1 means dump glyphs in short form.\n\ |
34802 | 11665 GLYPH > 1 or omitted means dump glyphs in long form.") |
34801
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11666 (row, glyphs) |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11667 Lisp_Object row, glyphs; |
25012 | 11668 { |
11669 CHECK_NUMBER (row, 0); | |
34801
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11670 dump_glyph_row (XWINDOW (selected_window)->current_matrix, |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11671 XINT (row), |
803bee3aa2bd
(Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents:
34789
diff
changeset
|
11672 INTEGERP (glyphs) ? XINT (glyphs) : 2); |
25012 | 11673 return Qnil; |
11674 } | |
11675 | |
11676 | |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11677 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "", |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11678 "Dump glyph row ROW of the tool-bar of the current frame to stderr.\n\ |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11679 GLYPH 0 means don't dump glyphs.\n\ |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11680 GLYPH 1 means dump glyphs in short form.\n\ |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11681 GLYPH > 1 or omitted means dump glyphs in long form.") |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11682 (row, glyphs) |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11683 Lisp_Object row, glyphs; |
25012 | 11684 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
11685 struct frame *sf = SELECTED_FRAME (); |
35267
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11686 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window)->current_matrix); |
5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents:
35246
diff
changeset
|
11687 dump_glyph_row (m, XINT (row), INTEGERP (glyphs) ? XINT (glyphs) : 2); |
25012 | 11688 return Qnil; |
11689 } | |
11690 | |
11691 | |
11692 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
11693 Strace_redisplay_toggle, 0, 0, "", | |
11694 "Toggle tracing of redisplay.") | |
11695 () | |
11696 { | |
11697 trace_redisplay_p = !trace_redisplay_p; | |
11698 return Qnil; | |
11699 } | |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11700 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11701 |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11702 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
|
11703 "Print STRING to stderr.") |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11704 (string) |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11705 Lisp_Object string; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11706 { |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11707 CHECK_STRING (string, 0); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11708 fprintf (stderr, "%s", XSTRING (string)->data); |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11709 return Qnil; |
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
11710 } |
25012 | 11711 |
11712 #endif /* GLYPH_DEBUG */ | |
11713 | |
11714 | |
277 | 11715 |
25012 | 11716 /*********************************************************************** |
11717 Building Desired Matrix Rows | |
11718 ***********************************************************************/ | |
11719 | |
11720 /* Return a temporary glyph row holding the glyphs of an overlay | |
11721 arrow. Only used for non-window-redisplay windows. */ | |
11722 | |
11723 static struct glyph_row * | |
11724 get_overlay_arrow_glyph_row (w) | |
11725 struct window *w; | |
11726 { | |
11727 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
11728 struct buffer *buffer = XBUFFER (w->buffer); | |
11729 struct buffer *old = current_buffer; | |
11730 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
11731 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
11732 unsigned char *arrow_end = arrow_string + arrow_len; | |
11733 unsigned char *p; | |
11734 struct it it; | |
11735 int multibyte_p; | |
11736 int n_glyphs_before; | |
11737 | |
11738 set_buffer_temp (buffer); | |
11739 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
11740 it.glyph_row->used[TEXT_AREA] = 0; | |
11741 SET_TEXT_POS (it.position, 0, 0); | |
11742 | |
11743 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
11744 p = arrow_string; | |
11745 while (p < arrow_end) | |
11746 { | |
11747 Lisp_Object face, ilisp; | |
11748 | |
11749 /* Get the next character. */ | |
11750 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
11751 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 11752 else |
11753 it.c = *p, it.len = 1; | |
11754 p += it.len; | |
11755 | |
11756 /* Get its face. */ | |
11757 XSETFASTINT (ilisp, p - arrow_string); | |
11758 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
11759 it.face_id = compute_char_face (f, it.c, face); | |
11760 | |
11761 /* Compute its width, get its glyphs. */ | |
11762 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
|
11763 SET_TEXT_POS (it.position, -1, -1); |
25012 | 11764 PRODUCE_GLYPHS (&it); |
11765 | |
11766 /* If this character doesn't fit any more in the line, we have | |
11767 to remove some glyphs. */ | |
11768 if (it.current_x > it.last_visible_x) | |
11769 { | |
11770 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
11771 break; | |
11772 } | |
11773 } | |
11774 | |
11775 set_buffer_temp (old); | |
11776 return it.glyph_row; | |
11777 } | |
11778 | |
11779 | |
11780 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
11781 glyphs are only inserted for terminal frames since we can't really | |
11782 win with truncation glyphs when partially visible glyphs are | |
11783 involved. Which glyphs to insert is determined by | |
11784 produce_special_glyphs. */ | |
11785 | |
11786 static void | |
11787 insert_left_trunc_glyphs (it) | |
11788 struct it *it; | |
11789 { | |
11790 struct it truncate_it; | |
11791 struct glyph *from, *end, *to, *toend; | |
11792 | |
11793 xassert (!FRAME_WINDOW_P (it->f)); | |
11794 | |
11795 /* Get the truncation glyphs. */ | |
11796 truncate_it = *it; | |
11797 truncate_it.current_x = 0; | |
11798 truncate_it.face_id = DEFAULT_FACE_ID; | |
11799 truncate_it.glyph_row = &scratch_glyph_row; | |
11800 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
11801 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
|
11802 truncate_it.object = make_number (0); |
25012 | 11803 produce_special_glyphs (&truncate_it, IT_TRUNCATION); |
11804 | |
11805 /* Overwrite glyphs from IT with truncation glyphs. */ | |
11806 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
11807 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
11808 to = it->glyph_row->glyphs[TEXT_AREA]; | |
11809 toend = to + it->glyph_row->used[TEXT_AREA]; | |
11810 | |
11811 while (from < end) | |
11812 *to++ = *from++; | |
11813 | |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11814 /* There may be padding glyphs left over. Overwrite them too. */ |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11815 while (to < toend && CHAR_GLYPH_PADDING_P (*to)) |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11816 { |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11817 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11818 while (from < end) |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11819 *to++ = *from++; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11820 } |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11821 |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11822 if (to > toend) |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
11823 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; |
25012 | 11824 } |
11825 | |
11826 | |
11827 /* Compute the pixel height and width of IT->glyph_row. | |
11828 | |
11829 Most of the time, ascent and height of a display line will be equal | |
11830 to the max_ascent and max_height values of the display iterator | |
11831 structure. This is not the case if | |
11832 | |
11833 1. We hit ZV without displaying anything. In this case, max_ascent | |
11834 and max_height will be zero. | |
11835 | |
11836 2. We have some glyphs that don't contribute to the line height. | |
11837 (The glyph row flag contributes_to_line_height_p is for future | |
11838 pixmap extensions). | |
11839 | |
11840 The first case is easily covered by using default values because in | |
11841 these cases, the line height does not really matter, except that it | |
11842 must not be zero. */ | |
11843 | |
11844 static void | |
11845 compute_line_metrics (it) | |
11846 struct it *it; | |
11847 { | |
11848 struct glyph_row *row = it->glyph_row; | |
11849 int area, i; | |
11850 | |
11851 if (FRAME_WINDOW_P (it->f)) | |
11852 { | |
25546 | 11853 int i, header_line_height; |
25012 | 11854 |
11855 /* The line may consist of one space only, that was added to | |
11856 place the cursor on it. If so, the row's height hasn't been | |
11857 computed yet. */ | |
11858 if (row->height == 0) | |
11859 { | |
11860 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
|
11861 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 11862 row->ascent = it->max_ascent; |
11863 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
|
11864 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
|
11865 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 11866 } |
11867 | |
11868 /* Compute the width of this line. */ | |
11869 row->pixel_width = row->x; | |
11870 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
11871 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
11872 | |
11873 xassert (row->pixel_width >= 0); | |
11874 xassert (row->ascent >= 0 && row->height > 0); | |
11875 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11876 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
|
11877 || 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
|
11878 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11879 /* 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
|
11880 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
|
11881 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
|
11882 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
|
11883 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11884 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11885 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
|
11886 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11887 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11888 |
25012 | 11889 /* Compute how much of the line is visible. */ |
11890 row->visible_height = row->height; | |
11891 | |
25546 | 11892 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
11893 if (row->y < header_line_height) | |
11894 row->visible_height -= header_line_height - row->y; | |
25012 | 11895 else |
11896 { | |
11897 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
11898 if (row->y + row->height > max_y) | |
11899 row->visible_height -= row->y + row->height - max_y; | |
11900 } | |
11901 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
11902 else |
25012 | 11903 { |
11904 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
|
11905 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
|
11906 row->height = row->phys_height = row->visible_height = 1; |
25012 | 11907 } |
11908 | |
11909 /* Compute a hash code for this row. */ | |
11910 row->hash = 0; | |
11911 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
11912 for (i = 0; i < row->used[area]; ++i) | |
11913 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
11914 + 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
|
11915 + 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
|
11916 + row->glyphs[area][i].padding_p |
25012 | 11917 + (row->glyphs[area][i].type << 2)); |
11918 | |
11919 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
|
11920 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 11921 } |
11922 | |
11923 | |
11924 /* Append one space to the glyph row of iterator IT if doing a | |
11925 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
11926 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
|
11927 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
|
11928 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11929 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
|
11930 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
|
11931 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
|
11932 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
|
11933 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
11934 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
|
11935 end of the line if the row ends in italic text. */ |
25012 | 11936 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11937 static int |
25012 | 11938 append_space (it, default_face_p) |
11939 struct it *it; | |
11940 int default_face_p; | |
11941 { | |
11942 if (FRAME_WINDOW_P (it->f)) | |
11943 { | |
11944 int n = it->glyph_row->used[TEXT_AREA]; | |
11945 | |
11946 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
11947 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
11948 { | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11949 /* Save some values that must not be changed. |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11950 Must save IT->c and IT->len because otherwise |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11951 ITERATOR_AT_END_P wouldn't work anymore after |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11952 append_space has been called. */ |
34987
cf1115a9c758
(make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34947
diff
changeset
|
11953 enum display_element_type saved_what = it->what; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11954 int saved_c = it->c, saved_len = it->len; |
25012 | 11955 int saved_x = it->current_x; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11956 int saved_face_id = it->face_id; |
25012 | 11957 struct text_pos saved_pos; |
11958 Lisp_Object saved_object; | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11959 struct face *face; |
25012 | 11960 |
11961 saved_object = it->object; | |
11962 saved_pos = it->position; | |
11963 | |
11964 it->what = IT_CHARACTER; | |
11965 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
|
11966 it->object = make_number (0); |
25012 | 11967 it->c = ' '; |
11968 it->len = 1; | |
11969 | |
11970 if (default_face_p) | |
11971 it->face_id = DEFAULT_FACE_ID; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11972 else if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
11973 it->face_id = it->saved_face_id; |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11974 face = FACE_FROM_ID (it->f, it->face_id); |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
11975 it->face_id = FACE_FOR_CHAR (it->f, face, 0); |
25012 | 11976 |
11977 PRODUCE_GLYPHS (it); | |
11978 | |
11979 it->current_x = saved_x; | |
11980 it->object = saved_object; | |
11981 it->position = saved_pos; | |
11982 it->what = saved_what; | |
11983 it->face_id = saved_face_id; | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11984 it->len = saved_len; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
11985 it->c = saved_c; |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11986 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11987 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11988 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11989 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11990 return 0; |
25012 | 11991 } |
11992 | |
11993 | |
11994 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
11995 to the end of the display line. Called from display_line. | |
11996 If the glyph row is empty, add a space glyph to it so that we | |
11997 know the face to draw. Set the glyph row flag fill_line_p. */ | |
11998 | |
11999 static void | |
12000 extend_face_to_end_of_line (it) | |
12001 struct it *it; | |
12002 { | |
12003 struct face *face; | |
12004 struct frame *f = it->f; | |
12005 | |
12006 /* If line is already filled, do nothing. */ | |
12007 if (it->current_x >= it->last_visible_x) | |
12008 return; | |
12009 | |
12010 /* Face extension extends the background and box of IT->face_id | |
12011 to the end of the line. If the background equals the background | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12012 of the frame, we don't have to do anything. */ |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12013 if (it->face_before_selective_p) |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12014 face = FACE_FROM_ID (it->f, it->saved_face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12015 else |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12016 face = FACE_FROM_ID (f, it->face_id); |
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12017 |
25012 | 12018 if (FRAME_WINDOW_P (f) |
12019 && face->box == FACE_NO_BOX | |
12020 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
12021 && !face->stipple) | |
12022 return; | |
12023 | |
12024 /* Set the glyph row flag indicating that the face of the last glyph | |
12025 in the text area has to be drawn to the end of the text area. */ | |
12026 it->glyph_row->fill_line_p = 1; | |
12027 | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
12028 /* 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
|
12029 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
|
12030 get_next_display_element returns a multibyte character. Note |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
12031 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
|
12032 if (!SINGLE_BYTE_CHAR_P (it->c)) |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
12033 { |
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
12034 it->face_id = FACE_FOR_CHAR (f, face, 0); |
25012 | 12035 } |
12036 | |
12037 if (FRAME_WINDOW_P (f)) | |
12038 { | |
12039 /* If the row is empty, add a space with the current face of IT, | |
12040 so that we know which face to draw. */ | |
12041 if (it->glyph_row->used[TEXT_AREA] == 0) | |
12042 { | |
12043 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
|
12044 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id; |
25012 | 12045 it->glyph_row->used[TEXT_AREA] = 1; |
12046 } | |
12047 } | |
12048 else | |
12049 { | |
12050 /* Save some values that must not be changed. */ | |
12051 int saved_x = it->current_x; | |
12052 struct text_pos saved_pos; | |
12053 Lisp_Object saved_object; | |
34987
cf1115a9c758
(make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34947
diff
changeset
|
12054 enum display_element_type saved_what = it->what; |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12055 int saved_face_id = it->face_id; |
25012 | 12056 |
12057 saved_object = it->object; | |
12058 saved_pos = it->position; | |
12059 | |
12060 it->what = IT_CHARACTER; | |
12061 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
|
12062 it->object = make_number (0); |
25012 | 12063 it->c = ' '; |
12064 it->len = 1; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12065 it->face_id = face->id; |
25012 | 12066 |
12067 PRODUCE_GLYPHS (it); | |
12068 | |
12069 while (it->current_x <= it->last_visible_x) | |
12070 PRODUCE_GLYPHS (it); | |
12071 | |
12072 /* Don't count these blanks really. It would let us insert a left | |
12073 truncation glyph below and make us set the cursor on them, maybe. */ | |
12074 it->current_x = saved_x; | |
12075 it->object = saved_object; | |
12076 it->position = saved_pos; | |
12077 it->what = saved_what; | |
34225
b5cdf1bb6bb8
(next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents:
34068
diff
changeset
|
12078 it->face_id = saved_face_id; |
25012 | 12079 } |
12080 } | |
12081 | |
12082 | |
12083 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
12084 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12085 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12086 static int |
25012 | 12087 trailing_whitespace_p (charpos) |
12088 int charpos; | |
12089 { | |
12090 int bytepos = CHAR_TO_BYTE (charpos); | |
12091 int c = 0; | |
12092 | |
12093 while (bytepos < ZV_BYTE | |
12094 && (c = FETCH_CHAR (bytepos), | |
12095 c == ' ' || c == '\t')) | |
12096 ++bytepos; | |
12097 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12098 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12099 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12100 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12101 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12102 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12103 return 0; |
25012 | 12104 } |
12105 | |
12106 | |
12107 /* Highlight trailing whitespace, if any, in ROW. */ | |
12108 | |
12109 void | |
12110 highlight_trailing_whitespace (f, row) | |
12111 struct frame *f; | |
12112 struct glyph_row *row; | |
12113 { | |
12114 int used = row->used[TEXT_AREA]; | |
12115 | |
12116 if (used) | |
12117 { | |
12118 struct glyph *start = row->glyphs[TEXT_AREA]; | |
12119 struct glyph *glyph = start + used - 1; | |
12120 | |
12121 /* Skip over the space glyph inserted to display the | |
12122 cursor at the end of a line. */ | |
12123 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
|
12124 && 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
|
12125 && INTEGERP (glyph->object)) |
25012 | 12126 --glyph; |
12127 | |
12128 /* If last glyph is a space or stretch, and it's trailing | |
12129 whitespace, set the face of all trailing whitespace glyphs in | |
12130 IT->glyph_row to `trailing-whitespace'. */ | |
12131 if (glyph >= start | |
12132 && BUFFERP (glyph->object) | |
12133 && (glyph->type == STRETCH_GLYPH | |
12134 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
12135 && glyph->u.ch == ' ')) |
25012 | 12136 && trailing_whitespace_p (glyph->charpos)) |
12137 { | |
28228
84be12f331b8
(charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents:
28206
diff
changeset
|
12138 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0); |
25012 | 12139 |
12140 while (glyph >= start | |
12141 && BUFFERP (glyph->object) | |
12142 && (glyph->type == STRETCH_GLYPH | |
12143 || (glyph->type == CHAR_GLYPH | |
27000
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
12144 && glyph->u.ch == ' '))) |
d7f15cd9c4ad
All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents:
26908
diff
changeset
|
12145 (glyph--)->face_id = face_id; |
25012 | 12146 } |
12147 } | |
12148 } | |
12149 | |
12150 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12151 /* Value is non-zero if glyph row ROW in window W should be |
33916
907c3073ae28
(forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents:
33898
diff
changeset
|
12152 used to hold the cursor. */ |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12153 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12154 static int |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12155 cursor_row_p (w, row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12156 struct window *w; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12157 struct glyph_row *row; |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12158 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12159 int cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12160 |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12161 if (PT == MATRIX_ROW_END_CHARPOS (row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12162 { |
32590
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12163 /* If the row ends with a newline from a string, we don't want |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12164 the cursor there (if the row is continued it doesn't end in a |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12165 newline). */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12166 if (CHARPOS (row->end.string_pos) >= 0 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12167 || MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12168 cursor_row_p = row->continued_p; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12169 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12170 /* If the row ends at ZV, display the cursor at the end of that |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12171 row instead of at the start of the row below. */ |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12172 else if (row->ends_at_zv_p) |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12173 cursor_row_p = 1; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12174 else |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12175 cursor_row_p = 0; |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12176 } |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12177 |
04def897a1c6
(cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents:
32585
diff
changeset
|
12178 return cursor_row_p; |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12179 } |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12180 |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12181 |
25012 | 12182 /* Construct the glyph row IT->glyph_row in the desired matrix of |
12183 IT->w from text at the current position of IT. See dispextern.h | |
12184 for an overview of struct it. Value is non-zero if | |
12185 IT->glyph_row displays text, as opposed to a line displaying ZV | |
12186 only. */ | |
12187 | |
12188 static int | |
12189 display_line (it) | |
12190 struct it *it; | |
12191 { | |
12192 struct glyph_row *row = it->glyph_row; | |
12193 | |
12194 /* We always start displaying at hpos zero even if hscrolled. */ | |
12195 xassert (it->hpos == 0 && it->current_x == 0); | |
12196 | |
12197 /* We must not display in a row that's not a text row. */ | |
12198 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
12199 < it->w->desired_matrix->nrows); | |
12200 | |
12201 /* Is IT->w showing the region? */ | |
12202 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
12203 | |
12204 /* Clear the result glyph row and enable it. */ | |
12205 prepare_desired_row (row); | |
12206 | |
12207 row->y = it->current_y; | |
12208 row->start = it->current; | |
12209 row->continuation_lines_width = it->continuation_lines_width; | |
12210 row->displays_text_p = 1; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12211 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
|
12212 it->starts_in_middle_of_char_p = 0; |
277 | 12213 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
12214 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 12215 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
|
12216 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
|
12217 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
|
12218 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 12219 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
12220 | |
12221 /* Move over display elements that are not visible because we are | |
12222 hscrolled. This may stop at an x-position < IT->first_visible_x | |
12223 if the first glyph is partially visible or if we hit a line end. */ | |
12224 if (it->current_x < it->first_visible_x) | |
12225 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
12226 MOVE_TO_POS | MOVE_TO_X); | |
12227 | |
12228 /* Get the initial row height. This is either the height of the | |
12229 text hscrolled, if there is any, or zero. */ | |
12230 row->ascent = it->max_ascent; | |
12231 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
|
12232 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
|
12233 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 12234 |
12235 /* Loop generating characters. The loop is left with IT on the next | |
12236 character to display. */ | |
12237 while (1) | |
12238 { | |
12239 int n_glyphs_before, hpos_before, x_before; | |
12240 int x, i, nglyphs; | |
31506
a1d733428491
(dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents:
31493
diff
changeset
|
12241 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
|
12242 |
25012 | 12243 /* Retrieve the next thing to display. Value is zero if end of |
12244 buffer reached. */ | |
12245 if (!get_next_display_element (it)) | |
12246 { | |
12247 /* 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
|
12248 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
|
12249 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
|
12250 to -1. */ |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12251 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
|
12252 || row->used[TEXT_AREA] == 0) |
12ddeb9a6efd
(display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents:
26258
diff
changeset
|
12253 { |
25012 | 12254 row->glyphs[TEXT_AREA]->charpos = -1; |
12255 row->displays_text_p = 0; | |
12256 | |
12257 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
12258 row->indicate_empty_line_p = 1; | |
12259 } | |
12260 | |
12261 it->continuation_lines_width = 0; | |
12262 row->ends_at_zv_p = 1; | |
12263 break; | |
12264 } | |
12265 | |
12266 /* Now, get the metrics of what we want to display. This also | |
12267 generates glyphs in `row' (which is IT->glyph_row). */ | |
12268 n_glyphs_before = row->used[TEXT_AREA]; | |
12269 x = it->current_x; | |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12270 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12271 /* 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
|
12272 fit on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12273 if (!it->truncate_lines_p) |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12274 { |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12275 ascent = it->max_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12276 descent = it->max_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12277 phys_ascent = it->max_phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12278 phys_descent = it->max_phys_descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12279 } |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12280 |
25012 | 12281 PRODUCE_GLYPHS (it); |
12282 | |
12283 /* If this display element was in marginal areas, continue with | |
12284 the next one. */ | |
12285 if (it->area != TEXT_AREA) | |
12286 { | |
12287 row->ascent = max (row->ascent, it->max_ascent); | |
12288 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
|
12289 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
|
12290 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
|
12291 it->max_phys_ascent + it->max_phys_descent); |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12292 set_iterator_to_next (it, 1); |
25012 | 12293 continue; |
12294 } | |
12295 | |
12296 /* Does the display element fit on the line? If we truncate | |
12297 lines, we should draw past the right edge of the window. If | |
12298 we don't truncate, we want to stop so that we can display the | |
12299 continuation glyph before the right margin. If lines are | |
12300 continued, there are two possible strategies for characters | |
12301 resulting in more than 1 glyph (e.g. tabs): Display as many | |
12302 glyphs as possible in this line and leave the rest for the | |
12303 continuation line, or display the whole element in the next | |
12304 line. Original redisplay did the former, so we do it also. */ | |
12305 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
12306 hpos_before = it->hpos; | |
12307 x_before = x; | |
35641
369c647a5ed5
(display_line): Don't treat a newline as fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35598
diff
changeset
|
12308 |
369c647a5ed5
(display_line): Don't treat a newline as fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35598
diff
changeset
|
12309 if (/* Not a newline. */ |
369c647a5ed5
(display_line): Don't treat a newline as fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35598
diff
changeset
|
12310 nglyphs > 0 |
35596
37e5851b22b2
(display_line): Simplify check for glyphs fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35550
diff
changeset
|
12311 /* Glyphs produced fit entirely in the line. */ |
35641
369c647a5ed5
(display_line): Don't treat a newline as fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35598
diff
changeset
|
12312 && it->current_x < it->last_visible_x) |
369c647a5ed5
(display_line): Don't treat a newline as fitting
Gerd Moellmann <gerd@gnu.org>
parents:
35598
diff
changeset
|
12313 { |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
12314 it->hpos += nglyphs; |
25012 | 12315 row->ascent = max (row->ascent, it->max_ascent); |
12316 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
|
12317 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
|
12318 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
|
12319 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12320 if (it->current_x - it->pixel_width < it->first_visible_x) |
12321 row->x = x - it->first_visible_x; | |
12322 } | |
12323 else | |
12324 { | |
12325 int new_x; | |
12326 struct glyph *glyph; | |
12327 | |
12328 for (i = 0; i < nglyphs; ++i, x = new_x) | |
12329 { | |
12330 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
12331 new_x = x + glyph->pixel_width; | |
12332 | |
12333 if (/* Lines are continued. */ | |
12334 !it->truncate_lines_p | |
12335 && (/* Glyph doesn't fit on the line. */ | |
12336 new_x > it->last_visible_x | |
12337 /* Or it fits exactly on a window system frame. */ | |
12338 || (new_x == it->last_visible_x | |
12339 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12340 { |
25012 | 12341 /* End of a continued line. */ |
12342 | |
12343 if (it->hpos == 0 | |
12344 || (new_x == it->last_visible_x | |
12345 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12346 { |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12347 /* 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
|
12348 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
|
12349 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
|
12350 after the glyph. */ |
25012 | 12351 row->continued_p = 1; |
12352 it->current_x = new_x; | |
12353 it->continuation_lines_width += new_x; | |
12354 ++it->hpos; | |
12355 if (i == nglyphs - 1) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12356 set_iterator_to_next (it, 1); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12357 } |
29461
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12358 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
|
12359 && !FRAME_WINDOW_P (it->f)) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12360 { |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12361 /* 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
|
12362 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
|
12363 on the line. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12364 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
|
12365 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12366 /* 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
|
12367 glyphs like in 20.x. */ |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12368 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
|
12369 < row->glyphs[1 + TEXT_AREA]) |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12370 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
|
12371 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12372 row->continued_p = 1; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12373 it->current_x = x_before; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12374 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
|
12375 |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12376 /* 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
|
12377 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
|
12378 it->max_ascent = ascent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12379 it->max_descent = descent; |
159e43bc7e3c
(display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents:
29449
diff
changeset
|
12380 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
|
12381 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
|
12382 } |
25012 | 12383 else |
12384 { | |
12385 /* Display element draws past the right edge of | |
12386 the window. Restore positions to values | |
12387 before the element. The next line starts | |
12388 with current_x before the glyph that could | |
12389 not be displayed, so that TAB works right. */ | |
12390 row->used[TEXT_AREA] = n_glyphs_before + i; | |
12391 | |
12392 /* Display continuation glyphs. */ | |
12393 if (!FRAME_WINDOW_P (it->f)) | |
12394 produce_special_glyphs (it, IT_CONTINUATION); | |
12395 row->continued_p = 1; | |
12396 | |
12397 it->current_x = x; | |
12398 it->continuation_lines_width += x; | |
29473
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12399 if (nglyphs > 1 && i > 0) |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12400 { |
80835e075d87
(display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents:
29461
diff
changeset
|
12401 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
|
12402 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
|
12403 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12404 |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12405 /* 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
|
12406 element not fitting on the line. */ |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12407 it->max_ascent = ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12408 it->max_descent = descent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12409 it->max_phys_ascent = phys_ascent; |
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12410 it->max_phys_descent = phys_descent; |
25012 | 12411 } |
28723
67ffd6aa22da
(display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents:
28709
diff
changeset
|
12412 |
25012 | 12413 break; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12414 } |
25012 | 12415 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
|
12416 { |
25012 | 12417 /* Increment number of glyphs actually displayed. */ |
12418 ++it->hpos; | |
12419 | |
12420 if (x < it->first_visible_x) | |
12421 /* Glyph is partially visible, i.e. row starts at | |
12422 negative X position. */ | |
12423 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
|
12424 } |
25012 | 12425 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12426 { |
25012 | 12427 /* Glyph is completely off the left margin of the |
12428 window. This should not happen because of the | |
12429 move_it_in_display_line at the start of | |
12430 this function. */ | |
12431 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12432 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
12433 } |
25012 | 12434 |
12435 row->ascent = max (row->ascent, it->max_ascent); | |
12436 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
|
12437 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
|
12438 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
|
12439 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12440 |
12441 /* End of this display line if row is continued. */ | |
12442 if (row->continued_p) | |
12443 break; | |
12444 } | |
12445 | |
12446 /* Is this a line end? If yes, we're also done, after making | |
12447 sure that a non-default face is extended up to the right | |
12448 margin of the window. */ | |
12449 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
12450 { | |
12451 int used_before = row->used[TEXT_AREA]; | |
12452 | |
12453 /* Add a space at the end of the line that is used to | |
12454 display the cursor there. */ | |
12455 append_space (it, 0); | |
12456 | |
12457 /* Extend the face to the end of the line. */ | |
12458 extend_face_to_end_of_line (it); | |
12459 | |
12460 /* Make sure we have the position. */ | |
12461 if (used_before == 0) | |
12462 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
12463 | |
12464 /* 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
|
12465 set_iterator_to_next (it, 1); |
25012 | 12466 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
|
12467 break; |
277 | 12468 } |
25012 | 12469 |
12470 /* Proceed with next display element. Note that this skips | |
12471 over lines invisible because of selective display. */ | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12472 set_iterator_to_next (it, 1); |
25012 | 12473 |
12474 /* If we truncate lines, we are done when the last displayed | |
12475 glyphs reach past the right margin of the window. */ | |
12476 if (it->truncate_lines_p | |
12477 && (FRAME_WINDOW_P (it->f) | |
12478 ? (it->current_x >= it->last_visible_x) | |
12479 : (it->current_x > it->last_visible_x))) | |
12480 { | |
12481 /* Maybe add truncation glyphs. */ | |
12482 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12483 { |
35200
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12484 int i, n; |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12485 |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12486 for (i = row->used[TEXT_AREA] - 1; i > 0; --i) |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12487 if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i])) |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12488 break; |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12489 |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12490 for (n = row->used[TEXT_AREA]; i < n; ++i) |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12491 { |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12492 row->used[TEXT_AREA] = i; |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12493 produce_special_glyphs (it, IT_TRUNCATION); |
13258951565d
(display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents:
35174
diff
changeset
|
12494 } |
277 | 12495 } |
25012 | 12496 |
12497 row->truncated_on_right_p = 1; | |
12498 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
|
12499 reseat_at_next_visible_line_start (it, 0); |
25012 | 12500 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
12501 it->hpos = hpos_before; | |
12502 it->current_x = x_before; | |
12503 break; | |
12504 } | |
12505 } | |
12506 | |
12507 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
12508 at the left window margin. */ | |
12509 if (it->first_visible_x | |
12510 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
12511 { | |
12512 if (!FRAME_WINDOW_P (it->f)) | |
12513 insert_left_trunc_glyphs (it); | |
12514 row->truncated_on_left_p = 1; | |
12515 } | |
12516 | |
12517 /* If the start of this line is the overlay arrow-position, then | |
12518 mark this glyph row as the one containing the overlay arrow. | |
12519 This is clearly a mess with variable size fonts. It would be | |
12520 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
|
12521 if (MARKERP (Voverlay_arrow_position) |
277 | 12522 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 12523 && (MATRIX_ROW_START_CHARPOS (row) |
12524 == 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
|
12525 && STRINGP (Voverlay_arrow_string) |
277 | 12526 && ! overlay_arrow_seen) |
12527 { | |
25012 | 12528 /* Overlay arrow in window redisplay is a bitmap. */ |
12529 if (!FRAME_WINDOW_P (it->f)) | |
12530 { | |
12531 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
12532 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
12533 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
12534 struct glyph *p = row->glyphs[TEXT_AREA]; | |
12535 struct glyph *p2, *end; | |
12536 | |
12537 /* Copy the arrow glyphs. */ | |
12538 while (glyph < arrow_end) | |
12539 *p++ = *glyph++; | |
12540 | |
12541 /* Throw away padding glyphs. */ | |
12542 p2 = p; | |
12543 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
12544 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
12545 ++p2; | |
12546 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
|
12547 { |
25012 | 12548 while (p2 < end) |
12549 *p++ = *p2++; | |
12550 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
|
12551 } |
25012 | 12552 } |
12553 | |
277 | 12554 overlay_arrow_seen = 1; |
25012 | 12555 row->overlay_arrow_p = 1; |
12556 } | |
12557 | |
12558 /* Compute pixel dimensions of this line. */ | |
12559 compute_line_metrics (it); | |
12560 | |
12561 /* Remember the position at which this line ends. */ | |
12562 row->end = it->current; | |
12563 | |
29481
b36d76033c9d
(display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents:
29473
diff
changeset
|
12564 /* Maybe set the cursor. */ |
25012 | 12565 if (it->w->cursor.vpos < 0 |
12566 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12567 && PT <= MATRIX_ROW_END_CHARPOS (row) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12568 && cursor_row_p (it->w, row)) |
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
12569 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); |
25012 | 12570 |
12571 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12572 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 12573 highlight_trailing_whitespace (it->f, it->glyph_row); |
12574 | |
12575 /* Prepare for the next line. This line starts horizontally at (X | |
12576 HPOS) = (0 0). Vertical positions are incremented. As a | |
12577 convenience for the caller, IT->glyph_row is set to the next | |
12578 row to be used. */ | |
12579 it->current_x = it->hpos = 0; | |
12580 it->current_y += row->height; | |
12581 ++it->vpos; | |
12582 ++it->glyph_row; | |
12583 return row->displays_text_p; | |
12584 } | |
12585 | |
12586 | |
277 | 12587 |
25012 | 12588 /*********************************************************************** |
12589 Menu Bar | |
12590 ***********************************************************************/ | |
12591 | |
12592 /* Redisplay the menu bar in the frame for window W. | |
12593 | |
12594 The menu bar of X frames that don't have X toolkit support is | |
12595 displayed in a special window W->frame->menu_bar_window. | |
12596 | |
12597 The menu bar of terminal frames is treated specially as far as | |
12598 glyph matrices are concerned. Menu bar lines are not part of | |
12599 windows, so the update is done directly on the frame matrix rows | |
12600 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12601 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12602 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12603 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12604 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12605 { |
25012 | 12606 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
12607 struct it it; | |
12608 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12609 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12610 |
25012 | 12611 /* 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
|
12612 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12613 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
12614 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12615 #endif |
25012 | 12616 #ifdef USE_X_TOOLKIT |
12617 if (FRAME_X_P (f)) | |
12618 return; | |
12619 #endif | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12620 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12621 if (FRAME_MAC_P (f)) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12622 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32592
diff
changeset
|
12623 #endif |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12624 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
12625 #ifdef USE_X_TOOLKIT |
25012 | 12626 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
|
12627 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 12628 it.first_visible_x = 0; |
12629 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12630 #else /* not USE_X_TOOLKIT */ | |
12631 if (FRAME_WINDOW_P (f)) | |
12632 { | |
12633 /* Menu bar lines are displayed in the desired matrix of the | |
12634 dummy window menu_bar_window. */ | |
12635 struct window *menu_w; | |
12636 xassert (WINDOWP (f->menu_bar_window)); | |
12637 menu_w = XWINDOW (f->menu_bar_window); | |
12638 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
|
12639 MENU_FACE_ID); |
25012 | 12640 it.first_visible_x = 0; |
12641 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
12642 } | |
12643 else | |
12644 { | |
12645 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
12646 pixel x/y. */ | |
12647 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
|
12648 MENU_FACE_ID); |
25012 | 12649 it.first_visible_x = 0; |
12650 it.last_visible_x = FRAME_WIDTH (f); | |
12651 } | |
12652 #endif /* not USE_X_TOOLKIT */ | |
12653 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12654 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12655 /* Force the menu-bar to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12656 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12657 |
25012 | 12658 /* Clear all rows of the menu bar. */ |
12659 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
12660 { | |
12661 struct glyph_row *row = it.glyph_row + i; | |
12662 clear_glyph_row (row); | |
12663 row->enabled_p = 1; | |
12664 row->full_width_p = 1; | |
12665 } | |
12666 | |
12667 /* Display all items of the menu bar. */ | |
12668 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
|
12669 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
|
12670 { |
25012 | 12671 Lisp_Object string; |
12672 | |
12673 /* Stop at nil string. */ | |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
12674 string = AREF (items, i + 1); |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12675 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12676 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
12677 |
25012 | 12678 /* Remember where item was displayed. */ |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
12679 AREF (items, i + 3) = make_number (it.hpos); |
25012 | 12680 |
12681 /* Display the item, pad with one space. */ | |
12682 if (it.current_x < it.last_visible_x) | |
12683 display_string (NULL, string, Qnil, 0, 0, &it, | |
12684 XSTRING (string)->size + 1, 0, 0, -1); | |
12685 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12686 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
12687 /* Fill out the line with spaces. */ |
25012 | 12688 if (it.current_x < it.last_visible_x) |
12689 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
12690 | |
12691 /* Compute the total height of the lines. */ | |
12692 compute_line_metrics (&it); | |
12693 } | |
12694 | |
12695 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
12696 |
25012 | 12697 /*********************************************************************** |
12698 Mode Line | |
12699 ***********************************************************************/ | |
12700 | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12701 /* 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
|
12702 FORCE is non-zero, redisplay mode lines unconditionally. |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12703 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
|
12704 the number of windows whose mode lines were redisplayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12705 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12706 static int |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12707 redisplay_mode_lines (window, force) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12708 Lisp_Object window; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12709 int force; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12710 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12711 int nwindows = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12712 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12713 while (!NILP (window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12714 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12715 struct window *w = XWINDOW (window); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12716 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12717 if (WINDOWP (w->hchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12718 nwindows += redisplay_mode_lines (w->hchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12719 else if (WINDOWP (w->vchild)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12720 nwindows += redisplay_mode_lines (w->vchild, force); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12721 else if (force |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12722 || FRAME_GARBAGED_P (XFRAME (w->frame)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12723 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12724 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12725 Lisp_Object old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12726 struct text_pos lpoint; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12727 struct buffer *old = current_buffer; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12728 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12729 /* 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
|
12730 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12731 set_buffer_internal_1 (XBUFFER (w->buffer)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12732 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12733 /* Point refers normally to the selected window. For any |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12734 other window, set up appropriate value. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12735 if (!EQ (window, selected_window)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12736 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12737 struct text_pos pt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12738 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12739 SET_TEXT_POS_FROM_MARKER (pt, w->pointm); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12740 if (CHARPOS (pt) < BEGV) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12741 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12742 else if (CHARPOS (pt) > (ZV - 1)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12743 TEMP_SET_PT_BOTH (ZV, ZV_BYTE); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12744 else |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12745 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12746 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12747 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12748 /* Temporarily set up the selected frame. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12749 old_selected_frame = selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12750 selected_frame = w->frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12751 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12752 /* Display mode lines. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12753 clear_glyph_matrix (w->desired_matrix); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12754 if (display_mode_lines (w)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12755 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12756 ++nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12757 w->must_be_updated_p = 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12758 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12759 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12760 /* Restore old settings. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12761 selected_frame = old_selected_frame; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12762 set_buffer_internal_1 (old); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12763 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12764 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12765 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12766 window = w->next; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12767 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12768 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12769 return nwindows; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12770 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12771 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12772 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12773 /* 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
|
12774 of mode lines displayed. */ |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12775 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12776 static int |
25012 | 12777 display_mode_lines (w) |
277 | 12778 struct window *w; |
12779 { | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12780 int n = 0; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12781 |
25012 | 12782 /* 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
|
12783 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
|
12784 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12785 |
25012 | 12786 if (WINDOW_WANTS_MODELINE_P (w)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12787 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12788 display_mode_line (w, MODE_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12789 current_buffer->mode_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12790 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12791 } |
25546 | 12792 |
12793 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12794 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12795 display_mode_line (w, HEADER_LINE_FACE_ID, |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12796 current_buffer->header_line_format); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12797 ++n; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12798 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12799 |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
12800 return n; |
25012 | 12801 } |
12802 | |
12803 | |
12804 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 12805 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12806 FORMAT is the mode line format to display. Value is the pixel |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12807 height of the mode line displayed. */ |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12808 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12809 static int |
25012 | 12810 display_mode_line (w, face_id, format) |
12811 struct window *w; | |
12812 enum face_id face_id; | |
12813 Lisp_Object format; | |
12814 { | |
12815 struct it it; | |
12816 struct face *face; | |
12817 | |
12818 init_iterator (&it, w, -1, -1, NULL, face_id); | |
12819 prepare_desired_row (it.glyph_row); | |
12820 | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12821 if (! mode_line_inverse_video) |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12822 /* Force the mode-line to be displayed in the default face. */ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12823 it.base_face_id = it.face_id = DEFAULT_FACE_ID; |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12824 |
25012 | 12825 /* Temporarily make frame's keyboard the current kboard so that |
12826 kboard-local variables in the mode_line_format will get the right | |
12827 values. */ | |
12828 push_frame_kboard (it.f); | |
12829 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
|
12830 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
12831 |
25012 | 12832 /* Fill up with spaces. */ |
12833 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
12834 | |
12835 compute_line_metrics (&it); | |
12836 it.glyph_row->full_width_p = 1; | |
12837 it.glyph_row->mode_line_p = 1; | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
12838 it.glyph_row->inverse_p = 0; |
25012 | 12839 it.glyph_row->continued_p = 0; |
12840 it.glyph_row->truncated_on_left_p = 0; | |
12841 it.glyph_row->truncated_on_right_p = 0; | |
12842 | |
12843 /* Make a 3D mode-line have a shadow at its right end. */ | |
12844 face = FACE_FROM_ID (it.f, face_id); | |
12845 extend_face_to_end_of_line (&it); | |
12846 if (face->box != FACE_NO_BOX) | |
12847 { | |
12848 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
12849 + it.glyph_row->used[TEXT_AREA] - 1); | |
12850 last->right_box_line_p = 1; | |
12851 } | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12852 |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
12853 return it.glyph_row->height; |
25012 | 12854 } |
12855 | |
12856 | |
12857 /* Contribute ELT to the mode line for window IT->w. How it | |
12858 translates into text depends on its data type. | |
12859 | |
12860 IT describes the display environment in which we display, as usual. | |
277 | 12861 |
12862 DEPTH is the depth in recursion. It is used to prevent | |
12863 infinite recursion here. | |
12864 | |
25012 | 12865 FIELD_WIDTH is the number of characters the display of ELT should |
12866 occupy in the mode line, and PRECISION is the maximum number of | |
12867 characters to display from ELT's representation. See | |
12868 display_string for details. * | |
12869 | |
12870 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 12871 |
12872 static int | |
25012 | 12873 display_mode_element (it, depth, field_width, precision, elt) |
12874 struct it *it; | |
277 | 12875 int depth; |
25012 | 12876 int field_width, precision; |
12877 Lisp_Object elt; | |
12878 { | |
12879 int n = 0, field, prec; | |
12880 | |
277 | 12881 tail_recurse: |
12882 if (depth > 10) | |
12883 goto invalid; | |
12884 | |
12885 depth++; | |
12886 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
12887 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 12888 { |
12889 case Lisp_String: | |
12890 { | |
12891 /* A string: output it and check for %-constructs within it. */ | |
25012 | 12892 unsigned char c; |
12893 unsigned char *this = XSTRING (elt)->data; | |
12894 unsigned char *lisp_string = this; | |
12895 | |
12896 while ((precision <= 0 || n < precision) | |
12897 && *this | |
12898 && (frame_title_ptr | |
12899 || it->current_x < it->last_visible_x)) | |
277 | 12900 { |
12901 unsigned char *last = this; | |
25012 | 12902 |
12903 /* Advance to end of string or next format specifier. */ | |
277 | 12904 while ((c = *this++) != '\0' && c != '%') |
12905 ; | |
25012 | 12906 |
277 | 12907 if (this - 1 != last) |
12908 { | |
25012 | 12909 /* Output to end of string or up to '%'. Field width |
12910 is length of string. Don't output more than | |
12911 PRECISION allows us. */ | |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
12912 --this; |
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
12913 prec = strwidth (last, this - last); |
25012 | 12914 if (precision > 0 && prec > precision - n) |
12915 prec = precision - n; | |
12916 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12917 if (frame_title_ptr) |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
12918 n += store_frame_title (last, 0, prec); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12919 else |
25012 | 12920 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
12921 it, 0, prec, 0, -1); | |
277 | 12922 } |
12923 else /* c == '%' */ | |
12924 { | |
25012 | 12925 unsigned char *percent_position = this; |
12926 | |
12927 /* Get the specified minimum width. Zero means | |
12928 don't pad. */ | |
12929 field = 0; | |
277 | 12930 while ((c = *this++) >= '0' && c <= '9') |
25012 | 12931 field = field * 10 + c - '0'; |
12932 | |
12933 /* Don't pad beyond the total padding allowed. */ | |
12934 if (field_width - n > 0 && field > field_width - n) | |
12935 field = field_width - n; | |
12936 | |
12937 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
12938 prec = precision - n; | |
12939 | |
277 | 12940 if (c == 'M') |
25012 | 12941 n += display_mode_element (it, depth, field, prec, |
12942 Vglobal_mode_string); | |
277 | 12943 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
|
12944 { |
25012 | 12945 unsigned char *spec |
12946 = decode_mode_spec (it->w, c, field, prec); | |
12947 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12948 if (frame_title_ptr) |
25012 | 12949 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
|
12950 else |
25012 | 12951 { |
12952 int nglyphs_before | |
12953 = it->glyph_row->used[TEXT_AREA]; | |
12954 int charpos | |
12955 = percent_position - XSTRING (elt)->data; | |
12956 int nwritten | |
12957 = display_string (spec, Qnil, elt, charpos, 0, it, | |
12958 field, prec, 0, -1); | |
12959 | |
12960 /* Assign to the glyphs written above the | |
12961 string where the `%x' came from, position | |
12962 of the `%'. */ | |
12963 if (nwritten > 0) | |
12964 { | |
12965 struct glyph *glyph | |
12966 = (it->glyph_row->glyphs[TEXT_AREA] | |
12967 + nglyphs_before); | |
12968 int i; | |
12969 | |
12970 for (i = 0; i < nwritten; ++i) | |
12971 { | |
12972 glyph[i].object = elt; | |
12973 glyph[i].charpos = charpos; | |
12974 } | |
12975 | |
12976 n += nwritten; | |
12977 } | |
12978 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12979 } |
277 | 12980 } |
12981 } | |
12982 } | |
12983 break; | |
12984 | |
12985 case Lisp_Symbol: | |
12986 /* A symbol: process the value of the symbol recursively | |
12987 as if it appeared here directly. Avoid error if symbol void. | |
12988 Special case: if value of symbol is a string, output the string | |
12989 literally. */ | |
12990 { | |
12991 register Lisp_Object tem; | |
12992 tem = Fboundp (elt); | |
485 | 12993 if (!NILP (tem)) |
277 | 12994 { |
12995 tem = Fsymbol_value (elt); | |
12996 /* If value is a string, output that string literally: | |
12997 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
|
12998 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12999 { |
35410
94d2751dcb5c
(store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents:
35389
diff
changeset
|
13000 prec = precision - n; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13001 if (frame_title_ptr) |
25012 | 13002 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
|
13003 else |
25012 | 13004 n += display_string (NULL, tem, Qnil, 0, 0, it, |
13005 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
|
13006 } |
277 | 13007 else if (!EQ (tem, elt)) |
25012 | 13008 { |
13009 /* Give up right away for nil or t. */ | |
13010 elt = tem; | |
13011 goto tail_recurse; | |
13012 } | |
277 | 13013 } |
13014 } | |
13015 break; | |
13016 | |
13017 case Lisp_Cons: | |
13018 { | |
13019 register Lisp_Object car, tem; | |
13020 | |
13021 /* A cons cell: three distinct cases. | |
13022 If first element is a string or a cons, process all the elements | |
13023 and effectively concatenate them. | |
13024 If first element is a negative number, truncate displaying cdr to | |
13025 at most that many characters. If positive, pad (with spaces) | |
13026 to at least that many characters. | |
13027 If first element is a symbol, process the cadr or caddr recursively | |
13028 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
|
13029 car = XCAR (elt); |
25012 | 13030 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
13031 { | |
13032 /* An element of the form (:eval FORM) means evaluate FORM | |
13033 and use the result as mode line elements. */ | |
13034 struct gcpro gcpro1; | |
13035 Lisp_Object spec; | |
13036 | |
32175
e5d99e8cbd94
(handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents:
31931
diff
changeset
|
13037 spec = safe_eval (XCAR (XCDR (elt))); |
25012 | 13038 GCPRO1 (spec); |
13039 n += display_mode_element (it, depth, field_width - n, | |
13040 precision - n, spec); | |
13041 UNGCPRO; | |
13042 } | |
13043 else if (SYMBOLP (car)) | |
277 | 13044 { |
13045 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13046 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
|
13047 if (!CONSP (elt)) |
277 | 13048 goto invalid; |
13049 /* elt is now the cdr, and we know it is a cons cell. | |
13050 Use its car if CAR has a non-nil value. */ | |
485 | 13051 if (!NILP (tem)) |
277 | 13052 { |
13053 tem = Fsymbol_value (car); | |
485 | 13054 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13055 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13056 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13057 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13058 } |
277 | 13059 } |
13060 /* Symbol's value is nil (or symbol is unbound) | |
13061 Get the cddr of the original list | |
13062 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
|
13063 elt = XCDR (elt); |
485 | 13064 if (NILP (elt)) |
277 | 13065 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13066 else if (!CONSP (elt)) |
277 | 13067 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13068 elt = XCAR (elt); |
277 | 13069 goto tail_recurse; |
13070 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13071 else if (INTEGERP (car)) |
277 | 13072 { |
13073 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13074 elt = XCDR (elt); |
277 | 13075 if (lim < 0) |
25012 | 13076 { |
13077 /* Negative int means reduce maximum width. */ | |
13078 if (precision <= 0) | |
13079 precision = -lim; | |
13080 else | |
13081 precision = min (precision, -lim); | |
13082 } | |
277 | 13083 else if (lim > 0) |
13084 { | |
13085 /* Padding specified. Don't let it be more than | |
13086 current maximum. */ | |
25012 | 13087 if (precision > 0) |
13088 lim = min (precision, lim); | |
13089 | |
277 | 13090 /* If that's more padding than already wanted, queue it. |
13091 But don't reduce padding already specified even if | |
13092 that is beyond the current truncation point. */ | |
25012 | 13093 field_width = max (lim, field_width); |
277 | 13094 } |
13095 goto tail_recurse; | |
13096 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13097 else if (STRINGP (car) || CONSP (car)) |
277 | 13098 { |
13099 register int limit = 50; | |
25012 | 13100 /* Limit is to protect against circular lists. */ |
13101 while (CONSP (elt) | |
13102 && --limit > 0 | |
13103 && (precision <= 0 || n < precision)) | |
277 | 13104 { |
25012 | 13105 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
|
13106 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13107 elt = XCDR (elt); |
277 | 13108 } |
13109 } | |
13110 } | |
13111 break; | |
13112 | |
13113 default: | |
13114 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13115 if (frame_title_ptr) |
25012 | 13116 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
|
13117 else |
25012 | 13118 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
13119 precision - n, 0, 0); | |
13120 return n; | |
13121 } | |
13122 | |
13123 /* Pad to FIELD_WIDTH. */ | |
13124 if (field_width > 0 && n < field_width) | |
13125 { | |
13126 if (frame_title_ptr) | |
13127 n += store_frame_title ("", field_width - n, 0); | |
13128 else | |
13129 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
13130 0, 0, 0); | |
13131 } | |
13132 | |
13133 return n; | |
13134 } | |
13135 | |
13136 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13137 /* 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
|
13138 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
|
13139 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13140 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13141 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13142 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13143 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13144 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13145 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13146 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13147 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13148 if (d <= 0) |
25012 | 13149 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13150 else |
25012 | 13151 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13152 while (d > 0) |
25012 | 13153 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13154 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13155 d /= 10; |
25012 | 13156 } |
13157 } | |
13158 | |
13159 for (width -= (int) (p - buf); width > 0; --width) | |
13160 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13161 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13162 while (p > buf) |
25012 | 13163 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13164 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13165 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13166 *p-- = d; |
25012 | 13167 } |
13168 } | |
13169 | |
13170 /* 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
|
13171 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
|
13172 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
|
13173 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
13174 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
|
13175 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13176 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13177 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
|
13178 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13179 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13180 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13181 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13182 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13183 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
|
13184 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13185 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13186 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13187 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
|
13188 |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13189 val = Fget (coding_system, Qcoding_system); |
31610
29c6825c59a8
(handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents:
31506
diff
changeset
|
13190 eoltype = Qnil; |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13191 |
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13192 if (!VECTORP (val)) /* Not yet decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13193 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13194 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13195 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
13196 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13197 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
|
13198 /* 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
|
13199 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13200 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13201 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13202 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13203 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13204 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
|
13205 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13206 if (multibyte) |
36285
df398b248a30
(handle_single_display_prop): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
36265
diff
changeset
|
13207 *buf++ = XFASTINT (AREF (val, 1)); |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
13208 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13209 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13210 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13211 /* 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
|
13212 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13213 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
|
13214 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
|
13215 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
|
13216 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
|
13217 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
|
13218 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
|
13219 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13220 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
13221 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13222 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13223 } |
25012 | 13224 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13225 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13226 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13227 /* 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
|
13228 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13229 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13230 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13231 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13232 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13233 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13234 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13235 { |
27721
c2a9f4621f9a
(decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents:
27681
diff
changeset
|
13236 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
|
13237 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
|
13238 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13239 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13240 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13241 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13242 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
|
13243 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
13244 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
|
13245 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13246 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
13247 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13248 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13249 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13250 |
277 | 13251 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 13252 generated by character C. PRECISION >= 0 means don't return a |
13253 string longer than that value. FIELD_WIDTH > 0 means pad the | |
13254 string returned with spaces to that value. */ | |
277 | 13255 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
13256 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
|
13257 |
277 | 13258 static char * |
25012 | 13259 decode_mode_spec (w, c, field_width, precision) |
277 | 13260 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
|
13261 register int c; |
25012 | 13262 int field_width, precision; |
277 | 13263 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13264 Lisp_Object obj; |
25012 | 13265 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
13266 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
|
13267 struct buffer *b = XBUFFER (w->buffer); |
277 | 13268 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
13269 obj = Qnil; |
277 | 13270 |
13271 switch (c) | |
13272 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13273 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13274 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
|
13275 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13276 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
|
13277 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13278 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13279 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13280 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13281 /* 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
|
13282 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
|
13283 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13284 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
|
13285 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13286 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13287 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13288 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13289 /* 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
|
13290 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
|
13291 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13292 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13293 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13294 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13295 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13296 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13297 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13298 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13299 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13300 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13301 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13302 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
|
13303 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13304 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
|
13305 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
|
13306 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13307 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13308 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
|
13309 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13310 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13311 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13312 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13313 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13314 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13315 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13316 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
|
13317 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13318 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
|
13319 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
|
13320 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13321 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13322 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
|
13323 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13324 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13325 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13326 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13327 register int i; |
25012 | 13328 |
13329 /* Let lots_of_dashes be a string of infinite length. */ | |
13330 if (field_width <= 0 | |
13331 || field_width > sizeof (lots_of_dashes)) | |
13332 { | |
13333 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
13334 decode_mode_spec_buf[i] = '-'; | |
13335 decode_mode_spec_buf[i] = '\0'; | |
13336 return decode_mode_spec_buf; | |
13337 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13338 else |
25012 | 13339 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
|
13340 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13341 |
277 | 13342 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13343 obj = b->name; |
277 | 13344 break; |
13345 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13346 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13347 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13348 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
|
13349 XSETFASTINT (w->column_number_displayed, col); |
25012 | 13350 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
|
13351 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
|
13352 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13353 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13354 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13355 /* %F displays the frame name. */ |
25012 | 13356 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
|
13357 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
13358 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
|
13359 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
|
13360 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
|
13361 |
277 | 13362 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13363 obj = b->filename; |
277 | 13364 break; |
13365 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13366 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13367 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13368 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13369 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13370 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13371 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13372 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13373 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13374 /* 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
|
13375 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13376 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
|
13377 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
13378 /* 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
|
13379 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
|
13380 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13381 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13382 /* 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
|
13383 if (INTEGERP (Vline_number_display_limit) |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
13384 && 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
|
13385 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13386 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13387 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13388 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13389 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13390 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13391 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13392 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13393 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13394 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13395 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13396 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13397 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
|
13398 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13399 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13400 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13401 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13402 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13403 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13404 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13405 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13406 /* 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
|
13407 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13408 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13409 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13410 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13411 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13412 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13413 /* 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
|
13414 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
|
13415 "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
|
13416 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
|
13417 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13418 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13419 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
|
13420 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
|
13421 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13422 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
|
13423 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13424 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13425 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13426 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13427 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
13428 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
|
13429 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13430 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13431 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13432 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13433 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13434 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13435 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13436 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13437 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13438 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13439 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13440 /* 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
|
13441 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
|
13442 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
|
13443 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13444 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13445 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13446 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13447 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13448 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13449 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
13450 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13451 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
|
13452 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13453 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13454 /* 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
|
13455 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13456 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13457 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13458 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13459 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13460 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13461 /* Make the string to show. */ |
25012 | 13462 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
|
13463 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13464 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13465 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13466 char* p = decode_mode_spec_buf; |
25012 | 13467 int pad = field_width - 2; |
13468 while (pad-- > 0) | |
13469 *p++ = ' '; | |
13470 *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
|
13471 *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
|
13472 *p = '\0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13473 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
13474 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13475 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13476 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
13477 |
277 | 13478 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13479 obj = b->mode_name; |
277 | 13480 break; |
13481 | |
13482 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13483 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 13484 return " Narrow"; |
13485 break; | |
13486 | |
13487 case 'p': | |
13488 { | |
13489 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
|
13490 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
|
13491 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13492 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 13493 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13494 if (pos <= BUF_BEGV (b)) |
277 | 13495 return "All"; |
13496 else | |
13497 return "Bottom"; | |
13498 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13499 else if (pos <= BUF_BEGV (b)) |
277 | 13500 return "Top"; |
13501 else | |
13502 { | |
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
|
13503 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
|
13504 /* 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
|
13505 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
|
13506 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
|
13507 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 13508 /* We can't normally display a 3-digit number, |
13509 so get us a 2-digit number that is close. */ | |
13510 if (total == 100) | |
13511 total = 99; | |
13512 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
13513 return decode_mode_spec_buf; | |
13514 } | |
13515 } | |
13516 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13517 /* 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
|
13518 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13519 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13520 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
|
13521 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
|
13522 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
|
13523 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13524 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13525 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13526 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13527 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13528 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13529 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13530 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13531 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13532 { |
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
|
13533 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
|
13534 /* 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
|
13535 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
|
13536 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
|
13537 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
|
13538 /* 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
|
13539 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
|
13540 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13541 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13542 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13543 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13544 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13545 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13546 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13547 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13548 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
13549 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13550 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13551 /* 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
|
13552 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
|
13553 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
|
13554 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
|
13555 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13556 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
|
13557 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13558 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13559 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13560 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
|
13561 #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
|
13562 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
|
13563 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13564 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
13565 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13566 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13567 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13568 /* 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
|
13569 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13570 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13571 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13572 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
|
13573 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13574 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
13575 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13576 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13577 /* 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
|
13578 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13579 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
|
13580 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
|
13581 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13582 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
|
13583 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
13584 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13585 #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
|
13586 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13587 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13588 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13589 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13590 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
|
13591 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13592 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
|
13593 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13594 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13595 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
13596 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13597 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13598 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13599 } |
277 | 13600 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
13601 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
13602 if (STRINGP (obj)) |
277 | 13603 return (char *) XSTRING (obj)->data; |
13604 else | |
13605 return ""; | |
13606 } | |
25012 | 13607 |
13608 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13609 /* 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
|
13610 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13611 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
|
13612 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13613 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
|
13614 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13615 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13616 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
|
13617 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13618 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13619 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13620 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13621 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13622 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13623 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13624 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13625 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13626 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13627 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13628 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13629 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13630 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13631 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13632 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13633 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13634 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13635 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13636 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13637 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13638 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13639 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13640 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13641 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13642 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13643 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13644 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13645 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13646 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13647 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13648 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13649 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13650 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13651 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13652 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13653 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13654 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13655 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13656 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13657 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13658 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13659 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13660 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13661 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13662 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13663 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13664 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13665 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13666 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13667 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13668 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13669 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13670 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13671 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13672 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13673 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13674 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
|
13675 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13676 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13677 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13678 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13679 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13680 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13681 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13682 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13683 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13684 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13685 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13686 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13687 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13688 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13689 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13690 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13691 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13692 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
|
13693 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13694 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13695 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13696 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13697 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13698 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13699 /* 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
|
13700 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
|
13701 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13702 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13703 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13704 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13705 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13706 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13707 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13708 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13709 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
13710 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
13711 } |
25012 | 13712 |
13713 | |
277 | 13714 |
25012 | 13715 /*********************************************************************** |
13716 Displaying strings | |
13717 ***********************************************************************/ | |
13718 | |
13719 /* Display a NUL-terminated string, starting with index START. | |
13720 | |
13721 If STRING is non-null, display that C string. Otherwise, the Lisp | |
13722 string LISP_STRING is displayed. | |
13723 | |
13724 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
13725 FACE_STRING. Display STRING or LISP_STRING with the face at | |
13726 FACE_STRING_POS in FACE_STRING: | |
13727 | |
13728 Display the string in the environment given by IT, but use the | |
13729 standard display table, temporarily. | |
13730 | |
13731 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
13732 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
13733 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
13734 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
13735 | |
13736 PRECISION is the maximum number of characters to output from | |
13737 STRING. PRECISION < 0 means don't truncate the string. | |
13738 | |
13739 This is roughly equivalent to printf format specifiers: | |
13740 | |
13741 FIELD_WIDTH PRECISION PRINTF | |
13742 ---------------------------------------- | |
13743 -1 -1 %s | |
13744 -1 10 %.10s | |
13745 10 -1 %10s | |
13746 20 10 %20.10s | |
13747 | |
13748 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
13749 display them, and < 0 means obey the current buffer's value of | |
13750 enable_multibyte_characters. | |
13751 | |
13752 Value is the number of glyphs produced. */ | |
277 | 13753 |
13754 static int | |
25012 | 13755 display_string (string, lisp_string, face_string, face_string_pos, |
13756 start, it, field_width, precision, max_x, multibyte) | |
277 | 13757 unsigned char *string; |
25012 | 13758 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
|
13759 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
|
13760 int face_string_pos; |
25012 | 13761 int start; |
13762 struct it *it; | |
13763 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
|
13764 int multibyte; |
277 | 13765 { |
25012 | 13766 int hpos_at_start = it->hpos; |
13767 int saved_face_id = it->face_id; | |
13768 struct glyph_row *row = it->glyph_row; | |
13769 | |
13770 /* Initialize the iterator IT for iteration over STRING beginning | |
13771 with index START. We assume that IT may be modified here (which | |
13772 means that display_line has to do something when displaying a | |
13773 mini-buffer prompt, which it does). */ | |
13774 reseat_to_string (it, string, lisp_string, start, | |
13775 precision, field_width, multibyte); | |
13776 | |
13777 /* If displaying STRING, set up the face of the iterator | |
13778 from LISP_STRING, if that's given. */ | |
13779 if (STRINGP (face_string)) | |
13780 { | |
13781 int endptr; | |
13782 struct face *face; | |
13783 | |
13784 it->face_id | |
13785 = face_at_string_position (it->w, face_string, face_string_pos, | |
13786 0, it->region_beg_charpos, | |
13787 it->region_end_charpos, | |
13788 &endptr, it->base_face_id); | |
13789 face = FACE_FROM_ID (it->f, it->face_id); | |
13790 it->face_box_p = face->box != FACE_NO_BOX; | |
13791 } | |
13792 | |
13793 /* Set max_x to the maximum allowed X position. Don't let it go | |
13794 beyond the right edge of the window. */ | |
13795 if (max_x <= 0) | |
13796 max_x = it->last_visible_x; | |
13797 else | |
13798 max_x = min (max_x, it->last_visible_x); | |
13799 | |
13800 /* Skip over display elements that are not visible. because IT->w is | |
13801 hscrolled. */ | |
13802 if (it->current_x < it->first_visible_x) | |
13803 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
13804 MOVE_TO_POS | MOVE_TO_X); | |
13805 | |
13806 row->ascent = it->max_ascent; | |
13807 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
|
13808 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
|
13809 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 13810 |
13811 /* This condition is for the case that we are called with current_x | |
13812 past last_visible_x. */ | |
13813 while (it->current_x < max_x) | |
13814 { | |
13815 int x_before, x, n_glyphs_before, i, nglyphs; | |
13816 | |
13817 /* Get the next display element. */ | |
13818 if (!get_next_display_element (it)) | |
13819 break; | |
13820 | |
13821 /* Produce glyphs. */ | |
13822 x_before = it->current_x; | |
13823 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
13824 PRODUCE_GLYPHS (it); | |
13825 | |
13826 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
13827 i = 0; | |
13828 x = x_before; | |
13829 while (i < nglyphs) | |
13830 { | |
13831 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
13832 | |
13833 if (!it->truncate_lines_p | |
13834 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
13835 { |
25012 | 13836 /* End of continued line or max_x reached. */ |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13837 if (CHAR_GLYPH_PADDING_P (*glyph)) |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13838 { |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13839 /* A wide character is unbreakable. */ |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13840 it->glyph_row->used[TEXT_AREA] = n_glyphs_before; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13841 it->current_x = x_before; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13842 } |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13843 else |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13844 { |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13845 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13846 it->current_x = x; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13847 } |
25012 | 13848 break; |
277 | 13849 } |
25012 | 13850 else if (x + glyph->pixel_width > it->first_visible_x) |
13851 { | |
13852 /* Glyph is at least partially visible. */ | |
13853 ++it->hpos; | |
13854 if (x < it->first_visible_x) | |
13855 it->glyph_row->x = x - it->first_visible_x; | |
13856 } | |
13857 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13858 { |
25012 | 13859 /* Glyph is off the left margin of the display area. |
13860 Should not happen. */ | |
13861 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
13862 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
13863 |
25012 | 13864 row->ascent = max (row->ascent, it->max_ascent); |
13865 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
|
13866 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
|
13867 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
|
13868 it->max_phys_ascent + it->max_phys_descent); |
25012 | 13869 x += glyph->pixel_width; |
13870 ++i; | |
13871 } | |
13872 | |
13873 /* Stop if max_x reached. */ | |
13874 if (i < nglyphs) | |
13875 break; | |
13876 | |
13877 /* Stop at line ends. */ | |
13878 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
13879 { | |
13880 it->continuation_lines_width = 0; | |
13881 break; | |
13882 } | |
13883 | |
32460
5d2167f8c6a6
(cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32175
diff
changeset
|
13884 set_iterator_to_next (it, 1); |
25012 | 13885 |
13886 /* Stop if truncating at the right edge. */ | |
13887 if (it->truncate_lines_p | |
13888 && it->current_x >= it->last_visible_x) | |
13889 { | |
13890 /* Add truncation mark, but don't do it if the line is | |
13891 truncated at a padding space. */ | |
13892 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
|
13893 { |
25012 | 13894 if (!FRAME_WINDOW_P (it->f)) |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13895 { |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13896 int i, n; |
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13897 |
35388
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13898 if (it->current_x > it->last_visible_x) |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13899 { |
35388
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13900 for (i = row->used[TEXT_AREA] - 1; i > 0; --i) |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13901 if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i])) |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13902 break; |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13903 for (n = row->used[TEXT_AREA]; i < n; ++i) |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13904 { |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13905 row->used[TEXT_AREA] = i; |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13906 produce_special_glyphs (it, IT_TRUNCATION); |
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13907 } |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13908 } |
35388
1ad9046911a2
(display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
35379
diff
changeset
|
13909 produce_special_glyphs (it, IT_TRUNCATION); |
35301
6cb4bc361bf8
(insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents:
35277
diff
changeset
|
13910 } |
25012 | 13911 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
|
13912 } |
25012 | 13913 break; |
13914 } | |
13915 } | |
13916 | |
13917 /* Maybe insert a truncation at the left. */ | |
13918 if (it->first_visible_x | |
13919 && IT_CHARPOS (*it) > 0) | |
13920 { | |
13921 if (!FRAME_WINDOW_P (it->f)) | |
13922 insert_left_trunc_glyphs (it); | |
13923 it->glyph_row->truncated_on_left_p = 1; | |
13924 } | |
13925 | |
13926 it->face_id = saved_face_id; | |
13927 | |
13928 /* Value is number of columns displayed. */ | |
13929 return it->hpos - hpos_at_start; | |
13930 } | |
13931 | |
13932 | |
277 | 13933 |
25012 | 13934 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
13935 appears as an element of LIST or as the car of an element of LIST. | |
13936 If PROPVAL is a list, compare each element against LIST in that | |
13937 way, and return 1 if any element of PROPVAL is found in LIST. | |
13938 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
|
13939 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13940 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13941 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13942 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13943 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13944 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13945 register Lisp_Object tail, proptail; |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13946 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13947 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
|
13948 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13949 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13950 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13951 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13952 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13953 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
|
13954 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13955 } |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13956 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13957 if (CONSP (propval)) |
31338
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13958 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13959 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13960 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13961 Lisp_Object propelt; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13962 propelt = XCAR (proptail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13963 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13964 { |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13965 register Lisp_Object tem; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13966 tem = XCAR (tail); |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13967 if (EQ (propelt, tem)) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13968 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13969 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13970 return 1; |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13971 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13972 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13973 } |
832733dd336e
(redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31294
diff
changeset
|
13974 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13975 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13976 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13977 |
25012 | 13978 |
13979 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
13980 the cdr of that element is non-nil. If PROPVAL is a list, check | |
13981 each element of PROPVAL in that way, and the first time some | |
13982 element is found, return 1 if the cdr of that element is non-nil. | |
13983 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
|
13984 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13985 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13986 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13987 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13988 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13989 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
13990 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13991 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13992 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
|
13993 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
13994 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13995 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13996 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13997 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13998 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
13999 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
14000 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14001 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
|
14002 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
14003 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14004 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14005 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
|
14006 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
14007 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14008 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14009 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14010 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
14011 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
14012 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
14013 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
14014 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
14015 } |
25012 | 14016 |
14017 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
14018 |
25012 | 14019 /*********************************************************************** |
14020 Initialization | |
14021 ***********************************************************************/ | |
14022 | |
277 | 14023 void |
14024 syms_of_xdisp () | |
14025 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14026 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
|
14027 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
|
14028 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14029 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14030 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14031 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14032 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14033 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14034 |
25012 | 14035 #if GLYPH_DEBUG |
14036 defsubr (&Sdump_glyph_matrix); | |
14037 defsubr (&Sdump_glyph_row); | |
25543 | 14038 defsubr (&Sdump_tool_bar_row); |
25012 | 14039 defsubr (&Strace_redisplay_toggle); |
27540
d26783d86d5f
(Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27118
diff
changeset
|
14040 defsubr (&Strace_to_stderr); |
25012 | 14041 #endif |
35517
28fcaa2d37b0
(syms_of_xdisp) <Stool_bar_lines_needed>: Don't defsubr
Eli Zaretskii <eliz@gnu.org>
parents:
35474
diff
changeset
|
14042 #ifdef HAVE_WINDOW_SYSTEM |
35465
41e0d3d78491
(Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35444
diff
changeset
|
14043 defsubr (&Stool_bar_lines_needed); |
35517
28fcaa2d37b0
(syms_of_xdisp) <Stool_bar_lines_needed>: Don't defsubr
Eli Zaretskii <eliz@gnu.org>
parents:
35474
diff
changeset
|
14044 #endif |
25012 | 14045 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
14046 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
|
14047 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
|
14048 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
14049 staticpro (&Qoverriding_terminal_local_map); |
12267 | 14050 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
|
14051 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
14052 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
|
14053 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
|
14054 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
14055 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
14056 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
|
14057 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
14058 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
14059 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 14060 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
14061 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
14062 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
|
14063 |
28002
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
14064 QCdata = intern (":data"); |
694ac11a3e1c
(QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
27990
diff
changeset
|
14065 staticpro (&QCdata); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14066 Qdisplay = intern ("display"); |
25012 | 14067 staticpro (&Qdisplay); |
14068 Qspace_width = intern ("space-width"); | |
14069 staticpro (&Qspace_width); | |
14070 Qraise = intern ("raise"); | |
14071 staticpro (&Qraise); | |
14072 Qspace = intern ("space"); | |
14073 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14074 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14075 staticpro (&Qmargin); |
25012 | 14076 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14077 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14078 Qright_margin = intern ("right-margin"); |
25012 | 14079 staticpro (&Qright_margin); |
14080 Qalign_to = intern ("align-to"); | |
14081 staticpro (&Qalign_to); | |
14082 QCalign_to = intern (":align-to"); | |
14083 staticpro (&QCalign_to); | |
14084 Qrelative_width = intern ("relative-width"); | |
14085 staticpro (&Qrelative_width); | |
14086 QCrelative_width = intern (":relative-width"); | |
14087 staticpro (&QCrelative_width); | |
14088 QCrelative_height = intern (":relative-height"); | |
14089 staticpro (&QCrelative_height); | |
14090 QCeval = intern (":eval"); | |
14091 staticpro (&QCeval); | |
25614 | 14092 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14093 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
14094 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
14095 staticpro (&QCfile); |
25012 | 14096 Qfontified = intern ("fontified"); |
14097 staticpro (&Qfontified); | |
14098 Qfontification_functions = intern ("fontification-functions"); | |
14099 staticpro (&Qfontification_functions); | |
14100 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
14101 staticpro (&Qtrailing_whitespace); | |
14102 Qimage = intern ("image"); | |
14103 staticpro (&Qimage); | |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14104 Qmessage_truncate_lines = intern ("message-truncate-lines"); |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14105 staticpro (&Qmessage_truncate_lines); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14106 Qgrow_only = intern ("grow-only"); |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14107 staticpro (&Qgrow_only); |
36194
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14108 Qinhibit_menubar_update = intern ("inhibit-menubar-update"); |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14109 staticpro (&Qinhibit_menubar_update); |
25012 | 14110 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14111 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
14112 last_arrow_string = Qnil; |
277 | 14113 staticpro (&last_arrow_position); |
14114 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
|
14115 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14116 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
|
14117 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14118 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14119 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14120 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
|
14121 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
|
14122 staticpro (&echo_area_buffer[1]); |
277 | 14123 |
30728
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
14124 Vmessages_buffer_name = build_string ("*Messages*"); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
14125 staticpro (&Vmessages_buffer_name); |
a87e28789082
(Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30721
diff
changeset
|
14126 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
14127 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
14128 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
14129 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
14130 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
14131 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14132 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14133 "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
|
14134 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14135 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
14136 |
277 | 14137 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
14138 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 14139 Vglobal_mode_string = Qnil; |
14140 | |
14141 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
14142 "Marker for where to display an arrow on top of the buffer text.\n\ | |
14143 This must be the beginning of a line in order to work.\n\ | |
14144 See also `overlay-arrow-string'."); | |
14145 Voverlay_arrow_position = Qnil; | |
14146 | |
14147 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
14148 "String to display as an arrow. See also `overlay-arrow-position'."); | |
14149 Voverlay_arrow_string = Qnil; | |
14150 | |
14151 DEFVAR_INT ("scroll-step", &scroll_step, | |
14152 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 14153 If that fails to bring point back on frame, point is centered instead.\n\ |
33490
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
14154 If this is zero, point is always centered after it moves off frame.\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
14155 If you want scrolling to always be a line at a time, you should set\n\ |
b714a06b99ec
(try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33462
diff
changeset
|
14156 `scroll-conservatively' to a large value rather than set this to 1."); |
277 | 14157 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
14158 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
|
14159 "*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
|
14160 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
|
14161 in the window."); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
14162 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
14163 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
14164 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
14165 "*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
|
14166 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
|
14167 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
14168 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
14169 |
25012 | 14170 #if GLYPH_DEBUG |
277 | 14171 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 14172 #endif |
277 | 14173 |
14174 DEFVAR_BOOL ("truncate-partial-width-windows", | |
14175 &truncate_partial_width_windows, | |
769 | 14176 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 14177 truncate_partial_width_windows = 1; |
14178 | |
14179 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
14180 "nil means display the mode-line/header-line/menu-bar in the default face.\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
14181 Any other value means to use the appropriate face, `mode-line',\n\ |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
14182 `header-line', or `menu' respectively.\n\ |
33721
c45f067779c1
(syms_of_xdisp): `mode-line-inverse-video' defualts to nil.
Miles Bader <miles@gnu.org>
parents:
33600
diff
changeset
|
14183 \n\ |
33840
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
14184 This variable is deprecated; please change the above faces instead."); |
e8b1a1d28ff4
(display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents:
33824
diff
changeset
|
14185 mode_line_inverse_video = 1; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
14186 |
29632
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
14187 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit, |
25012 | 14188 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 14189 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
|
14190 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
|
14191 Vline_number_display_limit = Qnil; |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
14192 |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
14193 DEFVAR_INT ("line-number-display-limit-width", |
96d83d5a48b3
(Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
29515
diff
changeset
|
14194 &line_number_display_limit_width, |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
14195 "*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
|
14196 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
|
14197 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
|
14198 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
14199 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
14200 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
|
14201 "*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
|
14202 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
|
14203 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14204 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
|
14205 "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
|
14206 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
|
14207 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
|
14208 `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
|
14209 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14210 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 14211 "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
|
14212 \(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
|
14213 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
|
14214 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
|
14215 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14216 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 14217 "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
|
14218 \(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
|
14219 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
|
14220 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
|
14221 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14222 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14223 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14224 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14225 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14226 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14227 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14228 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14229 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14230 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
14231 Qnil))); |
10393 | 14232 |
14233 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
14234 "Maximum number of lines to keep in the message log buffer.\n\ | |
14235 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
14236 the buffer when it becomes large."); | |
14237 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
14238 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
14239 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
|
14240 "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
|
14241 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
|
14242 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
|
14243 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
|
14244 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
|
14245 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
|
14246 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
14247 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 14248 "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
|
14249 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
|
14250 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
|
14251 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
|
14252 Vwindow_scroll_functions = Qnil; |
25012 | 14253 |
25543 | 14254 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
14255 "*Non-nil means automatically resize tool-bars.\n\ | |
14256 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
14257 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 14258 otherwise."); |
25543 | 14259 auto_resize_tool_bars_p = 1; |
14260 | |
14261 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
14262 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
14263 auto_raise_tool_bar_buttons_p = 1; | |
14264 | |
35277
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14265 DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin, |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14266 "*Margin around tool-bar buttons in pixels.\n\ |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14267 If an integer, use that for both horizontal and vertical margins.\n\ |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14268 Otherwise, value should be a pair of integers `(HORZ : VERT)' with\n\ |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14269 HORZ specifying the horizontal margin, and VERT specifying the\n\ |
a959d4b99e4d
(Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents:
35267
diff
changeset
|
14270 vertical margin."); |
35734
8c0eef9f8f5c
(build_desired_tool_bar_string, syms_of_xdisp): Use
Gerd Moellmann <gerd@gnu.org>
parents:
35692
diff
changeset
|
14271 Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
25543 | 14272 |
14273 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
14274 "Relief thickness of tool-bar buttons."); | |
35734
8c0eef9f8f5c
(build_desired_tool_bar_string, syms_of_xdisp): Use
Gerd Moellmann <gerd@gnu.org>
parents:
35692
diff
changeset
|
14275 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF; |
25012 | 14276 |
14277 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
14278 "List of functions to call to fontify regions of text.\n\ | |
14279 Each function is called with one argument POS. Functions must\n\ | |
14280 fontify a region starting at POS in the current buffer, and give\n\ | |
14281 fontified regions the property `fontified'.\n\ | |
14282 This variable automatically becomes buffer-local when set."); | |
14283 Vfontification_functions = Qnil; | |
33824
09db0c6cb714
(syms_of_xdisp): Make fontification-functions buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33762
diff
changeset
|
14284 Fmake_variable_buffer_local (Qfontification_functions); |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14285 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14286 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 14287 &unibyte_display_via_language_environment, |
14288 "*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
|
14289 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
|
14290 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
|
14291 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
|
14292 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
14293 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
|
14294 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14295 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
|
14296 "*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
|
14297 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14298 If an integer, it specifies a number of lines."); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
14299 Vmax_mini_window_height = make_float (0.25); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14300 |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14301 DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows, |
34844 | 14302 "*How to resize mini-windows.\n\ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14303 A value of nil means don't automatically resize mini-windows.\n\ |
34844 | 14304 A value of t means resize them to fit the text displayed in them.\n\ |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14305 A value of `grow-only', the default, means let mini-windows grow\n\ |
34844 | 14306 only, until their display becomes empty, at which point the windows\n\ |
14307 go back to their normal size."); | |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14308 Vresize_mini_windows = Qgrow_only; |
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14309 |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14310 DEFVAR_BOOL ("cursor-in-non-selected-windows", |
34847
67e70bac26c6
(syms_of_xdisp): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
34844
diff
changeset
|
14311 &cursor_in_non_selected_windows, |
27843
d401b5066063
(cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27721
diff
changeset
|
14312 "*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
|
14313 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
|
14314 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
|
14315 |
a22cc42e941d
(init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents:
28652
diff
changeset
|
14316 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
|
14317 "*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
|
14318 automatic_hscrolling_p = 1; |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14319 |
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14320 DEFVAR_LISP ("image-types", &Vimage_types, |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14321 "List of supported image types.\n\ |
28984
540ca0531c77
(Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
28932
diff
changeset
|
14322 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
|
14323 Vimage_types = Qnil; |
29634
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14324 |
ac38155fbce6
(message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents:
29632
diff
changeset
|
14325 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
|
14326 "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
|
14327 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
|
14328 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
|
14329 |
4bdcc0f0232f
(syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents:
31826
diff
changeset
|
14330 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
|
14331 "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
|
14332 Can be used to update submenus whose contents should vary."); |
33314
d09fc097a22d
(syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents:
33099
diff
changeset
|
14333 Vmenu_bar_update_hook = Qnil; |
36194
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14334 |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14335 DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update, |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14336 "Non-nil means don't update menu bars. Internal use only."); |
be25f9e946fb
(Qinhibit_menubar_update, inhibit_menubar_update):
Gerd Moellmann <gerd@gnu.org>
parents:
36192
diff
changeset
|
14337 inhibit_menubar_update = 0; |
277 | 14338 } |
14339 | |
25012 | 14340 |
14341 /* Initialize this module when Emacs starts. */ | |
14342 | |
21514 | 14343 void |
277 | 14344 init_xdisp () |
14345 { | |
14346 Lisp_Object root_window; | |
25012 | 14347 struct window *mini_w; |
14348 | |
33462
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14349 current_header_line_height = current_mode_line_height = -1; |
d8cd8e1bc659
(current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents:
33453
diff
changeset
|
14350 |
25012 | 14351 CHARPOS (this_line_start_pos) = 0; |
277 | 14352 |
14353 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
|
14354 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 14355 |
14356 if (!noninteractive) | |
14357 { | |
25012 | 14358 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
14359 int i; | |
14360 | |
14361 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
|
14362 set_window_height (root_window, |
25012 | 14363 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
|
14364 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14365 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 14366 set_window_height (minibuf_window, 1, 0); |
14367 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
14368 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
|
14369 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 14370 |
14371 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
14372 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
14373 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
14374 | |
14375 /* The default ellipsis glyphs `...'. */ | |
14376 for (i = 0; i < 3; ++i) | |
14377 XSETFASTINT (default_invis_vector[i], '.'); | |
14378 } | |
14379 | |
14380 #ifdef HAVE_WINDOW_SYSTEM | |
14381 { | |
14382 /* Allocate the buffer for frame titles. */ | |
14383 int size = 100; | |
14384 frame_title_buf = (char *) xmalloc (size); | |
14385 frame_title_buf_end = frame_title_buf + size; | |
14386 frame_title_ptr = NULL; | |
14387 } | |
14388 #endif /* HAVE_WINDOW_SYSTEM */ | |
31876
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14389 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14390 help_echo_showing_p = 0; |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14391 } |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14392 |
de16d989722a
(help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31849
diff
changeset
|
14393 |