|
428
|
1 /* Display generation from window structure and buffer text.
|
|
|
2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
|
|
|
3 Copyright (C) 1995 Free Software Foundation, Inc.
|
|
771
|
4 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
|
|
428
|
5 Copyright (C) 1995 Sun Microsystems, Inc.
|
|
|
6 Copyright (C) 1996 Chuck Thompson.
|
|
|
7
|
|
|
8 This file is part of XEmacs.
|
|
|
9
|
|
|
10 XEmacs is free software; you can redistribute it and/or modify it
|
|
|
11 under the terms of the GNU General Public License as published by the
|
|
|
12 Free Software Foundation; either version 2, or (at your option) any
|
|
|
13 later version.
|
|
|
14
|
|
|
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
|
|
|
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
18 for more details.
|
|
|
19
|
|
|
20 You should have received a copy of the GNU General Public License
|
|
|
21 along with XEmacs; see the file COPYING. If not, write to
|
|
|
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
23 Boston, MA 02111-1307, USA. */
|
|
|
24
|
|
|
25 /* Synched up with: Not in FSF. */
|
|
|
26
|
|
|
27 /* Author: Chuck Thompson */
|
|
|
28
|
|
|
29 /* Fixed up by Ben Wing for Mule */
|
|
|
30
|
|
|
31 /* This file has been Mule-ized. */
|
|
|
32
|
|
|
33 /*****************************************************************************
|
|
|
34 The Golden Rules of Redisplay
|
|
|
35
|
|
853
|
36 First: It Is Better To Be Correct Than Fast
|
|
|
37 Second: Thou Shalt Use Due Caution When Running Elisp From Within Redisplay
|
|
|
38 Third: It Is Better To Be Fast Than Not To Be
|
|
428
|
39 ****************************************************************************/
|
|
|
40
|
|
853
|
41 /* Note: The second rule used to prohibit running Elisp from within redisplay,
|
|
|
42 but that's not correct.
|
|
|
43
|
|
|
44 Use
|
|
|
45
|
|
|
46 callN_trapping_problems (..., INHIBIT_GC
|
|
|
47 | INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY)
|
|
|
48
|
|
|
49 instead.
|
|
|
50
|
|
|
51 --ben
|
|
|
52 */
|
|
|
53
|
|
428
|
54 #include <config.h>
|
|
|
55 #include "lisp.h"
|
|
|
56
|
|
|
57 #include "buffer.h"
|
|
|
58 #include "commands.h"
|
|
|
59 #include "debug.h"
|
|
872
|
60 #include "device-impl.h"
|
|
428
|
61 #include "elhash.h"
|
|
853
|
62 #include "events.h"
|
|
872
|
63 #include "extents-impl.h"
|
|
428
|
64 #include "faces.h"
|
|
872
|
65 #include "frame-impl.h"
|
|
428
|
66 #include "glyphs.h"
|
|
|
67 #include "gutter.h"
|
|
|
68 #include "insdel.h"
|
|
|
69 #include "menubar.h"
|
|
872
|
70 #include "objects-impl.h"
|
|
428
|
71 #include "process.h"
|
|
|
72 #include "redisplay.h"
|
|
|
73 #include "toolbar.h"
|
|
872
|
74 #include "window-impl.h"
|
|
428
|
75 #include "line-number.h"
|
|
|
76 #include "file-coding.h"
|
|
|
77
|
|
442
|
78 #include "sysfile.h"
|
|
|
79
|
|
428
|
80 #ifdef HAVE_TTY
|
|
|
81 #include "console-tty.h"
|
|
|
82 #endif /* HAVE_TTY */
|
|
|
83
|
|
|
84 /* Note: We have to be careful throughout this code to properly handle
|
|
867
|
85 and differentiate between Ibytes and Ichars.
|
|
|
86
|
|
|
87 Since strings are generally composed of Ibytes, I've taken the tack
|
|
|
88 that any contiguous set of Ibytes is called a "string", while
|
|
|
89 any contiguous set of Ichars is called an "array". */
|
|
428
|
90
|
|
|
91 /* Return value to indicate a failure by an add_*_rune routine to add
|
|
|
92 a rune, but no propagation information needs to be returned. */
|
|
|
93 #define ADD_FAILED (prop_block_dynarr *) 1
|
|
|
94
|
|
|
95 #define BEGIN_GLYPHS 0
|
|
|
96 #define END_GLYPHS 1
|
|
|
97 #define LEFT_GLYPHS 2
|
|
|
98 #define RIGHT_GLYPHS 3
|
|
|
99
|
|
|
100 #define VERTICAL_CLIP(w, display) \
|
|
442
|
101 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
|
|
428
|
102 ? INT_MAX \
|
|
442
|
103 : vertical_clip)
|
|
428
|
104
|
|
|
105 /* The following structures are completely private to redisplay.c so
|
|
|
106 we put them here instead of in a header file, for modularity. */
|
|
|
107
|
|
826
|
108 /* NOTE: Bytexpos's not Charxpos's in this structure. */
|
|
428
|
109
|
|
|
110 typedef struct position_redisplay_data_type
|
|
|
111 {
|
|
|
112 /* This information is normally filled in by the create_*_block
|
|
|
113 routines and is used by the add_*_rune routines. */
|
|
|
114 Lisp_Object window;
|
|
|
115 /* if we are working with strings rather than buffers we need a
|
|
|
116 handle to the string */
|
|
|
117 Lisp_Object string;
|
|
|
118 struct device *d;
|
|
|
119 struct display_block *db;
|
|
|
120 struct display_line *dl;
|
|
867
|
121 Ichar ch; /* Character that is to be added. This is
|
|
428
|
122 used to communicate this information to
|
|
867
|
123 add_ichar_rune(). */
|
|
428
|
124 Lisp_Object last_charset; /* The charset of the previous character.
|
|
|
125 Used to optimize some lookups -- we
|
|
|
126 only have to do some things when
|
|
|
127 the charset changes. */
|
|
|
128 face_index last_findex; /* The face index of the previous character.
|
|
|
129 Needed to ensure the validity of the
|
|
|
130 last_charset optimization. */
|
|
|
131
|
|
|
132 int last_char_width; /* The width of the previous character. */
|
|
|
133 int font_is_bogus; /* If true, it means we couldn't instantiate
|
|
|
134 the font for this charset, so we substitute
|
|
|
135 ~'s from the ASCII charset. */
|
|
826
|
136 Bytexpos byte_charpos; /* Position of character we are processing. This
|
|
|
137 is a Bytexpos, meaning it refers to bytes (not
|
|
|
138 chars) and can refer to either buffers (1-based)
|
|
|
139 or strings (0-based). We need to be careful
|
|
|
140 when doing anything that references the text in
|
|
|
141 the buffer or string. */
|
|
|
142 Bytexpos byte_endpos; /* ????? Unknown, under-used. */
|
|
428
|
143 int pixpos;
|
|
|
144 int max_pixpos;
|
|
|
145 int blank_width; /* Width of the blank that is to be added.
|
|
|
146 This is used to communicate this information
|
|
|
147 to add_blank_rune().
|
|
|
148
|
|
|
149 This is also used rather cheesily to
|
|
|
150 communicate the width of the eol-cursor-size
|
|
|
151 blank that exists at the end of the line.
|
|
867
|
152 add_ichar_rune() is called cheesily with
|
|
428
|
153 the non-printing char '\n', which is stuck
|
|
|
154 in the output routines with its width being
|
|
|
155 BLANK_WIDTH. */
|
|
826
|
156 Bytexpos byte_cursor_charpos; /* This stores the buffer position of the
|
|
|
157 cursor. */
|
|
428
|
158 unsigned int cursor_type :3;
|
|
|
159 int cursor_x; /* rune block cursor is at */
|
|
|
160 int start_col; /* Number of character columns (each column has
|
|
|
161 a width of the default char width) that still
|
|
|
162 need to be skipped. This is used for horizontal
|
|
|
163 scrolling, where a certain number of columns
|
|
|
164 (those off the left side of the screen) need
|
|
|
165 to be skipped before anything is displayed. */
|
|
826
|
166 Bytexpos byte_start_col_enabled;
|
|
428
|
167 int start_col_xoffset; /* Number of pixels that still need to
|
|
819
|
168 be skipped. This is used for
|
|
|
169 horizontal scrolling of glyphs, where we want
|
|
|
170 to be able to scroll over part of the glyph. */
|
|
428
|
171
|
|
|
172 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
|
|
|
173 glyph differs from space_width (w).
|
|
|
174 0 if no hscroll glyph was used,
|
|
|
175 i.e. the window is not scrolled
|
|
|
176 horizontally. Used in tab
|
|
|
177 calculations. */
|
|
|
178
|
|
|
179 /* Information about the face the text should be displayed in and
|
|
|
180 any begin-glyphs and end-glyphs. */
|
|
|
181 struct extent_fragment *ef;
|
|
|
182 face_index findex;
|
|
|
183
|
|
819
|
184 /* The height of a pixmap may either be predetermined if the user has set a
|
|
|
185 baseline value, or it may be dependent on whatever the line ascent and
|
|
|
186 descent values end up being, based just on font and pixmap-ascent
|
|
|
187 information. In the first case we can immediately update the values, thus
|
|
|
188 their inclusion here. In the last case we cannot determine the actual
|
|
|
189 contribution to the line height until we have finished laying out all text
|
|
|
190 on the line. Thus we propagate the max height of such pixmaps and do a
|
|
|
191 final calculation (in calculate_baseline()) after all text has been added
|
|
|
192 to the line. */
|
|
428
|
193 int new_ascent;
|
|
|
194 int new_descent;
|
|
|
195 int max_pixmap_height;
|
|
819
|
196 int need_baseline_computation;
|
|
|
197 int end_glyph_width; /* Well, it is the kitchen sink after all ... */
|
|
428
|
198
|
|
|
199 Lisp_Object result_str; /* String where we put the result of
|
|
|
200 generating a formatted string in the modeline. */
|
|
|
201 int is_modeline; /* Non-zero if we're generating the modeline. */
|
|
|
202 Charcount modeline_charpos; /* Number of chars used in result_str so far;
|
|
|
203 corresponds to bytepos. */
|
|
|
204 Bytecount bytepos; /* Number of bytes used in result_str so far.
|
|
|
205 We don't actually copy the bytes into result_str
|
|
|
206 until the end because we don't know how big the
|
|
|
207 string is going to be until then. */
|
|
|
208 } pos_data;
|
|
|
209
|
|
|
210 enum prop_type
|
|
|
211 {
|
|
|
212 PROP_STRING,
|
|
|
213 PROP_CHAR,
|
|
|
214 PROP_MINIBUF_PROMPT,
|
|
819
|
215 PROP_BLANK,
|
|
|
216 PROP_GLYPH
|
|
428
|
217 };
|
|
|
218
|
|
|
219 /* Data that should be propagated to the next line. Either a single
|
|
867
|
220 Ichar, a string of Ibyte's or a glyph.
|
|
428
|
221
|
|
|
222 The actual data that is propagated ends up as a Dynarr of these
|
|
|
223 blocks.
|
|
|
224
|
|
819
|
225 prop_blocks are used to indicate that data that was supposed to go
|
|
|
226 on the previous line couldn't actually be displayed. Generally this
|
|
|
227 shouldn't happen if we are clipping the end of lines. If we are
|
|
|
228 wrapping then we need to display the propagation data before moving
|
|
|
229 on. Its questionable whether we should wrap or clip glyphs in this
|
|
|
230 instance. Most e-lisp relies on clipping so we preserve this
|
|
|
231 behavior.
|
|
|
232
|
|
867
|
233 #### It's unclean that both Ichars and Ibytes are here.
|
|
428
|
234 */
|
|
|
235
|
|
|
236 typedef struct prop_block prop_block;
|
|
|
237 struct prop_block
|
|
|
238 {
|
|
|
239 enum prop_type type;
|
|
|
240
|
|
|
241 union data
|
|
|
242 {
|
|
|
243 struct
|
|
|
244 {
|
|
867
|
245 Ibyte *str;
|
|
428
|
246 Bytecount len; /* length of the string. */
|
|
|
247 } p_string;
|
|
|
248
|
|
|
249 struct
|
|
|
250 {
|
|
867
|
251 Ichar ch;
|
|
826
|
252 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
|
|
428
|
253 unsigned int cursor_type :3;
|
|
|
254 } p_char;
|
|
|
255
|
|
|
256 struct
|
|
|
257 {
|
|
|
258 int width;
|
|
|
259 face_index findex;
|
|
|
260 } p_blank;
|
|
819
|
261
|
|
|
262 struct
|
|
|
263 {
|
|
|
264 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
|
|
|
265 int width;
|
|
|
266 Lisp_Object glyph;
|
|
|
267 } p_glyph;
|
|
|
268
|
|
428
|
269 } data;
|
|
|
270 };
|
|
|
271
|
|
|
272 typedef struct
|
|
|
273 {
|
|
|
274 Dynarr_declare (prop_block);
|
|
|
275 } prop_block_dynarr;
|
|
|
276
|
|
|
277
|
|
|
278 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
|
|
|
279 Charcount pos, Charcount min_pos,
|
|
|
280 Charcount max_pos, Lisp_Object elt,
|
|
|
281 int depth, int max_pixsize,
|
|
438
|
282 face_index findex, int type,
|
|
|
283 Charcount *offset,
|
|
|
284 Lisp_Object cur_ext);
|
|
428
|
285 static prop_block_dynarr *add_glyph_rune (pos_data *data,
|
|
|
286 struct glyph_block *gb,
|
|
|
287 int pos_type, int allow_cursor,
|
|
|
288 struct glyph_cachel *cachel);
|
|
665
|
289 static Bytebpos create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
290 Bytebpos byte_start_pos,
|
|
|
291 prop_block_dynarr **prop,
|
|
|
292 int type);
|
|
428
|
293 static int create_overlay_glyph_block (struct window *w,
|
|
|
294 struct display_line *dl);
|
|
|
295 static void create_left_glyph_block (struct window *w,
|
|
|
296 struct display_line *dl,
|
|
|
297 int overlay_width);
|
|
|
298 static void create_right_glyph_block (struct window *w,
|
|
|
299 struct display_line *dl);
|
|
|
300 static void redisplay_windows (Lisp_Object window, int skip_selected);
|
|
867
|
301 static void decode_mode_spec (struct window *w, Ichar spec, int type);
|
|
428
|
302 static void free_display_line (struct display_line *dl);
|
|
826
|
303 static void update_line_start_cache (struct window *w, Charbpos from,
|
|
|
304 Charbpos to, Charbpos point,
|
|
|
305 int no_regen);
|
|
665
|
306 static int point_visible (struct window *w, Charbpos point, int type);
|
|
819
|
307 static void calculate_yoffset (struct display_line *dl,
|
|
|
308 struct display_block *fixup);
|
|
|
309 static void calculate_baseline (pos_data *data);
|
|
428
|
310
|
|
800
|
311 static void sledgehammer_check_redisplay_structs (void);
|
|
|
312
|
|
428
|
313 /* This used to be 10 but 30 seems to give much better performance. */
|
|
|
314 #define INIT_MAX_PREEMPTS 30
|
|
|
315 static int max_preempts;
|
|
|
316
|
|
|
317 #define REDISPLAY_PREEMPTION_CHECK \
|
|
|
318 ((void) \
|
|
|
319 (preempted = \
|
|
|
320 (!disable_preemption && \
|
|
|
321 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
|
|
|
322 (!INTERACTIVE || detect_input_pending ()))))
|
|
|
323
|
|
|
324 /*
|
|
|
325 * Redisplay global variables.
|
|
|
326 */
|
|
|
327
|
|
|
328 /* We need a third set of display structures for the cursor motion
|
|
|
329 routines. We used to just give each window a third set. However,
|
|
|
330 we always fully regenerate the structures when needed so there
|
|
|
331 isn't any reason we need more than a single set. */
|
|
|
332 display_line_dynarr *cmotion_display_lines;
|
|
|
333
|
|
|
334 /* We store the extents that we need to generate in a Dynarr and then
|
|
|
335 frob them all on at the end of generating the string. We do it
|
|
|
336 this way rather than adding them as we generate the string because
|
|
|
337 we don't store the text into the resulting string until we're done
|
|
|
338 (to avoid having to resize the string multiple times), and we don't
|
|
|
339 want to go around adding extents to a string when the extents might
|
|
|
340 stretch off the end of the string. */
|
|
|
341 static EXTENT_dynarr *formatted_string_extent_dynarr;
|
|
|
342 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
|
|
|
343 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
|
|
|
344
|
|
|
345
|
|
|
346 /* #### probably temporary */
|
|
458
|
347 Fixnum cache_adjustment;
|
|
428
|
348
|
|
|
349 /* This holds a string representing the text corresponding to a single
|
|
|
350 modeline % spec. */
|
|
867
|
351 static Ibyte_dynarr *mode_spec_ibyte_string;
|
|
428
|
352
|
|
|
353 int in_display; /* 1 if in redisplay. */
|
|
|
354
|
|
|
355 int disable_preemption; /* Used for debugging redisplay and for
|
|
|
356 force-redisplay. */
|
|
|
357
|
|
|
358 /* We only allow max_preempts preemptions before we force a redisplay. */
|
|
|
359 static int preemption_count;
|
|
|
360
|
|
|
361 /* Minimum pixel height of clipped bottom display line. */
|
|
458
|
362 Fixnum vertical_clip;
|
|
428
|
363
|
|
|
364 /* Minimum visible pixel width of clipped glyphs at right margin. */
|
|
458
|
365 Fixnum horizontal_clip;
|
|
428
|
366
|
|
|
367 /* Nonzero means reading single-character input with prompt
|
|
|
368 so put cursor on minibuffer after the prompt. */
|
|
|
369 int cursor_in_echo_area;
|
|
|
370 Lisp_Object Qcursor_in_echo_area;
|
|
|
371
|
|
|
372 /* Nonzero means truncate lines in all windows less wide than the frame */
|
|
|
373 int truncate_partial_width_windows;
|
|
|
374
|
|
|
375 /* non-nil if a buffer has changed since the last time redisplay completed */
|
|
|
376 int buffers_changed;
|
|
|
377 int buffers_changed_set;
|
|
|
378
|
|
|
379 /* non-nil if hscroll has changed somewhere or a buffer has been
|
|
|
380 narrowed or widened */
|
|
|
381 int clip_changed;
|
|
|
382 int clip_changed_set;
|
|
|
383
|
|
|
384 /* non-nil if any extent has changed since the last time redisplay completed */
|
|
|
385 int extents_changed;
|
|
|
386 int extents_changed_set;
|
|
|
387
|
|
|
388 /* non-nil if any face has changed since the last time redisplay completed */
|
|
|
389 int faces_changed;
|
|
|
390
|
|
|
391 /* Nonzero means some frames have been marked as garbaged */
|
|
|
392 int frame_changed;
|
|
|
393
|
|
|
394 /* non-zero if any of the builtin display glyphs (continuation,
|
|
|
395 hscroll, control-arrow, etc) is in need of updating
|
|
|
396 somewhere. */
|
|
|
397 int glyphs_changed;
|
|
|
398 int glyphs_changed_set;
|
|
|
399
|
|
442
|
400 /* non-zero if any subwindow has been deleted. */
|
|
428
|
401 int subwindows_changed;
|
|
|
402 int subwindows_changed_set;
|
|
|
403
|
|
|
404 /* non-zero if any displayed subwindow is in need of updating
|
|
|
405 somewhere. */
|
|
|
406 int subwindows_state_changed;
|
|
|
407 int subwindows_state_changed_set;
|
|
|
408
|
|
|
409 /* This variable is 1 if the icon has to be updated.
|
|
|
410 It is set to 1 when `frame-icon-glyph' changes. */
|
|
|
411 int icon_changed;
|
|
|
412 int icon_changed_set;
|
|
|
413
|
|
|
414 /* This variable is 1 if the menubar widget has to be updated.
|
|
|
415 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
|
|
|
416 has been updated. */
|
|
|
417 int menubar_changed;
|
|
|
418 int menubar_changed_set;
|
|
|
419
|
|
|
420 /* true iff we should redraw the modelines on the next redisplay */
|
|
|
421 int modeline_changed;
|
|
|
422 int modeline_changed_set;
|
|
|
423
|
|
|
424 /* non-nil if point has changed in some buffer since the last time
|
|
|
425 redisplay completed */
|
|
|
426 int point_changed;
|
|
|
427 int point_changed_set;
|
|
|
428
|
|
|
429 /* non-nil if some frame has changed its size */
|
|
|
430 int size_changed;
|
|
|
431
|
|
|
432 /* non-nil if some device has signaled that it wants to change size */
|
|
|
433 int asynch_device_change_pending;
|
|
|
434
|
|
|
435 /* non-nil if any toolbar has changed */
|
|
|
436 int toolbar_changed;
|
|
|
437 int toolbar_changed_set;
|
|
|
438
|
|
|
439 /* non-nil if any gutter has changed */
|
|
|
440 int gutter_changed;
|
|
|
441 int gutter_changed_set;
|
|
|
442
|
|
|
443 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
444 int windows_changed;
|
|
|
445
|
|
|
446 /* non-nil if any frame's window structure has changed since the last
|
|
|
447 time redisplay completed */
|
|
|
448 int windows_structure_changed;
|
|
|
449
|
|
|
450 /* If non-nil, use vertical bar cursor. */
|
|
|
451 Lisp_Object Vbar_cursor;
|
|
|
452 Lisp_Object Qbar_cursor;
|
|
|
453
|
|
442
|
454 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
|
|
|
455 then the frame will flash instead of
|
|
|
456 beeping when an error occurs */
|
|
428
|
457
|
|
|
458 /* Nonzero means no need to redraw the entire frame on resuming
|
|
|
459 a suspended Emacs. This is useful on terminals with multiple pages,
|
|
|
460 where one page is used for Emacs and another for all else. */
|
|
|
461 int no_redraw_on_reenter;
|
|
|
462
|
|
|
463 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
|
|
|
464 under which emacs is running
|
|
|
465 ('x is the only current possibility) */
|
|
|
466 Lisp_Object Vinitial_window_system;
|
|
|
467
|
|
|
468 Lisp_Object Vglobal_mode_string;
|
|
|
469
|
|
|
470 /* The number of lines scroll a window by when point leaves the window; if
|
|
|
471 it is <=0 then point is centered in the window */
|
|
458
|
472 Fixnum scroll_step;
|
|
428
|
473
|
|
|
474 /* Scroll up to this many lines, to bring point back on screen. */
|
|
458
|
475 Fixnum scroll_conservatively;
|
|
428
|
476
|
|
|
477 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
478 Lisp_Object Voverlay_arrow_position;
|
|
|
479 /* String to display for the arrow. */
|
|
|
480 Lisp_Object Voverlay_arrow_string;
|
|
|
481
|
|
|
482 Lisp_Object Vwindow_size_change_functions;
|
|
|
483 Lisp_Object Vwindow_scroll_functions;
|
|
|
484 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
|
|
|
485
|
|
442
|
486 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
|
|
|
487
|
|
|
488
|
|
428
|
489 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
|
|
|
490 this more. */
|
|
|
491 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
492 /* #### Chuck says: I think this needs more thought.
|
|
|
493 Think about this for 19.14. */
|
|
|
494 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
|
|
|
495 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
|
|
|
496 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
497
|
|
458
|
498 static Fixnum last_display_warning_tick;
|
|
|
499 static Fixnum display_warning_tick;
|
|
428
|
500 Lisp_Object Qdisplay_warning_buffer;
|
|
|
501 int inhibit_warning_display;
|
|
|
502
|
|
|
503 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
504 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
505 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
506 Lisp_Object Vtext_cursor_visible_p;
|
|
|
507
|
|
|
508 int column_number_start_at_one;
|
|
|
509
|
|
442
|
510 Lisp_Object Qtop_bottom;
|
|
|
511
|
|
444
|
512 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
|
|
428
|
513
|
|
|
514
|
|
|
515 /***************************************************************************/
|
|
|
516 /* */
|
|
|
517 /* low-level interfaces onto device routines */
|
|
|
518 /* */
|
|
|
519 /***************************************************************************/
|
|
|
520
|
|
|
521 static int
|
|
867
|
522 redisplay_text_width_ichar_string (struct window *w, int findex,
|
|
|
523 Ichar *str, Charcount len)
|
|
428
|
524 {
|
|
|
525 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
526 Lisp_Object window;
|
|
|
527
|
|
867
|
528 find_charsets_in_ichar_string (charsets, str, len);
|
|
793
|
529 window = wrap_window (w);
|
|
428
|
530 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
531 charsets);
|
|
|
532 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
533 text_width, (XFRAME (WINDOW_FRAME (w)),
|
|
|
534 WINDOW_FACE_CACHEL (w, findex), str, len));
|
|
|
535 }
|
|
|
536
|
|
867
|
537 static Ichar_dynarr *rtw_ichar_dynarr;
|
|
428
|
538
|
|
|
539 int
|
|
|
540 redisplay_text_width_string (struct window *w, int findex,
|
|
867
|
541 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
542 Bytecount offset, Bytecount len)
|
|
|
543 {
|
|
867
|
544 if (!rtw_ichar_dynarr)
|
|
|
545 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
546 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
547
|
|
|
548 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
549 if (STRINGP (reloc))
|
|
|
550 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
551 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
552 return redisplay_text_width_ichar_string
|
|
|
553 (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
554 Dynarr_length (rtw_ichar_dynarr));
|
|
428
|
555 }
|
|
|
556
|
|
|
557 int
|
|
|
558 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
867
|
559 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
560 Bytecount offset, Bytecount len)
|
|
|
561 {
|
|
|
562 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
563 Lisp_Object frame;
|
|
|
564 struct face_cachel cachel;
|
|
|
565
|
|
867
|
566 if (!rtw_ichar_dynarr)
|
|
|
567 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
568 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
569
|
|
|
570 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
571 if (STRINGP (reloc))
|
|
|
572 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
573 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
574 find_charsets_in_ibyte_string (charsets, nonreloc, len);
|
|
428
|
575 reset_face_cachel (&cachel);
|
|
|
576 cachel.face = face;
|
|
793
|
577 frame = wrap_frame (f);
|
|
428
|
578 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
579 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
867
|
580 text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
581 Dynarr_length (rtw_ichar_dynarr)));
|
|
428
|
582 }
|
|
|
583
|
|
|
584 /* Return the display block from DL of the given TYPE. A display line
|
|
|
585 can have only one display block of each possible type. If DL does
|
|
|
586 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
587
|
|
|
588 struct display_block *
|
|
|
589 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
590 {
|
|
|
591 int elt;
|
|
|
592 struct display_block db;
|
|
|
593
|
|
|
594 /* Check if this display line already has a block of the desired type and
|
|
|
595 if so, return it. */
|
|
|
596 if (dl->display_blocks)
|
|
|
597 {
|
|
|
598 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
599 {
|
|
|
600 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
601 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
602 }
|
|
|
603
|
|
|
604 /* There isn't an active block of the desired type, but there
|
|
|
605 might still be allocated blocks we need to reuse. */
|
|
|
606 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
607 {
|
|
|
608 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
609
|
|
|
610 /* 'add' the block to the list */
|
|
|
611 Dynarr_increment (dl->display_blocks);
|
|
|
612
|
|
|
613 /* initialize and return */
|
|
|
614 dbp->type = type;
|
|
|
615 return dbp;
|
|
|
616 }
|
|
|
617 }
|
|
|
618 else
|
|
|
619 {
|
|
|
620 /* This line doesn't have any display blocks, so initialize the display
|
|
|
621 bock array. */
|
|
|
622 dl->display_blocks = Dynarr_new (display_block);
|
|
|
623 }
|
|
|
624
|
|
|
625 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
626 one and add it to the line. */
|
|
|
627 xzero (db);
|
|
|
628 db.type = type;
|
|
|
629 db.runes = Dynarr_new (rune);
|
|
|
630 Dynarr_add (dl->display_blocks, db);
|
|
|
631
|
|
|
632 /* Return the newly added display block. */
|
|
|
633 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
634
|
|
|
635 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
636 }
|
|
|
637
|
|
|
638 static int
|
|
|
639 tab_char_width (struct window *w)
|
|
|
640 {
|
|
|
641 struct buffer *b = XBUFFER (w->buffer);
|
|
|
642 int char_tab_width = XINT (b->tab_width);
|
|
|
643
|
|
|
644 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
645
|
|
|
646 return char_tab_width;
|
|
|
647 }
|
|
|
648
|
|
|
649 static int
|
|
|
650 space_width (struct window *w)
|
|
|
651 {
|
|
|
652 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
653 fonts the space character tends to give too narrow a value. So
|
|
|
654 we use 'n' instead. Except that we don't. We use the default
|
|
|
655 character width for the default face. If this is actually
|
|
|
656 defined by the font then it is probably the best thing to
|
|
|
657 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
658 already calculated its width. Thus we can avoid a call to
|
|
|
659 XTextWidth on X frames by just querying the default width. */
|
|
|
660 return XFONT_INSTANCE
|
|
|
661 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
662 }
|
|
|
663
|
|
|
664 static int
|
|
|
665 tab_pix_width (struct window *w)
|
|
|
666 {
|
|
|
667 return space_width (w) * tab_char_width (w);
|
|
|
668 }
|
|
|
669
|
|
|
670 /* Given a pixel position in a window, return the pixel location of
|
|
|
671 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
672 terms of spaces displayed in the default face. Formerly the space
|
|
|
673 width was determined using the currently active face. That method
|
|
|
674 leads to tabstops which do not line up. */
|
|
|
675
|
|
|
676 static int
|
|
|
677 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
678 {
|
|
|
679 int n_pos = left_pixpos;
|
|
|
680 int pix_tab_width = tab_pix_width (w);
|
|
|
681
|
|
|
682 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
683 if (WINDOW_SCROLLED (w))
|
|
|
684 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
|
|
|
685
|
|
|
686 while (n_pos <= start_pixpos)
|
|
|
687 n_pos += pix_tab_width;
|
|
|
688
|
|
|
689 return n_pos;
|
|
|
690 }
|
|
|
691
|
|
|
692 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
693 display line. The whitespace boundaries must be calculated by the text
|
|
|
694 layout routines. */
|
|
|
695
|
|
|
696 layout_bounds
|
|
|
697 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
698 {
|
|
|
699 layout_bounds bounds;
|
|
|
700
|
|
|
701 /* Set the outermost boundaries which are the boundaries of the
|
|
|
702 window itself minus the gutters (and minus the scrollbars if this
|
|
|
703 is for the modeline). */
|
|
|
704 if (!modeline)
|
|
|
705 {
|
|
|
706 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
707 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
708 }
|
|
|
709 else
|
|
|
710 {
|
|
|
711 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
712 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
713 }
|
|
|
714
|
|
|
715 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
716 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
717 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
718
|
|
|
719 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
720 depend on the contents of the line being displayed. */
|
|
|
721 bounds.left_white = bounds.left_in;
|
|
|
722 bounds.right_white = bounds.right_in;
|
|
|
723
|
|
|
724 return bounds;
|
|
|
725 }
|
|
|
726
|
|
819
|
727 /* This takes a display_block and its containing line and corrects the yoffset
|
|
|
728 of each glyph in the block to cater for the ascent of the line as a
|
|
|
729 whole. Must be called *after* the line-ascent is known! */
|
|
|
730
|
|
|
731 static void
|
|
|
732 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
|
|
|
733 {
|
|
|
734 int i;
|
|
|
735 for (i=0; i<Dynarr_length (fixup->runes); i++)
|
|
|
736 {
|
|
|
737 struct rune *r = Dynarr_atp (fixup->runes,i);
|
|
|
738 if (r->type == RUNE_DGLYPH)
|
|
|
739 {
|
|
|
740 if (r->object.dglyph.ascent < dl->ascent)
|
|
|
741 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
|
|
|
742 r->object.dglyph.descent;
|
|
|
743 }
|
|
|
744 }
|
|
|
745 }
|
|
|
746
|
|
|
747 /* Calculate the textual baseline (the ascent and descent values for the
|
|
|
748 display_line as a whole).
|
|
|
749
|
|
|
750 If the baseline is completely blank, or contains no manually positioned
|
|
|
751 glyphs, then the textual baseline is simply the baseline of the default font.
|
|
|
752 (The `contains no manually positioned glyphs' part is actually done for
|
|
867
|
753 us by `add_ichar_rune'.)
|
|
819
|
754
|
|
|
755 If the baseline contains pixmaps, and they're all manually positioned, then
|
|
|
756 the textual baseline location is constrained that way, and we need do no
|
|
|
757 work.
|
|
|
758
|
|
|
759 If the baseline contains pixmaps, and at least one is automatically
|
|
|
760 positioned, then the textual ascent is the largest ascent on the line, and
|
|
|
761 the textual descent is the largest descent (which is how things are set up at
|
|
|
762 entry to this function anyway): except that if the max_ascent + max_descent
|
|
|
763 is too small for the height of the line (say you've adjusted the baseline of
|
|
|
764 a short glyph, and there's a tall one next to it), then take the ascent and
|
|
|
765 descent for the line individually from the largest of the explicitly set
|
|
|
766 ascent/descent, and the rescaled ascent/descent of the default font, scaled
|
|
|
767 such that the largest glyph will fit.
|
|
|
768
|
|
|
769 This means that if you have a short glyph (but taller than the default
|
|
|
770 font's descent) forced right under the baseline, and a really tall
|
|
|
771 automatically positioned glyph, that the descent for the line is just big
|
|
|
772 enough for the manually positioned short glyph, and the tall one uses as
|
|
|
773 much of that space as the default font would were it as tall as the tall
|
|
|
774 glyph; but that the ascent is big enough for the tall glyph to fit.
|
|
|
775
|
|
|
776 This behaviour means that under no circumstances will changing the baseline
|
|
|
777 of a short glyph cause a tall glyph to move around; nor will it move the
|
|
|
778 textual baseline more than necessary. (Changing a tall glyph's baseline
|
|
|
779 might move the text's baseline arbitrarily, of course.) */
|
|
|
780
|
|
|
781 static void
|
|
|
782 calculate_baseline (pos_data *data)
|
|
|
783 {
|
|
|
784 /* Blank line: baseline is default font's baseline. */
|
|
|
785
|
|
|
786 if (!data->new_ascent && !data->new_descent)
|
|
|
787 {
|
|
|
788 /* We've got a blank line so initialize these values from the default
|
|
|
789 face. */
|
|
|
790 default_face_font_info (data->window, &data->new_ascent,
|
|
|
791 &data->new_descent, 0, 0, 0);
|
|
|
792 }
|
|
|
793
|
|
|
794 /* No automatically positioned glyphs? Return at once. */
|
|
|
795 if (!data->need_baseline_computation)
|
|
|
796 return;
|
|
|
797
|
|
|
798 /* Is the tallest glyph on the line automatically positioned?
|
|
|
799 If it's manually positioned, or it's automatically positioned
|
|
|
800 and there's enough room for it anyway, we need do no more work. */
|
|
|
801 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
802 {
|
|
|
803 int default_font_ascent, default_font_descent, default_font_height;
|
|
|
804 int scaled_default_font_ascent, scaled_default_font_descent;
|
|
|
805
|
|
|
806 default_face_font_info (data->window, &default_font_ascent,
|
|
|
807 &default_font_descent, &default_font_height,
|
|
|
808 0, 0);
|
|
|
809
|
|
|
810 scaled_default_font_ascent = data->max_pixmap_height *
|
|
|
811 default_font_ascent / default_font_height;
|
|
|
812
|
|
|
813 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
|
|
|
814
|
|
|
815 /* The ascent may have expanded now. Do we still need to grow the descent,
|
|
|
816 or are things big enough?
|
|
|
817
|
|
|
818 The +1 caters for the baseline row itself. */
|
|
|
819 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
820 {
|
|
|
821 scaled_default_font_descent = (data->max_pixmap_height *
|
|
|
822 default_font_descent / default_font_height) + 1;
|
|
|
823
|
|
|
824 data->new_descent = max (data->new_descent, scaled_default_font_descent);
|
|
|
825 }
|
|
|
826 }
|
|
|
827 }
|
|
|
828
|
|
428
|
829 /* Given a display line and a starting position, ensure that the
|
|
|
830 contents of the display line accurately represent the visual
|
|
|
831 representation of the buffer contents starting from the given
|
|
|
832 position when displayed in the given window. The display line ends
|
|
|
833 when the contents of the line reach the right boundary of the given
|
|
|
834 window. */
|
|
|
835
|
|
665
|
836 static Charbpos
|
|
428
|
837 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
665
|
838 Charbpos start_pos, prop_block_dynarr **prop,
|
|
428
|
839 int type)
|
|
|
840 {
|
|
826
|
841 Charbpos ret_charpos;
|
|
428
|
842 int overlay_width;
|
|
|
843 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
844
|
|
|
845 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
846 if (!bounds)
|
|
|
847 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
848
|
|
|
849 /* Reset what this line is using. */
|
|
|
850 if (dl->display_blocks)
|
|
|
851 Dynarr_reset (dl->display_blocks);
|
|
|
852 if (dl->left_glyphs)
|
|
|
853 {
|
|
|
854 Dynarr_free (dl->left_glyphs);
|
|
|
855 dl->left_glyphs = 0;
|
|
|
856 }
|
|
|
857 if (dl->right_glyphs)
|
|
|
858 {
|
|
|
859 Dynarr_free (dl->right_glyphs);
|
|
|
860 dl->right_glyphs = 0;
|
|
|
861 }
|
|
|
862
|
|
|
863 /* We aren't generating a modeline at the moment. */
|
|
|
864 dl->modeline = 0;
|
|
|
865
|
|
|
866 /* Create a display block for the text region of the line. */
|
|
|
867 {
|
|
|
868 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
665
|
869 Bytebpos hacked_up_bytebpos =
|
|
|
870 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
|
|
428
|
871 prop, type);
|
|
826
|
872 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
|
|
|
873 ret_charpos = BUF_ZV (b) + 1;
|
|
428
|
874 else
|
|
826
|
875 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
|
|
428
|
876 }
|
|
826
|
877 dl->charpos = start_pos;
|
|
|
878 if (dl->end_charpos < dl->charpos)
|
|
|
879 dl->end_charpos = dl->charpos;
|
|
428
|
880
|
|
|
881 if (MARKERP (Voverlay_arrow_position)
|
|
|
882 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
883 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
884 && (STRINGP (Voverlay_arrow_string)
|
|
|
885 || GLYPHP (Voverlay_arrow_string)))
|
|
|
886 {
|
|
|
887 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
888 }
|
|
|
889 else
|
|
|
890 overlay_width = 0;
|
|
|
891
|
|
|
892 /* If there are left glyphs associated with any character in the
|
|
|
893 text block, then create a display block to handle them. */
|
|
|
894 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
895 create_left_glyph_block (w, dl, overlay_width);
|
|
|
896
|
|
|
897 /* If there are right glyphs associated with any character in the
|
|
|
898 text block, then create a display block to handle them. */
|
|
|
899 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
900 create_right_glyph_block (w, dl);
|
|
|
901
|
|
|
902 /* In the future additional types of display blocks may be generated
|
|
|
903 here. */
|
|
|
904
|
|
826
|
905 w->last_redisplay_pos = ret_charpos;
|
|
|
906
|
|
|
907 return ret_charpos;
|
|
428
|
908 }
|
|
|
909
|
|
|
910 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
911 the block had better be empty.
|
|
|
912
|
|
|
913 Yes, there are multiple places where this function is called but
|
|
|
914 that is the way it has to be. Each calling function has to deal
|
|
826
|
915 with byte_start_col_enabled a little differently depending on the
|
|
428
|
916 object being worked with. */
|
|
|
917
|
|
|
918 static prop_block_dynarr *
|
|
|
919 add_hscroll_rune (pos_data *data)
|
|
|
920 {
|
|
|
921 struct glyph_block gb;
|
|
|
922 prop_block_dynarr *retval;
|
|
826
|
923 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
924 int old_cursor_type = data->cursor_type;
|
|
826
|
925 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
926
|
|
|
927 if (data->cursor_type == CURSOR_ON
|
|
826
|
928 && data->byte_cursor_charpos >= data->byte_start_col_enabled
|
|
|
929 && data->byte_cursor_charpos <= data->byte_charpos)
|
|
|
930 {
|
|
|
931 data->byte_cursor_charpos = data->byte_start_col_enabled;
|
|
428
|
932 }
|
|
|
933 else
|
|
|
934 {
|
|
|
935 data->cursor_type = NO_CURSOR;
|
|
|
936 }
|
|
|
937
|
|
826
|
938 data->byte_endpos = data->byte_charpos;
|
|
|
939 data->byte_charpos = data->byte_start_col_enabled;
|
|
428
|
940
|
|
|
941 gb.extent = Qnil;
|
|
|
942 gb.glyph = Vhscroll_glyph;
|
|
|
943 {
|
|
|
944 int oldpixpos = data->pixpos;
|
|
442
|
945 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
|
|
428
|
946 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
947 HSCROLL_GLYPH_INDEX));
|
|
|
948 data->hscroll_glyph_width_adjust =
|
|
|
949 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
|
|
|
950 }
|
|
826
|
951 data->byte_endpos = 0;
|
|
|
952 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
953 data->cursor_type = old_cursor_type;
|
|
826
|
954 data->byte_charpos = byte_old_charpos;
|
|
|
955
|
|
|
956 data->byte_start_col_enabled = 0;
|
|
428
|
957 return retval;
|
|
|
958 }
|
|
|
959
|
|
793
|
960 /* Adds a character rune to a display block. If there is not enough room
|
|
|
961 to fit the rune on the display block (as determined by the MAX_PIXPOS)
|
|
|
962 then it adds nothing and returns ADD_FAILED. If
|
|
|
963 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
|
|
867
|
964 to affect the total line height. (See add_ibyte_string_runes()). */
|
|
428
|
965
|
|
|
966 static prop_block_dynarr *
|
|
867
|
967 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height)
|
|
428
|
968 {
|
|
|
969 struct rune rb, *crb;
|
|
|
970 int width, local;
|
|
|
971
|
|
|
972 if (data->start_col)
|
|
|
973 {
|
|
|
974 data->start_col--;
|
|
|
975
|
|
|
976 if (data->start_col)
|
|
|
977 return NULL;
|
|
|
978 }
|
|
|
979
|
|
826
|
980 if (data->byte_start_col_enabled)
|
|
428
|
981 {
|
|
|
982 return add_hscroll_rune (data);
|
|
|
983 }
|
|
|
984
|
|
|
985 if (data->ch == '\n')
|
|
|
986 {
|
|
|
987 data->font_is_bogus = 0;
|
|
|
988 /* Cheesy end-of-line pseudo-character. */
|
|
|
989 width = data->blank_width;
|
|
|
990 }
|
|
|
991 else
|
|
|
992 {
|
|
867
|
993 Lisp_Object charset = ichar_charset (data->ch);
|
|
428
|
994 if (!EQ (charset, data->last_charset) ||
|
|
|
995 data->findex != data->last_findex)
|
|
|
996 {
|
|
|
997 /* OK, we need to do things the hard way. */
|
|
|
998 struct window *w = XWINDOW (data->window);
|
|
|
999 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
1000 Lisp_Object font_instance =
|
|
|
1001 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
1002 charset);
|
|
440
|
1003 Lisp_Font_Instance *fi;
|
|
428
|
1004
|
|
|
1005 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
1006 {
|
|
|
1007 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
1008 data->font_is_bogus = 1;
|
|
|
1009 }
|
|
|
1010 else
|
|
|
1011 data->font_is_bogus = 0;
|
|
|
1012
|
|
|
1013 fi = XFONT_INSTANCE (font_instance);
|
|
771
|
1014 if (!fi->proportional_p || data->font_is_bogus)
|
|
|
1015 {
|
|
867
|
1016 Ichar ch = data->font_is_bogus ? '~' : data->ch;
|
|
771
|
1017
|
|
|
1018 data->last_char_width =
|
|
867
|
1019 redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1020 data->findex, &ch, 1);
|
|
|
1021 }
|
|
428
|
1022 else
|
|
|
1023 data->last_char_width = -1;
|
|
819
|
1024
|
|
793
|
1025 if (!no_contribute_to_line_height)
|
|
|
1026 {
|
|
|
1027 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
|
1028 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
1029 }
|
|
819
|
1030
|
|
428
|
1031 data->last_charset = charset;
|
|
|
1032 data->last_findex = data->findex;
|
|
|
1033 }
|
|
|
1034
|
|
|
1035 width = data->last_char_width;
|
|
771
|
1036 if (width < 0) /* proportional fonts */
|
|
867
|
1037 width = redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1038 data->findex,
|
|
|
1039 &data->ch, 1);
|
|
428
|
1040 }
|
|
|
1041
|
|
|
1042 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
1043 {
|
|
|
1044 return ADD_FAILED;
|
|
|
1045 }
|
|
|
1046
|
|
|
1047 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
1048 {
|
|
|
1049 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
1050 local = 0;
|
|
|
1051 }
|
|
|
1052 else
|
|
|
1053 {
|
|
|
1054 crb = &rb;
|
|
|
1055 local = 1;
|
|
|
1056 }
|
|
|
1057
|
|
|
1058 crb->findex = data->findex;
|
|
|
1059 crb->xpos = data->pixpos;
|
|
|
1060 crb->width = width;
|
|
826
|
1061 if (data->byte_charpos)
|
|
428
|
1062 {
|
|
|
1063 if (NILP (data->string))
|
|
826
|
1064 crb->charpos =
|
|
793
|
1065 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
|
|
|
1066 (XWINDOW (data->window))),
|
|
826
|
1067 data->byte_charpos);
|
|
428
|
1068 else
|
|
826
|
1069 crb->charpos =
|
|
|
1070 string_index_byte_to_char (data->string, data->byte_charpos);
|
|
428
|
1071 }
|
|
|
1072 else if (data->is_modeline)
|
|
826
|
1073 crb->charpos = data->modeline_charpos;
|
|
428
|
1074 else
|
|
442
|
1075 /* Text but not in buffer */
|
|
826
|
1076 crb->charpos = 0;
|
|
428
|
1077 crb->type = RUNE_CHAR;
|
|
|
1078 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1079 crb->endpos = 0;
|
|
|
1080
|
|
|
1081 if (data->cursor_type == CURSOR_ON)
|
|
|
1082 {
|
|
826
|
1083 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1084 {
|
|
|
1085 crb->cursor_type = CURSOR_ON;
|
|
|
1086 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1087 }
|
|
|
1088 else
|
|
|
1089 crb->cursor_type = CURSOR_OFF;
|
|
|
1090 }
|
|
|
1091 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1092 {
|
|
|
1093 crb->cursor_type = CURSOR_ON;
|
|
|
1094 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1095 data->cursor_type = NO_CURSOR;
|
|
|
1096 }
|
|
|
1097 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1098 crb->cursor_type = IGNORE_CURSOR;
|
|
|
1099 else
|
|
|
1100 crb->cursor_type = CURSOR_OFF;
|
|
|
1101
|
|
|
1102 if (local)
|
|
|
1103 Dynarr_add (data->db->runes, *crb);
|
|
|
1104 else
|
|
|
1105 Dynarr_increment (data->db->runes);
|
|
|
1106
|
|
|
1107 data->pixpos += width;
|
|
|
1108
|
|
|
1109 return NULL;
|
|
|
1110 }
|
|
|
1111
|
|
793
|
1112 static prop_block_dynarr *
|
|
867
|
1113 add_ichar_rune (pos_data *data)
|
|
|
1114 {
|
|
|
1115 return add_ichar_rune_1 (data, 0);
|
|
|
1116 }
|
|
|
1117
|
|
|
1118 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for
|
|
793
|
1119 each character in the string. Propagate any left-over data unless
|
|
|
1120 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
|
|
|
1121 allow this character to increase the total height of the line. (This is
|
|
|
1122 used when the character is part of a text glyph. In that case, the
|
|
|
1123 glyph code itself adjusts the line height as necessary, depending on
|
|
|
1124 whether glyph-contrib-p is true.) */
|
|
428
|
1125
|
|
|
1126 static prop_block_dynarr *
|
|
867
|
1127 add_ibyte_string_runes (pos_data *data, Ibyte *c_string,
|
|
793
|
1128 Bytecount c_length, int no_prop,
|
|
|
1129 int no_contribute_to_line_height)
|
|
428
|
1130 {
|
|
867
|
1131 Ibyte *pos, *end = c_string + c_length;
|
|
428
|
1132 prop_block_dynarr *prop;
|
|
|
1133
|
|
|
1134 /* #### This function is too simplistic. It needs to do the same
|
|
|
1135 sort of character interpretation (display-table lookup,
|
|
|
1136 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
1137 The functionality to do this in that routine needs to be
|
|
|
1138 modularized. */
|
|
|
1139
|
|
|
1140 for (pos = c_string; pos < end;)
|
|
|
1141 {
|
|
867
|
1142 Ibyte *old_pos = pos;
|
|
|
1143
|
|
|
1144 data->ch = itext_ichar (pos);
|
|
|
1145
|
|
|
1146 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
|
|
428
|
1147
|
|
|
1148 if (prop)
|
|
|
1149 {
|
|
|
1150 if (no_prop)
|
|
|
1151 return ADD_FAILED;
|
|
|
1152 else
|
|
|
1153 {
|
|
|
1154 struct prop_block pb;
|
|
|
1155 Bytecount len = end - pos;
|
|
|
1156 prop = Dynarr_new (prop_block);
|
|
|
1157
|
|
|
1158 pb.type = PROP_STRING;
|
|
867
|
1159 pb.data.p_string.str = xnew_array (Ibyte, len);
|
|
428
|
1160 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
1161 pb.data.p_string.len = len;
|
|
|
1162
|
|
|
1163 Dynarr_add (prop, pb);
|
|
|
1164 return prop;
|
|
|
1165 }
|
|
|
1166 }
|
|
867
|
1167 INC_IBYTEPTR (pos);
|
|
428
|
1168 assert (pos <= end);
|
|
464
|
1169 /* #### Duplicate code from add_string_to_fstring_db_runes
|
|
|
1170 should we do more?*/
|
|
|
1171 data->bytepos += pos - old_pos;
|
|
428
|
1172 }
|
|
|
1173
|
|
|
1174 return NULL;
|
|
|
1175 }
|
|
|
1176
|
|
|
1177 /* Add a single rune of the specified width. The area covered by this
|
|
|
1178 rune will be displayed in the foreground color of the associated
|
|
|
1179 face. */
|
|
|
1180
|
|
|
1181 static prop_block_dynarr *
|
|
|
1182 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1183 {
|
|
|
1184 struct rune rb;
|
|
|
1185
|
|
|
1186 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1187 been to add it as a tab. */
|
|
|
1188 if (data->start_col)
|
|
|
1189 {
|
|
|
1190 /* assert (w != NULL) */
|
|
|
1191 prop_block_dynarr *retval;
|
|
|
1192
|
|
|
1193 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1194 the width of this tab and return. */
|
|
|
1195 if (char_tab_width < data->start_col)
|
|
|
1196 {
|
|
|
1197 data->start_col -= char_tab_width;
|
|
|
1198 return NULL;
|
|
|
1199 }
|
|
|
1200 else if (char_tab_width == data->start_col)
|
|
|
1201 data->blank_width = 0;
|
|
|
1202 else
|
|
|
1203 {
|
|
|
1204 int spcwid = space_width (w);
|
|
|
1205
|
|
|
1206 if (spcwid >= data->blank_width)
|
|
|
1207 data->blank_width = 0;
|
|
|
1208 else
|
|
|
1209 data->blank_width -= spcwid;
|
|
|
1210 }
|
|
|
1211
|
|
|
1212 data->start_col = 0;
|
|
|
1213 retval = add_hscroll_rune (data);
|
|
|
1214
|
|
|
1215 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1216 if (retval != NULL || !data->blank_width)
|
|
|
1217 return retval;
|
|
|
1218 }
|
|
|
1219
|
|
|
1220 /* Blank runes are always calculated to fit. */
|
|
|
1221 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1222
|
|
|
1223 rb.findex = data->findex;
|
|
|
1224 rb.xpos = data->pixpos;
|
|
|
1225 rb.width = data->blank_width;
|
|
826
|
1226 if (data->byte_charpos)
|
|
|
1227 rb.charpos =
|
|
665
|
1228 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
|
|
826
|
1229 data->byte_charpos);
|
|
428
|
1230 else
|
|
|
1231 /* #### and this is really correct too? */
|
|
826
|
1232 rb.charpos = 0;
|
|
428
|
1233 rb.endpos = 0;
|
|
|
1234 rb.type = RUNE_BLANK;
|
|
|
1235
|
|
|
1236 if (data->cursor_type == CURSOR_ON)
|
|
|
1237 {
|
|
826
|
1238 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1239 {
|
|
|
1240 rb.cursor_type = CURSOR_ON;
|
|
|
1241 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1242 }
|
|
|
1243 else
|
|
|
1244 rb.cursor_type = CURSOR_OFF;
|
|
|
1245 }
|
|
|
1246 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1247 {
|
|
|
1248 rb.cursor_type = CURSOR_ON;
|
|
|
1249 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1250 data->cursor_type = NO_CURSOR;
|
|
|
1251 }
|
|
|
1252 else
|
|
|
1253 rb.cursor_type = CURSOR_OFF;
|
|
|
1254
|
|
|
1255 Dynarr_add (data->db->runes, rb);
|
|
|
1256 data->pixpos += data->blank_width;
|
|
|
1257
|
|
|
1258 return NULL;
|
|
|
1259 }
|
|
|
1260
|
|
|
1261 /* Add runes representing a character in octal. */
|
|
|
1262
|
|
|
1263 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1264 { \
|
|
867
|
1265 if (add_failed || (add_failed = add_ichar_rune (data))) \
|
|
428
|
1266 { \
|
|
|
1267 struct prop_block pb; \
|
|
|
1268 if (!prop) \
|
|
|
1269 prop = Dynarr_new (prop_block); \
|
|
|
1270 \
|
|
|
1271 pb.type = PROP_CHAR; \
|
|
|
1272 pb.data.p_char.ch = data->ch; \
|
|
|
1273 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1274 Dynarr_add (prop, pb); \
|
|
|
1275 } \
|
|
|
1276 } while (0)
|
|
|
1277
|
|
|
1278 static prop_block_dynarr *
|
|
|
1279 add_octal_runes (pos_data *data)
|
|
|
1280 {
|
|
819
|
1281 prop_block_dynarr *add_failed, *prop = 0;
|
|
867
|
1282 Ichar orig_char = data->ch;
|
|
647
|
1283 int orig_cursor_type = data->cursor_type;
|
|
428
|
1284
|
|
|
1285 /* Initialize */
|
|
|
1286 add_failed = NULL;
|
|
|
1287
|
|
|
1288 if (data->start_col)
|
|
|
1289 data->start_col--;
|
|
|
1290
|
|
|
1291 if (!data->start_col)
|
|
|
1292 {
|
|
826
|
1293 if (data->byte_start_col_enabled)
|
|
428
|
1294 {
|
|
|
1295 add_failed = add_hscroll_rune (data);
|
|
|
1296 }
|
|
|
1297 else
|
|
|
1298 {
|
|
|
1299 struct glyph_block gb;
|
|
|
1300 struct window *w = XWINDOW (data->window);
|
|
|
1301
|
|
|
1302 gb.extent = Qnil;
|
|
|
1303 gb.glyph = Voctal_escape_glyph;
|
|
|
1304 add_failed =
|
|
|
1305 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1306 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1307 }
|
|
|
1308 }
|
|
|
1309
|
|
|
1310 /* We only propagate information if the glyph was partially
|
|
|
1311 added. */
|
|
|
1312 if (add_failed)
|
|
|
1313 return add_failed;
|
|
|
1314
|
|
|
1315 data->cursor_type = IGNORE_CURSOR;
|
|
|
1316
|
|
|
1317 if (data->ch >= 0x100)
|
|
|
1318 {
|
|
|
1319 /* If the character is an extended Mule character, it could have
|
|
|
1320 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1321 octal number. This is not that pretty, but whatever. */
|
|
|
1322 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1323 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1324
|
|
|
1325 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1326 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1327
|
|
|
1328 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1329 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1330
|
|
|
1331 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1332 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1333 }
|
|
|
1334
|
|
|
1335 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1336 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1337
|
|
|
1338 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1339 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1340
|
|
|
1341 data->ch = (7 & orig_char) + '0';
|
|
|
1342 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1343
|
|
|
1344 data->cursor_type = orig_cursor_type;
|
|
819
|
1345 return NULL;
|
|
428
|
1346 }
|
|
|
1347
|
|
|
1348 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1349
|
|
|
1350 /* Add runes representing a control character to a display block. */
|
|
|
1351
|
|
|
1352 static prop_block_dynarr *
|
|
|
1353 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1354 {
|
|
|
1355 if (!NILP (b->ctl_arrow))
|
|
|
1356 {
|
|
|
1357 prop_block_dynarr *prop;
|
|
867
|
1358 Ichar orig_char = data->ch;
|
|
647
|
1359 int old_cursor_type = data->cursor_type;
|
|
428
|
1360
|
|
|
1361 /* Initialize */
|
|
|
1362 prop = NULL;
|
|
|
1363
|
|
|
1364 if (data->start_col)
|
|
|
1365 data->start_col--;
|
|
|
1366
|
|
|
1367 if (!data->start_col)
|
|
|
1368 {
|
|
826
|
1369 if (data->byte_start_col_enabled)
|
|
428
|
1370 {
|
|
|
1371 prop_block_dynarr *retval;
|
|
|
1372
|
|
|
1373 retval = add_hscroll_rune (data);
|
|
|
1374 if (retval)
|
|
|
1375 return retval;
|
|
|
1376 }
|
|
|
1377 else
|
|
|
1378 {
|
|
|
1379 struct glyph_block gb;
|
|
|
1380 struct window *w = XWINDOW (data->window);
|
|
|
1381
|
|
|
1382 gb.extent = Qnil;
|
|
|
1383 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1384
|
|
|
1385 /* We only propagate information if the glyph was partially
|
|
|
1386 added. */
|
|
|
1387 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1388 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1389 return ADD_FAILED;
|
|
|
1390 }
|
|
|
1391 }
|
|
|
1392
|
|
|
1393 if (orig_char == 0177)
|
|
|
1394 data->ch = '?';
|
|
|
1395 else
|
|
|
1396 data->ch = orig_char ^ 0100;
|
|
|
1397 data->cursor_type = IGNORE_CURSOR;
|
|
|
1398
|
|
867
|
1399 if (add_ichar_rune (data))
|
|
428
|
1400 {
|
|
|
1401 struct prop_block pb;
|
|
|
1402 if (!prop)
|
|
|
1403 prop = Dynarr_new (prop_block);
|
|
|
1404
|
|
|
1405 pb.type = PROP_CHAR;
|
|
|
1406 pb.data.p_char.ch = data->ch;
|
|
|
1407 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1408 Dynarr_add (prop, pb);
|
|
|
1409 }
|
|
|
1410
|
|
|
1411 data->cursor_type = old_cursor_type;
|
|
|
1412 return prop;
|
|
|
1413 }
|
|
|
1414 else
|
|
|
1415 {
|
|
|
1416 return add_octal_runes (data);
|
|
|
1417 }
|
|
|
1418 }
|
|
|
1419
|
|
|
1420 static prop_block_dynarr *
|
|
|
1421 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
|
|
|
1422 {
|
|
|
1423 prop_block_dynarr *prop = NULL;
|
|
|
1424
|
|
|
1425 if (STRINGP (entry))
|
|
|
1426 {
|
|
867
|
1427 prop = add_ibyte_string_runes (data,
|
|
428
|
1428 XSTRING_DATA (entry),
|
|
|
1429 XSTRING_LENGTH (entry),
|
|
793
|
1430 0, 0);
|
|
428
|
1431 }
|
|
|
1432 else if (GLYPHP (entry))
|
|
|
1433 {
|
|
|
1434 if (data->start_col)
|
|
|
1435 data->start_col--;
|
|
|
1436
|
|
826
|
1437 if (!data->start_col && data->byte_start_col_enabled)
|
|
428
|
1438 {
|
|
|
1439 prop = add_hscroll_rune (data);
|
|
|
1440 }
|
|
|
1441 else
|
|
|
1442 {
|
|
|
1443 struct glyph_block gb;
|
|
|
1444
|
|
|
1445 gb.glyph = entry;
|
|
|
1446 gb.extent = Qnil;
|
|
|
1447 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1448 }
|
|
|
1449 }
|
|
|
1450 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1451 {
|
|
|
1452 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
867
|
1453 prop = add_ichar_rune (data);
|
|
428
|
1454 }
|
|
|
1455 else if (CONSP (entry))
|
|
|
1456 {
|
|
|
1457 if (EQ (XCAR (entry), Qformat)
|
|
|
1458 && CONSP (XCDR (entry))
|
|
|
1459 && STRINGP (XCAR (XCDR (entry))))
|
|
|
1460 {
|
|
|
1461 Lisp_Object format = XCAR (XCDR (entry));
|
|
665
|
1462 Bytebpos len = XSTRING_LENGTH (format);
|
|
867
|
1463 Ibyte *src = XSTRING_DATA (format), *end = src + len;
|
|
|
1464 Ibyte *result = alloca_array (Ibyte, len);
|
|
|
1465 Ibyte *dst = result;
|
|
428
|
1466
|
|
|
1467 while (src < end)
|
|
|
1468 {
|
|
867
|
1469 Ichar c = itext_ichar (src);
|
|
|
1470 INC_IBYTEPTR (src);
|
|
428
|
1471 if (c != '%' || src == end)
|
|
867
|
1472 dst += set_itext_ichar (dst, c);
|
|
428
|
1473 else
|
|
|
1474 {
|
|
867
|
1475 c = itext_ichar (src);
|
|
|
1476 INC_IBYTEPTR (src);
|
|
428
|
1477 switch (c)
|
|
|
1478 {
|
|
|
1479 /*case 'x':
|
|
|
1480 dst += long_to_string_base ((char *)dst, data->ch, 16);
|
|
|
1481 break;*/
|
|
|
1482 case '%':
|
|
867
|
1483 dst += set_itext_ichar (dst, '%');
|
|
428
|
1484 break;
|
|
442
|
1485 /* #### unimplemented */
|
|
428
|
1486 }
|
|
|
1487 }
|
|
|
1488 }
|
|
867
|
1489 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
|
|
428
|
1490 }
|
|
|
1491 }
|
|
|
1492
|
|
|
1493 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1494 have any safe way of signaling an error. */
|
|
|
1495 return prop;
|
|
|
1496 }
|
|
|
1497
|
|
|
1498 /* Given a display table entry, call the appropriate functions to
|
|
|
1499 display each element of the entry. */
|
|
|
1500
|
|
|
1501 static prop_block_dynarr *
|
|
|
1502 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1503 {
|
|
|
1504 prop_block_dynarr *prop = NULL;
|
|
|
1505 if (VECTORP (entry))
|
|
|
1506 {
|
|
440
|
1507 Lisp_Vector *de = XVECTOR (entry);
|
|
428
|
1508 EMACS_INT len = vector_length (de);
|
|
|
1509 int elt;
|
|
|
1510
|
|
|
1511 for (elt = 0; elt < len; elt++)
|
|
|
1512 {
|
|
|
1513 if (NILP (vector_data (de)[elt]))
|
|
|
1514 continue;
|
|
|
1515 else
|
|
|
1516 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
|
|
|
1517 /* Else blow it off because someone added a bad entry and we
|
|
|
1518 don't have any safe way of signaling an error. Hey, this
|
|
|
1519 comment sounds familiar. */
|
|
|
1520
|
|
|
1521 /* #### Still need to add any remaining elements to the
|
|
|
1522 propagation information. */
|
|
|
1523 if (prop)
|
|
|
1524 return prop;
|
|
|
1525 }
|
|
|
1526 }
|
|
|
1527 else
|
|
|
1528 prop = add_disp_table_entry_runes_1 (data, entry);
|
|
|
1529 return prop;
|
|
|
1530 }
|
|
|
1531
|
|
|
1532 /* Add runes which were propagated from the previous line. */
|
|
|
1533
|
|
|
1534 static prop_block_dynarr *
|
|
|
1535 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1536 {
|
|
|
1537 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1538 this is finished. */
|
|
|
1539 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1540 case of not all the propagation blocks being added was not handled
|
|
|
1541 well. */
|
|
|
1542 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1543 of bogus. A cleaner solution is just to check for
|
|
|
1544 Dynarr_length (prop) > 0. */
|
|
|
1545 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1546 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1547 record? */
|
|
|
1548 int elt;
|
|
|
1549 prop_block_dynarr *add_failed;
|
|
826
|
1550 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
1551 int old_cursor_type = data->cursor_type;
|
|
428
|
1552
|
|
|
1553 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1554 {
|
|
|
1555 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1556
|
|
|
1557 switch (pb->type)
|
|
|
1558 {
|
|
|
1559 case PROP_CHAR:
|
|
|
1560 data->ch = pb->data.p_char.ch;
|
|
826
|
1561 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
|
|
428
|
1562 data->cursor_type = pb->data.p_char.cursor_type;
|
|
867
|
1563 add_failed = add_ichar_rune (data);
|
|
428
|
1564
|
|
|
1565 if (add_failed)
|
|
|
1566 goto oops_no_more_space;
|
|
|
1567 break;
|
|
|
1568 case PROP_STRING:
|
|
|
1569 if (pb->data.p_string.str)
|
|
|
1570 xfree (pb->data.p_string.str);
|
|
|
1571 /* #### bogus bogus -- this doesn't do anything!
|
|
867
|
1572 Should probably call add_ibyte_string_runes(),
|
|
428
|
1573 once that function is fixed. */
|
|
|
1574 break;
|
|
|
1575 case PROP_MINIBUF_PROMPT:
|
|
|
1576 {
|
|
|
1577 face_index old_findex = data->findex;
|
|
826
|
1578 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
1579
|
|
|
1580 data->findex = DEFAULT_INDEX;
|
|
826
|
1581 data->byte_charpos = 0;
|
|
428
|
1582 data->cursor_type = NO_CURSOR;
|
|
|
1583
|
|
|
1584 while (pb->data.p_string.len > 0)
|
|
|
1585 {
|
|
867
|
1586 data->ch = itext_ichar (pb->data.p_string.str);
|
|
|
1587 add_failed = add_ichar_rune (data);
|
|
428
|
1588
|
|
|
1589 if (add_failed)
|
|
|
1590 {
|
|
|
1591 data->findex = old_findex;
|
|
826
|
1592 data->byte_charpos = byte_old_charpos;
|
|
428
|
1593 goto oops_no_more_space;
|
|
|
1594 }
|
|
|
1595 else
|
|
|
1596 {
|
|
|
1597 /* Complicated equivalent of ptr++, len-- */
|
|
867
|
1598 Ibyte *oldpos = pb->data.p_string.str;
|
|
|
1599 INC_IBYTEPTR (pb->data.p_string.str);
|
|
428
|
1600 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1601 }
|
|
|
1602 }
|
|
|
1603
|
|
|
1604 data->findex = old_findex;
|
|
|
1605 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
826
|
1606 this function, data->byte_charpos is automatically incremented.
|
|
428
|
1607 However, we don't want that to happen if we were adding
|
|
|
1608 the minibuffer prompt. */
|
|
|
1609 {
|
|
|
1610 struct buffer *buf =
|
|
|
1611 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1612 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
826
|
1613 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
|
|
|
1614 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
|
|
428
|
1615 else
|
|
|
1616 /* #### is this correct? Does anyone know?
|
|
|
1617 Does anyone care? Is this a cheesy hack or what? */
|
|
826
|
1618 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
|
|
428
|
1619 }
|
|
|
1620 }
|
|
|
1621 break;
|
|
|
1622 case PROP_BLANK:
|
|
|
1623 {
|
|
|
1624 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1625 the blank_width, as it implies that the value carries
|
|
|
1626 over from one rune to the next, which is wrong. */
|
|
|
1627 int old_width = data->blank_width;
|
|
|
1628 face_index old_findex = data->findex;
|
|
|
1629
|
|
|
1630 data->findex = pb->data.p_blank.findex;
|
|
|
1631 data->blank_width = pb->data.p_blank.width;
|
|
826
|
1632 data->byte_cursor_charpos = 0;
|
|
428
|
1633 data->cursor_type = IGNORE_CURSOR;
|
|
|
1634
|
|
|
1635 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1636 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1637
|
|
|
1638 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1639 matter because unless something is really screwed up
|
|
|
1640 this call won't cause that arg to be used. */
|
|
|
1641 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1642
|
|
|
1643 /* This can happen in the case where we have a tab which
|
|
|
1644 is wider than the window. */
|
|
|
1645 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1646 {
|
|
|
1647 pb->data.p_blank.width -= data->blank_width;
|
|
|
1648 add_failed = ADD_FAILED;
|
|
|
1649 }
|
|
|
1650
|
|
|
1651 data->findex = old_findex;
|
|
|
1652 data->blank_width = old_width;
|
|
|
1653
|
|
|
1654 if (add_failed)
|
|
|
1655 goto oops_no_more_space;
|
|
|
1656 }
|
|
|
1657 break;
|
|
|
1658 default:
|
|
|
1659 abort ();
|
|
|
1660 }
|
|
|
1661 }
|
|
|
1662
|
|
|
1663 oops_no_more_space:
|
|
|
1664
|
|
826
|
1665 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
1666 data->cursor_type = old_cursor_type;
|
|
|
1667 if (elt < Dynarr_length (*prop))
|
|
|
1668 {
|
|
|
1669 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1670 return *prop;
|
|
|
1671 }
|
|
|
1672 else
|
|
|
1673 {
|
|
|
1674 Dynarr_free (*prop);
|
|
|
1675 return NULL;
|
|
|
1676 }
|
|
|
1677 }
|
|
|
1678
|
|
|
1679 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1680 the display block, but add all other types to the appropriate list
|
|
|
1681 of the display line. They will be added later by different
|
|
|
1682 routines. */
|
|
|
1683
|
|
|
1684 static prop_block_dynarr *
|
|
|
1685 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1686 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1687 {
|
|
|
1688 struct window *w = XWINDOW (data->window);
|
|
|
1689
|
|
440
|
1690 /* If window faces changed, and glyph instance is text, then
|
|
|
1691 glyph sizes might have changed too */
|
|
|
1692 invalidate_glyph_geometry_maybe (gb->glyph, w);
|
|
|
1693
|
|
442
|
1694 /* This makes sure the glyph is in the cachels.
|
|
|
1695
|
|
|
1696 #### We do this to make sure the glyph is in the glyph cachels,
|
|
|
1697 so that the dirty flag can be reset after redisplay has
|
|
|
1698 finished. We should do this some other way, maybe by iterating
|
|
|
1699 over the window cache of subwindows. */
|
|
|
1700 get_glyph_cachel_index (w, gb->glyph);
|
|
|
1701
|
|
428
|
1702 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1703 if (NILP (gb->extent)
|
|
|
1704 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1705 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1706 || (pos_type == END_GLYPHS &&
|
|
442
|
1707 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1708 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
|
|
428
|
1709 {
|
|
|
1710 struct rune rb;
|
|
|
1711 int width;
|
|
|
1712 int xoffset = 0;
|
|
|
1713 int ascent, descent;
|
|
|
1714 Lisp_Object baseline;
|
|
|
1715 Lisp_Object face;
|
|
442
|
1716 Lisp_Object instance;
|
|
|
1717 face_index findex;
|
|
819
|
1718 prop_block_dynarr *retval = 0;
|
|
428
|
1719
|
|
|
1720 if (cachel)
|
|
|
1721 width = cachel->width;
|
|
|
1722 else
|
|
438
|
1723 width = glyph_width (gb->glyph, data->window);
|
|
428
|
1724
|
|
|
1725 if (!width)
|
|
|
1726 return NULL;
|
|
|
1727
|
|
|
1728 if (data->start_col || data->start_col_xoffset)
|
|
|
1729 {
|
|
|
1730 int glyph_char_width = width / space_width (w);
|
|
|
1731
|
|
|
1732 /* If we still have not fully scrolled horizontally after
|
|
|
1733 taking into account the width of the glyph, subtract its
|
|
|
1734 width and return. */
|
|
|
1735 if (glyph_char_width < data->start_col)
|
|
|
1736 {
|
|
|
1737 data->start_col -= glyph_char_width;
|
|
|
1738 return NULL;
|
|
|
1739 }
|
|
|
1740 else if (glyph_char_width == data->start_col)
|
|
|
1741 width = 0;
|
|
|
1742 else
|
|
|
1743 {
|
|
|
1744 xoffset = space_width (w) * data->start_col;
|
|
|
1745 width -= xoffset;
|
|
|
1746
|
|
|
1747 /* #### Can this happen? */
|
|
|
1748 if (width < 0)
|
|
|
1749 width = 0;
|
|
|
1750 }
|
|
|
1751
|
|
|
1752 data->start_col = 0;
|
|
|
1753 retval = add_hscroll_rune (data);
|
|
|
1754
|
|
|
1755 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1756 if (retval != NULL || !width)
|
|
|
1757 return retval;
|
|
|
1758 }
|
|
|
1759 else
|
|
|
1760 xoffset = 0;
|
|
|
1761
|
|
|
1762 if (data->pixpos + width > data->max_pixpos)
|
|
|
1763 {
|
|
|
1764 /* If this is the first object we are attempting to add to
|
|
819
|
1765 the line then we ignore the horizontal_clip threshold.
|
|
|
1766 Otherwise we will loop until the bottom of the window
|
|
|
1767 continually failing to add this glyph because it is wider
|
|
|
1768 than the window. We could alternatively just completely
|
|
|
1769 ignore the glyph and proceed from there but I think that
|
|
|
1770 this is a better solution.
|
|
|
1771
|
|
|
1772 This does, however, create a different problem in that we
|
|
|
1773 can end up adding the object to every single line, never
|
|
|
1774 getting any further - for instance an extent with a long
|
|
|
1775 start-glyph that covers multitple following
|
|
|
1776 characters. */
|
|
428
|
1777 if (Dynarr_length (data->db->runes)
|
|
|
1778 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1779 return ADD_FAILED;
|
|
819
|
1780 else {
|
|
|
1781 struct prop_block pb;
|
|
|
1782
|
|
|
1783 /* We need to account for the width of the end-of-line
|
|
|
1784 glyph if there is nothing more in the line to display,
|
|
|
1785 since we will not display it in this instance. It seems
|
|
|
1786 kind of gross doing it here, but otherwise we have to
|
|
|
1787 search the runes in create_text_block(). */
|
|
|
1788 if (data->ch == '\n')
|
|
|
1789 data->max_pixpos += data->end_glyph_width;
|
|
428
|
1790 width = data->max_pixpos - data->pixpos;
|
|
819
|
1791 /* Add the glyph we are displaying, but clipping, to the
|
|
|
1792 propagation data so that we don't try and do it
|
|
|
1793 again. */
|
|
|
1794 retval = Dynarr_new (prop_block);
|
|
|
1795 pb.type = PROP_GLYPH;
|
|
|
1796 pb.data.p_glyph.glyph = gb->glyph;
|
|
|
1797 pb.data.p_glyph.width = width;
|
|
|
1798 Dynarr_add (retval, pb);
|
|
|
1799 }
|
|
428
|
1800 }
|
|
|
1801
|
|
|
1802 if (cachel)
|
|
|
1803 {
|
|
|
1804 ascent = cachel->ascent;
|
|
|
1805 descent = cachel->descent;
|
|
|
1806 }
|
|
|
1807 else
|
|
|
1808 {
|
|
438
|
1809 ascent = glyph_ascent (gb->glyph, data->window);
|
|
|
1810 descent = glyph_descent (gb->glyph, data->window);
|
|
428
|
1811 }
|
|
|
1812
|
|
|
1813 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1814
|
|
819
|
1815 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
|
|
|
1816
|
|
428
|
1817 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1818 {
|
|
|
1819 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1820 contribution will be determined later. */
|
|
|
1821 if (NILP (baseline))
|
|
|
1822 {
|
|
|
1823 int height = ascent + descent;
|
|
819
|
1824 data->need_baseline_computation = 1;
|
|
428
|
1825 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1826 }
|
|
|
1827
|
|
|
1828 /* A string so determine contribution normally. */
|
|
|
1829 else if (EQ (baseline, Qt))
|
|
|
1830 {
|
|
|
1831 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1832 data->new_descent = max (data->new_descent, descent);
|
|
|
1833 }
|
|
|
1834
|
|
|
1835 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1836 contribution here. */
|
|
|
1837 else if (INTP (baseline))
|
|
|
1838 {
|
|
|
1839 int height = ascent + descent;
|
|
|
1840 int pix_ascent, pix_descent;
|
|
|
1841
|
|
|
1842 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1843 pix_descent = height - pix_ascent;
|
|
|
1844
|
|
|
1845 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1846 data->new_descent = max (data->new_descent, pix_descent);
|
|
819
|
1847 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1848
|
|
|
1849 rb.object.dglyph.descent = pix_descent;
|
|
428
|
1850 }
|
|
|
1851
|
|
|
1852 /* Otherwise something is screwed up. */
|
|
|
1853 else
|
|
|
1854 abort ();
|
|
|
1855 }
|
|
|
1856
|
|
|
1857 face = glyph_face (gb->glyph, data->window);
|
|
|
1858 if (NILP (face))
|
|
442
|
1859 findex = data->findex;
|
|
428
|
1860 else
|
|
442
|
1861 findex = get_builtin_face_cache_index (w, face);
|
|
|
1862
|
|
|
1863 instance = glyph_image_instance (gb->glyph, data->window,
|
|
793
|
1864 ERROR_ME_DEBUG_WARN, 1);
|
|
442
|
1865 if (TEXT_IMAGE_INSTANCEP (instance))
|
|
|
1866 {
|
|
|
1867 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
|
|
|
1868 face_index orig_findex = data->findex;
|
|
826
|
1869 Bytebpos orig_charpos = data->byte_charpos;
|
|
|
1870 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
|
|
442
|
1871
|
|
|
1872 data->findex = findex;
|
|
826
|
1873 data->byte_start_col_enabled = 0;
|
|
442
|
1874 if (!allow_cursor)
|
|
826
|
1875 data->byte_charpos = 0;
|
|
867
|
1876 add_ibyte_string_runes (data, XSTRING_DATA (string),
|
|
793
|
1877 XSTRING_LENGTH (string), 0, 1);
|
|
442
|
1878 data->findex = orig_findex;
|
|
826
|
1879 data->byte_charpos = orig_charpos;
|
|
|
1880 data->byte_start_col_enabled = orig_start_col_enabled;
|
|
819
|
1881 return retval;
|
|
442
|
1882 }
|
|
|
1883
|
|
|
1884 rb.findex = findex;
|
|
428
|
1885 rb.xpos = data->pixpos;
|
|
|
1886 rb.width = width;
|
|
826
|
1887 rb.charpos = 0; /* glyphs are never "at" anywhere */
|
|
|
1888 if (data->byte_endpos)
|
|
428
|
1889 /* #### is this necessary at all? */
|
|
665
|
1890 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
826
|
1891 data->byte_endpos);
|
|
428
|
1892 else
|
|
|
1893 rb.endpos = 0;
|
|
|
1894 rb.type = RUNE_DGLYPH;
|
|
|
1895 rb.object.dglyph.glyph = gb->glyph;
|
|
|
1896 rb.object.dglyph.extent = gb->extent;
|
|
|
1897 rb.object.dglyph.xoffset = xoffset;
|
|
819
|
1898 rb.object.dglyph.ascent = ascent;
|
|
|
1899 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
|
|
|
1900 a normal (textual) baseline. */
|
|
428
|
1901
|
|
|
1902 if (allow_cursor)
|
|
|
1903 {
|
|
826
|
1904 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
|
1905 data->byte_charpos);
|
|
428
|
1906
|
|
|
1907 if (data->cursor_type == CURSOR_ON)
|
|
|
1908 {
|
|
826
|
1909 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1910 {
|
|
|
1911 rb.cursor_type = CURSOR_ON;
|
|
|
1912 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1913 }
|
|
|
1914 else
|
|
|
1915 rb.cursor_type = CURSOR_OFF;
|
|
|
1916 }
|
|
|
1917 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1918 {
|
|
|
1919 rb.cursor_type = CURSOR_ON;
|
|
|
1920 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1921 data->cursor_type = NO_CURSOR;
|
|
|
1922 }
|
|
|
1923 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1924 rb.cursor_type = IGNORE_CURSOR;
|
|
|
1925 else if (data->cursor_type == NO_CURSOR)
|
|
|
1926 rb.cursor_type = NO_CURSOR;
|
|
|
1927 else
|
|
|
1928 rb.cursor_type = CURSOR_OFF;
|
|
|
1929 }
|
|
|
1930 else
|
|
|
1931 rb.cursor_type = CURSOR_OFF;
|
|
|
1932
|
|
|
1933 Dynarr_add (data->db->runes, rb);
|
|
|
1934 data->pixpos += width;
|
|
|
1935
|
|
819
|
1936 return retval;
|
|
428
|
1937 }
|
|
|
1938 else
|
|
|
1939 {
|
|
|
1940 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
1941 gb->findex =
|
|
|
1942 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
1943 data->window));
|
|
|
1944 else
|
|
|
1945 gb->findex = data->findex;
|
|
|
1946
|
|
|
1947 if (pos_type == BEGIN_GLYPHS)
|
|
|
1948 {
|
|
|
1949 if (!data->dl->left_glyphs)
|
|
|
1950 data->dl->left_glyphs = Dynarr_new (glyph_block);
|
|
|
1951 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
1952 return NULL;
|
|
|
1953 }
|
|
|
1954 else if (pos_type == END_GLYPHS)
|
|
|
1955 {
|
|
|
1956 if (!data->dl->right_glyphs)
|
|
|
1957 data->dl->right_glyphs = Dynarr_new (glyph_block);
|
|
|
1958 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
1959 return NULL;
|
|
|
1960 }
|
|
|
1961 else
|
|
|
1962 abort (); /* there are no unknown types */
|
|
|
1963 }
|
|
|
1964
|
|
819
|
1965 return NULL;
|
|
428
|
1966 }
|
|
|
1967
|
|
|
1968 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
1969 data. */
|
|
|
1970
|
|
|
1971 static prop_block_dynarr *
|
|
|
1972 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
1973 {
|
|
|
1974 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
1975 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
1976 int elt;
|
|
|
1977 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
1978 ? data->ef->begin_glyphs
|
|
|
1979 : data->ef->end_glyphs);
|
|
|
1980 prop_block_dynarr *prop;
|
|
|
1981
|
|
|
1982 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
1983 {
|
|
|
1984 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
1985 0);
|
|
|
1986
|
|
|
1987 if (prop)
|
|
|
1988 {
|
|
|
1989 /* #### Add some propagation information. */
|
|
|
1990 return prop;
|
|
|
1991 }
|
|
|
1992 }
|
|
|
1993
|
|
|
1994 Dynarr_reset (glyph_arr);
|
|
|
1995
|
|
|
1996 return NULL;
|
|
|
1997 }
|
|
|
1998
|
|
|
1999 /* Given a position for a buffer in a window, ensure that the given
|
|
|
2000 display line DL accurately represents the text on a line starting
|
|
|
2001 at the given position.
|
|
|
2002
|
|
826
|
2003 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's.
|
|
428
|
2004 You must do appropriate conversion. */
|
|
|
2005
|
|
665
|
2006 static Bytebpos
|
|
428
|
2007 create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
2008 Bytebpos byte_start_pos, prop_block_dynarr **prop,
|
|
428
|
2009 int type)
|
|
|
2010 {
|
|
|
2011 struct frame *f = XFRAME (w->frame);
|
|
|
2012 struct buffer *b = XBUFFER (w->buffer);
|
|
|
2013 struct device *d = XDEVICE (f->device);
|
|
|
2014
|
|
|
2015 pos_data data;
|
|
|
2016
|
|
|
2017 /* Don't display anything in the minibuffer if this window is not on
|
|
|
2018 a selected frame. We consider all other windows to be active
|
|
|
2019 minibuffers as it simplifies the coding. */
|
|
|
2020 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
2021 (f == device_selected_frame (d)) ||
|
|
|
2022 is_surrogate_for_selected_frame (f));
|
|
|
2023
|
|
|
2024 int truncate_win = window_truncation_on (w);
|
|
|
2025
|
|
|
2026 /* If the buffer's value of selective_display is an integer then
|
|
|
2027 only lines that start with less than selective_display columns of
|
|
|
2028 space will be displayed. If selective_display is t then all text
|
|
|
2029 after a ^M is invisible. */
|
|
|
2030 int selective = (INTP (b->selective_display)
|
|
|
2031 ? XINT (b->selective_display)
|
|
434
|
2032 : (!NILP (b->selective_display) ? -1 : 0));
|
|
428
|
2033
|
|
|
2034 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
2035 can actually be displayed and which octal should be used for.
|
|
|
2036 #### This variable should probably have some rethought done to
|
|
|
2037 it.
|
|
|
2038
|
|
|
2039 #### It would also be really nice if you could specify that
|
|
|
2040 the characters come out in hex instead of in octal. Mule
|
|
|
2041 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
2042 but that's bogus -- we need a more general solution. I
|
|
|
2043 think you need to extend the concept of display tables
|
|
|
2044 into a more general conversion mechanism. Ideally you
|
|
|
2045 could specify a Lisp function that converts characters,
|
|
|
2046 but this violates the Second Golden Rule and besides would
|
|
|
2047 make things way way way way slow.
|
|
|
2048
|
|
|
2049 So instead, we extend the display-table concept, which was
|
|
|
2050 historically limited to 256-byte vectors, to one of the
|
|
|
2051 following:
|
|
|
2052
|
|
|
2053 a) A 256-entry vector, for backward compatibility;
|
|
|
2054 b) char-table, mapping characters to values;
|
|
|
2055 c) range-table, mapping ranges of characters to values;
|
|
|
2056 d) a list of the above.
|
|
|
2057
|
|
|
2058 The (d) option allows you to specify multiple display tables
|
|
|
2059 instead of just one. Each display table can specify conversions
|
|
|
2060 for some characters and leave others unchanged. The way the
|
|
|
2061 character gets displayed is determined by the first display table
|
|
|
2062 with a binding for that character. This way, you could call a
|
|
|
2063 function `enable-hex-display' that adds a hex display-table to
|
|
|
2064 the list of display tables for the current buffer.
|
|
|
2065
|
|
|
2066 #### ...not yet implemented... Also, we extend the concept of
|
|
|
2067 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
2068 extended characters show up as hex with a display table like
|
|
|
2069 this:
|
|
|
2070
|
|
|
2071 #s(range-table data ((256 524288) (format "%x")))
|
|
|
2072
|
|
|
2073 Since more than one display table is possible, you have
|
|
|
2074 great flexibility in mapping ranges of characters. */
|
|
867
|
2075 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
2076 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2077 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2078 ? 255 : 160));
|
|
|
2079
|
|
|
2080 Lisp_Object face_dt, window_dt;
|
|
|
2081
|
|
|
2082 /* The text display block for this display line. */
|
|
|
2083 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2084
|
|
|
2085 /* The first time through the main loop we need to force the glyph
|
|
|
2086 data to be updated. */
|
|
|
2087 int initial = 1;
|
|
|
2088
|
|
|
2089 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2090 equal to the position passed in if there are no more runs to be
|
|
|
2091 displayed. */
|
|
|
2092 int no_more_frags = 0;
|
|
|
2093
|
|
|
2094 Lisp_Object synch_minibuffers_value =
|
|
|
2095 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2096
|
|
|
2097 dl->used_prop_data = 0;
|
|
|
2098 dl->num_chars = 0;
|
|
442
|
2099 dl->line_continuation = 0;
|
|
428
|
2100
|
|
|
2101 xzero (data);
|
|
|
2102 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2103
|
|
|
2104 /* These values are used by all of the rune addition routines. We add
|
|
|
2105 them to this structure for ease of passing. */
|
|
|
2106 data.d = d;
|
|
793
|
2107 data.window = wrap_window (w);
|
|
428
|
2108 data.string = Qnil;
|
|
|
2109 data.db = db;
|
|
|
2110 data.dl = dl;
|
|
|
2111
|
|
826
|
2112 data.byte_charpos = byte_start_pos;
|
|
428
|
2113 data.pixpos = dl->bounds.left_in;
|
|
|
2114 data.last_charset = Qunbound;
|
|
|
2115 data.last_findex = DEFAULT_INDEX;
|
|
|
2116 data.result_str = Qnil;
|
|
|
2117
|
|
|
2118 /* Set the right boundary adjusting it to take into account any end
|
|
|
2119 glyph. Save the width of the end glyph for later use. */
|
|
|
2120 data.max_pixpos = dl->bounds.right_in;
|
|
|
2121 if (truncate_win)
|
|
819
|
2122 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2123 else
|
|
819
|
2124 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2125 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2126
|
|
|
2127 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2128 {
|
|
826
|
2129 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2130 data.cursor_type = CURSOR_ON;
|
|
|
2131 }
|
|
|
2132 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2133 data.cursor_type = NO_CURSOR;
|
|
|
2134 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2135 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2136 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2137 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2138 {
|
|
826
|
2139 data.byte_cursor_charpos = BYTE_BUF_PT (b);
|
|
428
|
2140 data.cursor_type = CURSOR_ON;
|
|
|
2141 }
|
|
|
2142 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2143 {
|
|
826
|
2144 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
|
|
428
|
2145 data.cursor_type = CURSOR_ON;
|
|
|
2146 }
|
|
|
2147 else
|
|
|
2148 data.cursor_type = NO_CURSOR;
|
|
|
2149 data.cursor_x = -1;
|
|
|
2150
|
|
|
2151 data.start_col = w->hscroll;
|
|
|
2152 data.start_col_xoffset = w->left_xoffset;
|
|
826
|
2153 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
2154 data.hscroll_glyph_width_adjust = 0;
|
|
|
2155
|
|
|
2156 /* We regenerate the line from the very beginning. */
|
|
|
2157 Dynarr_reset (db->runes);
|
|
|
2158
|
|
|
2159 /* Why is this less than or equal and not just less than? If the
|
|
|
2160 starting position is already equal to the maximum we can't add
|
|
|
2161 anything else, right? Wrong. We might still have a newline to
|
|
|
2162 add. A newline can use the room allocated for an end glyph since
|
|
|
2163 if we add it we know we aren't going to be adding any end
|
|
|
2164 glyph. */
|
|
|
2165
|
|
|
2166 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2167 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2168 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2169 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2170 that the loop terminates only when either (a) there is
|
|
|
2171 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2172
|
|
|
2173 #### Also I think you need to ensure that the operation
|
|
|
2174 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2175 can't get interrupted in the middle. If you run off the end
|
|
|
2176 of the line during that operation, then you keep accumulating
|
|
|
2177 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2178 there's a begin glyph at a particular position and attempting
|
|
|
2179 to display that glyph results in window-end being hit and
|
|
|
2180 propagation data being generated, then the character at that
|
|
|
2181 position won't be displayed.
|
|
|
2182
|
|
|
2183 #### See also the comment after the end of this loop, below.
|
|
|
2184 */
|
|
|
2185 while (data.pixpos <= data.max_pixpos
|
|
|
2186 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2187 {
|
|
|
2188 /* #### This check probably should not be necessary. */
|
|
826
|
2189 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
428
|
2190 {
|
|
|
2191 /* #### urk! More of this lossage! */
|
|
826
|
2192 data.byte_charpos--;
|
|
428
|
2193 goto done;
|
|
|
2194 }
|
|
|
2195
|
|
|
2196 /* If selective display was an integer and we aren't working on
|
|
|
2197 a continuation line then find the next line we are actually
|
|
|
2198 supposed to display. */
|
|
|
2199 if (selective > 0
|
|
826
|
2200 && (data.byte_charpos == BYTE_BUF_BEGV (b)
|
|
|
2201 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
|
|
|
2202 {
|
|
|
2203 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2204 {
|
|
826
|
2205 data.byte_charpos =
|
|
|
2206 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2207 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2208 {
|
|
826
|
2209 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2210 goto done;
|
|
|
2211 }
|
|
|
2212 }
|
|
|
2213 }
|
|
|
2214
|
|
|
2215 /* Check for face changes. */
|
|
826
|
2216 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
2217 {
|
|
819
|
2218 Lisp_Object last_glyph = Qnil;
|
|
|
2219
|
|
|
2220 /* Deal with glyphs that we have already displayed. The
|
|
|
2221 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2222 propagation data then we are clipping the glyph and there
|
|
|
2223 can be no propagation data before that point. The theory
|
|
|
2224 works because we always recalculate the extent-fragments
|
|
|
2225 for propagated data, we never actually propagate the
|
|
|
2226 fragments that still need to be displayed. */
|
|
|
2227 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2228 {
|
|
|
2229 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2230 Dynarr_free (*prop);
|
|
|
2231 *prop = 0;
|
|
|
2232 }
|
|
428
|
2233 /* Now compute the face and begin/end-glyph information. */
|
|
|
2234 data.findex =
|
|
665
|
2235 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
826
|
2236 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
2237
|
|
|
2238 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2239
|
|
826
|
2240 if (data.byte_charpos == data.ef->end)
|
|
428
|
2241 no_more_frags = 1;
|
|
|
2242 }
|
|
|
2243 initial = 0;
|
|
|
2244
|
|
|
2245 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2246 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2247 display then we determine what to do based on the character at the
|
|
|
2248 current buffer position. */
|
|
|
2249
|
|
|
2250 /* If the current position is covered by an invisible extent, do
|
|
|
2251 nothing (except maybe add some ellipses).
|
|
|
2252
|
|
|
2253 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2254 invisible extent should be investigated further. This is
|
|
|
2255 fairly low priority though. */
|
|
|
2256 if (data.ef->invisible)
|
|
|
2257 {
|
|
|
2258 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2259 really know what I'm doing. */
|
|
|
2260 if (*prop)
|
|
|
2261 {
|
|
|
2262 Dynarr_free (*prop);
|
|
|
2263 *prop = 0;
|
|
|
2264 }
|
|
|
2265
|
|
|
2266 /* The extent fragment code only sets this when we should
|
|
|
2267 really display the ellipses. It makes sure the ellipses
|
|
|
2268 don't get displayed more than once in a row. */
|
|
|
2269 if (data.ef->invisible_ellipses)
|
|
|
2270 {
|
|
|
2271 struct glyph_block gb;
|
|
|
2272
|
|
|
2273 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2274 data.ef->invisible_ellipses = 0;
|
|
|
2275 gb.extent = Qnil;
|
|
|
2276 gb.glyph = Vinvisible_text_glyph;
|
|
|
2277 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2278 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2279 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2280 is to display a newline (for compatibility with
|
|
|
2281 selective-display-ellipses)? Maybe that's too
|
|
|
2282 abstruse. */
|
|
|
2283 if (*prop)
|
|
|
2284 goto done;
|
|
|
2285 }
|
|
|
2286
|
|
|
2287 /* If point is in an invisible region we place it on the
|
|
|
2288 next visible character. */
|
|
|
2289 if (data.cursor_type == CURSOR_ON
|
|
826
|
2290 && data.byte_charpos == data.byte_cursor_charpos)
|
|
428
|
2291 {
|
|
|
2292 data.cursor_type = NEXT_CURSOR;
|
|
|
2293 }
|
|
|
2294
|
|
|
2295 /* #### What if we we're dealing with a display table? */
|
|
|
2296 if (data.start_col)
|
|
|
2297 data.start_col--;
|
|
|
2298
|
|
826
|
2299 if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2300 goto done;
|
|
|
2301 else
|
|
826
|
2302 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2303 }
|
|
|
2304
|
|
|
2305 /* If there is propagation data, then it represents the current
|
|
819
|
2306 buffer position being displayed. Add them and advance the
|
|
|
2307 position counter. This might also add the minibuffer
|
|
|
2308 prompt. */
|
|
428
|
2309 else if (*prop)
|
|
|
2310 {
|
|
|
2311 dl->used_prop_data = 1;
|
|
|
2312 *prop = add_propagation_runes (prop, &data);
|
|
|
2313
|
|
|
2314 if (*prop)
|
|
|
2315 goto done; /* gee, a really narrow window */
|
|
826
|
2316 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2317 goto done;
|
|
826
|
2318 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
|
|
428
|
2319 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
2320 data.byte_charpos = BYTE_BUF_BEGV (b);
|
|
428
|
2321 else
|
|
826
|
2322 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2323 }
|
|
|
2324
|
|
|
2325 /* If there are end glyphs, add them to the line. These are
|
|
|
2326 the end glyphs for the previous run of text. We add them
|
|
|
2327 here rather than doing them at the end of handling the
|
|
|
2328 previous run so that glyphs at the beginning and end of
|
|
|
2329 a line are handled correctly. */
|
|
819
|
2330 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2331 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2332 {
|
|
|
2333 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2334 /* #### I think this is safe, but could be wrong. */
|
|
826
|
2335 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
819
|
2336
|
|
|
2337 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2338 {
|
|
|
2339 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2340 tmpglyphs = data.ef->end_glyphs;
|
|
|
2341 }
|
|
|
2342
|
|
|
2343 /* If there are begin glyphs, add them to the line. */
|
|
|
2344 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2345 {
|
|
|
2346 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2347 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2348 }
|
|
|
2349
|
|
|
2350 if (*prop)
|
|
|
2351 {
|
|
|
2352 /* If we just clipped a glyph and we are at the end of a
|
|
|
2353 line and there are more glyphs to display then do
|
|
|
2354 appropriate processing to not get a continuation
|
|
|
2355 glyph. */
|
|
|
2356 if (*prop != ADD_FAILED
|
|
|
2357 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2358 && data.ch == '\n')
|
|
|
2359 {
|
|
|
2360 /* If there are no more glyphs then do the normal
|
|
|
2361 processing.
|
|
|
2362
|
|
|
2363 #### This doesn't actually work if the same glyph is
|
|
|
2364 present more than once in the block. To solve
|
|
|
2365 this we would have to carry the index around
|
|
|
2366 which might be problematic since the fragment is
|
|
|
2367 recalculated for each line. */
|
|
|
2368 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2369 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2370 {
|
|
|
2371 Dynarr_free (*prop);
|
|
|
2372 *prop = 0;
|
|
|
2373 }
|
|
|
2374 else {
|
|
|
2375 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2376 add_ichar_rune (&data); /* discard prop data. */
|
|
819
|
2377 goto done;
|
|
|
2378 }
|
|
|
2379 }
|
|
|
2380 else
|
|
|
2381 goto done;
|
|
|
2382 }
|
|
428
|
2383 }
|
|
|
2384
|
|
|
2385 /* If at end-of-buffer, we've already processed begin and
|
|
|
2386 end-glyphs at this point and there's no text to process,
|
|
|
2387 so we're done. */
|
|
826
|
2388 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2389 goto done;
|
|
|
2390
|
|
|
2391 else
|
|
|
2392 {
|
|
|
2393 Lisp_Object entry = Qnil;
|
|
|
2394 /* Get the character at the current buffer position. */
|
|
826
|
2395 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2396 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2397 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2398
|
|
|
2399 /* If there is a display table entry for it, hand it off to
|
|
|
2400 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2401 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2402 {
|
|
|
2403 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2404
|
|
|
2405 if (*prop)
|
|
|
2406 goto done;
|
|
|
2407 }
|
|
|
2408
|
|
|
2409 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2410 to the line and end this loop. */
|
|
|
2411 else if (data.ch == '\n')
|
|
|
2412 {
|
|
|
2413 /* We aren't going to be adding an end glyph so give its
|
|
|
2414 space back in order to make sure that the cursor can
|
|
|
2415 fit. */
|
|
819
|
2416 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2417
|
|
|
2418 if (selective > 0
|
|
826
|
2419 && (byte_spaces_at_point
|
|
|
2420 (b, next_bytebpos (b, data.byte_charpos))
|
|
428
|
2421 >= selective))
|
|
|
2422 {
|
|
|
2423 if (!NILP (b->selective_display_ellipses))
|
|
|
2424 {
|
|
|
2425 struct glyph_block gb;
|
|
|
2426
|
|
|
2427 gb.extent = Qnil;
|
|
|
2428 gb.glyph = Vinvisible_text_glyph;
|
|
|
2429 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2430 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2431 }
|
|
|
2432 else
|
|
|
2433 {
|
|
|
2434 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2435 line with a special "character rune" whose width
|
|
|
2436 is the EOL cursor width and whose character is
|
|
|
2437 the non-printing character '\n'. */
|
|
|
2438 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2439 *prop = add_ichar_rune (&data);
|
|
428
|
2440 }
|
|
|
2441
|
|
826
|
2442 /* We need to set data.byte_charpos to the start of the
|
|
428
|
2443 next visible region in order to make this line
|
|
|
2444 appear to contain all of the invisible area.
|
|
|
2445 Otherwise, the line cache won't work
|
|
|
2446 correctly. */
|
|
826
|
2447 INC_BYTEBPOS (b, data.byte_charpos);
|
|
|
2448 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2449 {
|
|
826
|
2450 data.byte_charpos =
|
|
|
2451 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2452 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2453 {
|
|
826
|
2454 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2455 break;
|
|
|
2456 }
|
|
|
2457 }
|
|
826
|
2458 if (BYTE_BUF_FETCH_CHAR
|
|
|
2459 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
|
|
|
2460 DEC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2461 }
|
|
|
2462 else
|
|
|
2463 {
|
|
|
2464 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2465 *prop = add_ichar_rune (&data);
|
|
428
|
2466 }
|
|
|
2467
|
|
|
2468 goto done;
|
|
|
2469 }
|
|
|
2470
|
|
|
2471 /* If the current character is ^M, and selective display is
|
|
|
2472 enabled, then add the invisible-text-glyph if
|
|
|
2473 selective-display-ellipses is set. In any case, this
|
|
|
2474 line is done. */
|
|
|
2475 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2476 {
|
|
826
|
2477 Bytebpos byte_next_charpos;
|
|
428
|
2478
|
|
|
2479 /* Find the buffer position at the end of the line. */
|
|
826
|
2480 byte_next_charpos =
|
|
|
2481 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2482 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
|
|
428
|
2483 == '\n')
|
|
826
|
2484 DEC_BYTEBPOS (b, byte_next_charpos);
|
|
428
|
2485
|
|
|
2486 /* If the cursor is somewhere in the elided text make
|
|
|
2487 sure that the cursor gets drawn appropriately. */
|
|
|
2488 if (data.cursor_type == CURSOR_ON
|
|
826
|
2489 && (data.byte_cursor_charpos >= data.byte_charpos &&
|
|
|
2490 data.byte_cursor_charpos < byte_next_charpos))
|
|
428
|
2491 {
|
|
|
2492 data.cursor_type = NEXT_CURSOR;
|
|
|
2493 }
|
|
|
2494
|
|
|
2495 /* We won't be adding a truncation or continuation glyph
|
|
|
2496 so give up the room allocated for them. */
|
|
819
|
2497 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2498
|
|
|
2499 if (!NILP (b->selective_display_ellipses))
|
|
|
2500 {
|
|
|
2501 /* We don't propagate anything from the invisible
|
|
|
2502 text glyph if it fails to fit. This is
|
|
|
2503 intentional. */
|
|
|
2504 struct glyph_block gb;
|
|
|
2505
|
|
|
2506 gb.extent = Qnil;
|
|
|
2507 gb.glyph = Vinvisible_text_glyph;
|
|
|
2508 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2509 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2510 }
|
|
|
2511
|
|
|
2512 /* Set the buffer position to the end of the line. We
|
|
|
2513 need to do this before potentially adding a newline
|
|
|
2514 so that the cursor flag will get set correctly (if
|
|
|
2515 needed). */
|
|
826
|
2516 data.byte_charpos = byte_next_charpos;
|
|
428
|
2517
|
|
|
2518 if (NILP (b->selective_display_ellipses)
|
|
826
|
2519 || data.byte_cursor_charpos == byte_next_charpos)
|
|
428
|
2520 {
|
|
|
2521 /* We have to at least add a newline character so
|
|
|
2522 that the cursor shows up properly. */
|
|
|
2523 data.ch = '\n';
|
|
|
2524 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2525 data.findex = DEFAULT_INDEX;
|
|
|
2526 data.start_col = 0;
|
|
|
2527 data.start_col_xoffset = 0;
|
|
826
|
2528 data.byte_start_col_enabled = 0;
|
|
428
|
2529
|
|
867
|
2530 add_ichar_rune (&data);
|
|
428
|
2531 }
|
|
|
2532
|
|
|
2533 /* This had better be a newline but doing it this way
|
|
|
2534 we'll see obvious incorrect results if it isn't. No
|
|
|
2535 need to abort here. */
|
|
826
|
2536 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2537
|
|
|
2538 goto done;
|
|
|
2539 }
|
|
|
2540
|
|
|
2541 /* If the current character is considered to be printable, then
|
|
|
2542 just add it. */
|
|
|
2543 else if (data.ch >= printable_min)
|
|
|
2544 {
|
|
867
|
2545 *prop = add_ichar_rune (&data);
|
|
428
|
2546 if (*prop)
|
|
|
2547 goto done;
|
|
|
2548 }
|
|
|
2549
|
|
|
2550 /* If the current character is a tab, determine the next tab
|
|
|
2551 starting position and add a blank rune which extends from the
|
|
|
2552 current pixel position to that starting position. */
|
|
|
2553 else if (data.ch == '\t')
|
|
|
2554 {
|
|
|
2555 int tab_start_pixpos = data.pixpos;
|
|
|
2556 int next_tab_start;
|
|
|
2557 int char_tab_width;
|
|
|
2558 int prop_width = 0;
|
|
|
2559
|
|
|
2560 if (data.start_col > 1)
|
|
434
|
2561 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2562 + data.start_col_xoffset;
|
|
|
2563
|
|
|
2564 next_tab_start =
|
|
|
2565 next_tab_position (w, tab_start_pixpos,
|
|
|
2566 dl->bounds.left_in +
|
|
|
2567 data.hscroll_glyph_width_adjust);
|
|
|
2568 if (next_tab_start > data.max_pixpos)
|
|
|
2569 {
|
|
|
2570 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2571 next_tab_start = data.max_pixpos;
|
|
|
2572 }
|
|
|
2573 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2574 char_tab_width =
|
|
|
2575 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2576
|
|
|
2577 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2578
|
|
|
2579 /* add_blank_rune is only supposed to be called with
|
|
|
2580 sizes guaranteed to fit in the available space. */
|
|
|
2581 assert (!(*prop));
|
|
|
2582
|
|
|
2583 if (prop_width)
|
|
|
2584 {
|
|
|
2585 struct prop_block pb;
|
|
|
2586 *prop = Dynarr_new (prop_block);
|
|
|
2587
|
|
|
2588 pb.type = PROP_BLANK;
|
|
|
2589 pb.data.p_blank.width = prop_width;
|
|
|
2590 pb.data.p_blank.findex = data.findex;
|
|
|
2591 Dynarr_add (*prop, pb);
|
|
|
2592
|
|
|
2593 goto done;
|
|
|
2594 }
|
|
|
2595 }
|
|
|
2596
|
|
|
2597 /* If character is a control character, pass it off to
|
|
|
2598 add_control_char_runes.
|
|
|
2599
|
|
|
2600 The is_*() routines have undefined results on
|
|
|
2601 arguments outside of the range [-1, 255]. (This
|
|
|
2602 often bites people who carelessly use `char' instead
|
|
|
2603 of `unsigned char'.)
|
|
|
2604 */
|
|
867
|
2605 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
2606 {
|
|
|
2607 *prop = add_control_char_runes (&data, b);
|
|
|
2608
|
|
|
2609 if (*prop)
|
|
|
2610 goto done;
|
|
|
2611 }
|
|
|
2612
|
|
|
2613 /* If the character is above the ASCII range and we have not
|
|
|
2614 already handled it, then print it as an octal number. */
|
|
|
2615 else if (data.ch >= 0200)
|
|
|
2616 {
|
|
|
2617 *prop = add_octal_runes (&data);
|
|
|
2618
|
|
|
2619 if (*prop)
|
|
|
2620 goto done;
|
|
|
2621 }
|
|
|
2622
|
|
|
2623 /* Assume the current character is considered to be printable,
|
|
|
2624 then just add it. */
|
|
|
2625 else
|
|
|
2626 {
|
|
867
|
2627 *prop = add_ichar_rune (&data);
|
|
428
|
2628 if (*prop)
|
|
|
2629 goto done;
|
|
|
2630 }
|
|
|
2631
|
|
826
|
2632 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2633 }
|
|
|
2634 }
|
|
|
2635
|
|
|
2636 done:
|
|
|
2637
|
|
|
2638 /* Determine the starting point of the next line if we did not hit the
|
|
|
2639 end of the buffer. */
|
|
826
|
2640 if (data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2641 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2642 {
|
|
|
2643 /* #### This check is not correct. If the line terminated
|
|
|
2644 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
2645 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
2646 you make the two changes mentioned at the top of this loop,
|
|
|
2647 you should be able to say '(if (*prop))'. That should also
|
|
826
|
2648 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2649 check. */
|
|
|
2650
|
|
|
2651 /* The common case is that the line ended because we hit a newline.
|
|
|
2652 In that case, the next character is just the next buffer
|
|
|
2653 position. */
|
|
|
2654 if (data.ch == '\n')
|
|
|
2655 {
|
|
|
2656 /* If data.start_col_enabled is still true, then the window is
|
|
|
2657 scrolled far enough so that nothing on this line is visible.
|
|
|
2658 We need to stick a truncation glyph at the beginning of the
|
|
|
2659 line in that case unless the line is completely blank. */
|
|
826
|
2660 if (data.byte_start_col_enabled)
|
|
428
|
2661 {
|
|
|
2662 if (data.cursor_type == CURSOR_ON)
|
|
|
2663 {
|
|
826
|
2664 if (data.byte_cursor_charpos >= byte_start_pos
|
|
|
2665 && data.byte_cursor_charpos <= data.byte_charpos)
|
|
|
2666 data.byte_cursor_charpos = data.byte_charpos;
|
|
428
|
2667 }
|
|
|
2668 data.findex = DEFAULT_INDEX;
|
|
|
2669 data.start_col = 0;
|
|
826
|
2670 data.byte_start_col_enabled = 0;
|
|
|
2671
|
|
|
2672 if (data.byte_charpos != byte_start_pos)
|
|
428
|
2673 {
|
|
|
2674 struct glyph_block gb;
|
|
|
2675
|
|
|
2676 gb.extent = Qnil;
|
|
|
2677 gb.glyph = Vhscroll_glyph;
|
|
|
2678 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2679 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2680 }
|
|
|
2681 else
|
|
|
2682 {
|
|
|
2683 /* This duplicates code down below to add a newline to
|
|
|
2684 the end of an otherwise empty line.*/
|
|
|
2685 data.ch = '\n';
|
|
|
2686 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2687
|
|
867
|
2688 add_ichar_rune (&data);
|
|
428
|
2689 }
|
|
|
2690 }
|
|
|
2691
|
|
826
|
2692 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2693 }
|
|
|
2694
|
|
|
2695 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2696 line. */
|
|
|
2697 else
|
|
|
2698 {
|
|
|
2699 struct glyph_block gb;
|
|
|
2700 struct glyph_cachel *cachel;
|
|
|
2701
|
|
|
2702 /* If the line is to be truncated then we actually have to look
|
|
|
2703 for the next newline. We also add the end-of-line glyph which
|
|
|
2704 we know will fit because we adjusted the right border before
|
|
|
2705 we starting laying out the line. */
|
|
819
|
2706 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2707 data.findex = DEFAULT_INDEX;
|
|
|
2708 gb.extent = Qnil;
|
|
|
2709
|
|
|
2710 if (truncate_win)
|
|
|
2711 {
|
|
826
|
2712 Bytebpos byte_pos;
|
|
428
|
2713
|
|
|
2714 /* Now find the start of the next line. */
|
|
826
|
2715 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
428
|
2716
|
|
|
2717 /* If the cursor is past the truncation line then we
|
|
|
2718 make it appear on the truncation glyph. If we've hit
|
|
|
2719 the end of the buffer then we also make the cursor
|
|
|
2720 appear unless eob is immediately preceded by a
|
|
|
2721 newline. In that case the cursor should actually
|
|
|
2722 appear on the next line. */
|
|
|
2723 if (data.cursor_type == CURSOR_ON
|
|
826
|
2724 && data.byte_cursor_charpos >= data.byte_charpos
|
|
|
2725 && (data.byte_cursor_charpos < byte_pos ||
|
|
|
2726 (byte_pos == BYTE_BUF_ZV (b)
|
|
|
2727 && (byte_pos == BYTE_BUF_BEGV (b)
|
|
|
2728 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
|
|
428
|
2729 != '\n')))))
|
|
826
|
2730 data.byte_cursor_charpos = byte_pos;
|
|
428
|
2731 else
|
|
|
2732 data.cursor_type = NO_CURSOR;
|
|
|
2733
|
|
826
|
2734 data.byte_charpos = byte_pos;
|
|
428
|
2735 gb.glyph = Vtruncation_glyph;
|
|
|
2736 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2737 }
|
|
|
2738 else
|
|
|
2739 {
|
|
|
2740 /* The cursor can never be on the continuation glyph. */
|
|
|
2741 data.cursor_type = NO_CURSOR;
|
|
|
2742
|
|
826
|
2743 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
2744
|
|
442
|
2745 dl->line_continuation = 1;
|
|
428
|
2746 gb.glyph = Vcontinuation_glyph;
|
|
|
2747 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2748 }
|
|
|
2749
|
|
442
|
2750 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2751
|
|
826
|
2752 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
|
|
|
2753 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
|
|
428
|
2754 /* #### Damn this losing shit. */
|
|
826
|
2755 data.byte_charpos++;
|
|
428
|
2756 }
|
|
|
2757 }
|
|
|
2758 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
826
|
2759 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
|
|
428
|
2760 {
|
|
|
2761 /* We need to add a marker to the end of the line since there is no
|
|
|
2762 newline character in order for the cursor to get drawn. We label
|
|
|
2763 it as a newline so that it gets handled correctly by the
|
|
|
2764 whitespace routines below. */
|
|
|
2765
|
|
|
2766 data.ch = '\n';
|
|
|
2767 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2768 data.findex = DEFAULT_INDEX;
|
|
|
2769 data.start_col = 0;
|
|
|
2770 data.start_col_xoffset = 0;
|
|
826
|
2771 data.byte_start_col_enabled = 0;
|
|
428
|
2772
|
|
|
2773 data.max_pixpos += data.blank_width;
|
|
867
|
2774 add_ichar_rune (&data);
|
|
428
|
2775 data.max_pixpos -= data.blank_width;
|
|
|
2776
|
|
|
2777 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2778 manipulating invalid positions is guaranteed to result in
|
|
|
2779 trouble sooner or later. */
|
|
826
|
2780 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
|
|
428
|
2781 }
|
|
|
2782
|
|
|
2783 /* Calculate left whitespace boundary. */
|
|
|
2784 {
|
|
|
2785 int elt = 0;
|
|
|
2786
|
|
|
2787 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2788 while (elt < Dynarr_length (db->runes))
|
|
|
2789 {
|
|
|
2790 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2791
|
|
|
2792 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2793 || rb->type == RUNE_BLANK)
|
|
|
2794 {
|
|
|
2795 dl->bounds.left_white += rb->width;
|
|
|
2796 elt++;
|
|
|
2797 }
|
|
|
2798 else
|
|
|
2799 elt = Dynarr_length (db->runes);
|
|
|
2800 }
|
|
|
2801 }
|
|
|
2802
|
|
|
2803 /* Calculate right whitespace boundary. */
|
|
|
2804 {
|
|
|
2805 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2806 int done = 0;
|
|
|
2807
|
|
|
2808 while (!done && elt >= 0)
|
|
|
2809 {
|
|
|
2810 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2811
|
|
|
2812 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2813 && isspace (rb->object.chr.ch))
|
|
|
2814 && !rb->type == RUNE_BLANK)
|
|
|
2815 {
|
|
|
2816 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2817 done = 1;
|
|
|
2818 }
|
|
|
2819
|
|
|
2820 elt--;
|
|
|
2821
|
|
|
2822 }
|
|
|
2823
|
|
|
2824 /* The line is blank so everything is considered to be right
|
|
|
2825 whitespace. */
|
|
|
2826 if (!done)
|
|
|
2827 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2828 }
|
|
|
2829
|
|
|
2830 /* Set the display blocks bounds. */
|
|
|
2831 db->start_pos = dl->bounds.left_in;
|
|
|
2832 if (Dynarr_length (db->runes))
|
|
|
2833 {
|
|
|
2834 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2835
|
|
|
2836 db->end_pos = rb->xpos + rb->width;
|
|
|
2837 }
|
|
|
2838 else
|
|
|
2839 db->end_pos = dl->bounds.right_white;
|
|
|
2840
|
|
819
|
2841 calculate_baseline (&data);
|
|
428
|
2842
|
|
|
2843 dl->ascent = data.new_ascent;
|
|
|
2844 dl->descent = data.new_descent;
|
|
|
2845
|
|
|
2846 {
|
|
|
2847 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2848
|
|
|
2849 if (dl->ascent < ascent)
|
|
|
2850 dl->ascent = ascent;
|
|
|
2851 }
|
|
|
2852 {
|
|
|
2853 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2854
|
|
|
2855 if (dl->descent < descent)
|
|
|
2856 dl->descent = descent;
|
|
|
2857 }
|
|
|
2858
|
|
819
|
2859 calculate_yoffset (dl, db);
|
|
|
2860
|
|
428
|
2861 dl->cursor_elt = data.cursor_x;
|
|
|
2862 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
2863 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
|
2864 dl->end_charpos = BUF_ZV (b);
|
|
428
|
2865 else
|
|
826
|
2866 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
|
|
428
|
2867 if (truncate_win)
|
|
826
|
2868 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
|
|
428
|
2869 else
|
|
|
2870 /* This doesn't correctly take into account tabs and control
|
|
|
2871 characters but if the window isn't being truncated then this
|
|
|
2872 value isn't going to end up being used anyhow. */
|
|
826
|
2873 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
2874
|
|
|
2875 /* #### handle horizontally scrolled line with text none of which
|
|
|
2876 was actually laid out. */
|
|
|
2877
|
|
|
2878 /* #### handle any remainder of overlay arrow */
|
|
|
2879
|
|
|
2880 if (*prop == ADD_FAILED)
|
|
|
2881 *prop = NULL;
|
|
|
2882
|
|
|
2883 if (truncate_win && *prop)
|
|
|
2884 {
|
|
|
2885 Dynarr_free (*prop);
|
|
|
2886 *prop = NULL;
|
|
|
2887 }
|
|
|
2888
|
|
|
2889 extent_fragment_delete (data.ef);
|
|
|
2890
|
|
|
2891 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2892 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2893 The main loop should get fixed so that it isn't necessary to call
|
|
|
2894 this function if we are already at EOB. */
|
|
|
2895
|
|
826
|
2896 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
|
|
|
2897 return data.byte_charpos + 1; /* Yuck! */
|
|
428
|
2898 else
|
|
826
|
2899 return data.byte_charpos;
|
|
428
|
2900 }
|
|
|
2901
|
|
|
2902 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2903
|
|
|
2904 static int
|
|
|
2905 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2906 {
|
|
|
2907 struct frame *f = XFRAME (w->frame);
|
|
|
2908 struct device *d = XDEVICE (f->device);
|
|
|
2909 pos_data data;
|
|
|
2910
|
|
|
2911 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2912 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2913 return 0;
|
|
|
2914
|
|
|
2915 xzero (data);
|
|
|
2916 data.ef = NULL;
|
|
|
2917 data.d = d;
|
|
793
|
2918 data.window = wrap_window (w);
|
|
428
|
2919 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2920 data.dl = dl;
|
|
|
2921 data.pixpos = dl->bounds.left_in;
|
|
|
2922 data.max_pixpos = dl->bounds.right_in;
|
|
|
2923 data.cursor_type = NO_CURSOR;
|
|
|
2924 data.cursor_x = -1;
|
|
|
2925 data.findex = DEFAULT_INDEX;
|
|
|
2926 data.last_charset = Qunbound;
|
|
|
2927 data.last_findex = DEFAULT_INDEX;
|
|
|
2928 data.result_str = Qnil;
|
|
|
2929 data.string = Qnil;
|
|
|
2930
|
|
|
2931 Dynarr_reset (data.db->runes);
|
|
|
2932
|
|
|
2933 if (STRINGP (Voverlay_arrow_string))
|
|
|
2934 {
|
|
867
|
2935 add_ibyte_string_runes
|
|
428
|
2936 (&data,
|
|
|
2937 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
2938 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
2939 1, 0);
|
|
428
|
2940 }
|
|
|
2941 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
2942 {
|
|
|
2943 struct glyph_block gb;
|
|
|
2944
|
|
|
2945 gb.glyph = Voverlay_arrow_string;
|
|
|
2946 gb.extent = Qnil;
|
|
|
2947 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
2948 }
|
|
819
|
2949
|
|
428
|
2950 if (data.max_pixmap_height)
|
|
|
2951 {
|
|
|
2952 int height = data.new_ascent + data.new_descent;
|
|
|
2953 int pix_ascent, pix_descent;
|
|
819
|
2954
|
|
428
|
2955 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2956 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
2957 calculate_baseline (&data);
|
|
428
|
2958
|
|
|
2959 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2960 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2961 }
|
|
|
2962
|
|
|
2963 dl->ascent = data.new_ascent;
|
|
|
2964 dl->descent = data.new_descent;
|
|
|
2965
|
|
|
2966 data.db->start_pos = dl->bounds.left_in;
|
|
|
2967 data.db->end_pos = data.pixpos;
|
|
|
2968
|
|
819
|
2969 calculate_yoffset (dl, data.db);
|
|
|
2970
|
|
428
|
2971 return data.pixpos - dl->bounds.left_in;
|
|
|
2972 }
|
|
|
2973
|
|
|
2974 /* Add a type of glyph to a margin display block. */
|
|
|
2975
|
|
|
2976 static int
|
|
|
2977 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
2978 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
2979 {
|
|
|
2980 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
2981 ? dl->left_glyphs
|
|
|
2982 : dl->right_glyphs);
|
|
|
2983 int elt, end;
|
|
|
2984 int reverse;
|
|
442
|
2985 struct window *w = XWINDOW (window);
|
|
|
2986 struct frame *f = XFRAME (w->frame);
|
|
|
2987 struct device *d = XDEVICE (f->device);
|
|
|
2988 pos_data data;
|
|
|
2989
|
|
|
2990 xzero (data);
|
|
|
2991 data.d = d;
|
|
|
2992 data.window = window;
|
|
|
2993 data.db = db;
|
|
|
2994 data.dl = dl;
|
|
|
2995 data.pixpos = start;
|
|
|
2996 data.cursor_type = NO_CURSOR;
|
|
|
2997 data.cursor_x = -1;
|
|
|
2998 data.last_charset = Qunbound;
|
|
|
2999 data.last_findex = DEFAULT_INDEX;
|
|
|
3000 data.result_str = Qnil;
|
|
|
3001 data.string = Qnil;
|
|
|
3002 data.new_ascent = dl->ascent;
|
|
|
3003 data.new_descent = dl->descent;
|
|
428
|
3004
|
|
|
3005 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
3006 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
3007 {
|
|
|
3008 reverse = 1;
|
|
|
3009 elt = Dynarr_length (gbd) - 1;
|
|
|
3010 end = 0;
|
|
|
3011 }
|
|
|
3012 else
|
|
|
3013 {
|
|
|
3014 reverse = 0;
|
|
|
3015 elt = 0;
|
|
|
3016 end = Dynarr_length (gbd);
|
|
|
3017 }
|
|
|
3018
|
|
|
3019 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
3020 {
|
|
|
3021 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3022
|
|
|
3023 if (NILP (gb->extent))
|
|
|
3024 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3025
|
|
|
3026 if (gb->active &&
|
|
|
3027 ((side == LEFT_GLYPHS &&
|
|
|
3028 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3029 || (side == RIGHT_GLYPHS &&
|
|
|
3030 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3031 {
|
|
442
|
3032 data.findex = gb->findex;
|
|
|
3033 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3034 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3035 count--;
|
|
|
3036 gb->active = 0;
|
|
|
3037 }
|
|
|
3038
|
|
|
3039 (reverse ? elt-- : elt++);
|
|
|
3040 }
|
|
|
3041
|
|
819
|
3042 calculate_baseline (&data);
|
|
442
|
3043
|
|
|
3044 dl->ascent = data.new_ascent;
|
|
|
3045 dl->descent = data.new_descent;
|
|
|
3046
|
|
819
|
3047 calculate_yoffset (dl, data.db);
|
|
|
3048
|
|
442
|
3049 return data.pixpos;
|
|
428
|
3050 }
|
|
|
3051
|
|
|
3052 /* Add a blank to a margin display block. */
|
|
|
3053
|
|
|
3054 static void
|
|
|
3055 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
3056 struct window *w, int xpos, int width, int side)
|
|
|
3057 {
|
|
|
3058 struct rune rb;
|
|
|
3059
|
|
|
3060 rb.findex = (side == LEFT_GLYPHS
|
|
|
3061 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3062 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3063 rb.xpos = xpos;
|
|
|
3064 rb.width = width;
|
|
826
|
3065 rb.charpos = -1;
|
|
428
|
3066 rb.endpos = 0;
|
|
|
3067 rb.type = RUNE_BLANK;
|
|
|
3068 rb.cursor_type = CURSOR_OFF;
|
|
|
3069
|
|
|
3070 Dynarr_add (db->runes, rb);
|
|
|
3071 }
|
|
|
3072
|
|
|
3073 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3074 left whitespace area. */
|
|
|
3075
|
|
|
3076 static void
|
|
|
3077 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3078 int overlay_width)
|
|
|
3079 {
|
|
|
3080 Lisp_Object window;
|
|
|
3081
|
|
|
3082 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3083 int elt, end_xpos;
|
|
|
3084 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3085 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3086 int left_in_start = dl->bounds.left_in;
|
|
|
3087 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3088
|
|
|
3089 struct display_block *odb, *idb;
|
|
|
3090
|
|
793
|
3091 window = wrap_window (w);
|
|
428
|
3092
|
|
|
3093 /* We have to add the glyphs to the line in the order outside,
|
|
|
3094 inside, whitespace. However the precedence dictates that we
|
|
|
3095 determine how many will fit in the reverse order. */
|
|
|
3096
|
|
|
3097 /* Determine how many whitespace glyphs we can display and where
|
|
|
3098 they should start. */
|
|
|
3099 white_in_start = dl->bounds.left_white;
|
|
|
3100 white_out_start = left_in_start;
|
|
|
3101 white_out_cnt = white_in_cnt = 0;
|
|
|
3102 elt = 0;
|
|
|
3103
|
|
|
3104 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3105 {
|
|
|
3106 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3107
|
|
|
3108 if (NILP (gb->extent))
|
|
|
3109 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3110
|
|
|
3111 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3112 {
|
|
|
3113 int width;
|
|
|
3114
|
|
438
|
3115 width = glyph_width (gb->glyph, window);
|
|
428
|
3116
|
|
|
3117 if (white_in_start - width >= left_in_end)
|
|
|
3118 {
|
|
|
3119 white_in_cnt++;
|
|
|
3120 white_in_start -= width;
|
|
|
3121 gb->width = width;
|
|
|
3122 gb->active = 1;
|
|
|
3123 }
|
|
|
3124 else if (use_overflow
|
|
|
3125 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3126 {
|
|
|
3127 white_out_cnt++;
|
|
|
3128 white_out_start -= width;
|
|
|
3129 gb->width = width;
|
|
|
3130 gb->active = 1;
|
|
|
3131 }
|
|
|
3132 else
|
|
|
3133 gb->active = 0;
|
|
|
3134 }
|
|
|
3135
|
|
|
3136 elt++;
|
|
|
3137 }
|
|
|
3138
|
|
|
3139 /* Determine how many inside margin glyphs we can display and where
|
|
|
3140 they should start. The inside margin glyphs get whatever space
|
|
|
3141 is left after the whitespace glyphs have been displayed. These
|
|
|
3142 are tricky to calculate since if we decide to use the overflow
|
|
|
3143 area we basically have to start over. So for these we build up a
|
|
|
3144 list of just the inside margin glyphs and manipulate it to
|
|
|
3145 determine the needed info. */
|
|
|
3146 {
|
|
|
3147 glyph_block_dynarr *ib;
|
|
|
3148 int avail_in, avail_out;
|
|
|
3149 int done = 0;
|
|
|
3150 int marker = 0;
|
|
|
3151 int used_in, used_out;
|
|
|
3152
|
|
|
3153 elt = 0;
|
|
|
3154 used_in = used_out = 0;
|
|
|
3155 ib = Dynarr_new (glyph_block);
|
|
|
3156 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3157 {
|
|
|
3158 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3159
|
|
|
3160 if (NILP (gb->extent))
|
|
|
3161 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3162
|
|
|
3163 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3164 GL_INSIDE_MARGIN)
|
|
|
3165 {
|
|
438
|
3166 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3167 used_in += gb->width;
|
|
|
3168 Dynarr_add (ib, *gb);
|
|
|
3169 }
|
|
|
3170
|
|
|
3171 elt++;
|
|
|
3172 }
|
|
|
3173
|
|
|
3174 if (white_out_cnt)
|
|
|
3175 avail_in = 0;
|
|
|
3176 else
|
|
|
3177 {
|
|
|
3178 avail_in = white_in_start - left_in_end;
|
|
|
3179 if (avail_in < 0)
|
|
|
3180 avail_in = 0;
|
|
|
3181 }
|
|
|
3182
|
|
|
3183 if (!use_overflow)
|
|
|
3184 avail_out = 0;
|
|
|
3185 else
|
|
|
3186 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3187
|
|
|
3188 marker = 0;
|
|
|
3189 while (!done && marker < Dynarr_length (ib))
|
|
|
3190 {
|
|
|
3191 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3192
|
|
|
3193 /* If everything now fits in the available inside margin
|
|
|
3194 space, we're done. */
|
|
|
3195 if (used_in <= avail_in)
|
|
|
3196 done = 1;
|
|
|
3197 else
|
|
|
3198 {
|
|
|
3199 /* Otherwise see if we have room to move a glyph to the
|
|
|
3200 outside. */
|
|
|
3201 if (used_out + width <= avail_out)
|
|
|
3202 {
|
|
|
3203 used_out += width;
|
|
|
3204 used_in -= width;
|
|
|
3205 }
|
|
|
3206 else
|
|
|
3207 done = 1;
|
|
|
3208 }
|
|
|
3209
|
|
|
3210 if (!done)
|
|
|
3211 marker++;
|
|
|
3212 }
|
|
|
3213
|
|
|
3214 /* At this point we now know that everything from marker on goes in
|
|
|
3215 the inside margin and everything before it goes in the outside
|
|
|
3216 margin. The stuff going into the outside margin is guaranteed
|
|
|
3217 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3218
|
|
|
3219 in_in_end = left_in_end;
|
|
|
3220 in_out_start = white_out_start;
|
|
|
3221 in_out_cnt = in_in_cnt = 0;
|
|
|
3222
|
|
|
3223 Dynarr_free (ib);
|
|
|
3224 elt = 0;
|
|
|
3225 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3226 {
|
|
|
3227 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3228
|
|
|
3229 if (NILP (gb->extent))
|
|
|
3230 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3231
|
|
|
3232 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3233 GL_INSIDE_MARGIN)
|
|
|
3234 {
|
|
438
|
3235 int width = glyph_width (gb->glyph, window);
|
|
428
|
3236
|
|
|
3237 if (used_out)
|
|
|
3238 {
|
|
|
3239 in_out_cnt++;
|
|
|
3240 in_out_start -= width;
|
|
|
3241 gb->width = width;
|
|
|
3242 gb->active = 1;
|
|
|
3243 used_out -= width;
|
|
|
3244 }
|
|
|
3245 else if (in_in_end + width < white_in_start)
|
|
|
3246 {
|
|
|
3247 in_in_cnt++;
|
|
|
3248 in_in_end += width;
|
|
|
3249 gb->width = width;
|
|
|
3250 gb->active = 1;
|
|
|
3251 }
|
|
|
3252 else
|
|
|
3253 gb->active = 0;
|
|
|
3254 }
|
|
|
3255
|
|
|
3256 elt++;
|
|
|
3257 }
|
|
|
3258 }
|
|
|
3259
|
|
|
3260 /* Determine how many outside margin glyphs we can display. They
|
|
|
3261 always start at the left outside margin and can only use the
|
|
|
3262 outside margin space. */
|
|
|
3263 out_end = dl->bounds.left_out;
|
|
|
3264 out_cnt = 0;
|
|
|
3265 elt = 0;
|
|
|
3266
|
|
|
3267 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3268 {
|
|
|
3269 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3270
|
|
|
3271 if (NILP (gb->extent))
|
|
|
3272 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3273
|
|
|
3274 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3275 GL_OUTSIDE_MARGIN)
|
|
|
3276 {
|
|
438
|
3277 int width = glyph_width (gb->glyph, window);
|
|
428
|
3278
|
|
|
3279 if (out_end + width <= in_out_start)
|
|
|
3280 {
|
|
|
3281 out_cnt++;
|
|
|
3282 out_end += width;
|
|
|
3283 gb->width = width;
|
|
|
3284 gb->active = 1;
|
|
|
3285 }
|
|
|
3286 else
|
|
|
3287 gb->active = 0;
|
|
|
3288 }
|
|
|
3289
|
|
|
3290 elt++;
|
|
|
3291 }
|
|
|
3292
|
|
|
3293 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3294 runes to the appropriate display blocks. */
|
|
|
3295 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3296 {
|
|
|
3297 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3298 odb->start_pos = dl->bounds.left_out;
|
|
|
3299 /* #### We should stop adding a blank to account for the space
|
|
|
3300 between the end of the glyphs and the margin and instead set
|
|
|
3301 this accordingly. */
|
|
|
3302 odb->end_pos = dl->bounds.left_in;
|
|
|
3303 Dynarr_reset (odb->runes);
|
|
|
3304 }
|
|
|
3305 else
|
|
|
3306 odb = 0;
|
|
|
3307
|
|
|
3308 if (in_in_cnt || white_in_cnt)
|
|
|
3309 {
|
|
|
3310 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3311 idb->start_pos = dl->bounds.left_in;
|
|
|
3312 /* #### See above comment for odb->end_pos */
|
|
|
3313 idb->end_pos = dl->bounds.left_white;
|
|
|
3314 Dynarr_reset (idb->runes);
|
|
|
3315 }
|
|
|
3316 else
|
|
|
3317 idb = 0;
|
|
|
3318
|
|
|
3319 /* First add the outside margin glyphs. */
|
|
|
3320 if (out_cnt)
|
|
|
3321 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3322 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3323 else
|
|
|
3324 end_xpos = dl->bounds.left_out;
|
|
|
3325
|
|
|
3326 /* There may be blank space between the outside margin glyphs and
|
|
|
3327 the inside margin glyphs. If so, add a blank. */
|
|
|
3328 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3329 {
|
|
|
3330 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3331 LEFT_GLYPHS);
|
|
|
3332 }
|
|
|
3333
|
|
|
3334 /* Next add the inside margin glyphs which are actually in the
|
|
|
3335 outside margin. */
|
|
|
3336 if (in_out_cnt)
|
|
|
3337 {
|
|
|
3338 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3339 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3340 }
|
|
|
3341
|
|
|
3342 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3343 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3344 here. */
|
|
|
3345 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3346 {
|
|
|
3347 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3348 LEFT_GLYPHS);
|
|
|
3349 }
|
|
|
3350
|
|
|
3351 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3352 outside margin. */
|
|
|
3353 if (white_out_cnt)
|
|
|
3354 {
|
|
|
3355 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3356 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3357 }
|
|
|
3358
|
|
|
3359 /* We take care of clearing between the end of the glyphs and the
|
|
|
3360 start of the inside margin for lines which have glyphs. */
|
|
|
3361 if (odb && (left_in_start - end_xpos))
|
|
|
3362 {
|
|
|
3363 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3364 LEFT_GLYPHS);
|
|
|
3365 }
|
|
|
3366
|
|
|
3367 /* Next add the inside margin glyphs which are actually in the
|
|
|
3368 inside margin. */
|
|
|
3369 if (in_in_cnt)
|
|
|
3370 {
|
|
|
3371 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3372 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3373 }
|
|
|
3374 else
|
|
|
3375 end_xpos = left_in_end;
|
|
|
3376
|
|
|
3377 /* Make sure that the area between the end of the inside margin
|
|
|
3378 glyphs and the whitespace glyphs is cleared. */
|
|
|
3379 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3380 {
|
|
|
3381 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3382 LEFT_GLYPHS);
|
|
|
3383 }
|
|
|
3384
|
|
|
3385 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3386 inside margin. */
|
|
|
3387 if (white_in_cnt)
|
|
|
3388 {
|
|
|
3389 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3390 LEFT_GLYPHS, window);
|
|
|
3391 }
|
|
|
3392
|
|
|
3393 /* Whitespace glyphs always end right next to the text block so
|
|
|
3394 there is nothing we have to make sure is cleared after them. */
|
|
|
3395 }
|
|
|
3396
|
|
|
3397 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3398 right whitespace area. */
|
|
|
3399
|
|
|
3400 static void
|
|
|
3401 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3402 {
|
|
|
3403 Lisp_Object window;
|
|
|
3404
|
|
|
3405 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3406 int elt, end_xpos;
|
|
|
3407 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3408 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3409
|
|
|
3410 struct display_block *odb, *idb;
|
|
|
3411
|
|
793
|
3412 window = wrap_window (w);
|
|
428
|
3413
|
|
|
3414 /* We have to add the glyphs to the line in the order outside,
|
|
|
3415 inside, whitespace. However the precedence dictates that we
|
|
|
3416 determine how many will fit in the reverse order. */
|
|
|
3417
|
|
|
3418 /* Determine how many whitespace glyphs we can display and where
|
|
|
3419 they should start. */
|
|
|
3420 white_in_end = dl->bounds.right_white;
|
|
|
3421 white_out_end = dl->bounds.right_in;
|
|
|
3422 white_out_cnt = white_in_cnt = 0;
|
|
|
3423 elt = 0;
|
|
|
3424
|
|
|
3425 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3426 {
|
|
|
3427 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3428
|
|
|
3429 if (NILP (gb->extent))
|
|
|
3430 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3431
|
|
|
3432 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3433 {
|
|
438
|
3434 int width = glyph_width (gb->glyph, window);
|
|
428
|
3435
|
|
|
3436 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3437 {
|
|
|
3438 white_in_cnt++;
|
|
|
3439 white_in_end += width;
|
|
|
3440 gb->width = width;
|
|
|
3441 gb->active = 1;
|
|
|
3442 }
|
|
|
3443 else if (use_overflow
|
|
|
3444 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3445 {
|
|
|
3446 white_out_cnt++;
|
|
|
3447 white_out_end += width;
|
|
|
3448 gb->width = width;
|
|
|
3449 gb->active = 1;
|
|
|
3450 }
|
|
|
3451 else
|
|
|
3452 gb->active = 0;
|
|
|
3453 }
|
|
|
3454
|
|
|
3455 elt++;
|
|
|
3456 }
|
|
|
3457
|
|
|
3458 /* Determine how many inside margin glyphs we can display and where
|
|
|
3459 they should start. The inside margin glyphs get whatever space
|
|
|
3460 is left after the whitespace glyphs have been displayed. These
|
|
|
3461 are tricky to calculate since if we decide to use the overflow
|
|
|
3462 area we basically have to start over. So for these we build up a
|
|
|
3463 list of just the inside margin glyphs and manipulate it to
|
|
|
3464 determine the needed info. */
|
|
|
3465 {
|
|
|
3466 glyph_block_dynarr *ib;
|
|
|
3467 int avail_in, avail_out;
|
|
|
3468 int done = 0;
|
|
|
3469 int marker = 0;
|
|
|
3470 int used_in, used_out;
|
|
|
3471
|
|
|
3472 elt = 0;
|
|
|
3473 used_in = used_out = 0;
|
|
|
3474 ib = Dynarr_new (glyph_block);
|
|
|
3475 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3476 {
|
|
|
3477 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3478
|
|
|
3479 if (NILP (gb->extent))
|
|
|
3480 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3481
|
|
|
3482 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3483 {
|
|
438
|
3484 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3485 used_in += gb->width;
|
|
|
3486 Dynarr_add (ib, *gb);
|
|
|
3487 }
|
|
|
3488
|
|
|
3489 elt++;
|
|
|
3490 }
|
|
|
3491
|
|
|
3492 if (white_out_cnt)
|
|
|
3493 avail_in = 0;
|
|
|
3494 else
|
|
|
3495 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3496
|
|
|
3497 if (!use_overflow)
|
|
|
3498 avail_out = 0;
|
|
|
3499 else
|
|
|
3500 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3501
|
|
|
3502 marker = 0;
|
|
|
3503 while (!done && marker < Dynarr_length (ib))
|
|
|
3504 {
|
|
|
3505 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3506
|
|
|
3507 /* If everything now fits in the available inside margin
|
|
|
3508 space, we're done. */
|
|
|
3509 if (used_in <= avail_in)
|
|
|
3510 done = 1;
|
|
|
3511 else
|
|
|
3512 {
|
|
|
3513 /* Otherwise see if we have room to move a glyph to the
|
|
|
3514 outside. */
|
|
|
3515 if (used_out + width <= avail_out)
|
|
|
3516 {
|
|
|
3517 used_out += width;
|
|
|
3518 used_in -= width;
|
|
|
3519 }
|
|
|
3520 else
|
|
|
3521 done = 1;
|
|
|
3522 }
|
|
|
3523
|
|
|
3524 if (!done)
|
|
|
3525 marker++;
|
|
|
3526 }
|
|
|
3527
|
|
|
3528 /* At this point we now know that everything from marker on goes in
|
|
|
3529 the inside margin and everything before it goes in the outside
|
|
|
3530 margin. The stuff going into the outside margin is guaranteed
|
|
|
3531 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3532
|
|
|
3533 in_in_start = dl->bounds.right_in;
|
|
|
3534 in_out_end = dl->bounds.right_in;
|
|
|
3535 in_out_cnt = in_in_cnt = 0;
|
|
|
3536
|
|
|
3537 Dynarr_free (ib);
|
|
|
3538 elt = 0;
|
|
|
3539 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3540 {
|
|
|
3541 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3542
|
|
|
3543 if (NILP (gb->extent))
|
|
|
3544 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3545
|
|
|
3546 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3547 {
|
|
438
|
3548 int width = glyph_width (gb->glyph, window);
|
|
428
|
3549
|
|
|
3550 if (used_out)
|
|
|
3551 {
|
|
|
3552 in_out_cnt++;
|
|
|
3553 in_out_end += width;
|
|
|
3554 gb->width = width;
|
|
|
3555 gb->active = 1;
|
|
|
3556 used_out -= width;
|
|
|
3557 }
|
|
|
3558 else if (in_in_start - width >= white_in_end)
|
|
|
3559 {
|
|
|
3560 in_in_cnt++;
|
|
|
3561 in_in_start -= width;
|
|
|
3562 gb->width = width;
|
|
|
3563 gb->active = 1;
|
|
|
3564 }
|
|
|
3565 else
|
|
|
3566 gb->active = 0;
|
|
|
3567 }
|
|
|
3568
|
|
|
3569 elt++;
|
|
|
3570 }
|
|
|
3571 }
|
|
|
3572
|
|
|
3573 /* Determine how many outside margin glyphs we can display. They
|
|
|
3574 always start at the right outside margin and can only use the
|
|
|
3575 outside margin space. */
|
|
|
3576 out_start = dl->bounds.right_out;
|
|
|
3577 out_cnt = 0;
|
|
|
3578 elt = 0;
|
|
|
3579
|
|
|
3580 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3581 {
|
|
|
3582 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3583
|
|
|
3584 if (NILP (gb->extent))
|
|
|
3585 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3586
|
|
|
3587 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3588 {
|
|
438
|
3589 int width = glyph_width (gb->glyph, window);
|
|
428
|
3590
|
|
|
3591 if (out_start - width >= in_out_end)
|
|
|
3592 {
|
|
|
3593 out_cnt++;
|
|
|
3594 out_start -= width;
|
|
|
3595 gb->width = width;
|
|
|
3596 gb->active = 1;
|
|
|
3597 }
|
|
|
3598 else
|
|
|
3599 gb->active = 0;
|
|
|
3600 }
|
|
|
3601
|
|
|
3602 elt++;
|
|
|
3603 }
|
|
|
3604
|
|
|
3605 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3606 to the appropriate display blocks. */
|
|
|
3607 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3608 {
|
|
|
3609 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3610 /* #### See comments before odb->start_pos init in
|
|
|
3611 create_left_glyph_block */
|
|
|
3612 odb->start_pos = dl->bounds.right_in;
|
|
|
3613 odb->end_pos = dl->bounds.right_out;
|
|
|
3614 Dynarr_reset (odb->runes);
|
|
|
3615 }
|
|
|
3616 else
|
|
|
3617 odb = 0;
|
|
|
3618
|
|
|
3619 if (in_in_cnt || white_in_cnt)
|
|
|
3620 {
|
|
|
3621 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3622 idb->start_pos = dl->bounds.right_white;
|
|
|
3623 /* #### See comments before odb->start_pos init in
|
|
|
3624 create_left_glyph_block */
|
|
|
3625 idb->end_pos = dl->bounds.right_in;
|
|
|
3626 Dynarr_reset (idb->runes);
|
|
|
3627 }
|
|
|
3628 else
|
|
|
3629 idb = 0;
|
|
|
3630
|
|
|
3631 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3632 inside margin. */
|
|
|
3633 if (white_in_cnt)
|
|
|
3634 {
|
|
|
3635 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3636 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3637 window);
|
|
|
3638 }
|
|
|
3639 else
|
|
|
3640 end_xpos = dl->bounds.right_white;
|
|
|
3641
|
|
|
3642 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3643 and the inside margin glyphs is cleared. */
|
|
|
3644 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3645 {
|
|
|
3646 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3647 RIGHT_GLYPHS);
|
|
|
3648 }
|
|
|
3649
|
|
|
3650 /* Next add the inside margin glyphs which are actually in the
|
|
|
3651 inside margin. */
|
|
|
3652 if (in_in_cnt)
|
|
|
3653 {
|
|
|
3654 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3655 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3656 }
|
|
|
3657
|
|
|
3658 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3659 of the inside margin area gets cleared. */
|
|
|
3660 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3661 {
|
|
|
3662 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3663 RIGHT_GLYPHS);
|
|
|
3664 }
|
|
|
3665
|
|
|
3666 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3667 if (white_out_cnt)
|
|
|
3668 {
|
|
|
3669 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3670 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3671 }
|
|
|
3672 else
|
|
|
3673 end_xpos = dl->bounds.right_in;
|
|
|
3674
|
|
|
3675 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3676 if (in_out_cnt)
|
|
|
3677 {
|
|
|
3678 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3679 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3680 }
|
|
|
3681
|
|
|
3682 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3683 in the outside margin and the actual outside margin glyphs. */
|
|
|
3684 if (odb && (out_start - end_xpos))
|
|
|
3685 {
|
|
|
3686 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3687 RIGHT_GLYPHS);
|
|
|
3688 }
|
|
|
3689
|
|
|
3690 /* Finally, add the outside margin glyphs. */
|
|
|
3691 if (out_cnt)
|
|
|
3692 {
|
|
|
3693 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3694 RIGHT_GLYPHS, window);
|
|
|
3695 }
|
|
|
3696 }
|
|
|
3697
|
|
|
3698
|
|
|
3699 /***************************************************************************/
|
|
|
3700 /* */
|
|
|
3701 /* modeline routines */
|
|
|
3702 /* */
|
|
|
3703 /***************************************************************************/
|
|
|
3704
|
|
438
|
3705 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3706 void
|
|
|
3707 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3708 struct window *w, struct display_line *dl,
|
|
|
3709 struct display_block *db, face_index findex,
|
|
|
3710 int min_pixpos, int max_pixpos, int type)
|
|
|
3711 {
|
|
|
3712 struct frame *f = XFRAME (w->frame);
|
|
|
3713 struct device *d = XDEVICE (f->device);
|
|
|
3714
|
|
|
3715 pos_data data;
|
|
|
3716 int c_pixpos;
|
|
|
3717 Charcount offset = 0;
|
|
|
3718
|
|
|
3719 xzero (data);
|
|
|
3720 data.d = d;
|
|
|
3721 data.db = db;
|
|
|
3722 data.dl = dl;
|
|
|
3723 data.findex = findex;
|
|
|
3724 data.pixpos = min_pixpos;
|
|
|
3725 data.max_pixpos = max_pixpos;
|
|
|
3726 data.cursor_type = NO_CURSOR;
|
|
|
3727 data.last_charset = Qunbound;
|
|
|
3728 data.last_findex = DEFAULT_INDEX;
|
|
|
3729 data.result_str = result_str;
|
|
|
3730 data.is_modeline = 1;
|
|
|
3731 data.string = Qnil;
|
|
793
|
3732 data.window = wrap_window (w);
|
|
438
|
3733
|
|
|
3734 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3735 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3736 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3737
|
|
|
3738 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3739 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3740 horizontal scrolling amount */
|
|
438
|
3741 if (! NILP (result_str))
|
|
|
3742 offset = w->modeline_hscroll;
|
|
|
3743 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3744 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3745 Qnil);
|
|
|
3746
|
|
|
3747 if (Dynarr_length (db->runes))
|
|
|
3748 {
|
|
|
3749 struct rune *rb =
|
|
|
3750 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3751 c_pixpos = rb->xpos + rb->width;
|
|
|
3752 }
|
|
|
3753 else
|
|
|
3754 c_pixpos = min_pixpos;
|
|
|
3755
|
|
|
3756 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3757 to make up the difference. This usually only occurs if the
|
|
|
3758 modeline face is using a proportional width font or a fixed width
|
|
|
3759 font of a different size from the default face font. */
|
|
|
3760
|
|
|
3761 if (c_pixpos < max_pixpos)
|
|
|
3762 {
|
|
|
3763 data.pixpos = c_pixpos;
|
|
|
3764 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3765
|
|
|
3766 add_blank_rune (&data, NULL, 0);
|
|
|
3767 }
|
|
|
3768
|
|
|
3769 /* Now create the result string and frob the extents into it. */
|
|
|
3770 if (!NILP (result_str))
|
|
|
3771 {
|
|
|
3772 int elt;
|
|
|
3773 Bytecount len;
|
|
867
|
3774 Ibyte *strdata;
|
|
438
|
3775 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3776
|
|
442
|
3777 in_modeline_generation = 1;
|
|
|
3778
|
|
771
|
3779 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3780 detach_all_extents (result_str);
|
|
793
|
3781 resize_string (result_str, -1,
|
|
438
|
3782 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3783
|
|
|
3784 strdata = XSTRING_DATA (result_str);
|
|
|
3785
|
|
|
3786 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3787 {
|
|
|
3788 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3789 {
|
|
867
|
3790 len += (set_itext_ichar
|
|
438
|
3791 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3792 elt)->object.chr.ch));
|
|
|
3793 }
|
|
|
3794 }
|
|
|
3795
|
|
771
|
3796 init_string_ascii_begin (result_str);
|
|
|
3797 bump_string_modiff (result_str);
|
|
|
3798 sledgehammer_check_ascii_begin (result_str);
|
|
|
3799
|
|
438
|
3800 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3801 elt++)
|
|
|
3802 {
|
|
|
3803 Lisp_Object extent = Qnil;
|
|
|
3804 Lisp_Object child;
|
|
|
3805
|
|
793
|
3806 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3807 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3808 if (NILP (child))
|
|
|
3809 {
|
|
|
3810 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3811 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3812 }
|
|
|
3813 Fset_extent_parent (child, extent);
|
|
|
3814 set_extent_endpoints
|
|
|
3815 (XEXTENT (child),
|
|
|
3816 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3817 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3818 result_str);
|
|
|
3819 }
|
|
442
|
3820
|
|
|
3821 in_modeline_generation = 0;
|
|
438
|
3822 }
|
|
|
3823 }
|
|
|
3824
|
|
428
|
3825 /* Ensure that the given display line DL accurately represents the
|
|
|
3826 modeline for the given window. */
|
|
|
3827 static void
|
|
|
3828 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3829 {
|
|
|
3830 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3831 struct frame *f = XFRAME (w->frame);
|
|
|
3832 struct device *d = XDEVICE (f->device);
|
|
|
3833
|
|
|
3834 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3835 our feet. */
|
|
|
3836 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3837 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3838 Lisp_Object font_inst;
|
|
|
3839
|
|
|
3840 /* This will actually determine incorrect inside boundaries for the
|
|
|
3841 modeline since it ignores the margins. However being aware of this fact
|
|
|
3842 we never use those values anywhere so it doesn't matter. */
|
|
|
3843 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3844
|
|
|
3845 /* We are generating a modeline. */
|
|
|
3846 dl->modeline = 1;
|
|
|
3847 dl->cursor_elt = -1;
|
|
|
3848
|
|
|
3849 /* Reset the runes on the modeline. */
|
|
|
3850 Dynarr_reset (db->runes);
|
|
|
3851
|
|
|
3852 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3853 {
|
|
|
3854 struct rune rb;
|
|
|
3855
|
|
|
3856 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3857 if (window_scrollbar_height (w))
|
|
|
3858 return;
|
|
|
3859
|
|
|
3860 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3861 dl->descent = 0;
|
|
|
3862 /* The modeline is at the bottom of the gutters. */
|
|
|
3863 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3864
|
|
|
3865 rb.findex = MODELINE_INDEX;
|
|
|
3866 rb.xpos = dl->bounds.left_out;
|
|
|
3867 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
826
|
3868 rb.charpos = 0;
|
|
428
|
3869 rb.endpos = 0;
|
|
|
3870 rb.type = RUNE_HLINE;
|
|
|
3871 rb.object.hline.thickness = 1;
|
|
|
3872 rb.object.hline.yoffset = 0;
|
|
|
3873 rb.cursor_type = NO_CURSOR;
|
|
|
3874
|
|
|
3875 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3876 && FRAME_WIN_P (f))
|
|
|
3877 {
|
|
|
3878 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3879
|
|
|
3880 dl->ypos -= shadow_thickness;
|
|
|
3881 rb.xpos += shadow_thickness;
|
|
|
3882 rb.width -= 2 * shadow_thickness;
|
|
|
3883 }
|
|
|
3884
|
|
|
3885 Dynarr_add (db->runes, rb);
|
|
|
3886 return;
|
|
|
3887 }
|
|
|
3888
|
|
|
3889 /* !!#### not right; needs to compute the max height of
|
|
|
3890 all the charsets */
|
|
|
3891 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3892
|
|
|
3893 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3894 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3895
|
|
|
3896 min_pixpos = dl->bounds.left_out;
|
|
|
3897 max_pixpos = dl->bounds.right_out;
|
|
|
3898
|
|
|
3899 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3900 {
|
|
|
3901 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3902
|
|
|
3903 ypos_adj = shadow_thickness;
|
|
|
3904 min_pixpos += shadow_thickness;
|
|
|
3905 max_pixpos -= shadow_thickness;
|
|
|
3906 }
|
|
|
3907 else
|
|
|
3908 ypos_adj = 0;
|
|
|
3909
|
|
|
3910 generate_formatted_string_db (b->modeline_format,
|
|
|
3911 b->generated_modeline_string, w, dl, db,
|
|
|
3912 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3913
|
|
|
3914 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3915 set this until we've generated the modeline in order to account
|
|
|
3916 for any embedded faces. */
|
|
|
3917 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3918 }
|
|
|
3919
|
|
|
3920 static Charcount
|
|
867
|
3921 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
|
|
771
|
3922 Charcount pos, Charcount min_pos,
|
|
|
3923 Charcount max_pos)
|
|
428
|
3924 {
|
|
|
3925 /* This function has been Mule-ized. */
|
|
|
3926 Charcount end;
|
|
867
|
3927 const Ibyte *cur_pos = str;
|
|
428
|
3928 struct display_block *db = data->db;
|
|
|
3929
|
|
|
3930 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3931 while (Dynarr_length (db->runes) < pos)
|
|
|
3932 add_blank_rune (data, NULL, 0);
|
|
|
3933
|
|
|
3934 end = (Dynarr_length (db->runes) +
|
|
442
|
3935 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
3936 if (max_pos != -1)
|
|
|
3937 end = min (max_pos, end);
|
|
|
3938
|
|
|
3939 while (pos < end && *cur_pos)
|
|
|
3940 {
|
|
867
|
3941 const Ibyte *old_cur_pos = cur_pos;
|
|
428
|
3942 int succeeded;
|
|
|
3943
|
|
867
|
3944 data->ch = itext_ichar (cur_pos);
|
|
|
3945 succeeded = (add_ichar_rune (data) != ADD_FAILED);
|
|
|
3946 INC_IBYTEPTR (cur_pos);
|
|
428
|
3947 if (succeeded)
|
|
|
3948 {
|
|
|
3949 pos++;
|
|
|
3950 data->modeline_charpos++;
|
|
|
3951 data->bytepos += cur_pos - old_cur_pos;
|
|
|
3952 }
|
|
|
3953 }
|
|
|
3954
|
|
|
3955 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
3956 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3957 add_blank_rune (data, NULL, 0);
|
|
|
3958
|
|
|
3959 return Dynarr_length (db->runes);
|
|
|
3960 }
|
|
|
3961
|
|
|
3962 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
3963 modeline extents. */
|
|
|
3964 static Charcount
|
|
|
3965 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
438
|
3966 Charcount pos, Charcount min_pos,
|
|
|
3967 Charcount max_pos, Lisp_Object extent)
|
|
428
|
3968 {
|
|
|
3969 /* This function has been Mule-ized. */
|
|
|
3970 Charcount end;
|
|
|
3971 struct display_block *db = data->db;
|
|
|
3972 struct glyph_block gb;
|
|
|
3973
|
|
|
3974 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3975 while (Dynarr_length (db->runes) < pos)
|
|
|
3976 add_blank_rune (data, NULL, 0);
|
|
|
3977
|
|
|
3978 end = Dynarr_length (db->runes) + 1;
|
|
|
3979 if (max_pos != -1)
|
|
|
3980 end = min (max_pos, end);
|
|
|
3981
|
|
|
3982 gb.glyph = glyph;
|
|
438
|
3983 gb.extent = extent;
|
|
428
|
3984 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3985 pos++;
|
|
|
3986
|
|
|
3987 while (Dynarr_length (db->runes) < pos &&
|
|
|
3988 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3989 add_blank_rune (data, NULL, 0);
|
|
|
3990
|
|
|
3991 return Dynarr_length (db->runes);
|
|
|
3992 }
|
|
|
3993
|
|
|
3994 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
3995 true of max_pixsize. */
|
|
|
3996 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
3997 if (Dynarr_length (data->db->runes)) \
|
|
|
3998 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
3999 else \
|
|
|
4000 cur_pixsize = 0;
|
|
|
4001
|
|
|
4002 /* Note that this function does "positions" in terms of characters and
|
|
|
4003 not in terms of columns. This is necessary to make the formatting
|
|
|
4004 work correctly when proportional width fonts are used in the
|
|
|
4005 modeline. */
|
|
|
4006 static Charcount
|
|
|
4007 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
4008 Charcount min_pos, Charcount max_pos,
|
|
|
4009 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
4010 face_index findex, int type, Charcount *offset,
|
|
|
4011 Lisp_Object cur_ext)
|
|
428
|
4012 {
|
|
|
4013 /* This function has been Mule-ized. */
|
|
|
4014 /* #### The other losing things in this function are:
|
|
|
4015
|
|
|
4016 -- C zero-terminated-string lossage.
|
|
|
4017 -- Non-printable characters should be converted into something
|
|
|
4018 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
4019 */
|
|
|
4020
|
|
|
4021 tail_recurse:
|
|
|
4022 if (depth > 10)
|
|
|
4023 goto invalid;
|
|
|
4024
|
|
|
4025 depth++;
|
|
|
4026
|
|
|
4027 if (STRINGP (elt))
|
|
|
4028 {
|
|
|
4029 /* A string. Add to the display line and check for %-constructs
|
|
|
4030 within it. */
|
|
|
4031
|
|
867
|
4032 Ibyte *this = XSTRING_DATA (elt);
|
|
428
|
4033
|
|
|
4034 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4035 {
|
|
867
|
4036 Ibyte *last = this;
|
|
428
|
4037
|
|
|
4038 while (*this && *this != '%')
|
|
|
4039 this++;
|
|
|
4040
|
|
|
4041 if (this != last)
|
|
|
4042 {
|
|
438
|
4043 /* No %-construct */
|
|
428
|
4044 Charcount size =
|
|
438
|
4045 bytecount_to_charcount (last, this - last);
|
|
|
4046
|
|
|
4047 if (size <= *offset)
|
|
|
4048 *offset -= size;
|
|
|
4049 else
|
|
|
4050 {
|
|
|
4051 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4052 min (pos + size - *offset, max_pos));
|
|
867
|
4053 const Ibyte *tmp_last = itext_n_addr (last, *offset);
|
|
438
|
4054
|
|
|
4055 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4056 pos, pos, tmp_max);
|
|
|
4057 *offset = 0;
|
|
|
4058 }
|
|
428
|
4059 }
|
|
|
4060 else /* *this == '%' */
|
|
|
4061 {
|
|
|
4062 Charcount spec_width = 0;
|
|
|
4063
|
|
|
4064 this++; /* skip over '%' */
|
|
|
4065
|
|
|
4066 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4067 * Argument specifies minwidth but not maxwidth
|
|
|
4068 * (maxwidth can be specified by
|
|
|
4069 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4070 */
|
|
|
4071 while (isdigit (*this))
|
|
|
4072 {
|
|
|
4073 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4074 this++;
|
|
|
4075 }
|
|
|
4076 spec_width += pos;
|
|
|
4077
|
|
|
4078 if (*this == 'M')
|
|
|
4079 {
|
|
|
4080 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4081 max_pos, Vglobal_mode_string,
|
|
|
4082 depth, max_pixsize, findex,
|
|
438
|
4083 type, offset, cur_ext);
|
|
428
|
4084 }
|
|
|
4085 else if (*this == '-')
|
|
|
4086 {
|
|
|
4087 Charcount num_to_add;
|
|
|
4088
|
|
|
4089 if (max_pixsize < 0)
|
|
|
4090 num_to_add = 0;
|
|
|
4091 else if (max_pos != -1)
|
|
|
4092 num_to_add = max_pos - pos;
|
|
|
4093 else
|
|
|
4094 {
|
|
|
4095 int cur_pixsize;
|
|
|
4096 int dash_pixsize;
|
|
867
|
4097 Ibyte ch = '-';
|
|
428
|
4098 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4099
|
|
|
4100 dash_pixsize =
|
|
|
4101 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4102 1);
|
|
|
4103
|
|
|
4104 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4105 num_to_add++;
|
|
|
4106 }
|
|
|
4107
|
|
|
4108 while (num_to_add--)
|
|
|
4109 pos = add_string_to_fstring_db_runes
|
|
867
|
4110 (data, (const Ibyte *) "-", pos, pos, max_pos);
|
|
428
|
4111 }
|
|
|
4112 else if (*this != 0)
|
|
|
4113 {
|
|
867
|
4114 Ichar ch = itext_ichar (this);
|
|
|
4115 Ibyte *str;
|
|
438
|
4116 Charcount size;
|
|
|
4117
|
|
428
|
4118 decode_mode_spec (w, ch, type);
|
|
|
4119
|
|
867
|
4120 str = Dynarr_atp (mode_spec_ibyte_string, 0);
|
|
438
|
4121 size = bytecount_to_charcount
|
|
|
4122 /* Skip the null character added by `decode_mode_spec' */
|
|
867
|
4123 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
|
|
438
|
4124
|
|
|
4125 if (size <= *offset)
|
|
|
4126 *offset -= size;
|
|
|
4127 else
|
|
|
4128 {
|
|
867
|
4129 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4130
|
|
440
|
4131 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4132 computed and used here as in the plain string case
|
|
|
4133 above. -- dv */
|
|
|
4134 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4135 pos, pos,
|
|
|
4136 max_pos);
|
|
|
4137 *offset = 0;
|
|
|
4138 }
|
|
428
|
4139 }
|
|
|
4140
|
|
|
4141 /* NOT this++. There could be any sort of character at
|
|
|
4142 the current position. */
|
|
867
|
4143 INC_IBYTEPTR (this);
|
|
428
|
4144 }
|
|
|
4145
|
|
|
4146 if (max_pixsize > 0)
|
|
|
4147 {
|
|
|
4148 int cur_pixsize;
|
|
|
4149 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4150
|
|
|
4151 if (cur_pixsize >= max_pixsize)
|
|
|
4152 break;
|
|
|
4153 }
|
|
|
4154 }
|
|
|
4155 }
|
|
|
4156 else if (SYMBOLP (elt))
|
|
|
4157 {
|
|
|
4158 /* A symbol: process the value of the symbol recursively
|
|
|
4159 as if it appeared here directly. */
|
|
|
4160 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4161
|
|
|
4162 if (!UNBOUNDP (tem))
|
|
|
4163 {
|
|
438
|
4164 /* If value is a string, output that string literally:
|
|
428
|
4165 don't check for % within it. */
|
|
|
4166 if (STRINGP (tem))
|
|
|
4167 {
|
|
867
|
4168 Ibyte *str = XSTRING_DATA (tem);
|
|
826
|
4169 Charcount size = string_char_length (tem);
|
|
438
|
4170
|
|
|
4171 if (size <= *offset)
|
|
|
4172 *offset -= size;
|
|
|
4173 else
|
|
|
4174 {
|
|
867
|
4175 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4176
|
|
440
|
4177 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4178 computed and used here as in the plain string case
|
|
|
4179 above. -- dv */
|
|
|
4180 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4181 min_pos, max_pos);
|
|
|
4182 *offset = 0;
|
|
|
4183 }
|
|
428
|
4184 }
|
|
|
4185 /* Give up right away for nil or t. */
|
|
|
4186 else if (!EQ (tem, elt))
|
|
|
4187 {
|
|
|
4188 elt = tem;
|
|
|
4189 goto tail_recurse;
|
|
|
4190 }
|
|
|
4191 }
|
|
|
4192 }
|
|
|
4193 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4194 {
|
|
|
4195 Lisp_Object window, tem;
|
|
793
|
4196 window = wrap_window (w);
|
|
428
|
4197 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4198 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4199 if (!UNBOUNDP (tem))
|
|
|
4200 {
|
|
|
4201 elt = tem;
|
|
|
4202 goto tail_recurse;
|
|
|
4203 }
|
|
|
4204 }
|
|
|
4205 else if (CONSP (elt))
|
|
|
4206 {
|
|
|
4207 /* A cons cell: four distinct cases.
|
|
438
|
4208 * - If first element is a string or a cons, process all the elements
|
|
|
4209 * and effectively concatenate them.
|
|
|
4210 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4211 * at most that many characters. If positive, pad (with spaces)
|
|
|
4212 * to at least that many characters.
|
|
771
|
4213 * - If first element is another symbol or a boolean specifier, process
|
|
|
4214 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4215 * value or specifier's instance is non-nil or nil.
|
|
|
4216 * - If first element is , process the cadr or caddr
|
|
|
4217 * recursively according to whether the instance of the specifier in
|
|
|
4218 * the modeline's window is non-nil or nil.
|
|
442
|
4219 * - If first element is an extent, process the cdr recursively
|
|
|
4220 * and handle the extent's face.
|
|
428
|
4221 */
|
|
438
|
4222
|
|
428
|
4223 Lisp_Object car, tem;
|
|
|
4224
|
|
|
4225 car = XCAR (elt);
|
|
771
|
4226 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4227 {
|
|
|
4228 elt = XCDR (elt);
|
|
|
4229 if (!CONSP (elt))
|
|
|
4230 goto invalid;
|
|
|
4231
|
|
771
|
4232 if (SYMBOLP (car))
|
|
|
4233 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4234 else
|
|
|
4235 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4236 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4237 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4238 Use its car if CAR has a non-nil value. */
|
|
771
|
4239 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4240 {
|
|
771
|
4241 elt = XCAR (elt);
|
|
|
4242 goto tail_recurse;
|
|
438
|
4243 }
|
|
771
|
4244 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4245 * Get the cddr of the original list
|
|
|
4246 * and if possible find the caddr and use that.
|
|
|
4247 */
|
|
|
4248 elt = XCDR (elt);
|
|
|
4249 if (NILP (elt))
|
|
|
4250 ;
|
|
|
4251 else if (!CONSP (elt))
|
|
|
4252 goto invalid;
|
|
|
4253 else
|
|
|
4254 {
|
|
|
4255 elt = XCAR (elt);
|
|
|
4256 goto tail_recurse;
|
|
|
4257 }
|
|
|
4258 }
|
|
428
|
4259 else if (INTP (car))
|
|
|
4260 {
|
|
|
4261 Charcount lim = XINT (car);
|
|
|
4262
|
|
|
4263 elt = XCDR (elt);
|
|
|
4264
|
|
|
4265 if (lim < 0)
|
|
|
4266 {
|
|
|
4267 /* Negative int means reduce maximum width.
|
|
|
4268 * DO NOT change MIN_PIXPOS here!
|
|
|
4269 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4270 * and then pad to 20.
|
|
|
4271 */
|
|
|
4272 if (max_pos == -1)
|
|
|
4273 max_pos = pos - lim;
|
|
|
4274 else
|
|
|
4275 max_pos = min (max_pos, pos - lim);
|
|
|
4276 }
|
|
|
4277 else if (lim > 0)
|
|
|
4278 {
|
|
|
4279 /* Padding specified. Don't let it be more than
|
|
|
4280 * current maximum.
|
|
|
4281 */
|
|
|
4282 lim += pos;
|
|
|
4283 if (max_pos != -1 && lim > max_pos)
|
|
|
4284 lim = max_pos;
|
|
|
4285 /* If that's more padding than already wanted, queue it.
|
|
|
4286 * But don't reduce padding already specified even if
|
|
|
4287 * that is beyond the current truncation point.
|
|
|
4288 */
|
|
|
4289 if (lim > min_pos)
|
|
|
4290 min_pos = lim;
|
|
|
4291 }
|
|
|
4292 goto tail_recurse;
|
|
|
4293 }
|
|
|
4294 else if (STRINGP (car) || CONSP (car))
|
|
|
4295 {
|
|
|
4296 int limit = 50;
|
|
438
|
4297
|
|
428
|
4298 /* LIMIT is to protect against circular lists. */
|
|
|
4299 while (CONSP (elt) && --limit > 0
|
|
|
4300 && (pos < max_pos || max_pos == -1))
|
|
|
4301 {
|
|
|
4302 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4303 XCAR (elt), depth, max_pixsize,
|
|
|
4304 findex, type, offset, cur_ext);
|
|
428
|
4305 elt = XCDR (elt);
|
|
|
4306 }
|
|
|
4307 }
|
|
|
4308 else if (EXTENTP (car))
|
|
|
4309 {
|
|
|
4310 struct extent *ext = XEXTENT (car);
|
|
|
4311
|
|
|
4312 if (EXTENT_LIVE_P (ext))
|
|
|
4313 {
|
|
|
4314 face_index old_findex = data->findex;
|
|
|
4315 Lisp_Object face;
|
|
|
4316 Lisp_Object font_inst;
|
|
|
4317 face_index new_findex;
|
|
|
4318 Bytecount start = data->bytepos;
|
|
|
4319
|
|
|
4320 face = extent_face (ext);
|
|
|
4321 if (FACEP (face))
|
|
|
4322 {
|
|
|
4323 /* #### needs to merge faces, sigh */
|
|
|
4324 /* #### needs to handle list of faces */
|
|
|
4325 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4326 /* !!#### not right; needs to compute the max height of
|
|
|
4327 all the charsets */
|
|
|
4328 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4329 Vcharset_ascii);
|
|
|
4330
|
|
|
4331 data->dl->ascent = max (data->dl->ascent,
|
|
|
4332 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4333 data->dl->descent = max (data->dl->descent,
|
|
|
4334 XFONT_INSTANCE (font_inst)->
|
|
|
4335 descent);
|
|
|
4336 }
|
|
|
4337 else
|
|
|
4338 new_findex = old_findex;
|
|
|
4339
|
|
|
4340 data->findex = new_findex;
|
|
|
4341 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4342 XCDR (elt), depth - 1,
|
|
438
|
4343 max_pixsize, new_findex, type,
|
|
|
4344 offset, car);
|
|
428
|
4345 data->findex = old_findex;
|
|
|
4346 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4347 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4348 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4349 }
|
|
|
4350 }
|
|
|
4351 }
|
|
|
4352 else if (GLYPHP (elt))
|
|
|
4353 {
|
|
438
|
4354 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4355 horizontal scrolling facility. -- dv */
|
|
|
4356 if (*offset > 0)
|
|
|
4357 *offset -= 1;
|
|
|
4358 else
|
|
|
4359 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4360 cur_ext);
|
|
428
|
4361 }
|
|
|
4362 else
|
|
|
4363 {
|
|
|
4364 invalid:
|
|
438
|
4365 {
|
|
|
4366 char *str = GETTEXT ("*invalid*");
|
|
|
4367 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4368
|
|
|
4369 if (size <= *offset)
|
|
|
4370 *offset -= size;
|
|
|
4371 else
|
|
|
4372 {
|
|
867
|
4373 const Ibyte *tmp_str =
|
|
|
4374 itext_n_addr ((const Ibyte *) str, *offset);
|
|
438
|
4375
|
|
440
|
4376 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4377 used here as in the plain string case above. -- dv */
|
|
|
4378 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4379 min_pos, max_pos);
|
|
|
4380 *offset = 0;
|
|
|
4381 }
|
|
|
4382 }
|
|
428
|
4383 }
|
|
|
4384
|
|
|
4385 if (min_pos > pos)
|
|
|
4386 {
|
|
867
|
4387 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
|
|
438
|
4388 min_pos, -1);
|
|
428
|
4389 }
|
|
|
4390
|
|
|
4391 return pos;
|
|
|
4392 }
|
|
|
4393
|
|
|
4394 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4395 they do not have a modeline block, it does nothing. */
|
|
|
4396 static void
|
|
|
4397 regenerate_modeline (struct window *w)
|
|
|
4398 {
|
|
|
4399 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4400
|
|
|
4401 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4402 return;
|
|
|
4403 else
|
|
|
4404 {
|
|
|
4405 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4406 redisplay_update_line (w, 0, 0, 0);
|
|
|
4407 }
|
|
|
4408 }
|
|
|
4409
|
|
|
4410 /* Make sure that modeline display line is present in the given
|
|
|
4411 display structs if the window has a modeline and update that
|
|
|
4412 line. Returns true if a modeline was needed. */
|
|
|
4413 static int
|
|
|
4414 ensure_modeline_generated (struct window *w, int type)
|
|
|
4415 {
|
|
|
4416 int need_modeline;
|
|
|
4417
|
|
|
4418 /* minibuffer windows don't have modelines */
|
|
|
4419 if (MINI_WINDOW_P (w))
|
|
|
4420 need_modeline = 0;
|
|
|
4421 /* windows which haven't had it turned off do */
|
|
|
4422 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4423 need_modeline = 1;
|
|
|
4424 /* windows which have it turned off don't have a divider if there is
|
|
|
4425 a horizontal scrollbar */
|
|
|
4426 else if (window_scrollbar_height (w))
|
|
|
4427 need_modeline = 0;
|
|
|
4428 /* and in this case there is none */
|
|
|
4429 else
|
|
|
4430 need_modeline = 1;
|
|
|
4431
|
|
|
4432 if (need_modeline)
|
|
|
4433 {
|
|
|
4434 display_line_dynarr *dla;
|
|
|
4435
|
|
|
4436 dla = window_display_lines (w, type);
|
|
|
4437
|
|
|
4438 /* We don't care if there is a display line which is not
|
|
|
4439 currently a modeline because it is definitely going to become
|
|
|
4440 one if we have gotten to this point. */
|
|
|
4441 if (Dynarr_length (dla) == 0)
|
|
|
4442 {
|
|
|
4443 if (Dynarr_largest (dla) > 0)
|
|
800
|
4444 Dynarr_increment (dla);
|
|
428
|
4445 else
|
|
|
4446 {
|
|
|
4447 struct display_line modeline;
|
|
|
4448 xzero (modeline);
|
|
|
4449 Dynarr_add (dla, modeline);
|
|
|
4450 }
|
|
|
4451 }
|
|
|
4452
|
|
|
4453 /* If we're adding a new place marker go ahead and generate the
|
|
|
4454 modeline so that it is available for use by
|
|
|
4455 window_modeline_height. */
|
|
|
4456 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4457 }
|
|
|
4458
|
|
|
4459 return need_modeline;
|
|
|
4460 }
|
|
|
4461
|
|
|
4462 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4463 int
|
|
|
4464 real_current_modeline_height (struct window *w)
|
|
|
4465 {
|
|
|
4466 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4467 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4468
|
|
|
4469 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4470 {
|
|
|
4471 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4472
|
|
|
4473 if (Dynarr_length (dla))
|
|
|
4474 {
|
|
|
4475 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4476 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4477 Dynarr_atp (dla, 0)->descent);
|
|
|
4478 }
|
|
|
4479 }
|
|
|
4480 return 0;
|
|
|
4481 }
|
|
|
4482
|
|
|
4483
|
|
|
4484 /***************************************************************************/
|
|
819
|
4485 /* */
|
|
826
|
4486 /* displayable string routines */
|
|
819
|
4487 /* */
|
|
428
|
4488 /***************************************************************************/
|
|
|
4489
|
|
|
4490 /* Given a position for a string in a window, ensure that the given
|
|
|
4491 display line DL accurately represents the text on a line starting
|
|
|
4492 at the given position.
|
|
|
4493
|
|
|
4494 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4495 looked just too hard to change create_text_block to handle strings
|
|
|
4496 *and* buffers. We already make a distinction between the two
|
|
|
4497 elsewhere in the code so I think unifying them would require a
|
|
|
4498 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4499 functions cover text that the user *cannot edit* so we can remove
|
|
|
4500 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4501 modeline routines should be modified to use this code as it copes
|
|
|
4502 with many more types of display situation. */
|
|
|
4503
|
|
665
|
4504 static Charbpos
|
|
428
|
4505 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4506 struct display_line *dl,
|
|
826
|
4507 Charcount start_pos,
|
|
428
|
4508 prop_block_dynarr **prop,
|
|
|
4509 face_index default_face)
|
|
|
4510 {
|
|
|
4511 struct frame *f = XFRAME (w->frame);
|
|
|
4512 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4513 because you might well want to make use of it (selective display
|
|
|
4514 etc), its just the buffer text that we do not use. However, it
|
|
|
4515 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4516 against this case. */
|
|
|
4517 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4518 struct device *d = XDEVICE (f->device);
|
|
|
4519
|
|
|
4520 /* we're working with these a lot so precalculate them */
|
|
|
4521 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
826
|
4522 Bytecount byte_string_zv = slen;
|
|
|
4523 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4524
|
|
|
4525 pos_data data;
|
|
|
4526
|
|
|
4527 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4528
|
|
442
|
4529 /* We're going to ditch selective display for static text, it's an
|
|
|
4530 FSF thing and invisible extents are the way to go here.
|
|
|
4531 Implementing it also relies on a number of buffer-specific
|
|
428
|
4532 functions that we don't have the luxury of being able to use
|
|
|
4533 here. */
|
|
|
4534
|
|
|
4535 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4536 can actually be displayed and which octal should be used for.
|
|
|
4537 #### This variable should probably have some rethought done to
|
|
|
4538 it.
|
|
|
4539
|
|
|
4540 #### It would also be really nice if you could specify that
|
|
|
4541 the characters come out in hex instead of in octal. Mule
|
|
|
4542 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4543 but that's bogus -- we need a more general solution. I
|
|
|
4544 think you need to extend the concept of display tables
|
|
|
4545 into a more general conversion mechanism. Ideally you
|
|
|
4546 could specify a Lisp function that converts characters,
|
|
|
4547 but this violates the Second Golden Rule and besides would
|
|
|
4548 make things way way way way slow.
|
|
|
4549
|
|
|
4550 So instead, we extend the display-table concept, which was
|
|
|
4551 historically limited to 256-byte vectors, to one of the
|
|
|
4552 following:
|
|
|
4553
|
|
|
4554 a) A 256-entry vector, for backward compatibility;
|
|
|
4555 b) char-table, mapping characters to values;
|
|
|
4556 c) range-table, mapping ranges of characters to values;
|
|
|
4557 d) a list of the above.
|
|
|
4558
|
|
|
4559 The (d) option allows you to specify multiple display tables
|
|
|
4560 instead of just one. Each display table can specify conversions
|
|
|
4561 for some characters and leave others unchanged. The way the
|
|
|
4562 character gets displayed is determined by the first display table
|
|
|
4563 with a binding for that character. This way, you could call a
|
|
|
4564 function `enable-hex-display' that adds a hex display-table to
|
|
|
4565 the list of display tables for the current buffer.
|
|
|
4566
|
|
|
4567 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4568 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4569 extended characters show up as hex with a display table like
|
|
|
4570 this:
|
|
|
4571
|
|
|
4572 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4573
|
|
|
4574 Since more than one display table is possible, you have
|
|
|
4575 great flexibility in mapping ranges of characters. */
|
|
867
|
4576 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
4577 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4578 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4579 ? 255 : 160)) : 255;
|
|
|
4580
|
|
|
4581 Lisp_Object face_dt, window_dt;
|
|
|
4582
|
|
|
4583 /* The text display block for this display line. */
|
|
|
4584 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4585
|
|
|
4586 /* The first time through the main loop we need to force the glyph
|
|
|
4587 data to be updated. */
|
|
|
4588 int initial = 1;
|
|
|
4589
|
|
|
4590 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4591 equal to the position passed in if there are no more runs to be
|
|
|
4592 displayed. */
|
|
|
4593 int no_more_frags = 0;
|
|
|
4594
|
|
|
4595 dl->used_prop_data = 0;
|
|
|
4596 dl->num_chars = 0;
|
|
442
|
4597 dl->line_continuation = 0;
|
|
428
|
4598
|
|
|
4599 /* set up faces to use for clearing areas, used by
|
|
|
4600 output_display_line */
|
|
|
4601 dl->default_findex = default_face;
|
|
|
4602 if (default_face)
|
|
|
4603 {
|
|
|
4604 dl->left_margin_findex = default_face;
|
|
|
4605 dl->right_margin_findex = default_face;
|
|
|
4606 }
|
|
|
4607 else
|
|
|
4608 {
|
|
434
|
4609 dl->left_margin_findex =
|
|
428
|
4610 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4611 dl->right_margin_findex =
|
|
428
|
4612 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4613 }
|
|
|
4614
|
|
|
4615 xzero (data);
|
|
|
4616 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4617
|
|
|
4618 /* These values are used by all of the rune addition routines. We add
|
|
|
4619 them to this structure for ease of passing. */
|
|
|
4620 data.d = d;
|
|
793
|
4621 data.window = wrap_window (w);
|
|
428
|
4622 data.db = db;
|
|
|
4623 data.dl = dl;
|
|
|
4624
|
|
826
|
4625 data.byte_charpos = byte_start_pos;
|
|
428
|
4626 data.pixpos = dl->bounds.left_in;
|
|
|
4627 data.last_charset = Qunbound;
|
|
|
4628 data.last_findex = default_face;
|
|
|
4629 data.result_str = Qnil;
|
|
|
4630 data.string = disp_string;
|
|
|
4631
|
|
|
4632 /* Set the right boundary adjusting it to take into account any end
|
|
|
4633 glyph. Save the width of the end glyph for later use. */
|
|
|
4634 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4635 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4636
|
|
|
4637 data.cursor_type = NO_CURSOR;
|
|
|
4638 data.cursor_x = -1;
|
|
|
4639
|
|
|
4640 data.start_col = 0;
|
|
|
4641 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4642 the window
|
|
428
|
4643 data.start_col = w->hscroll;
|
|
826
|
4644 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
4645 */
|
|
826
|
4646 data.byte_start_col_enabled = 0;
|
|
428
|
4647 data.hscroll_glyph_width_adjust = 0;
|
|
|
4648
|
|
|
4649 /* We regenerate the line from the very beginning. */
|
|
|
4650 Dynarr_reset (db->runes);
|
|
|
4651
|
|
|
4652 /* Why is this less than or equal and not just less than? If the
|
|
|
4653 starting position is already equal to the maximum we can't add
|
|
|
4654 anything else, right? Wrong. We might still have a newline to
|
|
|
4655 add. A newline can use the room allocated for an end glyph since
|
|
|
4656 if we add it we know we aren't going to be adding any end
|
|
|
4657 glyph. */
|
|
|
4658
|
|
|
4659 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4660 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4661 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4662 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4663 that the loop terminates only when either (a) there is
|
|
|
4664 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4665
|
|
|
4666 #### Also I think you need to ensure that the operation
|
|
|
4667 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4668 can't get interrupted in the middle. If you run off the end
|
|
|
4669 of the line during that operation, then you keep accumulating
|
|
|
4670 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4671 there's a begin glyph at a particular position and attempting
|
|
|
4672 to display that glyph results in window-end being hit and
|
|
|
4673 propagation data being generated, then the character at that
|
|
|
4674 position won't be displayed.
|
|
|
4675
|
|
|
4676 #### See also the comment after the end of this loop, below.
|
|
|
4677 */
|
|
|
4678 while (data.pixpos <= data.max_pixpos)
|
|
|
4679 {
|
|
|
4680 /* #### This check probably should not be necessary. */
|
|
826
|
4681 if (data.byte_charpos > byte_string_zv)
|
|
428
|
4682 {
|
|
|
4683 /* #### urk! More of this lossage! */
|
|
826
|
4684 data.byte_charpos--;
|
|
428
|
4685 goto done;
|
|
|
4686 }
|
|
|
4687
|
|
|
4688 /* Check for face changes. */
|
|
826
|
4689 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
4690 {
|
|
819
|
4691 Lisp_Object last_glyph = Qnil;
|
|
|
4692 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4693 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4694 {
|
|
|
4695 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4696 Dynarr_free (*prop);
|
|
|
4697 *prop = 0;
|
|
|
4698 }
|
|
428
|
4699 /* Now compute the face and begin/end-glyph information. */
|
|
|
4700 data.findex =
|
|
793
|
4701 /* Remember that the extent-fragment routines deal in
|
|
826
|
4702 Bytexpos's. */
|
|
|
4703 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
4704 /* This is somewhat cheesy but the alternative is to
|
|
|
4705 propagate default_face into extent_fragment_update. */
|
|
|
4706 if (data.findex == DEFAULT_INDEX)
|
|
|
4707 data.findex = default_face;
|
|
|
4708
|
|
|
4709 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4710
|
|
826
|
4711 if (data.byte_charpos == data.ef->end)
|
|
428
|
4712 no_more_frags = 1;
|
|
|
4713 }
|
|
|
4714 initial = 0;
|
|
|
4715
|
|
|
4716 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4717 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4718 display then we determine what to do based on the character at the
|
|
|
4719 current buffer position. */
|
|
|
4720
|
|
|
4721 /* If the current position is covered by an invisible extent, do
|
|
|
4722 nothing (except maybe add some ellipses).
|
|
|
4723
|
|
|
4724 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4725 invisible extent should be investigated further. This is
|
|
|
4726 fairly low priority though. */
|
|
|
4727 if (data.ef->invisible)
|
|
|
4728 {
|
|
|
4729 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4730 really know what I'm doing. */
|
|
|
4731 if (*prop)
|
|
|
4732 {
|
|
|
4733 Dynarr_free (*prop);
|
|
|
4734 *prop = 0;
|
|
|
4735 }
|
|
|
4736
|
|
|
4737 /* The extent fragment code only sets this when we should
|
|
|
4738 really display the ellipses. It makes sure the ellipses
|
|
|
4739 don't get displayed more than once in a row. */
|
|
|
4740 if (data.ef->invisible_ellipses)
|
|
|
4741 {
|
|
|
4742 struct glyph_block gb;
|
|
|
4743
|
|
|
4744 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4745 data.ef->invisible_ellipses = 0;
|
|
|
4746 gb.extent = Qnil;
|
|
|
4747 gb.glyph = Vinvisible_text_glyph;
|
|
|
4748 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4749 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4750 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4751 is to display a newline (for compatibility with
|
|
|
4752 selective-display-ellipses)? Maybe that's too
|
|
|
4753 abstruse. */
|
|
|
4754 if (*prop)
|
|
|
4755 goto done;
|
|
|
4756 }
|
|
|
4757
|
|
638
|
4758 /* #### What if we're dealing with a display table? */
|
|
428
|
4759 if (data.start_col)
|
|
|
4760 data.start_col--;
|
|
|
4761
|
|
826
|
4762 if (data.byte_charpos == byte_string_zv)
|
|
428
|
4763 goto done;
|
|
|
4764 else
|
|
826
|
4765 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4766 }
|
|
|
4767
|
|
|
4768 /* If there is propagation data, then it represents the current
|
|
|
4769 buffer position being displayed. Add them and advance the
|
|
|
4770 position counter. This might also add the minibuffer
|
|
|
4771 prompt. */
|
|
|
4772 else if (*prop)
|
|
|
4773 {
|
|
|
4774 dl->used_prop_data = 1;
|
|
|
4775 *prop = add_propagation_runes (prop, &data);
|
|
|
4776
|
|
|
4777 if (*prop)
|
|
|
4778 goto done; /* gee, a really narrow window */
|
|
826
|
4779 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4780 goto done;
|
|
826
|
4781 else if (data.byte_charpos < 0)
|
|
428
|
4782 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
4783 data.byte_charpos = 0;
|
|
428
|
4784 else
|
|
826
|
4785 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4786 }
|
|
|
4787
|
|
|
4788 /* If there are end glyphs, add them to the line. These are
|
|
|
4789 the end glyphs for the previous run of text. We add them
|
|
|
4790 here rather than doing them at the end of handling the
|
|
|
4791 previous run so that glyphs at the beginning and end of
|
|
|
4792 a line are handled correctly. */
|
|
|
4793 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4794 {
|
|
867
|
4795 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4796 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4797
|
|
|
4798 if (*prop) {
|
|
428
|
4799 goto done;
|
|
819
|
4800 }
|
|
428
|
4801 }
|
|
|
4802
|
|
|
4803 /* If there are begin glyphs, add them to the line. */
|
|
|
4804 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4805 {
|
|
867
|
4806 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4807 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4808
|
|
|
4809 if (*prop) {
|
|
428
|
4810 goto done;
|
|
819
|
4811 }
|
|
428
|
4812 }
|
|
|
4813
|
|
|
4814 /* If at end-of-buffer, we've already processed begin and
|
|
|
4815 end-glyphs at this point and there's no text to process,
|
|
|
4816 so we're done. */
|
|
826
|
4817 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4818 goto done;
|
|
|
4819
|
|
|
4820 else
|
|
|
4821 {
|
|
|
4822 Lisp_Object entry = Qnil;
|
|
|
4823 /* Get the character at the current buffer position. */
|
|
867
|
4824 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4825 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4826 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4827
|
|
|
4828 /* If there is a display table entry for it, hand it off to
|
|
|
4829 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4830 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4831 {
|
|
|
4832 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4833
|
|
|
4834 if (*prop)
|
|
|
4835 goto done;
|
|
|
4836 }
|
|
|
4837
|
|
|
4838 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4839 to the line and end this loop. */
|
|
|
4840 else if (data.ch == '\n')
|
|
|
4841 {
|
|
|
4842 /* We aren't going to be adding an end glyph so give its
|
|
|
4843 space back in order to make sure that the cursor can
|
|
|
4844 fit. */
|
|
819
|
4845 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4846 goto done;
|
|
|
4847 }
|
|
|
4848
|
|
|
4849 /* If the current character is considered to be printable, then
|
|
|
4850 just add it. */
|
|
|
4851 else if (data.ch >= printable_min)
|
|
|
4852 {
|
|
867
|
4853 *prop = add_ichar_rune (&data);
|
|
428
|
4854 if (*prop)
|
|
|
4855 goto done;
|
|
|
4856 }
|
|
|
4857
|
|
|
4858 /* If the current character is a tab, determine the next tab
|
|
|
4859 starting position and add a blank rune which extends from the
|
|
|
4860 current pixel position to that starting position. */
|
|
|
4861 else if (data.ch == '\t')
|
|
|
4862 {
|
|
|
4863 int tab_start_pixpos = data.pixpos;
|
|
|
4864 int next_tab_start;
|
|
|
4865 int char_tab_width;
|
|
|
4866 int prop_width = 0;
|
|
|
4867
|
|
|
4868 if (data.start_col > 1)
|
|
|
4869 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4870
|
|
|
4871 next_tab_start =
|
|
|
4872 next_tab_position (w, tab_start_pixpos,
|
|
|
4873 dl->bounds.left_in +
|
|
|
4874 data.hscroll_glyph_width_adjust);
|
|
|
4875 if (next_tab_start > data.max_pixpos)
|
|
|
4876 {
|
|
|
4877 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4878 next_tab_start = data.max_pixpos;
|
|
|
4879 }
|
|
|
4880 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4881 char_tab_width =
|
|
|
4882 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4883
|
|
|
4884 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4885
|
|
|
4886 /* add_blank_rune is only supposed to be called with
|
|
819
|
4887 sizes guaranteed to fit in the available space. */
|
|
428
|
4888 assert (!(*prop));
|
|
|
4889
|
|
|
4890 if (prop_width)
|
|
|
4891 {
|
|
|
4892 struct prop_block pb;
|
|
|
4893 *prop = Dynarr_new (prop_block);
|
|
|
4894
|
|
|
4895 pb.type = PROP_BLANK;
|
|
|
4896 pb.data.p_blank.width = prop_width;
|
|
|
4897 pb.data.p_blank.findex = data.findex;
|
|
|
4898 Dynarr_add (*prop, pb);
|
|
|
4899
|
|
|
4900 goto done;
|
|
|
4901 }
|
|
|
4902 }
|
|
|
4903
|
|
|
4904 /* If character is a control character, pass it off to
|
|
|
4905 add_control_char_runes.
|
|
|
4906
|
|
|
4907 The is_*() routines have undefined results on
|
|
|
4908 arguments outside of the range [-1, 255]. (This
|
|
|
4909 often bites people who carelessly use `char' instead
|
|
|
4910 of `unsigned char'.)
|
|
|
4911 */
|
|
867
|
4912 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
4913 {
|
|
|
4914 *prop = add_control_char_runes (&data, b);
|
|
|
4915
|
|
|
4916 if (*prop)
|
|
|
4917 goto done;
|
|
|
4918 }
|
|
|
4919
|
|
|
4920 /* If the character is above the ASCII range and we have not
|
|
|
4921 already handled it, then print it as an octal number. */
|
|
|
4922 else if (data.ch >= 0200)
|
|
|
4923 {
|
|
|
4924 *prop = add_octal_runes (&data);
|
|
|
4925
|
|
|
4926 if (*prop)
|
|
|
4927 goto done;
|
|
|
4928 }
|
|
|
4929
|
|
|
4930 /* Assume the current character is considered to be printable,
|
|
|
4931 then just add it. */
|
|
|
4932 else
|
|
|
4933 {
|
|
867
|
4934 *prop = add_ichar_rune (&data);
|
|
428
|
4935 if (*prop)
|
|
|
4936 goto done;
|
|
|
4937 }
|
|
|
4938
|
|
826
|
4939 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4940 }
|
|
|
4941 }
|
|
|
4942
|
|
819
|
4943 done:
|
|
428
|
4944
|
|
|
4945 /* Determine the starting point of the next line if we did not hit the
|
|
|
4946 end of the buffer. */
|
|
826
|
4947 if (data.byte_charpos < byte_string_zv)
|
|
428
|
4948 {
|
|
|
4949 /* #### This check is not correct. If the line terminated
|
|
|
4950 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
4951 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
4952 you make the two changes mentioned at the top of this loop,
|
|
|
4953 you should be able to say '(if (*prop))'. That should also
|
|
826
|
4954 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
4955 check. */
|
|
|
4956
|
|
|
4957 /* The common case is that the line ended because we hit a newline.
|
|
|
4958 In that case, the next character is just the next buffer
|
|
|
4959 position. */
|
|
|
4960 if (data.ch == '\n')
|
|
|
4961 {
|
|
826
|
4962 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4963 }
|
|
|
4964
|
|
|
4965 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
4966 line. */
|
|
|
4967 else
|
|
|
4968 {
|
|
|
4969 struct glyph_block gb;
|
|
|
4970 struct glyph_cachel *cachel;
|
|
|
4971
|
|
|
4972 /* If the line is to be truncated then we actually have to look
|
|
|
4973 for the next newline. We also add the end-of-line glyph which
|
|
|
4974 we know will fit because we adjusted the right border before
|
|
|
4975 we starting laying out the line. */
|
|
819
|
4976 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4977 data.findex = default_face;
|
|
|
4978 gb.extent = Qnil;
|
|
|
4979
|
|
|
4980 if (truncate_win)
|
|
|
4981 {
|
|
826
|
4982 Bytecount byte_pos;
|
|
428
|
4983
|
|
|
4984 /* Now find the start of the next line. */
|
|
867
|
4985 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
|
|
826
|
4986 data.byte_charpos, 1);
|
|
428
|
4987
|
|
|
4988 data.cursor_type = NO_CURSOR;
|
|
826
|
4989 data.byte_charpos = byte_pos;
|
|
428
|
4990 gb.glyph = Vtruncation_glyph;
|
|
|
4991 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
4992 }
|
|
|
4993 else
|
|
|
4994 {
|
|
|
4995 /* The cursor can never be on the continuation glyph. */
|
|
|
4996 data.cursor_type = NO_CURSOR;
|
|
|
4997
|
|
826
|
4998 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
4999
|
|
442
|
5000 dl->line_continuation = 1;
|
|
428
|
5001 gb.glyph = Vcontinuation_glyph;
|
|
|
5002 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
5003 }
|
|
|
5004
|
|
819
|
5005 if (data.end_glyph_width)
|
|
428
|
5006 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
5007
|
|
826
|
5008 if (truncate_win && data.byte_charpos == byte_string_zv)
|
|
428
|
5009 {
|
|
867
|
5010 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
|
|
826
|
5011 byte_string_zv);
|
|
867
|
5012 DEC_IBYTEPTR (endb);
|
|
|
5013 if (itext_ichar (endb) != '\n')
|
|
428
|
5014 {
|
|
|
5015 /* #### Damn this losing shit. */
|
|
826
|
5016 data.byte_charpos++;
|
|
428
|
5017 }
|
|
|
5018 }
|
|
|
5019 }
|
|
|
5020 }
|
|
826
|
5021 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
5022 {
|
|
|
5023 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5024 up subwindow display. Since we never have a cursor in the
|
|
|
5025 gutter we can safely ignore it. */
|
|
|
5026 }
|
|
|
5027 /* Calculate left whitespace boundary. */
|
|
|
5028 {
|
|
|
5029 int elt = 0;
|
|
|
5030
|
|
|
5031 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5032 while (elt < Dynarr_length (db->runes))
|
|
|
5033 {
|
|
|
5034 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5035
|
|
|
5036 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5037 || rb->type == RUNE_BLANK)
|
|
|
5038 {
|
|
|
5039 dl->bounds.left_white += rb->width;
|
|
|
5040 elt++;
|
|
|
5041 }
|
|
|
5042 else
|
|
|
5043 elt = Dynarr_length (db->runes);
|
|
|
5044 }
|
|
|
5045 }
|
|
|
5046
|
|
|
5047 /* Calculate right whitespace boundary. */
|
|
|
5048 {
|
|
|
5049 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5050 int done = 0;
|
|
|
5051
|
|
|
5052 while (!done && elt >= 0)
|
|
|
5053 {
|
|
|
5054 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5055
|
|
|
5056 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5057 && isspace (rb->object.chr.ch))
|
|
|
5058 && !rb->type == RUNE_BLANK)
|
|
|
5059 {
|
|
|
5060 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5061 done = 1;
|
|
|
5062 }
|
|
|
5063
|
|
|
5064 elt--;
|
|
|
5065
|
|
|
5066 }
|
|
|
5067
|
|
|
5068 /* The line is blank so everything is considered to be right
|
|
|
5069 whitespace. */
|
|
|
5070 if (!done)
|
|
|
5071 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5072 }
|
|
|
5073
|
|
|
5074 /* Set the display blocks bounds. */
|
|
|
5075 db->start_pos = dl->bounds.left_in;
|
|
|
5076 if (Dynarr_length (db->runes))
|
|
|
5077 {
|
|
|
5078 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5079
|
|
|
5080 db->end_pos = rb->xpos + rb->width;
|
|
|
5081 }
|
|
|
5082 else
|
|
|
5083 db->end_pos = dl->bounds.right_white;
|
|
|
5084
|
|
819
|
5085 calculate_baseline (&data);
|
|
428
|
5086
|
|
|
5087 dl->ascent = data.new_ascent;
|
|
|
5088 dl->descent = data.new_descent;
|
|
|
5089
|
|
|
5090 {
|
|
|
5091 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5092
|
|
|
5093 if (dl->ascent < ascent)
|
|
|
5094 dl->ascent = ascent;
|
|
|
5095 }
|
|
|
5096 {
|
|
|
5097 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5098
|
|
|
5099 if (dl->descent < descent)
|
|
|
5100 dl->descent = descent;
|
|
|
5101 }
|
|
|
5102
|
|
819
|
5103 calculate_yoffset (dl, db);
|
|
|
5104
|
|
428
|
5105 dl->cursor_elt = data.cursor_x;
|
|
|
5106 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
5107 if (data.byte_charpos > byte_string_zv)
|
|
|
5108 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5109 byte_string_zv);
|
|
428
|
5110 else
|
|
826
|
5111 dl->end_charpos =
|
|
|
5112 buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5113 data.byte_charpos) - 1;
|
|
428
|
5114 if (truncate_win)
|
|
434
|
5115 data.dl->num_chars =
|
|
826
|
5116 string_column_at_point (disp_string, dl->end_charpos,
|
|
793
|
5117 b ? XINT (b->tab_width) : 8);
|
|
428
|
5118 else
|
|
|
5119 /* This doesn't correctly take into account tabs and control
|
|
|
5120 characters but if the window isn't being truncated then this
|
|
|
5121 value isn't going to end up being used anyhow. */
|
|
826
|
5122 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
5123
|
|
|
5124 /* #### handle horizontally scrolled line with text none of which
|
|
|
5125 was actually laid out. */
|
|
|
5126
|
|
|
5127 /* #### handle any remainder of overlay arrow */
|
|
|
5128
|
|
|
5129 if (*prop == ADD_FAILED)
|
|
|
5130 *prop = NULL;
|
|
|
5131
|
|
|
5132 if (truncate_win && *prop)
|
|
|
5133 {
|
|
|
5134 Dynarr_free (*prop);
|
|
|
5135 *prop = NULL;
|
|
|
5136 }
|
|
|
5137
|
|
|
5138 extent_fragment_delete (data.ef);
|
|
|
5139
|
|
|
5140 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5141 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5142 The main loop should get fixed so that it isn't necessary to call
|
|
|
5143 this function if we are already at EOB. */
|
|
|
5144
|
|
826
|
5145 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
|
|
793
|
5146 return string_index_byte_to_char (disp_string,
|
|
826
|
5147 data.byte_charpos) + 1; /* Yuck! */
|
|
428
|
5148 else
|
|
826
|
5149 return string_index_byte_to_char (disp_string, data.byte_charpos);
|
|
428
|
5150 }
|
|
|
5151
|
|
|
5152 /* Given a display line and a starting position, ensure that the
|
|
|
5153 contents of the display line accurately represent the visual
|
|
|
5154 representation of the buffer contents starting from the given
|
|
|
5155 position when displayed in the given window. The display line ends
|
|
|
5156 when the contents of the line reach the right boundary of the given
|
|
434
|
5157 window.
|
|
|
5158
|
|
428
|
5159 This is very similar to generate_display_line but with the same
|
|
|
5160 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5161 of fixing the bytebpos stuff though.*/
|
|
|
5162
|
|
|
5163 static Charbpos
|
|
428
|
5164 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5165 struct display_line *dl,
|
|
826
|
5166 Charcount start_pos,
|
|
428
|
5167 prop_block_dynarr **prop,
|
|
|
5168 face_index default_face)
|
|
|
5169 {
|
|
826
|
5170 Charcount ret_charcount;
|
|
428
|
5171
|
|
|
5172 /* you must set bounds before calling this. */
|
|
434
|
5173
|
|
428
|
5174 /* Reset what this line is using. */
|
|
|
5175 if (dl->display_blocks)
|
|
|
5176 Dynarr_reset (dl->display_blocks);
|
|
|
5177 if (dl->left_glyphs)
|
|
|
5178 {
|
|
|
5179 Dynarr_free (dl->left_glyphs);
|
|
|
5180 dl->left_glyphs = 0;
|
|
|
5181 }
|
|
|
5182 if (dl->right_glyphs)
|
|
|
5183 {
|
|
|
5184 Dynarr_free (dl->right_glyphs);
|
|
|
5185 dl->right_glyphs = 0;
|
|
|
5186 }
|
|
|
5187
|
|
|
5188 /* We aren't generating a modeline at the moment. */
|
|
|
5189 dl->modeline = 0;
|
|
|
5190
|
|
|
5191 /* Create a display block for the text region of the line. */
|
|
826
|
5192 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
|
|
|
5193 prop, default_face);
|
|
|
5194 dl->charpos = start_pos;
|
|
|
5195 if (dl->end_charpos < dl->charpos)
|
|
|
5196 dl->end_charpos = dl->charpos;
|
|
428
|
5197
|
|
|
5198 /* If there are left glyphs associated with any character in the
|
|
|
5199 text block, then create a display block to handle them. */
|
|
|
5200 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5201 create_left_glyph_block (w, dl, 0);
|
|
|
5202
|
|
|
5203 /* If there are right glyphs associated with any character in the
|
|
|
5204 text block, then create a display block to handle them. */
|
|
|
5205 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5206 create_right_glyph_block (w, dl);
|
|
|
5207
|
|
826
|
5208 return ret_charcount;
|
|
428
|
5209 }
|
|
|
5210
|
|
|
5211 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5212 loop through elements in the string creating display lines until we
|
|
|
5213 have covered the provided area. Simple really. */
|
|
|
5214 void
|
|
|
5215 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5216 int xpos, int ypos, int width, int height,
|
|
|
5217 display_line_dynarr* dla,
|
|
826
|
5218 Charcount start_pos,
|
|
428
|
5219 face_index default_face)
|
|
|
5220 {
|
|
|
5221 int yend = ypos + height;
|
|
|
5222 Charcount s_zv;
|
|
|
5223
|
|
|
5224 prop_block_dynarr *prop = 0;
|
|
|
5225 layout_bounds bounds;
|
|
|
5226 assert (dla);
|
|
|
5227
|
|
|
5228 Dynarr_reset (dla);
|
|
|
5229 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5230 there is something to do. */
|
|
|
5231 if (NILP (disp_string))
|
|
|
5232 return;
|
|
|
5233
|
|
826
|
5234 s_zv = string_char_length (disp_string);
|
|
428
|
5235
|
|
|
5236 bounds.left_out = xpos;
|
|
|
5237 bounds.right_out = xpos + width;
|
|
|
5238 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5239 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5240 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5241 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5242 depend on the contents of the line being displayed. */
|
|
|
5243 bounds.left_white = bounds.left_in;
|
|
|
5244 bounds.right_white = bounds.right_in;
|
|
|
5245
|
|
|
5246 while (ypos < yend)
|
|
|
5247 {
|
|
|
5248 struct display_line dl;
|
|
|
5249 struct display_line *dlp;
|
|
826
|
5250 Charcount next_pos;
|
|
428
|
5251 int local;
|
|
851
|
5252 int pos_of_dlp = -1;
|
|
428
|
5253
|
|
|
5254 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5255 {
|
|
851
|
5256 pos_of_dlp = Dynarr_length (dla);
|
|
|
5257 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5258 local = 0;
|
|
|
5259 }
|
|
|
5260 else
|
|
|
5261 {
|
|
|
5262
|
|
|
5263 xzero (dl);
|
|
|
5264 dlp = &dl;
|
|
|
5265 local = 1;
|
|
|
5266 }
|
|
|
5267
|
|
|
5268 dlp->bounds = bounds;
|
|
|
5269 dlp->offset = 0;
|
|
|
5270 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5271 &prop, default_face);
|
|
|
5272 /* we need to make sure that we continue along the line if there
|
|
|
5273 is more left to display otherwise we just end up redisplaying
|
|
|
5274 the same chunk over and over again. */
|
|
|
5275 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5276 start_pos++;
|
|
|
5277 else
|
|
|
5278 start_pos = next_pos;
|
|
|
5279
|
|
|
5280 dlp->ypos = ypos + dlp->ascent;
|
|
|
5281 ypos = dlp->ypos + dlp->descent;
|
|
|
5282
|
|
|
5283 if (ypos > yend)
|
|
|
5284 {
|
|
|
5285 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5286
|
|
|
5287 dlp->clip = (ypos - yend);
|
|
|
5288 visible_height -= dlp->clip;
|
|
|
5289
|
|
|
5290 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5291 {
|
|
|
5292 if (local)
|
|
|
5293 free_display_line (dlp);
|
|
|
5294 break;
|
|
|
5295 }
|
|
|
5296 }
|
|
|
5297 else
|
|
|
5298 dlp->clip = 0;
|
|
|
5299
|
|
851
|
5300 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5301 Dynarr_add (dla, *dlp);
|
|
|
5302
|
|
|
5303 /* #### This type of check needs to be done down in the
|
|
|
5304 generate_display_line call. */
|
|
|
5305 if (start_pos >= s_zv)
|
|
|
5306 break;
|
|
|
5307 }
|
|
|
5308
|
|
|
5309 if (prop)
|
|
|
5310 Dynarr_free (prop);
|
|
|
5311 }
|
|
|
5312
|
|
|
5313
|
|
|
5314 /***************************************************************************/
|
|
|
5315 /* */
|
|
|
5316 /* window-regeneration routines */
|
|
|
5317 /* */
|
|
|
5318 /***************************************************************************/
|
|
|
5319
|
|
|
5320 /* For a given window and starting position in the buffer it contains,
|
|
|
5321 ensure that the TYPE display lines accurately represent the
|
|
|
5322 presentation of the window. We pass the buffer instead of getting
|
|
|
5323 it from the window since redisplay_window may have temporarily
|
|
|
5324 changed it to the echo area buffer. */
|
|
|
5325
|
|
|
5326 static void
|
|
665
|
5327 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5328 {
|
|
|
5329 struct frame *f = XFRAME (w->frame);
|
|
|
5330 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5331 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5332 int yend; /* set farther down */
|
|
|
5333 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5334 int force;
|
|
428
|
5335
|
|
|
5336 prop_block_dynarr *prop;
|
|
|
5337 layout_bounds bounds;
|
|
|
5338 display_line_dynarr *dla;
|
|
|
5339 int need_modeline;
|
|
|
5340
|
|
|
5341 /* The lines had better exist by this point. */
|
|
|
5342 if (!(dla = window_display_lines (w, type)))
|
|
|
5343 abort ();
|
|
|
5344 Dynarr_reset (dla);
|
|
|
5345 w->max_line_len = 0;
|
|
|
5346
|
|
|
5347 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5348 for this function to get called from some other points where that
|
|
|
5349 update may not have occurred. This acts as a safety check. */
|
|
|
5350 if (!Dynarr_length (w->face_cachels))
|
|
|
5351 reset_face_cachels (w);
|
|
|
5352 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5353 reset_glyph_cachels (w);
|
|
|
5354
|
|
|
5355 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5356 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5357 w->last_point_x[type] = -1;
|
|
|
5358 w->last_point_y[type] = -1;
|
|
|
5359
|
|
|
5360 /* Make sure a modeline is in the structs if needed. */
|
|
|
5361 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5362
|
|
|
5363 /* Wait until here to set this so that the structs have a modeline
|
|
|
5364 generated in the case where one didn't exist. */
|
|
|
5365 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5366
|
|
|
5367 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5368
|
|
|
5369 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5370 if (MINI_WINDOW_P (w)
|
|
|
5371 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5372 && !echo_area_active (f)
|
|
|
5373 && start_pos == BUF_BEGV (b))
|
|
|
5374 {
|
|
|
5375 struct prop_block pb;
|
|
|
5376 Lisp_Object string;
|
|
|
5377 prop = Dynarr_new (prop_block);
|
|
|
5378
|
|
|
5379 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5380 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5381 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5382 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5383 Dynarr_add (prop, pb);
|
|
|
5384 }
|
|
|
5385 else
|
|
|
5386 prop = 0;
|
|
|
5387
|
|
442
|
5388 /* When we are computing things for scrolling purposes, make
|
|
|
5389 sure at least one line is always generated */
|
|
|
5390 force = (type == CMOTION_DISP);
|
|
|
5391
|
|
|
5392 /* Make sure this is set always */
|
|
|
5393 /* Note the conversion at end */
|
|
|
5394 w->window_end_pos[type] = start_pos;
|
|
|
5395 while (ypos < yend || force)
|
|
428
|
5396 {
|
|
|
5397 struct display_line dl;
|
|
|
5398 struct display_line *dlp;
|
|
|
5399 int local;
|
|
851
|
5400 int pos_of_dlp = -1;
|
|
428
|
5401
|
|
|
5402 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5403 {
|
|
851
|
5404 pos_of_dlp = Dynarr_length (dla);
|
|
|
5405 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5406 local = 0;
|
|
|
5407 }
|
|
|
5408 else
|
|
|
5409 {
|
|
|
5410
|
|
|
5411 xzero (dl);
|
|
|
5412 dlp = &dl;
|
|
|
5413 local = 1;
|
|
|
5414 }
|
|
|
5415
|
|
|
5416 dlp->bounds = bounds;
|
|
|
5417 dlp->offset = 0;
|
|
|
5418 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
|
5419
|
|
|
5420 if (yclip > dlp->ascent)
|
|
|
5421 {
|
|
|
5422 /* this should never happen, but if it does just display the
|
|
|
5423 whole line */
|
|
|
5424 yclip = 0;
|
|
|
5425 }
|
|
|
5426
|
|
|
5427 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5428 ypos = dlp->ypos + dlp->descent;
|
|
|
5429
|
|
|
5430 /* See if we've been asked to start midway through a line, for
|
|
|
5431 partial display line scrolling. */
|
|
434
|
5432 if (yclip)
|
|
428
|
5433 {
|
|
|
5434 dlp->top_clip = yclip;
|
|
|
5435 yclip = 0;
|
|
|
5436 }
|
|
|
5437 else
|
|
|
5438 dlp->top_clip = 0;
|
|
|
5439
|
|
|
5440 if (ypos > yend)
|
|
|
5441 {
|
|
|
5442 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5443
|
|
|
5444 dlp->clip = (ypos - yend);
|
|
|
5445 /* Although this seems strange we could have a single very
|
|
|
5446 tall line visible for which we need to account for both
|
|
|
5447 the top clip and the bottom clip. */
|
|
|
5448 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5449
|
|
442
|
5450 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5451 {
|
|
|
5452 if (local)
|
|
|
5453 free_display_line (dlp);
|
|
|
5454 break;
|
|
|
5455 }
|
|
|
5456 }
|
|
|
5457 else
|
|
|
5458 dlp->clip = 0;
|
|
|
5459
|
|
|
5460 if (dlp->cursor_elt != -1)
|
|
|
5461 {
|
|
|
5462 /* #### This check is steaming crap. Have to get things
|
|
|
5463 fixed so when create_text_block hits EOB, we're done,
|
|
|
5464 period. */
|
|
|
5465 if (w->last_point_x[type] == -1)
|
|
|
5466 {
|
|
|
5467 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5468 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5469 }
|
|
|
5470 else
|
|
|
5471 {
|
|
|
5472 /* #### This means that we've added a cursor at EOB
|
|
|
5473 twice. Yuck oh yuck. */
|
|
|
5474 struct display_block *db =
|
|
|
5475 get_display_block_from_line (dlp, TEXT);
|
|
|
5476
|
|
|
5477 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5478 dlp->cursor_elt = -1;
|
|
|
5479 }
|
|
|
5480 }
|
|
|
5481
|
|
|
5482 if (dlp->num_chars > w->max_line_len)
|
|
|
5483 w->max_line_len = dlp->num_chars;
|
|
|
5484
|
|
851
|
5485 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5486 Dynarr_add (dla, *dlp);
|
|
|
5487
|
|
|
5488 /* #### This isn't right, but it is close enough for now. */
|
|
|
5489 w->window_end_pos[type] = start_pos;
|
|
|
5490
|
|
|
5491 /* #### This type of check needs to be done down in the
|
|
|
5492 generate_display_line call. */
|
|
|
5493 if (start_pos > BUF_ZV (b))
|
|
|
5494 break;
|
|
442
|
5495
|
|
|
5496 force = 0;
|
|
428
|
5497 }
|
|
|
5498
|
|
|
5499 if (prop)
|
|
|
5500 Dynarr_free (prop);
|
|
|
5501
|
|
|
5502 /* #### More not quite right, but close enough. */
|
|
442
|
5503 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5504 as the number of characters between the window end and the
|
|
|
5505 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5506 the justification for this?
|
|
|
5507
|
|
|
5508 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5509 that can change. This representation allows initalizing with 0.
|
|
|
5510 */
|
|
428
|
5511 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5512
|
|
|
5513 if (need_modeline)
|
|
|
5514 {
|
|
|
5515 /* We know that this is the right thing to use because we put it
|
|
|
5516 there when we first started working in this function. */
|
|
|
5517 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5518 }
|
|
|
5519 }
|
|
|
5520
|
|
826
|
5521 #define REGEN_INC_FIND_START_END \
|
|
|
5522 do { \
|
|
|
5523 /* Determine start and end of lines. */ \
|
|
|
5524 if (!Dynarr_length (cdla)) \
|
|
|
5525 return 0; \
|
|
|
5526 else \
|
|
|
5527 { \
|
|
428
|
5528 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
826
|
5529 { \
|
|
|
5530 dla_start = 1; \
|
|
|
5531 } \
|
|
|
5532 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5533 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5534 { \
|
|
|
5535 dla_start = 0; \
|
|
|
5536 } \
|
|
|
5537 else \
|
|
|
5538 abort (); /* structs differ */ \
|
|
|
5539 \
|
|
|
5540 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5541 } \
|
|
|
5542 \
|
|
|
5543 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
|
|
|
5544 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5545 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5546 full regen. */ \
|
|
|
5547 if (startp != start_pos) \
|
|
|
5548 return 0; \
|
|
|
5549 \
|
|
|
5550 /* Point is outside the visible region so give up. */ \
|
|
|
5551 if (pointm < start_pos) \
|
|
|
5552 return 0; \
|
|
|
5553 \
|
|
428
|
5554 } while (0)
|
|
|
5555
|
|
|
5556 /* This attempts to incrementally update the display structures. It
|
|
|
5557 returns a boolean indicating success or failure. This function is
|
|
|
5558 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5559 called from that function. However, because of the nature of the
|
|
|
5560 changes it deals with it sometimes makes different assumptions
|
|
|
5561 which can lead to success which are much more difficult to make
|
|
|
5562 when dealing with buffer changes. */
|
|
|
5563
|
|
|
5564 static int
|
|
665
|
5565 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5566 Charbpos pointm,
|
|
428
|
5567 Charcount beg_unchanged,
|
|
|
5568 Charcount end_unchanged)
|
|
|
5569 {
|
|
|
5570 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5571 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5572 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5573
|
|
|
5574 int dla_start = 0;
|
|
|
5575 int dla_end, line;
|
|
|
5576 int first_line, last_line;
|
|
665
|
5577 Charbpos start_pos;
|
|
428
|
5578 /* Don't define this in the loop where it is used because we
|
|
|
5579 definitely want its value to survive between passes. */
|
|
|
5580 prop_block_dynarr *prop = NULL;
|
|
|
5581
|
|
|
5582 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5583 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5584 under which this can happen, but I believe that it is probably a
|
|
|
5585 reasonable happening. */
|
|
|
5586 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5587 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5588 return 0;
|
|
|
5589
|
|
|
5590 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5591 go ahead and proceed with the optimization attempt. */
|
|
|
5592 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5593 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5594 {
|
|
|
5595 struct frame *f = XFRAME (w->frame);
|
|
|
5596 struct device *d = XDEVICE (f->device);
|
|
|
5597 struct frame *sel_f = device_selected_frame (d);
|
|
|
5598 int success = 0;
|
|
|
5599
|
|
|
5600 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5601 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5602 {
|
|
|
5603
|
|
|
5604 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5605 {
|
|
|
5606 /* Always regenerate the modeline in case it is
|
|
|
5607 displaying the current line or column. */
|
|
|
5608 regenerate_modeline (w);
|
|
|
5609 success = 1;
|
|
|
5610 }
|
|
|
5611 }
|
|
|
5612 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5613 {
|
|
|
5614 if (f->modeline_changed)
|
|
|
5615 regenerate_modeline (w);
|
|
|
5616 success = 1;
|
|
|
5617 }
|
|
|
5618
|
|
|
5619 if (!success)
|
|
|
5620 return 0;
|
|
|
5621 }
|
|
|
5622
|
|
|
5623 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5624 return 1;
|
|
|
5625
|
|
|
5626 /* assert: There are no buffer modifications or they are all below the
|
|
|
5627 visible region. We assume that regenerate_window_incrementally has
|
|
|
5628 not called us unless this is true. */
|
|
|
5629
|
|
|
5630 REGEN_INC_FIND_START_END;
|
|
|
5631
|
|
|
5632 /* If the changed are starts before the visible area, give up. */
|
|
|
5633 if (beg_unchanged < startp)
|
|
|
5634 return 0;
|
|
|
5635
|
|
|
5636 /* Find what display line the extent changes first affect. */
|
|
|
5637 line = dla_start;
|
|
|
5638 while (line <= dla_end)
|
|
|
5639 {
|
|
|
5640 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5641 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5642 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5643
|
|
|
5644 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5645 break;
|
|
|
5646
|
|
|
5647 line++;
|
|
|
5648 }
|
|
|
5649
|
|
|
5650 /* If the changes are below the visible area then if point hasn't
|
|
|
5651 moved return success otherwise fail in order to be safe. */
|
|
|
5652 if (line > dla_end)
|
|
|
5653 {
|
|
|
5654 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5655 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5656 return 1;
|
|
|
5657 else
|
|
|
5658 return 0;
|
|
|
5659 }
|
|
|
5660
|
|
|
5661 /* At this point we know what line the changes first affect. We now
|
|
|
5662 begin redrawing lines as long as we are still in the affected
|
|
|
5663 region and the line's size and positioning don't change.
|
|
|
5664 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5665 structs which could lead to an assertion failure. However, if we
|
|
|
5666 fail the next thing that is going to happen is a full regen so we
|
|
|
5667 will actually end up being safe. */
|
|
|
5668 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5669 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5670 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5671 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5672
|
|
|
5673 first_line = last_line = line;
|
|
|
5674 while (line <= dla_end)
|
|
|
5675 {
|
|
665
|
5676 Charbpos old_start, old_end, new_start;
|
|
428
|
5677 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5678 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5679 struct display_block *db;
|
|
|
5680 int initial_size;
|
|
|
5681
|
|
826
|
5682 assert (cdl->charpos == ddl->charpos);
|
|
|
5683 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5684 assert (cdl->offset == ddl->offset);
|
|
|
5685
|
|
|
5686 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5687 initial_size = Dynarr_length (db->runes);
|
|
826
|
5688 old_start = ddl->charpos + ddl->offset;
|
|
|
5689 old_end = ddl->end_charpos + ddl->offset;
|
|
428
|
5690
|
|
|
5691 /* If this is the first line being updated and it used
|
|
|
5692 propagation data, fail. Otherwise we'll be okay because
|
|
|
5693 we'll have the necessary propagation data. */
|
|
|
5694 if (line == first_line && ddl->used_prop_data)
|
|
|
5695 return 0;
|
|
|
5696
|
|
826
|
5697 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5698 &prop, DESIRED_DISP);
|
|
|
5699 ddl->offset = 0;
|
|
|
5700
|
|
|
5701 /* #### If there is propagated stuff the fail. We could
|
|
|
5702 probably actually deal with this if the line had propagated
|
|
|
5703 information when originally created by a full
|
|
|
5704 regeneration. */
|
|
|
5705 if (prop)
|
|
|
5706 {
|
|
|
5707 Dynarr_free (prop);
|
|
|
5708 return 0;
|
|
|
5709 }
|
|
|
5710
|
|
|
5711 /* If any line position parameters have changed or a
|
|
|
5712 cursor has disappeared or disappeared, fail. */
|
|
|
5713 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5714 if (cdl->ypos != ddl->ypos
|
|
|
5715 || cdl->ascent != ddl->ascent
|
|
|
5716 || cdl->descent != ddl->descent
|
|
|
5717 || cdl->top_clip != ddl->top_clip
|
|
|
5718 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5719 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
826
|
5720 || old_start != ddl->charpos
|
|
|
5721 || old_end != ddl->end_charpos
|
|
428
|
5722 || initial_size != Dynarr_length (db->runes))
|
|
|
5723 {
|
|
|
5724 return 0;
|
|
|
5725 }
|
|
|
5726
|
|
|
5727 if (ddl->cursor_elt != -1)
|
|
|
5728 {
|
|
|
5729 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5730 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5731 }
|
|
|
5732
|
|
|
5733 last_line = line;
|
|
|
5734
|
|
|
5735 /* If the extent changes end on the line we just updated then
|
|
|
5736 we're done. Otherwise go on to the next line. */
|
|
826
|
5737 if (end_unchanged <= ddl->end_charpos)
|
|
428
|
5738 break;
|
|
|
5739 else
|
|
|
5740 line++;
|
|
|
5741 }
|
|
|
5742
|
|
|
5743 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5744 return 1;
|
|
|
5745 }
|
|
|
5746
|
|
|
5747 /* Attempt to update the display data structures based on knowledge of
|
|
|
5748 the changed region in the buffer. Returns a boolean indicating
|
|
|
5749 success or failure. If this function returns a failure then a
|
|
|
5750 regenerate_window _must_ be performed next in order to maintain
|
|
|
5751 invariants located here. */
|
|
|
5752
|
|
|
5753 static int
|
|
665
|
5754 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5755 Charbpos pointm)
|
|
428
|
5756 {
|
|
|
5757 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5758 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5759 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5760 Charcount beg_unchanged, end_unchanged;
|
|
|
5761 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5762
|
|
|
5763 int dla_start = 0;
|
|
|
5764 int dla_end, line;
|
|
665
|
5765 Charbpos start_pos;
|
|
428
|
5766
|
|
|
5767 /* If this function is called, the current and desired structures
|
|
|
5768 had better be identical. If they are not, then that is a bug. */
|
|
|
5769 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5770
|
|
|
5771 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5772 screws us up. */
|
|
|
5773 if (MINI_WINDOW_P (w))
|
|
|
5774 return 0;
|
|
|
5775
|
|
|
5776 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
5777 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
5778 ? -1
|
|
|
5779 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
5780
|
|
|
5781 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
5782 and succeed. */
|
|
|
5783 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
5784 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5785 extent_beg_unchanged,
|
|
|
5786 extent_end_unchanged);
|
|
|
5787
|
|
|
5788 /* We can't deal with deleted newlines. */
|
|
|
5789 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
5790 return 0;
|
|
|
5791
|
|
|
5792 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
5793 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
5794 ? -1
|
|
|
5795 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
5796
|
|
|
5797 REGEN_INC_FIND_START_END;
|
|
|
5798
|
|
|
5799 /* If the changed area starts before the visible area, give up. */
|
|
|
5800 if (beg_unchanged < startp)
|
|
|
5801 return 0;
|
|
|
5802
|
|
|
5803 /* Find what display line the buffer changes first affect. */
|
|
|
5804 line = dla_start;
|
|
|
5805 while (line <= dla_end)
|
|
|
5806 {
|
|
|
5807 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5808 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5809 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5810
|
|
|
5811 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5812 break;
|
|
|
5813
|
|
|
5814 line++;
|
|
|
5815 }
|
|
|
5816
|
|
|
5817 /* If the changes are below the visible area then if point hasn't
|
|
|
5818 moved return success otherwise fail in order to be safe. */
|
|
|
5819 if (line > dla_end)
|
|
|
5820 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5821 extent_beg_unchanged,
|
|
|
5822 extent_end_unchanged);
|
|
|
5823 else
|
|
|
5824 /* At this point we know what line the changes first affect. We
|
|
|
5825 now redraw that line. If the changes are contained within it
|
|
|
5826 we are going to succeed and can update just that one line.
|
|
|
5827 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5828 structs which could lead to an assertion failure. However, if
|
|
|
5829 we fail the next thing that is going to happen is a full regen
|
|
|
5830 so we will actually end up being safe. */
|
|
|
5831 {
|
|
665
|
5832 Charbpos new_start;
|
|
428
|
5833 prop_block_dynarr *prop = NULL;
|
|
|
5834 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5835 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5836
|
|
826
|
5837 assert (cdl->charpos == ddl->charpos);
|
|
|
5838 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5839 assert (cdl->offset == ddl->offset);
|
|
|
5840
|
|
442
|
5841 /* If the line continues to next display line, fail. */
|
|
|
5842 if (ddl->line_continuation)
|
|
|
5843 return 0;
|
|
428
|
5844
|
|
|
5845 /* If the line was generated using propagation data, fail. */
|
|
|
5846 if (ddl->used_prop_data)
|
|
|
5847 return 0;
|
|
|
5848
|
|
826
|
5849 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5850 &prop, DESIRED_DISP);
|
|
|
5851 ddl->offset = 0;
|
|
|
5852
|
|
|
5853 /* If there is propagated stuff then it is pretty much a
|
|
|
5854 guarantee that more than just the one line is affected. */
|
|
|
5855 if (prop)
|
|
|
5856 {
|
|
|
5857 Dynarr_free (prop);
|
|
|
5858 return 0;
|
|
|
5859 }
|
|
|
5860
|
|
442
|
5861 /* If the line continues to next display line, fail. */
|
|
|
5862 if (ddl->line_continuation)
|
|
|
5863 return 0;
|
|
428
|
5864
|
|
|
5865 /* If any line position parameters have changed or a
|
|
|
5866 cursor has disappeared or disappeared, fail. */
|
|
|
5867 if (cdl->ypos != ddl->ypos
|
|
|
5868 || cdl->ascent != ddl->ascent
|
|
|
5869 || cdl->descent != ddl->descent
|
|
|
5870 || cdl->top_clip != ddl->top_clip
|
|
|
5871 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5872 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
5873 {
|
|
|
5874 return 0;
|
|
|
5875 }
|
|
|
5876
|
|
|
5877 /* If the changed area also ends on this line, then we may be in
|
|
|
5878 business. Update everything and return success. */
|
|
826
|
5879 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
|
|
428
|
5880 {
|
|
|
5881 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5882 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5883 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
5884 w->buffer);
|
|
|
5885 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
5886 w->buffer);
|
|
|
5887
|
|
|
5888 if (ddl->cursor_elt != -1)
|
|
|
5889 {
|
|
|
5890 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5891 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5892 }
|
|
|
5893
|
|
|
5894 redisplay_update_line (w, line, line, 1);
|
|
|
5895 regenerate_modeline (w);
|
|
|
5896
|
|
|
5897 /* #### For now we just flush the cache until this has been
|
|
|
5898 tested. After that is done, this should correct the
|
|
|
5899 cache directly. */
|
|
|
5900 Dynarr_reset (w->line_start_cache);
|
|
|
5901
|
|
|
5902 /* Adjust the extent changed boundaries to remove any
|
|
|
5903 overlap with the buffer changes since we've just
|
|
|
5904 successfully updated that area. */
|
|
|
5905 if (extent_beg_unchanged != -1
|
|
|
5906 && extent_beg_unchanged >= beg_unchanged
|
|
|
5907 && extent_beg_unchanged < end_unchanged)
|
|
|
5908 extent_beg_unchanged = end_unchanged;
|
|
|
5909
|
|
|
5910 if (extent_end_unchanged != -1
|
|
|
5911 && extent_end_unchanged >= beg_unchanged
|
|
|
5912 && extent_end_unchanged < end_unchanged)
|
|
|
5913 extent_end_unchanged = beg_unchanged - 1;
|
|
|
5914
|
|
|
5915 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
5916 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
5917
|
|
|
5918 /* This could lead to odd results if it fails, but since the
|
|
|
5919 buffer changes update succeeded this probably will to.
|
|
|
5920 We already know that the extent changes start at or after
|
|
|
5921 the line because we checked before entering the loop. */
|
|
|
5922 if (extent_beg_unchanged != -1
|
|
|
5923 && extent_end_unchanged != -1
|
|
826
|
5924 && ((extent_beg_unchanged < ddl->charpos)
|
|
|
5925 || (extent_end_unchanged > ddl->end_charpos)))
|
|
428
|
5926 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5927 extent_beg_unchanged,
|
|
|
5928 extent_end_unchanged);
|
|
|
5929 else
|
|
|
5930 return 1;
|
|
|
5931 }
|
|
|
5932 }
|
|
|
5933
|
|
|
5934 /* Oh, well. */
|
|
|
5935 return 0;
|
|
|
5936 }
|
|
|
5937
|
|
|
5938 /* Given a window and a point, update the given display lines such
|
|
|
5939 that point is displayed in the middle of the window.
|
|
|
5940 Return the window's new start position. */
|
|
|
5941
|
|
665
|
5942 static Charbpos
|
|
|
5943 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
5944 {
|
|
665
|
5945 Charbpos startp;
|
|
428
|
5946
|
|
|
5947 /* We need to make sure that the modeline is generated so that the
|
|
|
5948 window height can be calculated correctly. */
|
|
|
5949 ensure_modeline_generated (w, type);
|
|
|
5950
|
|
|
5951 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
5952 regenerate_window (w, startp, point, type);
|
|
|
5953 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
5954
|
|
|
5955 return startp;
|
|
|
5956 }
|
|
|
5957
|
|
|
5958 /* Given a window and a set of display lines, return a boolean
|
|
|
5959 indicating whether the given point is contained within. */
|
|
|
5960
|
|
|
5961 static int
|
|
665
|
5962 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
5963 {
|
|
|
5964 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5965 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
5966 int first_line;
|
|
|
5967
|
|
|
5968 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
5969 first_line = 1;
|
|
|
5970 else
|
|
|
5971 first_line = 0;
|
|
|
5972
|
|
|
5973 if (Dynarr_length (dla) > first_line)
|
|
|
5974 {
|
|
665
|
5975 Charbpos start, end;
|
|
428
|
5976 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
5977
|
|
826
|
5978 start = dl->charpos;
|
|
428
|
5979 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
5980
|
|
|
5981 if (point >= start && point <= end)
|
|
|
5982 {
|
|
|
5983 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
5984 {
|
|
|
5985 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
5986
|
|
826
|
5987 if (point >= (dl->charpos + dl->offset)
|
|
|
5988 && point <= (dl->end_charpos + dl->offset))
|
|
428
|
5989 return !dl->clip;
|
|
|
5990 else
|
|
|
5991 return 1;
|
|
|
5992 }
|
|
|
5993 else
|
|
|
5994 return 1;
|
|
|
5995 }
|
|
|
5996 else
|
|
|
5997 return 0;
|
|
|
5998 }
|
|
|
5999 else
|
|
|
6000 return 0;
|
|
|
6001 }
|
|
|
6002
|
|
|
6003 /* Return pixel position the middle of the window, not including the
|
|
|
6004 modeline and any potential horizontal scrollbar. */
|
|
|
6005
|
|
|
6006 int
|
|
|
6007 window_half_pixpos (struct window *w)
|
|
|
6008 {
|
|
|
6009 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
6010 }
|
|
|
6011
|
|
|
6012 /* Return the display line which is currently in the middle of the
|
|
|
6013 window W for display lines TYPE. */
|
|
|
6014
|
|
|
6015 int
|
|
665
|
6016 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6017 {
|
|
|
6018 display_line_dynarr *dla;
|
|
|
6019 int half;
|
|
|
6020 int elt;
|
|
|
6021 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
6022
|
|
|
6023 if (type == CMOTION_DISP)
|
|
|
6024 regenerate_window (w, start, point, type);
|
|
|
6025
|
|
|
6026 dla = window_display_lines (w, type);
|
|
|
6027 half = window_half_pixpos (w);
|
|
|
6028
|
|
|
6029 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6030 {
|
|
|
6031 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6032 int line_bot = dl->ypos + dl->descent;
|
|
|
6033
|
|
|
6034 if (line_bot > half)
|
|
|
6035 return elt;
|
|
|
6036 }
|
|
|
6037
|
|
|
6038 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6039 being displayed. */
|
|
|
6040 return -1;
|
|
|
6041 }
|
|
|
6042
|
|
|
6043 /* Return a value for point that would place it at the beginning of
|
|
|
6044 the line which is in the middle of the window. */
|
|
|
6045
|
|
665
|
6046 Charbpos
|
|
|
6047 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6048 {
|
|
|
6049 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6050 int line = line_at_center (w, type, start, point);
|
|
|
6051
|
|
|
6052 if (line == -1)
|
|
|
6053 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6054 else
|
|
|
6055 {
|
|
|
6056 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6057 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6058
|
|
826
|
6059 return dl->charpos;
|
|
428
|
6060 }
|
|
|
6061 }
|
|
|
6062
|
|
|
6063 /* For a given window, ensure that the current visual representation
|
|
|
6064 is accurate. */
|
|
|
6065
|
|
|
6066 static void
|
|
|
6067 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6068 {
|
|
|
6069 struct window *w = XWINDOW (window);
|
|
|
6070 struct frame *f = XFRAME (w->frame);
|
|
|
6071 struct device *d = XDEVICE (f->device);
|
|
|
6072 Lisp_Object old_buffer = w->buffer;
|
|
|
6073 Lisp_Object the_buffer = w->buffer;
|
|
|
6074 struct buffer *b;
|
|
|
6075 int echo_active = 0;
|
|
|
6076 int startp = 1;
|
|
|
6077 int pointm;
|
|
|
6078 int old_startp = 1;
|
|
|
6079 int old_pointm = 1;
|
|
|
6080 int selected_in_its_frame;
|
|
|
6081 int selected_globally;
|
|
|
6082 int skip_output = 0;
|
|
|
6083 int truncation_changed;
|
|
|
6084 int inactive_minibuffer =
|
|
|
6085 (MINI_WINDOW_P (w) &&
|
|
|
6086 (f != device_selected_frame (d)) &&
|
|
|
6087 !is_surrogate_for_selected_frame (f));
|
|
|
6088
|
|
|
6089 /* #### In the new world this function actually does a bunch of
|
|
|
6090 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6091 implemented yet. */
|
|
|
6092
|
|
|
6093 /* If this is a combination window, do its children; that's all.
|
|
|
6094 The selected window is always a leaf so we don't check for
|
|
|
6095 skip_selected here. */
|
|
|
6096 if (!NILP (w->vchild))
|
|
|
6097 {
|
|
|
6098 redisplay_windows (w->vchild, skip_selected);
|
|
|
6099 return;
|
|
|
6100 }
|
|
|
6101 if (!NILP (w->hchild))
|
|
|
6102 {
|
|
|
6103 redisplay_windows (w->hchild, skip_selected);
|
|
|
6104 return;
|
|
|
6105 }
|
|
|
6106
|
|
|
6107 /* Is this window the selected window on its frame? */
|
|
|
6108 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6109 selected_globally =
|
|
|
6110 selected_in_its_frame &&
|
|
|
6111 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6112 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6113 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6114 if (skip_selected && selected_in_its_frame)
|
|
|
6115 return;
|
|
|
6116
|
|
|
6117 /* It is possible that the window is not fully initialized yet. */
|
|
|
6118 if (NILP (w->buffer))
|
|
|
6119 return;
|
|
|
6120
|
|
|
6121 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6122 {
|
|
|
6123 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6124 echo_active = 1;
|
|
|
6125 }
|
|
|
6126
|
|
|
6127 b = XBUFFER (w->buffer);
|
|
|
6128
|
|
|
6129 if (echo_active)
|
|
|
6130 {
|
|
|
6131 old_pointm = selected_globally
|
|
|
6132 ? BUF_PT (b)
|
|
|
6133 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6134 pointm = 1;
|
|
|
6135 }
|
|
|
6136 else
|
|
|
6137 {
|
|
|
6138 if (selected_globally)
|
|
|
6139 {
|
|
|
6140 pointm = BUF_PT (b);
|
|
|
6141 }
|
|
|
6142 else
|
|
|
6143 {
|
|
|
6144 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6145
|
|
|
6146 if (pointm < BUF_BEGV (b))
|
|
|
6147 pointm = BUF_BEGV (b);
|
|
|
6148 else if (pointm > BUF_ZV (b))
|
|
|
6149 pointm = BUF_ZV (b);
|
|
|
6150 }
|
|
|
6151 }
|
|
|
6152 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6153
|
|
|
6154 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6155 cache elements. */
|
|
|
6156 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6157 || !Dynarr_length (w->face_cachels)
|
|
|
6158 || f->faces_changed)
|
|
|
6159 reset_face_cachels (w);
|
|
|
6160 else
|
|
|
6161 mark_face_cachels_as_not_updated (w);
|
|
|
6162
|
|
|
6163 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6164 the cache purely because glyphs have changed - this is now
|
|
|
6165 handled by the dirty flag.*/
|
|
|
6166 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6167 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6168 reset_glyph_cachels (w);
|
|
|
6169 else
|
|
|
6170 mark_glyph_cachels_as_not_updated (w);
|
|
|
6171
|
|
|
6172 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6173 to find a new starting position. */
|
|
|
6174 if (!MINI_WINDOW_P (w)
|
|
|
6175 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6176 {
|
|
|
6177 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6178
|
|
|
6179 goto regeneration_done;
|
|
|
6180 }
|
|
|
6181
|
|
|
6182 if (echo_active)
|
|
|
6183 {
|
|
|
6184 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6185 startp = 1;
|
|
|
6186 }
|
|
|
6187 else
|
|
|
6188 {
|
|
|
6189 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6190 if (startp < BUF_BEGV (b))
|
|
|
6191 startp = BUF_BEGV (b);
|
|
|
6192 else if (startp > BUF_ZV (b))
|
|
|
6193 startp = BUF_ZV (b);
|
|
|
6194 }
|
|
|
6195 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6196
|
|
|
6197 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6198 (unsigned int) window_truncation_on (w));
|
|
428
|
6199
|
|
|
6200 /* If w->force_start is set, then some function set w->start and we
|
|
|
6201 should display from there and change point, if necessary, to
|
|
|
6202 ensure that it is visible. */
|
|
|
6203 if (w->force_start || inactive_minibuffer)
|
|
|
6204 {
|
|
|
6205 w->force_start = 0;
|
|
|
6206 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6207 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6208
|
|
|
6209 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6210
|
|
|
6211 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6212 {
|
|
|
6213 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6214
|
|
|
6215 if (selected_globally)
|
|
|
6216 BUF_SET_PT (b, pointm);
|
|
|
6217
|
|
|
6218 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6219 the_buffer);
|
|
|
6220
|
|
|
6221 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6222 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6223 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6224 }
|
|
|
6225
|
|
|
6226 goto regeneration_done;
|
|
|
6227 }
|
|
|
6228
|
|
|
6229 /* If nothing has changed since the last redisplay, then we just
|
|
|
6230 need to make sure that point is still visible. */
|
|
|
6231 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6232 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6233 && pointm >= startp
|
|
|
6234 /* This check is to make sure we restore the minibuffer after a
|
|
|
6235 temporary change to the echo area. */
|
|
|
6236 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6237 && !f->frame_changed
|
|
|
6238 && !truncation_changed
|
|
442
|
6239 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6240 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6241 )
|
|
|
6242 {
|
|
|
6243 /* Check if the cursor has actually moved. */
|
|
|
6244 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6245 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6246 && selected_globally
|
|
|
6247 && !w->windows_changed
|
|
|
6248 && !f->clip_changed
|
|
|
6249 && !f->extents_changed
|
|
|
6250 && !f->faces_changed
|
|
|
6251 && !f->glyphs_changed
|
|
|
6252 && !f->subwindows_changed
|
|
442
|
6253 /* && !f->subwindows_state_changed*/
|
|
428
|
6254 && !f->point_changed
|
|
|
6255 && !f->windows_structure_changed)
|
|
|
6256 {
|
|
|
6257 /* If not, we're done. */
|
|
|
6258 if (f->modeline_changed)
|
|
|
6259 regenerate_modeline (w);
|
|
|
6260
|
|
|
6261 skip_output = 1;
|
|
|
6262 goto regeneration_done;
|
|
|
6263 }
|
|
|
6264 else
|
|
|
6265 {
|
|
|
6266 /* If the new point is visible in the redisplay structures,
|
|
|
6267 then let the output update routines handle it, otherwise
|
|
|
6268 do things the hard way. */
|
|
|
6269 if (!w->windows_changed
|
|
|
6270 && !f->clip_changed
|
|
|
6271 && !f->extents_changed
|
|
|
6272 && !f->faces_changed
|
|
|
6273 && !f->glyphs_changed
|
|
|
6274 && !f->subwindows_changed
|
|
442
|
6275 /* && !f->subwindows_state_changed*/
|
|
428
|
6276 && !f->windows_structure_changed)
|
|
|
6277 {
|
|
|
6278 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6279 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6280 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6281 {
|
|
|
6282 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6283 {
|
|
|
6284 /* Always regenerate in case it is displaying
|
|
|
6285 the current line or column. */
|
|
|
6286 regenerate_modeline (w);
|
|
|
6287
|
|
|
6288 skip_output = 1;
|
|
|
6289 goto regeneration_done;
|
|
|
6290 }
|
|
|
6291 }
|
|
|
6292 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6293 {
|
|
|
6294 if (f->modeline_changed)
|
|
|
6295 regenerate_modeline (w);
|
|
|
6296
|
|
|
6297 skip_output = 1;
|
|
|
6298 goto regeneration_done;
|
|
|
6299 }
|
|
|
6300 }
|
|
|
6301
|
|
|
6302 /* If we weren't able to take the shortcut method, then use
|
|
|
6303 the brute force method. */
|
|
|
6304 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6305
|
|
|
6306 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6307 goto regeneration_done;
|
|
|
6308 }
|
|
|
6309 }
|
|
|
6310
|
|
|
6311 /* Check if the starting point is no longer at the beginning of a
|
|
|
6312 line, in which case find a new starting point. We also recenter
|
|
|
6313 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6314 up with a blank window. */
|
|
|
6315 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6316 && !(startp == BUF_BEGV (b)
|
|
|
6317 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6318 || (pointm == startp &&
|
|
|
6319 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6320 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6321 || (startp == BUF_ZV (b)))
|
|
|
6322 {
|
|
|
6323 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6324
|
|
|
6325 goto regeneration_done;
|
|
|
6326 }
|
|
|
6327 /* See if we can update the data structures locally based on
|
|
|
6328 knowledge of what changed in the buffer. */
|
|
|
6329 else if (!w->windows_changed
|
|
|
6330 && !f->clip_changed
|
|
|
6331 && !f->faces_changed
|
|
|
6332 && !f->glyphs_changed
|
|
|
6333 && !f->subwindows_changed
|
|
442
|
6334 /* && !f->subwindows_state_changed*/
|
|
428
|
6335 && !f->windows_structure_changed
|
|
|
6336 && !f->frame_changed
|
|
|
6337 && !truncation_changed
|
|
|
6338 && pointm >= startp
|
|
|
6339 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6340 {
|
|
|
6341 if (f->modeline_changed
|
|
|
6342 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6343 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6344 regenerate_modeline (w);
|
|
|
6345
|
|
|
6346 skip_output = 1;
|
|
|
6347 goto regeneration_done;
|
|
|
6348 }
|
|
|
6349 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6350 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6351 else
|
|
|
6352 {
|
|
|
6353 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6354
|
|
|
6355 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6356 goto regeneration_done;
|
|
|
6357 }
|
|
|
6358
|
|
|
6359 /* We still haven't gotten the window regenerated with point
|
|
|
6360 visible. Next we try scrolling a little and see if point comes
|
|
|
6361 back onto the screen. */
|
|
|
6362 if (scroll_step > 0)
|
|
|
6363 {
|
|
|
6364 int scrolled = scroll_conservatively;
|
|
|
6365 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6366 {
|
|
|
6367 startp = vmotion (w, startp,
|
|
|
6368 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6369 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6370
|
|
|
6371 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6372 goto regeneration_done;
|
|
|
6373 }
|
|
|
6374 }
|
|
|
6375
|
|
|
6376 /* We still haven't managed to get the screen drawn with point on
|
|
|
6377 the screen, so just center it and be done with it. */
|
|
|
6378 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6379
|
|
|
6380
|
|
|
6381 regeneration_done:
|
|
|
6382
|
|
|
6383 /* If the window's frame is changed then reset the current display
|
|
|
6384 lines in order to force a full repaint. */
|
|
|
6385 if (f->frame_changed)
|
|
|
6386 {
|
|
|
6387 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6388
|
|
|
6389 Dynarr_reset (cla);
|
|
|
6390 }
|
|
|
6391
|
|
|
6392 /* Must do this before calling redisplay_output_window because it
|
|
|
6393 sets some markers on the window. */
|
|
|
6394 if (echo_active)
|
|
|
6395 {
|
|
|
6396 w->buffer = old_buffer;
|
|
|
6397 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6398 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6399 }
|
|
|
6400
|
|
|
6401 /* These also have to be set before calling redisplay_output_window
|
|
|
6402 since it sets the CURRENT_DISP values based on them. */
|
|
|
6403 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6404 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6405 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6406 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6407
|
|
|
6408 if (!skip_output)
|
|
|
6409 {
|
|
665
|
6410 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6411 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6412 ? BUF_ZV (b)
|
|
|
6413 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6414 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6415 if (w->start_at_line_beg)
|
|
|
6416 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6417 redisplay_output_window (w);
|
|
|
6418 /*
|
|
|
6419 * If we just displayed the echo area, the line start cache is
|
|
|
6420 * no longer valid, because the minibuffer window is associated
|
|
|
6421 * with the window now.
|
|
|
6422 */
|
|
|
6423 if (echo_active)
|
|
|
6424 w->line_cache_last_updated = make_int (-1);
|
|
|
6425 }
|
|
|
6426
|
|
|
6427 /* #### This should be dependent on face changes and will need to be
|
|
|
6428 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6429 mark_face_cachels_as_clean (w);
|
|
|
6430
|
|
438
|
6431 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6432 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6433 flag since everything must be up-to-date. */
|
|
428
|
6434 if (glyphs_changed)
|
|
|
6435 mark_glyph_cachels_as_clean (w);
|
|
|
6436
|
|
|
6437 w->windows_changed = 0;
|
|
|
6438 }
|
|
|
6439
|
|
|
6440 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6441 currently visible in all frames on all devices. #### There has to
|
|
|
6442 be a better way to do this. */
|
|
|
6443
|
|
|
6444 static int
|
|
|
6445 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
6446 {
|
|
|
6447 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6448 return 0;
|
|
|
6449 }
|
|
|
6450
|
|
|
6451 static void
|
|
|
6452 reset_buffer_changes (void)
|
|
|
6453 {
|
|
|
6454 Lisp_Object frmcons, devcons, concons;
|
|
|
6455
|
|
|
6456 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6457 {
|
|
|
6458 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6459
|
|
|
6460 if (FRAME_REPAINT_P (f))
|
|
|
6461 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6462 }
|
|
|
6463 }
|
|
|
6464
|
|
|
6465 /* Ensure that all windows underneath the given window in the window
|
|
|
6466 hierarchy are correctly displayed. */
|
|
|
6467
|
|
|
6468 static void
|
|
|
6469 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6470 {
|
|
|
6471 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6472 {
|
|
|
6473 redisplay_window (window, skip_selected);
|
|
|
6474 }
|
|
|
6475 }
|
|
|
6476
|
|
|
6477 static int
|
|
|
6478 call_redisplay_end_triggers (struct window *w, void *closure)
|
|
|
6479 {
|
|
665
|
6480 Charbpos lrpos = w->last_redisplay_pos;
|
|
428
|
6481 w->last_redisplay_pos = 0;
|
|
|
6482 if (!NILP (w->buffer)
|
|
|
6483 && !NILP (w->redisplay_end_trigger)
|
|
|
6484 && lrpos > 0)
|
|
|
6485 {
|
|
665
|
6486 Charbpos pos;
|
|
428
|
6487
|
|
|
6488 if (MARKERP (w->redisplay_end_trigger)
|
|
|
6489 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
|
|
|
6490 pos = marker_position (w->redisplay_end_trigger);
|
|
|
6491 else if (INTP (w->redisplay_end_trigger))
|
|
|
6492 pos = XINT (w->redisplay_end_trigger);
|
|
|
6493 else
|
|
|
6494 {
|
|
|
6495 w->redisplay_end_trigger = Qnil;
|
|
|
6496 return 0;
|
|
|
6497 }
|
|
|
6498
|
|
|
6499 if (lrpos >= pos)
|
|
|
6500 {
|
|
793
|
6501 Lisp_Object window = wrap_window (w);
|
|
|
6502
|
|
853
|
6503 va_run_hook_with_args_in_buffer_trapping_problems
|
|
|
6504 ("Error in redisplay end trigger",
|
|
|
6505 XBUFFER (w->buffer),
|
|
|
6506 Qredisplay_end_trigger_functions,
|
|
|
6507 2, window,
|
|
|
6508 w->redisplay_end_trigger,
|
|
|
6509 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6510 w->redisplay_end_trigger = Qnil;
|
|
|
6511 }
|
|
|
6512 }
|
|
|
6513
|
|
|
6514 return 0;
|
|
|
6515 }
|
|
|
6516
|
|
|
6517 /* Ensure that all windows on the given frame are correctly displayed. */
|
|
|
6518
|
|
442
|
6519 int
|
|
428
|
6520 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6521 {
|
|
|
6522 struct device *d = XDEVICE (f->device);
|
|
853
|
6523 int depth;
|
|
428
|
6524
|
|
545
|
6525 if (preemption_check
|
|
|
6526 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6527 {
|
|
|
6528 /* The preemption check itself takes a lot of time,
|
|
|
6529 so normally don't do it here. We do it if called
|
|
|
6530 from Lisp, though (`redisplay-frame'). */
|
|
|
6531 int preempted;
|
|
|
6532
|
|
|
6533 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6534 if (preempted)
|
|
|
6535 return 1;
|
|
|
6536 }
|
|
|
6537
|
|
442
|
6538 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6539 {
|
|
|
6540 Lisp_Object frame;
|
|
|
6541
|
|
|
6542 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6543 f->buffer_alist);
|
|
793
|
6544 frame = wrap_frame (f);
|
|
442
|
6545 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6546 }
|
|
|
6547
|
|
428
|
6548 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6549 any which are already pending. */
|
|
|
6550 if (f->size_change_pending)
|
|
|
6551 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6552
|
|
|
6553 /* If frame size might need to be changed, due to changed size
|
|
|
6554 of toolbars, scrollbars etc, change it now */
|
|
|
6555 if (f->size_slipped)
|
|
|
6556 {
|
|
|
6557 adjust_frame_size (f);
|
|
|
6558 assert (!f->size_slipped);
|
|
|
6559 }
|
|
|
6560
|
|
|
6561 /* The menubar, toolbar, and icon updates must be done before
|
|
853
|
6562 enter_redisplay_critical_section is called and we are officially
|
|
428
|
6563 'in_display'. They may eval lisp code which may call Fsignal.
|
|
|
6564 If in_display is set Fsignal will abort. */
|
|
|
6565
|
|
|
6566 #ifdef HAVE_MENUBARS
|
|
|
6567 /* Update the menubar. It is done first since it could change
|
|
|
6568 the menubar's visibility. This way we avoid having flashing
|
|
|
6569 caused by an Expose event generated by the visibility change
|
|
|
6570 being handled. */
|
|
|
6571 update_frame_menubars (f);
|
|
|
6572 #endif /* HAVE_MENUBARS */
|
|
|
6573 #ifdef HAVE_TOOLBARS
|
|
|
6574 /* Update the toolbars. */
|
|
|
6575 update_frame_toolbars (f);
|
|
|
6576 #endif /* HAVE_TOOLBARS */
|
|
442
|
6577 /* Gutter update proper has to be done inside display when no frame
|
|
|
6578 size changes can occur, thus we separately update the gutter
|
|
|
6579 geometry here if it needs it. */
|
|
|
6580 update_frame_gutter_geometry (f);
|
|
428
|
6581
|
|
|
6582 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
6583 if (f->clear)
|
|
|
6584 f->frame_changed = 1;
|
|
|
6585
|
|
442
|
6586 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
6587 to cause subwindows to get instantiated. This is because
|
|
428
|
6588 subwindows_state_changed is less strict - dealing with things
|
|
|
6589 like the clicked state of button. We have to do this before
|
|
|
6590 redisplaying the gutters as subwindows get unmapped in the
|
|
|
6591 process.*/
|
|
442
|
6592 if (f->frame_changed)
|
|
|
6593 reset_frame_subwindow_instance_cache (f);
|
|
|
6594
|
|
|
6595 if (f->frame_changed || f->subwindows_changed)
|
|
|
6596 {
|
|
428
|
6597 /* we have to do this so the gutter gets regenerated. */
|
|
|
6598 reset_gutter_display_lines (f);
|
|
|
6599 }
|
|
|
6600
|
|
853
|
6601 depth = enter_redisplay_critical_section ();
|
|
428
|
6602
|
|
|
6603 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6604 /* Within this section, we are defenseless and assume that the
|
|
|
6605 following cannot happen:
|
|
|
6606
|
|
|
6607 1) garbage collection
|
|
|
6608 2) Lisp code evaluation
|
|
|
6609 3) frame size changes
|
|
|
6610
|
|
853
|
6611 We ensure (3) by calling enter_redisplay_critical_section(), which
|
|
428
|
6612 will cause any pending frame size changes to get put on hold
|
|
|
6613 till after the end of the critical section. (1) follows
|
|
|
6614 automatically if (2) is met. #### Unfortunately, there are
|
|
|
6615 some places where Lisp code can be called within this section.
|
|
|
6616 We need to remove them.
|
|
|
6617
|
|
|
6618 If Fsignal() is called during this critical section, we
|
|
|
6619 will abort().
|
|
|
6620
|
|
|
6621 If garbage collection is called during this critical section,
|
|
|
6622 we simply return. #### We should abort instead.
|
|
|
6623
|
|
|
6624 #### If a frame-size change does occur we should probably
|
|
|
6625 actually be preempting redisplay. */
|
|
|
6626
|
|
442
|
6627 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
6628
|
|
|
6629 /* We can now update the gutters, safe in the knowledge that our
|
|
|
6630 efforts won't get undone. */
|
|
|
6631
|
|
|
6632 /* This can call lisp, but redisplay is protected by binding
|
|
|
6633 inhibit_quit. More importantly the code involving display lines
|
|
|
6634 *assumes* that GC will not happen and so does not GCPRO
|
|
|
6635 anything. Since we use this code the whole time with the gutters
|
|
|
6636 we cannot allow GC to happen when manipulating the gutters. */
|
|
|
6637 update_frame_gutters (f);
|
|
|
6638
|
|
428
|
6639 /* Erase the frame before outputting its contents. */
|
|
|
6640 if (f->clear)
|
|
|
6641 {
|
|
442
|
6642 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
6643 }
|
|
|
6644
|
|
|
6645 /* Do the selected window first. */
|
|
|
6646 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
6647
|
|
|
6648 /* Then do the rest. */
|
|
|
6649 redisplay_windows (f->root_window, 1);
|
|
|
6650
|
|
442
|
6651 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
6652
|
|
|
6653 update_frame_title (f);
|
|
|
6654
|
|
|
6655 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
6656 f->window_face_cache_reset = 0;
|
|
|
6657 f->echo_area_garbaged = 0;
|
|
|
6658 f->clear = 0;
|
|
|
6659
|
|
|
6660 if (!f->size_change_pending)
|
|
|
6661 f->size_changed = 0;
|
|
|
6662
|
|
|
6663 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6664
|
|
853
|
6665 /* Allow frame size changes to occur again. */
|
|
|
6666 exit_redisplay_critical_section (depth);
|
|
428
|
6667
|
|
|
6668 map_windows (f, call_redisplay_end_triggers, 0);
|
|
|
6669 return 0;
|
|
|
6670 }
|
|
|
6671
|
|
440
|
6672 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
6673 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
6674 no automatic redisplay, as printers do, then the device is not
|
|
|
6675 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
6676 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
6677 when called from "lazy" redisplay();
|
|
|
6678 */
|
|
428
|
6679
|
|
|
6680 static int
|
|
440
|
6681 redisplay_device (struct device *d, int automatic)
|
|
428
|
6682 {
|
|
|
6683 Lisp_Object frame, frmcons;
|
|
|
6684 int size_change_failed = 0;
|
|
|
6685 struct frame *f;
|
|
|
6686
|
|
545
|
6687 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
6688 return 0;
|
|
|
6689
|
|
428
|
6690 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
6691 return 0;
|
|
|
6692
|
|
|
6693 /* It is possible that redisplay has been called before the
|
|
545
|
6694 device is fully initialized, or that the console implementation
|
|
|
6695 allows frameless devices. If so then continue with the next
|
|
|
6696 device. */
|
|
428
|
6697 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
6698 return 0;
|
|
|
6699
|
|
545
|
6700 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
6701 {
|
|
|
6702 int preempted;
|
|
|
6703 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6704 if (preempted)
|
|
|
6705 return 1;
|
|
|
6706 }
|
|
428
|
6707
|
|
|
6708 /* Always do the selected frame first. */
|
|
|
6709 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
6710
|
|
|
6711 f = XFRAME (frame);
|
|
|
6712
|
|
|
6713 if (f->icon_changed || f->windows_changed)
|
|
|
6714 update_frame_icon (f);
|
|
|
6715
|
|
|
6716 if (FRAME_REPAINT_P (f))
|
|
|
6717 {
|
|
|
6718 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
6719 {
|
|
588
|
6720 int preempted = redisplay_frame (f, 1);
|
|
545
|
6721 if (preempted)
|
|
|
6722 return 1;
|
|
|
6723 }
|
|
428
|
6724
|
|
|
6725 /* If the frame redisplay did not get preempted, then this flag
|
|
|
6726 should have gotten set to 0. It might be possible for that
|
|
|
6727 not to happen if a size change event were to occur at an odd
|
|
|
6728 time. To make sure we don't miss anything we simply don't
|
|
|
6729 reset the top level flags until the condition ends up being
|
|
|
6730 in the right state. */
|
|
|
6731 if (f->size_changed)
|
|
|
6732 size_change_failed = 1;
|
|
|
6733 }
|
|
|
6734
|
|
|
6735 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
6736 {
|
|
|
6737 f = XFRAME (XCAR (frmcons));
|
|
|
6738
|
|
|
6739 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
6740 continue;
|
|
|
6741
|
|
|
6742 if (f->icon_changed || f->windows_changed)
|
|
|
6743 update_frame_icon (f);
|
|
|
6744
|
|
|
6745 if (FRAME_REPAINT_P (f))
|
|
|
6746 {
|
|
430
|
6747 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
6748 {
|
|
588
|
6749 int preempted = redisplay_frame (f, 1);
|
|
545
|
6750 if (preempted)
|
|
|
6751 return 1;
|
|
428
|
6752 }
|
|
|
6753
|
|
|
6754 if (f->size_change_pending)
|
|
|
6755 size_change_failed = 1;
|
|
|
6756 }
|
|
|
6757 }
|
|
|
6758
|
|
|
6759 /* If we get here then we redisplayed all of our frames without
|
|
|
6760 getting preempted so mark ourselves as clean. */
|
|
|
6761 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
6762
|
|
|
6763 if (!size_change_failed)
|
|
|
6764 d->size_changed = 0;
|
|
|
6765
|
|
|
6766 return 0;
|
|
|
6767 }
|
|
|
6768
|
|
|
6769 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
6770 the current contents of their respective buffers. */
|
|
|
6771
|
|
|
6772 static void
|
|
|
6773 redisplay_without_hooks (void)
|
|
|
6774 {
|
|
|
6775 Lisp_Object devcons, concons;
|
|
|
6776 int size_change_failed = 0;
|
|
|
6777 int count = specpdl_depth ();
|
|
|
6778
|
|
|
6779 if (profiling_active)
|
|
853
|
6780 internal_bind_int (&profiling_redisplay_flag, 1);
|
|
428
|
6781
|
|
|
6782 if (asynch_device_change_pending)
|
|
|
6783 handle_asynch_device_change ();
|
|
|
6784
|
|
|
6785 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
6786 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
6787 goto done;
|
|
|
6788
|
|
|
6789 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
6790 {
|
|
|
6791 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
6792 int preempted;
|
|
|
6793
|
|
430
|
6794 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
6795 {
|
|
440
|
6796 preempted = redisplay_device (d, 1);
|
|
428
|
6797
|
|
|
6798 if (preempted)
|
|
|
6799 {
|
|
|
6800 preemption_count++;
|
|
|
6801 RESET_CHANGED_SET_FLAGS;
|
|
|
6802 goto done;
|
|
|
6803 }
|
|
|
6804
|
|
|
6805 /* See comment in redisplay_device. */
|
|
|
6806 if (d->size_changed)
|
|
|
6807 size_change_failed = 1;
|
|
|
6808 }
|
|
|
6809 }
|
|
|
6810 preemption_count = 0;
|
|
|
6811
|
|
|
6812 /* Mark redisplay as accurate */
|
|
|
6813 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
6814 RESET_CHANGED_SET_FLAGS;
|
|
|
6815
|
|
|
6816 if (faces_changed)
|
|
|
6817 {
|
|
|
6818 mark_all_faces_as_clean ();
|
|
|
6819 faces_changed = 0;
|
|
|
6820 }
|
|
|
6821
|
|
|
6822 if (!size_change_failed)
|
|
|
6823 size_changed = 0;
|
|
|
6824
|
|
|
6825 reset_buffer_changes ();
|
|
|
6826
|
|
|
6827 done:
|
|
771
|
6828 unbind_to (count);
|
|
800
|
6829 #ifdef ERROR_CHECK_DISPLAY
|
|
|
6830 sledgehammer_check_redisplay_structs ();
|
|
|
6831 #endif /* ERROR_CHECK_DISPLAY */
|
|
428
|
6832 }
|
|
|
6833
|
|
853
|
6834 /* Note: All places in the C code that call redisplay() are prepared
|
|
|
6835 to handle GCing. However, we can't currently handle GC inside the
|
|
|
6836 guts of redisplay (#### someone should fix this), so we need to use
|
|
|
6837 INHIBIT_GC when calling Lisp.
|
|
|
6838
|
|
|
6839 #### We probably can't handle any deletion of existing buffers, frames,
|
|
|
6840 windows, devices, consoles, text changes, etc. either. We should
|
|
|
6841
|
|
|
6842 (a) Create the appropriate INHIBIT_ flags for this.
|
|
|
6843 (b) In the longer run, fix redisplay to handle this.
|
|
|
6844
|
|
|
6845 (#### What about other external entry points to the redisplay code?
|
|
|
6846 Someone should go through and make sure that all callers can handle
|
|
|
6847 GC there, too.)
|
|
|
6848 */
|
|
|
6849
|
|
428
|
6850 void
|
|
|
6851 redisplay (void)
|
|
|
6852 {
|
|
853
|
6853 run_pre_idle_hook ();
|
|
|
6854 redisplay_no_pre_idle_hook ();
|
|
|
6855 }
|
|
|
6856
|
|
|
6857 void
|
|
|
6858 redisplay_no_pre_idle_hook (void)
|
|
|
6859 {
|
|
428
|
6860 if (last_display_warning_tick != display_warning_tick &&
|
|
|
6861 !inhibit_warning_display)
|
|
|
6862 {
|
|
|
6863 /* If an error occurs during this function, oh well.
|
|
|
6864 If we report another warning, we could get stuck in an
|
|
|
6865 infinite loop reporting warnings. */
|
|
853
|
6866 call0_trapping_problems
|
|
|
6867 (0, Qdisplay_warning_buffer,
|
|
|
6868 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6869 last_display_warning_tick = display_warning_tick;
|
|
|
6870 }
|
|
853
|
6871 /* The run_hook_trapping_problems functions are smart enough not
|
|
428
|
6872 to do any evalling if the hook function is empty, so there
|
|
853
|
6873 should not be any significant time loss. */
|
|
428
|
6874 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
853
|
6875 run_hook_trapping_problems
|
|
|
6876 ("Error in pre-redisplay-hook",
|
|
|
6877 Qpre_redisplay_hook,
|
|
|
6878 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6879 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6880
|
|
|
6881 redisplay_without_hooks ();
|
|
|
6882
|
|
|
6883 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
853
|
6884 run_hook_trapping_problems
|
|
|
6885 ("Error in post-redisplay-hook",
|
|
|
6886 Qpost_redisplay_hook,
|
|
|
6887 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6888 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6889 }
|
|
|
6890
|
|
853
|
6891 Lisp_Object
|
|
|
6892 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker)
|
|
|
6893 {
|
|
|
6894 return
|
|
|
6895 eval_in_buffer_trapping_problems
|
|
|
6896 ("Error calling function within redisplay", current_buffer,
|
|
|
6897 dont_trust_this_damn_sucker,
|
|
|
6898 INHIBIT_GC | INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
|
|
|
6899 }
|
|
428
|
6900
|
|
|
6901 /* Efficiently determine the window line number, and return a pointer
|
|
|
6902 to its printed representation. Do this regardless of whether
|
|
|
6903 line-number-mode is on. The first line in the buffer is counted as
|
|
|
6904 1. If narrowing is in effect, the lines are counted from the
|
|
|
6905 beginning of the visible portion of the buffer. */
|
|
|
6906 static char *
|
|
|
6907 window_line_number (struct window *w, int type)
|
|
|
6908 {
|
|
|
6909 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
6910 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6911 /* Be careful in the order of these tests. The first clause will
|
|
|
6912 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
6913 This can occur when the frame title is computed really early */
|
|
665
|
6914 Charbpos pos =
|
|
428
|
6915 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
6916 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
6917 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6918 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
6919 ? BUF_PT (b)
|
|
|
6920 : marker_position (w->pointm[type]));
|
|
|
6921 EMACS_INT line;
|
|
|
6922
|
|
|
6923 line = buffer_line_number (b, pos, 1);
|
|
|
6924
|
|
603
|
6925 {
|
|
|
6926 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
6927
|
|
|
6928 long_to_string (window_line_number_buf, line + 1);
|
|
|
6929
|
|
|
6930 return window_line_number_buf;
|
|
|
6931 }
|
|
428
|
6932 }
|
|
|
6933
|
|
|
6934
|
|
|
6935 /* Given a character representing an object in a modeline
|
|
|
6936 specification, return a string (stored into the global array
|
|
867
|
6937 `mode_spec_ibyte_string') with the information that object
|
|
428
|
6938 represents.
|
|
|
6939
|
|
|
6940 This function is largely unchanged from previous versions of the
|
|
|
6941 redisplay engine.
|
|
|
6942
|
|
|
6943 Warning! This code is also used for frame titles and can be called
|
|
|
6944 very early in the device/frame update process! JV
|
|
|
6945 */
|
|
|
6946
|
|
|
6947 static void
|
|
867
|
6948 decode_mode_spec (struct window *w, Ichar spec, int type)
|
|
428
|
6949 {
|
|
|
6950 Lisp_Object obj = Qnil;
|
|
442
|
6951 const char *str = NULL;
|
|
428
|
6952 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6953
|
|
867
|
6954 Dynarr_reset (mode_spec_ibyte_string);
|
|
428
|
6955
|
|
|
6956 switch (spec)
|
|
|
6957 {
|
|
|
6958 /* print buffer name */
|
|
|
6959 case 'b':
|
|
|
6960 obj = b->name;
|
|
|
6961 break;
|
|
|
6962
|
|
|
6963 /* print visited file name */
|
|
|
6964 case 'f':
|
|
|
6965 obj = b->filename;
|
|
|
6966 break;
|
|
|
6967
|
|
|
6968 /* print the current column */
|
|
|
6969 case 'c':
|
|
|
6970 {
|
|
665
|
6971 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
6972 ? BUF_PT (b)
|
|
|
6973 : marker_position (w->pointm[type]);
|
|
|
6974 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
6975 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
6976
|
|
|
6977 long_to_string (buf, col);
|
|
|
6978
|
|
867
|
6979 Dynarr_add_many (mode_spec_ibyte_string,
|
|
|
6980 (const Ibyte *) buf, strlen (buf));
|
|
428
|
6981
|
|
|
6982 goto decode_mode_spec_done;
|
|
|
6983 }
|
|
|
6984 /* print the file coding system */
|
|
|
6985 case 'C':
|
|
|
6986 {
|
|
|
6987 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
6988 /* Be very careful here not to get an error. */
|
|
|
6989 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
6990 {
|
|
771
|
6991 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
6992 if (CODING_SYSTEMP (codesys))
|
|
|
6993 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
6994 }
|
|
|
6995 }
|
|
|
6996 break;
|
|
|
6997
|
|
|
6998 /* print the current line number */
|
|
|
6999 case 'l':
|
|
|
7000 str = window_line_number (w, type);
|
|
|
7001 break;
|
|
|
7002
|
|
|
7003 /* print value of mode-name (obsolete) */
|
|
|
7004 case 'm':
|
|
|
7005 obj = b->mode_name;
|
|
|
7006 break;
|
|
|
7007
|
|
|
7008 /* print hyphen and frame number, if != 1 */
|
|
|
7009 case 'N':
|
|
|
7010 #ifdef HAVE_TTY
|
|
|
7011 {
|
|
|
7012 struct frame *f = XFRAME (w->frame);
|
|
|
7013 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
7014 {
|
|
|
7015 /* Naughty, naughty */
|
|
|
7016 char * writable_str = alloca_array (char, 10);
|
|
|
7017 sprintf (writable_str, "-%d", f->order_count);
|
|
|
7018 str = writable_str;
|
|
|
7019 }
|
|
|
7020 }
|
|
|
7021 #endif /* HAVE_TTY */
|
|
|
7022 break;
|
|
|
7023
|
|
|
7024 /* print Narrow if appropriate */
|
|
|
7025 case 'n':
|
|
|
7026 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
7027 || BUF_ZV (b) < BUF_Z (b))
|
|
|
7028 str = " Narrow";
|
|
|
7029 break;
|
|
|
7030
|
|
|
7031 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
7032 case '*':
|
|
|
7033 str = (!NILP (b->read_only)
|
|
|
7034 ? "%"
|
|
|
7035 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7036 ? "*"
|
|
|
7037 : "-"));
|
|
|
7038 break;
|
|
|
7039
|
|
|
7040 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
7041 read-only but still indicate whether it is modified. */
|
|
|
7042 case '+':
|
|
|
7043 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7044 ? "*"
|
|
|
7045 : (!NILP (b->read_only)
|
|
|
7046 ? "%"
|
|
|
7047 : "-"));
|
|
|
7048 break;
|
|
|
7049
|
|
|
7050 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
7051 modeline-format doc string. */
|
|
|
7052 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
7053 case '&':
|
|
|
7054 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7055 ? "*"
|
|
|
7056 : "-");
|
|
|
7057 break;
|
|
|
7058
|
|
|
7059 /* print process status */
|
|
|
7060 case 's':
|
|
|
7061 obj = Fget_buffer_process (w->buffer);
|
|
|
7062 if (NILP (obj))
|
|
|
7063 str = GETTEXT ("no process");
|
|
|
7064 else
|
|
|
7065 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7066 break;
|
|
|
7067
|
|
|
7068 /* Print name of selected frame. */
|
|
|
7069 case 'S':
|
|
|
7070 obj = XFRAME (w->frame)->name;
|
|
|
7071 break;
|
|
|
7072
|
|
|
7073 /* indicate TEXT or BINARY */
|
|
|
7074 case 't':
|
|
|
7075 /* #### NT does not use this any more. Now what? */
|
|
|
7076 str = "T";
|
|
|
7077 break;
|
|
|
7078
|
|
|
7079 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7080 case 'p':
|
|
|
7081 {
|
|
665
|
7082 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7083
|
|
|
7084 /* This had better be while the desired lines are being done. */
|
|
|
7085 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7086 {
|
|
|
7087 if (pos <= BUF_BEGV (b))
|
|
|
7088 str = "All";
|
|
|
7089 else
|
|
|
7090 str = "Bottom";
|
|
|
7091 }
|
|
|
7092 else if (pos <= BUF_BEGV (b))
|
|
|
7093 str = "Top";
|
|
|
7094 else
|
|
|
7095 {
|
|
|
7096 /* This hard limit is ok since the string it will hold has a
|
|
|
7097 fixed maximum length of 3. But just to be safe... */
|
|
|
7098 char buf[10];
|
|
|
7099 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7100 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7101
|
|
|
7102 /* Avoid overflow on big buffers */
|
|
|
7103 int percent = total > LONG_MAX/200 ?
|
|
|
7104 (chars + total/200) / (total / 100) :
|
|
|
7105 (chars * 100 + total/2) / total;
|
|
|
7106
|
|
|
7107 /* We can't normally display a 3-digit number, so get us a
|
|
|
7108 2-digit number that is close. */
|
|
|
7109 if (percent == 100)
|
|
|
7110 percent = 99;
|
|
|
7111
|
|
|
7112 sprintf (buf, "%d%%", percent);
|
|
867
|
7113 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7114 strlen (buf));
|
|
|
7115
|
|
|
7116 goto decode_mode_spec_done;
|
|
|
7117 }
|
|
|
7118 break;
|
|
|
7119 }
|
|
|
7120
|
|
|
7121 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7122 Top, or print Bottom or All */
|
|
|
7123 case 'P':
|
|
|
7124 {
|
|
665
|
7125 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7126 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7127
|
|
|
7128 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7129 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7130 botpos may be negative. */
|
|
|
7131 if (botpos < toppos)
|
|
|
7132 botpos = toppos;
|
|
|
7133
|
|
|
7134 if (botpos >= BUF_ZV (b))
|
|
|
7135 {
|
|
|
7136 if (toppos <= BUF_BEGV (b))
|
|
|
7137 str = "All";
|
|
|
7138 else
|
|
|
7139 str = "Bottom";
|
|
|
7140 }
|
|
|
7141 else
|
|
|
7142 {
|
|
|
7143 /* This hard limit is ok since the string it will hold has a
|
|
|
7144 fixed maximum length of around 6. But just to be safe... */
|
|
|
7145 char buf[10];
|
|
|
7146 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7147 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7148
|
|
|
7149 /* Avoid overflow on big buffers */
|
|
|
7150 int percent = total > LONG_MAX/200 ?
|
|
|
7151 (chars + total/200) / (total / 100) :
|
|
|
7152 (chars * 100 + total/2) / max (total, 1);
|
|
|
7153
|
|
|
7154 /* We can't normally display a 3-digit number, so get us a
|
|
|
7155 2-digit number that is close. */
|
|
|
7156 if (percent == 100)
|
|
|
7157 percent = 99;
|
|
|
7158
|
|
|
7159 if (toppos <= BUF_BEGV (b))
|
|
|
7160 sprintf (buf, "Top%d%%", percent);
|
|
|
7161 else
|
|
|
7162 sprintf (buf, "%d%%", percent);
|
|
|
7163
|
|
867
|
7164 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7165 strlen (buf));
|
|
|
7166
|
|
|
7167 goto decode_mode_spec_done;
|
|
|
7168 }
|
|
|
7169 break;
|
|
|
7170 }
|
|
|
7171
|
|
|
7172 /* print % */
|
|
|
7173 case '%':
|
|
|
7174 str = "%";
|
|
|
7175 break;
|
|
|
7176
|
|
|
7177 /* print one [ for each recursive editing level. */
|
|
|
7178 case '[':
|
|
|
7179 {
|
|
|
7180 int i;
|
|
|
7181
|
|
|
7182 if (command_loop_level > 5)
|
|
|
7183 {
|
|
|
7184 str = "[[[... ";
|
|
|
7185 break;
|
|
|
7186 }
|
|
|
7187
|
|
|
7188 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7189 Dynarr_add (mode_spec_ibyte_string, '[');
|
|
428
|
7190
|
|
|
7191 goto decode_mode_spec_done;
|
|
|
7192 }
|
|
|
7193
|
|
|
7194 /* print one ] for each recursive editing level. */
|
|
|
7195 case ']':
|
|
|
7196 {
|
|
|
7197 int i;
|
|
|
7198
|
|
|
7199 if (command_loop_level > 5)
|
|
|
7200 {
|
|
|
7201 str = "...]]]";
|
|
|
7202 break;
|
|
|
7203 }
|
|
|
7204
|
|
|
7205 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7206 Dynarr_add (mode_spec_ibyte_string, ']');
|
|
428
|
7207
|
|
|
7208 goto decode_mode_spec_done;
|
|
|
7209 }
|
|
|
7210
|
|
|
7211 /* print infinitely many dashes -- handle at top level now */
|
|
|
7212 case '-':
|
|
|
7213 break;
|
|
|
7214
|
|
|
7215 }
|
|
|
7216
|
|
|
7217 if (STRINGP (obj))
|
|
867
|
7218 Dynarr_add_many (mode_spec_ibyte_string,
|
|
428
|
7219 XSTRING_DATA (obj),
|
|
|
7220 XSTRING_LENGTH (obj));
|
|
|
7221 else if (str)
|
|
867
|
7222 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
|
|
428
|
7223
|
|
|
7224 decode_mode_spec_done:
|
|
867
|
7225 Dynarr_add (mode_spec_ibyte_string, '\0');
|
|
428
|
7226 }
|
|
|
7227
|
|
|
7228 /* Given a display line, free all of its data structures. */
|
|
|
7229
|
|
|
7230 static void
|
|
|
7231 free_display_line (struct display_line *dl)
|
|
|
7232 {
|
|
|
7233 int block;
|
|
|
7234
|
|
|
7235 if (dl->display_blocks)
|
|
|
7236 {
|
|
|
7237 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
|
7238 {
|
|
|
7239 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7240
|
|
|
7241 Dynarr_free (db->runes);
|
|
|
7242 }
|
|
|
7243
|
|
|
7244 Dynarr_free (dl->display_blocks);
|
|
|
7245 dl->display_blocks = NULL;
|
|
|
7246 }
|
|
|
7247
|
|
|
7248 if (dl->left_glyphs)
|
|
|
7249 {
|
|
|
7250 Dynarr_free (dl->left_glyphs);
|
|
|
7251 dl->left_glyphs = NULL;
|
|
|
7252 }
|
|
|
7253
|
|
|
7254 if (dl->right_glyphs)
|
|
|
7255 {
|
|
|
7256 Dynarr_free (dl->right_glyphs);
|
|
|
7257 dl->right_glyphs = NULL;
|
|
|
7258 }
|
|
|
7259 }
|
|
|
7260
|
|
|
7261
|
|
|
7262 /* Given an array of display lines, free them and all data structures
|
|
|
7263 contained within them. */
|
|
|
7264
|
|
|
7265 void
|
|
|
7266 free_display_lines (display_line_dynarr *dla)
|
|
|
7267 {
|
|
|
7268 int line;
|
|
|
7269
|
|
|
7270 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7271 {
|
|
|
7272 free_display_line (Dynarr_atp (dla, line));
|
|
|
7273 }
|
|
|
7274
|
|
|
7275 Dynarr_free (dla);
|
|
|
7276 }
|
|
|
7277
|
|
|
7278 /* Call internal free routine for each set of display lines. */
|
|
|
7279
|
|
|
7280 void
|
|
|
7281 free_display_structs (struct window_mirror *mir)
|
|
|
7282 {
|
|
|
7283 if (mir->current_display_lines)
|
|
|
7284 {
|
|
|
7285 free_display_lines (mir->current_display_lines);
|
|
|
7286 mir->current_display_lines = 0;
|
|
|
7287 }
|
|
|
7288
|
|
|
7289 if (mir->desired_display_lines)
|
|
|
7290 {
|
|
|
7291 free_display_lines (mir->desired_display_lines);
|
|
|
7292 mir->desired_display_lines = 0;
|
|
|
7293 }
|
|
|
7294 }
|
|
|
7295
|
|
|
7296
|
|
|
7297 static void
|
|
|
7298 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7299 {
|
|
|
7300 if (gba)
|
|
|
7301 {
|
|
|
7302 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7303 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7304
|
|
|
7305 for (; gb < gb_last; gb++)
|
|
|
7306 {
|
|
|
7307 if (!NILP (gb->glyph))
|
|
|
7308 mark_object (gb->glyph);
|
|
|
7309 if (!NILP (gb->extent))
|
|
|
7310 mark_object (gb->extent);
|
|
|
7311 }
|
|
|
7312 }
|
|
|
7313 }
|
|
|
7314
|
|
442
|
7315 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7316 the glyph will also mark the image_instance. */
|
|
|
7317 void
|
|
428
|
7318 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7319 {
|
|
|
7320 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7321 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7322
|
|
|
7323 for (; dl < dl_last; dl++)
|
|
|
7324 {
|
|
|
7325 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7326 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7327 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7328
|
|
|
7329 for (; db < db_last; db++)
|
|
|
7330 {
|
|
|
7331 rune_dynarr *ra = db->runes;
|
|
|
7332 rune *r = Dynarr_atp (ra, 0);
|
|
|
7333 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7334
|
|
|
7335 for (; r < r_last; r++)
|
|
|
7336 {
|
|
|
7337 if (r->type == RUNE_DGLYPH)
|
|
|
7338 {
|
|
|
7339 if (!NILP (r->object.dglyph.glyph))
|
|
|
7340 mark_object (r->object.dglyph.glyph);
|
|
|
7341 if (!NILP (r->object.dglyph.extent))
|
|
|
7342 mark_object (r->object.dglyph.extent);
|
|
|
7343 }
|
|
|
7344 }
|
|
|
7345 }
|
|
|
7346
|
|
|
7347 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7348 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7349 }
|
|
|
7350 }
|
|
|
7351
|
|
|
7352
|
|
|
7353 /*****************************************************************************
|
|
|
7354 Line Start Cache Description and Rationale
|
|
|
7355
|
|
|
7356 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
7357 It depends on the key assumption that the number of lines that can be
|
|
|
7358 displayed at any given time is fixed. This led to a complete separation
|
|
|
7359 of the scrolling code from the redisplay code. In order to fully support
|
|
|
7360 variable height lines, the scrolling code must actually be tightly
|
|
|
7361 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
7362 will be displayed on a screen for any given starting point.
|
|
|
7363
|
|
|
7364 What is ideally wanted is a complete list of the starting buffer position
|
|
|
7365 for every possible display line of a buffer along with the height of that
|
|
|
7366 display line. Maintaining such a full list would be very expensive. We
|
|
|
7367 settle for having it include information for all areas which we happen to
|
|
|
7368 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
7369 areas we need to work with.
|
|
|
7370
|
|
|
7371 In order to ensure that the cache accurately represents what redisplay
|
|
|
7372 would actually show, it is necessary to invalidate it in many situations.
|
|
|
7373 If the buffer changes, the starting positions may no longer be correct.
|
|
|
7374 If a face or an extent has changed then the line heights may have altered.
|
|
|
7375 These events happen frequently enough that the cache can end up being
|
|
|
7376 constantly disabled. With this potentially constant invalidation when is
|
|
|
7377 the cache ever useful?
|
|
|
7378
|
|
|
7379 Even if the cache is invalidated before every single usage, it is
|
|
|
7380 necessary. Scrolling often requires knowledge about display lines which
|
|
|
7381 are actually above or below the visible region. The cache provides a
|
|
|
7382 convenient light-weight method of storing this information for multiple
|
|
|
7383 display regions. This knowledge is necessary for the scrolling code to
|
|
|
7384 always obey the First Golden Rule of Redisplay.
|
|
|
7385
|
|
|
7386 If the cache already contains all of the information that the scrolling
|
|
|
7387 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
7388 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
7389 do to help out the cache is to always add the displayed region. This
|
|
|
7390 region had to be generated anyway, so the cache ends up getting the
|
|
|
7391 information basically for free. In those cases where a user is simply
|
|
|
7392 scrolling around viewing a buffer there is a high probability that this is
|
|
|
7393 sufficient to always provide the needed information. The second thing we
|
|
|
7394 can do is be smart about invalidating the cache.
|
|
|
7395
|
|
|
7396 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
7397
|
|
|
7398 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
7399 starting positions of any display lines. These types of buffer
|
|
|
7400 modifications should not invalidate the cache. This is actually a large
|
|
|
7401 optimization for redisplay speed as well.
|
|
|
7402
|
|
|
7403 + Buffer modifications frequently only affect the display of lines at and
|
|
|
7404 below where they occur. In these situations we should only invalidate
|
|
|
7405 the part of the cache starting at where the modification occurs.
|
|
|
7406
|
|
|
7407 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
7408 applicable.
|
|
|
7409 ****************************************************************************/
|
|
|
7410
|
|
|
7411 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7412 allocating and freeing it. */
|
|
|
7413 static line_start_cache_dynarr *internal_cache;
|
|
|
7414
|
|
|
7415 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7416 the TYPE display structs. */
|
|
|
7417
|
|
|
7418 static void
|
|
|
7419 update_internal_cache_list (struct window *w, int type)
|
|
|
7420 {
|
|
|
7421 int line;
|
|
|
7422 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7423
|
|
|
7424 Dynarr_reset (internal_cache);
|
|
|
7425 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7426 {
|
|
|
7427 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7428
|
|
|
7429 if (dl->modeline)
|
|
|
7430 continue;
|
|
|
7431 else
|
|
|
7432 {
|
|
|
7433 struct line_start_cache lsc;
|
|
434
|
7434
|
|
826
|
7435 lsc.start = dl->charpos;
|
|
|
7436 lsc.end = dl->end_charpos;
|
|
428
|
7437 lsc.height = dl->ascent + dl->descent;
|
|
|
7438
|
|
|
7439 Dynarr_add (internal_cache, lsc);
|
|
|
7440 }
|
|
|
7441 }
|
|
|
7442 }
|
|
|
7443
|
|
|
7444 /* Reset the line cache if necessary. This should be run at the
|
|
|
7445 beginning of any function which access the cache. */
|
|
|
7446
|
|
|
7447 static void
|
|
|
7448 validate_line_start_cache (struct window *w)
|
|
|
7449 {
|
|
|
7450 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7451 struct frame *f = XFRAME (w->frame);
|
|
|
7452
|
|
|
7453 if (!w->line_cache_validation_override)
|
|
|
7454 {
|
|
|
7455 /* f->extents_changed used to be in here because extent face and
|
|
|
7456 size changes can cause text shifting. However, the extent
|
|
|
7457 covering the region is constantly having its face set and
|
|
|
7458 priority altered by the mouse code. This means that the line
|
|
|
7459 start cache is constantly being invalidated. This is bad
|
|
|
7460 since the mouse code also triggers heavy usage of the cache.
|
|
|
7461 Since it is an unlikely that f->extents being changed
|
|
|
7462 indicates that the cache really needs to be updated and if it
|
|
|
7463 does redisplay will catch it pretty quickly we no longer
|
|
|
7464 invalidate the cache if it is set. This greatly speeds up
|
|
|
7465 dragging out regions with the mouse. */
|
|
|
7466 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7467 || f->faces_changed
|
|
|
7468 || f->clip_changed)
|
|
|
7469 {
|
|
|
7470 Dynarr_reset (w->line_start_cache);
|
|
|
7471 }
|
|
|
7472 }
|
|
|
7473 }
|
|
|
7474
|
|
|
7475 /* Return the very first buffer position contained in the given
|
|
|
7476 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7477 cache is valid. */
|
|
|
7478
|
|
665
|
7479 static Charbpos
|
|
428
|
7480 line_start_cache_start (struct window *w)
|
|
|
7481 {
|
|
|
7482 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7483
|
|
|
7484 if (!Dynarr_length (cache))
|
|
|
7485 return -1;
|
|
|
7486 else
|
|
|
7487 return Dynarr_atp (cache, 0)->start;
|
|
|
7488 }
|
|
|
7489
|
|
|
7490 /* Return the very last buffer position contained in the given
|
|
|
7491 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7492 cache is valid. */
|
|
|
7493
|
|
665
|
7494 static Charbpos
|
|
428
|
7495 line_start_cache_end (struct window *w)
|
|
|
7496 {
|
|
|
7497 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7498
|
|
|
7499 if (!Dynarr_length (cache))
|
|
|
7500 return -1;
|
|
|
7501 else
|
|
|
7502 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7503 }
|
|
|
7504
|
|
|
7505 /* Return the index of the line POINT is contained within in window
|
|
|
7506 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7507 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7508 a guarantee of the number of entries in the cache present on either
|
|
|
7509 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7510 then it will be treated as 0, but the cache window will not be
|
|
|
7511 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7512 for any reason. */
|
|
|
7513
|
|
|
7514 int
|
|
665
|
7515 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7516 {
|
|
|
7517 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7518 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7519 int top, bottom, pos;
|
|
428
|
7520
|
|
|
7521 validate_line_start_cache (w);
|
|
|
7522 w->line_cache_validation_override++;
|
|
|
7523
|
|
|
7524 /* Let functions pass in negative values, but we still treat -1
|
|
|
7525 specially. */
|
|
|
7526 /* #### bogosity alert */
|
|
|
7527 if (min_past < 0 && min_past != -1)
|
|
|
7528 min_past = -min_past;
|
|
|
7529
|
|
|
7530 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7531 || line_start_cache_end (w) < point)
|
|
|
7532 {
|
|
|
7533 int loop;
|
|
|
7534 int win_char_height = window_char_height (w, 1);
|
|
|
7535
|
|
|
7536 /* Occasionally we get here with a 0 height
|
|
|
7537 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7538 count of 0 so handle that case. */
|
|
|
7539 if (!win_char_height)
|
|
|
7540 win_char_height = 1;
|
|
|
7541
|
|
|
7542 if (!Dynarr_length (cache))
|
|
|
7543 {
|
|
665
|
7544 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7545 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7546
|
|
|
7547 update_line_start_cache (w, from, to, point, 0);
|
|
|
7548
|
|
|
7549 if (!Dynarr_length (cache))
|
|
|
7550 {
|
|
|
7551 w->line_cache_validation_override--;
|
|
|
7552 return -1;
|
|
|
7553 }
|
|
|
7554 }
|
|
|
7555
|
|
|
7556 assert (Dynarr_length (cache));
|
|
|
7557
|
|
|
7558 loop = 0;
|
|
|
7559 while (line_start_cache_start (w) > point
|
|
|
7560 && (loop < cache_adjustment || min_past == -1))
|
|
|
7561 {
|
|
665
|
7562 Charbpos from, to;
|
|
428
|
7563
|
|
|
7564 from = line_start_cache_start (w);
|
|
|
7565 if (from <= BUF_BEGV (b))
|
|
|
7566 break;
|
|
|
7567
|
|
|
7568 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7569 to = line_start_cache_end (w);
|
|
|
7570
|
|
|
7571 update_line_start_cache (w, from, to, point, 0);
|
|
|
7572 loop++;
|
|
|
7573 }
|
|
|
7574
|
|
|
7575 if (line_start_cache_start (w) > point)
|
|
|
7576 {
|
|
665
|
7577 Charbpos from, to;
|
|
428
|
7578
|
|
|
7579 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7580 if (from >= BUF_ZV (b))
|
|
|
7581 {
|
|
|
7582 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7583 from = to;
|
|
|
7584 to = BUF_ZV (b);
|
|
|
7585 }
|
|
|
7586 else
|
|
|
7587 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7588
|
|
|
7589 update_line_start_cache (w, from, to, point, 0);
|
|
|
7590 }
|
|
|
7591
|
|
|
7592 loop = 0;
|
|
|
7593 while (line_start_cache_end (w) < point
|
|
|
7594 && (loop < cache_adjustment || min_past == -1))
|
|
|
7595 {
|
|
665
|
7596 Charbpos from, to;
|
|
428
|
7597
|
|
|
7598 to = line_start_cache_end (w);
|
|
|
7599 if (to >= BUF_ZV (b))
|
|
|
7600 break;
|
|
|
7601
|
|
|
7602 from = line_start_cache_end (w);
|
|
|
7603 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7604
|
|
|
7605 update_line_start_cache (w, from, to, point, 0);
|
|
|
7606 loop++;
|
|
|
7607 }
|
|
|
7608
|
|
|
7609 if (line_start_cache_end (w) < point)
|
|
|
7610 {
|
|
665
|
7611 Charbpos from, to;
|
|
428
|
7612
|
|
|
7613 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7614 if (from >= BUF_ZV (b))
|
|
|
7615 {
|
|
|
7616 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7617 from = to;
|
|
|
7618 to = BUF_ZV (b);
|
|
|
7619 }
|
|
|
7620 else
|
|
|
7621 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7622
|
|
|
7623 update_line_start_cache (w, from, to, point, 0);
|
|
|
7624 }
|
|
|
7625 }
|
|
|
7626
|
|
|
7627 assert (Dynarr_length (cache));
|
|
|
7628
|
|
|
7629 if (min_past == -1)
|
|
|
7630 min_past = 0;
|
|
|
7631
|
|
|
7632 /* This could happen if the buffer is narrowed. */
|
|
|
7633 if (line_start_cache_start (w) > point
|
|
|
7634 || line_start_cache_end (w) < point)
|
|
|
7635 {
|
|
|
7636 w->line_cache_validation_override--;
|
|
|
7637 return -1;
|
|
|
7638 }
|
|
|
7639
|
|
|
7640 find_point_loop:
|
|
|
7641
|
|
|
7642 top = Dynarr_length (cache) - 1;
|
|
|
7643 bottom = 0;
|
|
|
7644
|
|
|
7645 while (1)
|
|
|
7646 {
|
|
647
|
7647 int new_pos;
|
|
665
|
7648 Charbpos start, end;
|
|
428
|
7649
|
|
|
7650 pos = (bottom + top + 1) >> 1;
|
|
|
7651 start = Dynarr_atp (cache, pos)->start;
|
|
|
7652 end = Dynarr_atp (cache, pos)->end;
|
|
|
7653
|
|
|
7654 if (point >= start && point <= end)
|
|
|
7655 {
|
|
|
7656 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
7657 {
|
|
665
|
7658 Charbpos from =
|
|
428
|
7659 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
7660 -min_past - 1);
|
|
665
|
7661 Charbpos to = line_start_cache_end (w);
|
|
428
|
7662
|
|
|
7663 update_line_start_cache (w, from, to, point, 0);
|
|
|
7664 goto find_point_loop;
|
|
|
7665 }
|
|
|
7666 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
7667 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
7668 {
|
|
665
|
7669 Charbpos from = line_start_cache_end (w);
|
|
|
7670 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7671 (min_past
|
|
|
7672 ? min_past
|
|
|
7673 : 1));
|
|
|
7674
|
|
|
7675 update_line_start_cache (w, from, to, point, 0);
|
|
|
7676 goto find_point_loop;
|
|
|
7677 }
|
|
|
7678 else
|
|
|
7679 {
|
|
|
7680 w->line_cache_validation_override--;
|
|
|
7681 return pos;
|
|
|
7682 }
|
|
|
7683 }
|
|
|
7684 else if (point > end)
|
|
|
7685 bottom = pos + 1;
|
|
|
7686 else if (point < start)
|
|
|
7687 top = pos - 1;
|
|
|
7688 else
|
|
|
7689 abort ();
|
|
|
7690
|
|
|
7691 new_pos = (bottom + top + 1) >> 1;
|
|
|
7692 if (pos == new_pos)
|
|
|
7693 {
|
|
|
7694 w->line_cache_validation_override--;
|
|
|
7695 return -1;
|
|
|
7696 }
|
|
|
7697 }
|
|
|
7698 }
|
|
|
7699
|
|
|
7700 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
7701 if display of the window was to begin at STARTP. */
|
|
|
7702
|
|
|
7703 int
|
|
665
|
7704 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
|
|
428
|
7705 {
|
|
|
7706 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
7707 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
7708 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
7709 int start_elt;
|
|
|
7710
|
|
|
7711 /* If point is before the intended start it obviously can't be visible. */
|
|
|
7712 if (point < startp)
|
|
|
7713 return 0;
|
|
|
7714
|
|
|
7715 /* If point or start are not in the accessible buffer range, then
|
|
|
7716 fail. */
|
|
|
7717 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
7718 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
7719 return 0;
|
|
|
7720
|
|
|
7721 validate_line_start_cache (w);
|
|
|
7722 w->line_cache_validation_override++;
|
|
|
7723
|
|
|
7724 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
7725 if (start_elt == -1)
|
|
|
7726 {
|
|
|
7727 w->line_cache_validation_override--;
|
|
|
7728 return 0;
|
|
|
7729 }
|
|
|
7730
|
|
|
7731 assert (line_start_cache_start (w) <= startp
|
|
|
7732 && line_start_cache_end (w) >= startp);
|
|
|
7733
|
|
|
7734 while (1)
|
|
|
7735 {
|
|
|
7736 int height;
|
|
|
7737
|
|
|
7738 /* Expand the cache if necessary. */
|
|
|
7739 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7740 {
|
|
665
|
7741 Charbpos old_startp =
|
|
428
|
7742 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
7743
|
|
|
7744 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
7745 window_char_height (w, 0));
|
|
|
7746
|
|
|
7747 /* We've already actually processed old_startp, so increment
|
|
|
7748 immediately. */
|
|
|
7749 start_elt++;
|
|
|
7750
|
|
|
7751 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
7752 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7753 {
|
|
|
7754 w->line_cache_validation_override--;
|
|
|
7755 return 0;
|
|
|
7756 }
|
|
|
7757 }
|
|
|
7758
|
|
|
7759 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
7760
|
|
|
7761 if (pixpos + height > bottom)
|
|
|
7762 {
|
|
|
7763 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7764 {
|
|
|
7765 w->line_cache_validation_override--;
|
|
|
7766 return 0;
|
|
|
7767 }
|
|
|
7768 }
|
|
|
7769
|
|
|
7770 pixpos += height;
|
|
|
7771 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
7772 {
|
|
|
7773 w->line_cache_validation_override--;
|
|
|
7774 return 1;
|
|
|
7775 }
|
|
|
7776
|
|
|
7777 start_elt++;
|
|
|
7778 }
|
|
|
7779 }
|
|
|
7780
|
|
|
7781 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7782 the buffer position at the beginning or end of the last line
|
|
|
7783 displayed. The end of the last line is also know as the window end
|
|
|
7784 position.
|
|
|
7785
|
|
442
|
7786 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
7787 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
7788 does occur in the following situation: A mouse event has come in and we
|
|
|
7789 need to compute its location in a window. That code (in
|
|
|
7790 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
7791
|
|
428
|
7792 #### With a little work this could probably be reworked as just a
|
|
|
7793 call to start_with_line_at_pixpos. */
|
|
|
7794
|
|
665
|
7795 static Charbpos
|
|
|
7796 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
7797 int may_error)
|
|
428
|
7798 {
|
|
|
7799 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7800 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7801 int pixpos = 0;
|
|
|
7802 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
7803 Charbpos cur_start;
|
|
428
|
7804 int start_elt;
|
|
|
7805
|
|
|
7806 validate_line_start_cache (w);
|
|
|
7807 w->line_cache_validation_override++;
|
|
|
7808
|
|
|
7809 if (startp < BUF_BEGV (b))
|
|
|
7810 startp = BUF_BEGV (b);
|
|
|
7811 else if (startp > BUF_ZV (b))
|
|
|
7812 startp = BUF_ZV (b);
|
|
|
7813 cur_start = startp;
|
|
|
7814
|
|
|
7815 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
7816 if (start_elt == -1)
|
|
442
|
7817 return may_error ? 0 : startp;
|
|
428
|
7818
|
|
|
7819 while (1)
|
|
|
7820 {
|
|
|
7821 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
7822
|
|
|
7823 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
7824
|
|
|
7825 if (pixpos + height > bottom)
|
|
|
7826 {
|
|
|
7827 /* Adjust for any possible clip. */
|
|
|
7828 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7829 start_elt--;
|
|
|
7830
|
|
|
7831 if (start_elt < 0)
|
|
|
7832 {
|
|
|
7833 w->line_cache_validation_override--;
|
|
|
7834 if (end)
|
|
|
7835 return BUF_ZV (b);
|
|
|
7836 else
|
|
|
7837 return BUF_BEGV (b);
|
|
|
7838 }
|
|
|
7839 else
|
|
|
7840 {
|
|
|
7841 w->line_cache_validation_override--;
|
|
|
7842 if (end)
|
|
|
7843 return Dynarr_atp (cache, start_elt)->end;
|
|
|
7844 else
|
|
|
7845 return Dynarr_atp (cache, start_elt)->start;
|
|
|
7846 }
|
|
|
7847 }
|
|
|
7848
|
|
|
7849 pixpos += height;
|
|
|
7850 start_elt++;
|
|
|
7851 if (start_elt == Dynarr_length (cache))
|
|
|
7852 {
|
|
665
|
7853 Charbpos from = line_start_cache_end (w);
|
|
428
|
7854 int win_char_height = window_char_height (w, 0);
|
|
665
|
7855 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7856 (win_char_height
|
|
|
7857 ? win_char_height
|
|
|
7858 : 1));
|
|
|
7859
|
|
|
7860 /* We've hit the end of the bottom so that's what it is. */
|
|
|
7861 if (from >= BUF_ZV (b))
|
|
|
7862 {
|
|
|
7863 w->line_cache_validation_override--;
|
|
|
7864 return BUF_ZV (b);
|
|
|
7865 }
|
|
|
7866
|
|
|
7867 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
7868
|
|
|
7869 /* Updating the cache invalidates any current indexes. */
|
|
|
7870 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
7871 }
|
|
|
7872 }
|
|
|
7873 }
|
|
|
7874
|
|
|
7875 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7876 the buffer position at the beginning of the last line displayed. */
|
|
|
7877
|
|
665
|
7878 Charbpos
|
|
|
7879 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7880 {
|
|
442
|
7881 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
7882 }
|
|
|
7883
|
|
|
7884 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7885 the buffer position at the end of the last line displayed. This is
|
|
|
7886 also know as the window end position. */
|
|
|
7887
|
|
665
|
7888 Charbpos
|
|
|
7889 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7890 {
|
|
442
|
7891 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
7892 }
|
|
|
7893
|
|
665
|
7894 static Charbpos
|
|
|
7895 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
7896 {
|
|
|
7897 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
7898 }
|
|
|
7899
|
|
|
7900
|
|
428
|
7901 /* For window W, what does the starting position have to be so that
|
|
|
7902 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
7903
|
|
665
|
7904 Charbpos
|
|
|
7905 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
7906 {
|
|
|
7907 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7908 int cur_elt;
|
|
665
|
7909 Charbpos cur_pos, prev_pos = point;
|
|
428
|
7910 int point_line_height;
|
|
|
7911 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
7912
|
|
|
7913 validate_line_start_cache (w);
|
|
|
7914 w->line_cache_validation_override++;
|
|
|
7915
|
|
|
7916 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
7917 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
7918 if (cur_elt < 0)
|
|
|
7919 {
|
|
|
7920 w->line_cache_validation_override--;
|
|
|
7921 return point;
|
|
|
7922 }
|
|
|
7923
|
|
|
7924 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7925
|
|
|
7926 while (1)
|
|
|
7927 {
|
|
|
7928 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7929
|
|
|
7930 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7931
|
|
|
7932 /* Do not take into account the value of vertical_clip here.
|
|
|
7933 That is the responsibility of the calling functions. */
|
|
|
7934 if (pixheight < 0)
|
|
|
7935 {
|
|
|
7936 w->line_cache_validation_override--;
|
|
|
7937 if (-pixheight > point_line_height)
|
|
|
7938 /* We can't make the target line cover pixpos, so put it
|
|
|
7939 above pixpos. That way it will at least be visible. */
|
|
|
7940 return prev_pos;
|
|
|
7941 else
|
|
|
7942 return cur_pos;
|
|
|
7943 }
|
|
|
7944
|
|
|
7945 cur_elt--;
|
|
|
7946 while (cur_elt < 0)
|
|
|
7947 {
|
|
665
|
7948 Charbpos from, to;
|
|
428
|
7949 int win_char_height;
|
|
|
7950
|
|
|
7951 if (cur_pos <= BUF_BEGV (b))
|
|
|
7952 {
|
|
|
7953 w->line_cache_validation_override--;
|
|
|
7954 return BUF_BEGV (b);
|
|
|
7955 }
|
|
|
7956
|
|
|
7957 win_char_height = window_char_height (w, 0);
|
|
|
7958 if (!win_char_height)
|
|
|
7959 win_char_height = 1;
|
|
|
7960
|
|
|
7961 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
7962 to = line_start_cache_end (w);
|
|
|
7963 update_line_start_cache (w, from, to, point, 0);
|
|
|
7964
|
|
|
7965 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
7966 assert (cur_elt >= -1);
|
|
|
7967 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
7968 point is in the top line and not at BUF_BEGV, then
|
|
434
|
7969 setting the window_start to a newline before the start of
|
|
428
|
7970 the first line will always cause scrolling.
|
|
|
7971
|
|
|
7972 However in my (jv) opinion this is wrong. That new line
|
|
|
7973 can be hidden in various ways: invisible extents, an
|
|
|
7974 explicit window-start not at a newline character etc.
|
|
|
7975 The existence of those are indeed known to create crashes
|
|
|
7976 on that assert. So we have no option but to continue the
|
|
|
7977 search if we found point at the top of the line_start_cache
|
|
|
7978 again. */
|
|
434
|
7979 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
7980 }
|
|
|
7981 prev_pos = cur_pos;
|
|
|
7982 }
|
|
|
7983 }
|
|
|
7984
|
|
|
7985 /* For window W, what does the starting position have to be so that
|
|
|
7986 the line containing point is on display line LINE. If LINE is
|
|
|
7987 positive it is considered to be the number of lines from the top of
|
|
|
7988 the window (0 is the top line). If it is negative the number is
|
|
|
7989 considered to be the number of lines from the bottom (-1 is the
|
|
|
7990 bottom line). */
|
|
|
7991
|
|
665
|
7992 Charbpos
|
|
|
7993 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
7994 {
|
|
|
7995 validate_line_start_cache (w);
|
|
|
7996 w->line_cache_validation_override++;
|
|
|
7997
|
|
|
7998 if (line >= 0)
|
|
|
7999 {
|
|
|
8000 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
8001
|
|
|
8002 if (cur_elt - line < 0)
|
|
|
8003 cur_elt = 0; /* Hit the top */
|
|
|
8004 else
|
|
|
8005 cur_elt -= line;
|
|
|
8006
|
|
|
8007 w->line_cache_validation_override--;
|
|
|
8008 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8009 }
|
|
|
8010 else
|
|
|
8011 {
|
|
|
8012 /* The calculated value of pixpos is correct for the bottom line
|
|
|
8013 or what we want when line is -1. Therefore we subtract one
|
|
|
8014 because we have already handled one line. */
|
|
|
8015 int new_line = -line - 1;
|
|
|
8016 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
8017 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
8018 Charbpos retval, search_point;
|
|
428
|
8019
|
|
|
8020 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
8021 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
8022 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
8023 line, so back up from the bottom by the height of the line
|
|
|
8024 containing point. */
|
|
|
8025 if (scroll_on_clipped_lines)
|
|
|
8026 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8027 else
|
|
|
8028 pixpos -= 1;
|
|
|
8029
|
|
|
8030 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
8031 {
|
|
|
8032 /* Hit the bottom of the buffer. */
|
|
|
8033 int adjustment =
|
|
|
8034 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
8035 Lisp_Object window;
|
|
|
8036 int defheight;
|
|
|
8037
|
|
793
|
8038 window = wrap_window (w);
|
|
428
|
8039 default_face_height_and_width (window, &defheight, 0);
|
|
|
8040
|
|
|
8041 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
8042
|
|
|
8043 pixpos -= (adjustment * defheight);
|
|
|
8044 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
8045 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
8046 }
|
|
|
8047 else
|
|
|
8048 cur_elt = cur_elt + new_line;
|
|
|
8049
|
|
|
8050 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8051
|
|
|
8052 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
8053 w->line_cache_validation_override--;
|
|
|
8054 return retval;
|
|
|
8055 }
|
|
|
8056 }
|
|
|
8057
|
|
|
8058 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8059 buffer starting positions for display lines. This allows the
|
|
|
8060 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8061 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8062 display structs which are in the given range.
|
|
|
8063
|
|
|
8064 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8065 that this function will actually add information outside of the
|
|
|
8066 lines containing those positions. This can't hurt but it could
|
|
|
8067 possibly help.
|
|
|
8068
|
|
|
8069 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8070 It might help to make the cache a dynarr of caches so that we can
|
|
|
8071 cover more areas. This might, however, turn out to be a lot of
|
|
|
8072 overhead for too little gain. */
|
|
|
8073
|
|
|
8074 static void
|
|
665
|
8075 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8076 Charbpos point, int no_regen)
|
|
428
|
8077 {
|
|
|
8078 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8079 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8080 Charbpos low_bound, high_bound;
|
|
428
|
8081
|
|
|
8082 validate_line_start_cache (w);
|
|
|
8083 w->line_cache_validation_override++;
|
|
|
8084
|
|
|
8085 if (from < BUF_BEGV (b))
|
|
|
8086 from = BUF_BEGV (b);
|
|
|
8087 if (to > BUF_ZV (b))
|
|
|
8088 to = BUF_ZV (b);
|
|
|
8089
|
|
|
8090 if (from > to)
|
|
|
8091 {
|
|
|
8092 w->line_cache_validation_override--;
|
|
|
8093 return;
|
|
|
8094 }
|
|
|
8095
|
|
|
8096 if (Dynarr_length (cache))
|
|
|
8097 {
|
|
|
8098 low_bound = line_start_cache_start (w);
|
|
|
8099 high_bound = line_start_cache_end (w);
|
|
|
8100
|
|
|
8101 /* Check to see if the desired range is already in the cache. */
|
|
|
8102 if (from >= low_bound && to <= high_bound)
|
|
|
8103 {
|
|
|
8104 w->line_cache_validation_override--;
|
|
|
8105 return;
|
|
|
8106 }
|
|
|
8107
|
|
|
8108 /* Check to make sure that the desired range is adjacent to the
|
|
|
8109 current cache. If not, invalidate the cache. */
|
|
|
8110 if (to < low_bound || from > high_bound)
|
|
|
8111 {
|
|
|
8112 Dynarr_reset (cache);
|
|
|
8113 low_bound = high_bound = -1;
|
|
|
8114 }
|
|
|
8115 }
|
|
|
8116 else
|
|
|
8117 {
|
|
|
8118 low_bound = high_bound = -1;
|
|
|
8119 }
|
|
|
8120
|
|
|
8121 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8122
|
|
|
8123 /* This could be integrated into the next two sections, but it is easier
|
|
|
8124 to follow what's going on by having it separate. */
|
|
|
8125 if (no_regen)
|
|
|
8126 {
|
|
665
|
8127 Charbpos start, end;
|
|
428
|
8128
|
|
|
8129 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8130 if (!Dynarr_length (internal_cache))
|
|
|
8131 {
|
|
|
8132 w->line_cache_validation_override--;
|
|
|
8133 return;
|
|
|
8134 }
|
|
|
8135
|
|
|
8136 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8137 end =
|
|
|
8138 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8139
|
|
|
8140 /* We aren't allowed to generate additional information to fill in
|
|
|
8141 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8142 cache. */
|
|
|
8143 if (Dynarr_length (cache))
|
|
|
8144 {
|
|
|
8145 if (end < low_bound || start > high_bound)
|
|
|
8146 Dynarr_reset (cache);
|
|
|
8147
|
|
|
8148 /* #### What should really happen if what we are doing is
|
|
|
8149 extending a line (the last line)? */
|
|
|
8150 if (Dynarr_length (cache) == 1
|
|
|
8151 && Dynarr_length (internal_cache) == 1)
|
|
|
8152 Dynarr_reset (cache);
|
|
|
8153 }
|
|
|
8154
|
|
|
8155 if (!Dynarr_length (cache))
|
|
|
8156 {
|
|
|
8157 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8158 Dynarr_length (internal_cache));
|
|
|
8159 w->line_cache_validation_override--;
|
|
|
8160 return;
|
|
|
8161 }
|
|
|
8162
|
|
|
8163 /* An extra check just in case the calling function didn't pass in
|
|
|
8164 the bounds of the DESIRED structs in the first place. */
|
|
|
8165 if (start >= low_bound && end <= high_bound)
|
|
|
8166 {
|
|
|
8167 w->line_cache_validation_override--;
|
|
|
8168 return;
|
|
|
8169 }
|
|
|
8170
|
|
|
8171 /* At this point we know that the internal cache partially overlaps
|
|
|
8172 the main cache. */
|
|
|
8173 if (start < low_bound)
|
|
|
8174 {
|
|
|
8175 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8176 while (ic_elt >= 0)
|
|
|
8177 {
|
|
|
8178 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8179 break;
|
|
|
8180 else
|
|
|
8181 ic_elt--;
|
|
|
8182 }
|
|
|
8183
|
|
|
8184 if (!(ic_elt >= 0))
|
|
|
8185 {
|
|
|
8186 Dynarr_reset (cache);
|
|
|
8187 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8188 Dynarr_length (internal_cache));
|
|
|
8189 w->line_cache_validation_override--;
|
|
|
8190 return;
|
|
|
8191 }
|
|
|
8192
|
|
|
8193 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8194 ic_elt + 1);
|
|
|
8195 }
|
|
|
8196
|
|
|
8197 if (end > high_bound)
|
|
|
8198 {
|
|
|
8199 int ic_elt = 0;
|
|
|
8200
|
|
|
8201 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8202 {
|
|
|
8203 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8204 break;
|
|
|
8205 else
|
|
|
8206 ic_elt++;
|
|
|
8207 }
|
|
|
8208
|
|
|
8209 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8210 {
|
|
|
8211 Dynarr_reset (cache);
|
|
|
8212 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8213 Dynarr_length (internal_cache));
|
|
|
8214 w->line_cache_validation_override--;
|
|
|
8215 return;
|
|
|
8216 }
|
|
|
8217
|
|
|
8218 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8219 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8220 }
|
|
|
8221
|
|
|
8222 w->line_cache_validation_override--;
|
|
|
8223 return;
|
|
|
8224 }
|
|
|
8225
|
|
|
8226 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8227 {
|
|
665
|
8228 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8229 int marker = 0;
|
|
|
8230 int old_lb = low_bound;
|
|
|
8231
|
|
|
8232 while (startp < old_lb || low_bound == -1)
|
|
|
8233 {
|
|
|
8234 int ic_elt;
|
|
665
|
8235 Charbpos new_startp;
|
|
428
|
8236
|
|
|
8237 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8238 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8239
|
|
|
8240 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8241 to layout a single line. This is not possible since we
|
|
|
8242 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8243 assert (Dynarr_length (internal_cache));
|
|
428
|
8244 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8245
|
|
|
8246 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8247 if (low_bound != -1)
|
|
|
8248 {
|
|
|
8249 while (ic_elt >= 0)
|
|
|
8250 {
|
|
|
8251 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8252 break;
|
|
|
8253 else
|
|
|
8254 ic_elt--;
|
|
|
8255 }
|
|
|
8256 }
|
|
|
8257 assert (ic_elt >= 0);
|
|
|
8258
|
|
|
8259 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8260
|
|
|
8261 /*
|
|
|
8262 * Handle invisible text properly:
|
|
|
8263 * If the last line we're inserting has the same end as the
|
|
|
8264 * line before which it will be added, merge the two lines.
|
|
|
8265 */
|
|
|
8266 if (Dynarr_length (cache) &&
|
|
|
8267 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8268 Dynarr_atp (cache, marker)->end)
|
|
|
8269 {
|
|
|
8270 Dynarr_atp (cache, marker)->start
|
|
|
8271 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8272 Dynarr_atp (cache, marker)->height
|
|
|
8273 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8274 ic_elt--;
|
|
|
8275 }
|
|
|
8276
|
|
|
8277 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8278 {
|
|
|
8279 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8280 ic_elt + 1, marker);
|
|
|
8281 marker += (ic_elt + 1);
|
|
|
8282 }
|
|
|
8283
|
|
|
8284 if (startp < low_bound || low_bound == -1)
|
|
|
8285 low_bound = startp;
|
|
|
8286 startp = new_startp;
|
|
|
8287 if (startp > BUF_ZV (b))
|
|
|
8288 {
|
|
|
8289 w->line_cache_validation_override--;
|
|
|
8290 return;
|
|
|
8291 }
|
|
|
8292 }
|
|
|
8293 }
|
|
|
8294
|
|
|
8295 assert (Dynarr_length (cache));
|
|
|
8296 assert (from >= low_bound);
|
|
|
8297
|
|
|
8298 /* Readjust the high_bound to account for any changes made while
|
|
|
8299 correcting the low_bound. */
|
|
|
8300 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8301
|
|
|
8302 if (to > high_bound)
|
|
|
8303 {
|
|
665
|
8304 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8305
|
|
|
8306 do
|
|
|
8307 {
|
|
|
8308 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8309 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8310
|
|
|
8311 /* See comment above about regenerate_window failing. */
|
|
|
8312 assert (Dynarr_length (internal_cache));
|
|
|
8313
|
|
|
8314 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8315 Dynarr_length (internal_cache));
|
|
|
8316 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8317 startp = high_bound + 1;
|
|
|
8318 }
|
|
|
8319 while (to > high_bound);
|
|
|
8320 }
|
|
|
8321
|
|
|
8322 w->line_cache_validation_override--;
|
|
|
8323 assert (to <= high_bound);
|
|
|
8324 }
|
|
|
8325
|
|
|
8326
|
|
|
8327 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8328 return the pixel location corresponding to those coordinates. The
|
|
|
8329 pixel location returned is the center of the given character
|
|
|
8330 position. The pixel values are generated relative to the window,
|
|
|
8331 not the frame.
|
|
|
8332
|
|
|
8333 The modeline is considered to be part of the window. */
|
|
|
8334
|
|
|
8335 void
|
|
|
8336 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8337 int *pix_x, int *pix_y)
|
|
|
8338 {
|
|
|
8339 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8340 int num_disp_lines, modeline;
|
|
|
8341 Lisp_Object window;
|
|
|
8342 int defheight, defwidth;
|
|
|
8343
|
|
793
|
8344 window = wrap_window (w);
|
|
428
|
8345 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8346
|
|
|
8347 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8348 the window, use the first window line or character position
|
|
|
8349 instead. */
|
|
|
8350 if (char_y < 0)
|
|
|
8351 char_y = 0;
|
|
|
8352 if (char_x < 0)
|
|
|
8353 char_x = 0;
|
|
|
8354
|
|
|
8355 num_disp_lines = Dynarr_length (dla);
|
|
|
8356 modeline = 0;
|
|
|
8357 if (num_disp_lines)
|
|
|
8358 {
|
|
|
8359 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8360 {
|
|
|
8361 num_disp_lines--;
|
|
|
8362 modeline = 1;
|
|
|
8363 }
|
|
|
8364 }
|
|
|
8365
|
|
|
8366 /* First check if the y position intersects the display lines. */
|
|
|
8367 if (char_y < num_disp_lines)
|
|
|
8368 {
|
|
|
8369 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8370 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8371
|
|
|
8372 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8373 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8374
|
|
|
8375 if (char_x < Dynarr_length (db->runes))
|
|
|
8376 {
|
|
|
8377 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8378
|
|
|
8379 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8380 }
|
|
|
8381 else
|
|
|
8382 {
|
|
|
8383 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8384 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8385
|
|
|
8386 char_x -= last_rune;
|
|
|
8387
|
|
|
8388 *pix_x = rb->xpos + rb->width;
|
|
|
8389 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8390 *pix_x += (defwidth >> 1);
|
|
|
8391 }
|
|
|
8392 }
|
|
|
8393 else
|
|
|
8394 {
|
|
|
8395 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8396 modeline in this since we don't have true character positions in
|
|
|
8397 it. */
|
|
|
8398
|
|
|
8399 if (!Dynarr_length (w->face_cachels))
|
|
|
8400 reset_face_cachels (w);
|
|
|
8401
|
|
|
8402 char_y -= num_disp_lines;
|
|
|
8403
|
|
|
8404 if (Dynarr_length (dla))
|
|
|
8405 {
|
|
|
8406 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8407 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8408 }
|
|
|
8409 else
|
|
|
8410 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8411
|
|
|
8412 *pix_y += (char_y * defheight);
|
|
|
8413 *pix_y += (defheight >> 1);
|
|
|
8414
|
|
|
8415 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8416 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8417 *pix_x += (char_x * defwidth);
|
|
|
8418 *pix_x += (defwidth >> 1);
|
|
|
8419 }
|
|
|
8420
|
|
|
8421 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8422 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8423 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8424 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8425
|
|
|
8426 *pix_x -= w->pixel_left;
|
|
|
8427 *pix_y -= w->pixel_top;
|
|
|
8428 }
|
|
|
8429
|
|
|
8430 /* Given a display line and a position, determine if there is a glyph
|
|
|
8431 there and return information about it if there is. */
|
|
|
8432
|
|
|
8433 static void
|
|
|
8434 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8435 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8436 int *high_x_coord)
|
|
|
8437 {
|
|
|
8438 struct display_block *db;
|
|
|
8439 int elt;
|
|
|
8440 int block =
|
|
|
8441 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8442
|
|
|
8443 /* We use get_next_display_block to get the actual display block
|
|
|
8444 that would be displayed at x_coord. */
|
|
|
8445
|
|
|
8446 if (block == NO_BLOCK)
|
|
|
8447 return;
|
|
|
8448 else
|
|
|
8449 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8450
|
|
|
8451 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8452 {
|
|
|
8453 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8454
|
|
|
8455 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8456 {
|
|
|
8457 if (rb->type == RUNE_DGLYPH)
|
|
|
8458 {
|
|
|
8459 *obj1 = rb->object.dglyph.glyph;
|
|
|
8460 *obj2 = rb->object.dglyph.extent;
|
|
|
8461 }
|
|
|
8462 else
|
|
|
8463 {
|
|
|
8464 *obj1 = Qnil;
|
|
|
8465 *obj2 = Qnil;
|
|
|
8466 }
|
|
|
8467
|
|
|
8468 if (low_x_coord)
|
|
|
8469 *low_x_coord = rb->xpos;
|
|
|
8470 if (high_x_coord)
|
|
|
8471 *high_x_coord = rb->xpos + rb->width;
|
|
|
8472
|
|
|
8473 return;
|
|
|
8474 }
|
|
|
8475 }
|
|
|
8476 }
|
|
|
8477
|
|
|
8478 #define UPDATE_CACHE_RETURN \
|
|
|
8479 do { \
|
|
|
8480 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8481 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8482 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8483 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8484 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8485 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8486 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8487 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8488 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8489 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8490 d->pixel_to_glyph_cache.w = *w; \
|
|
826
|
8491 d->pixel_to_glyph_cache.charpos = *charpos; \
|
|
428
|
8492 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8493 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8494 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8495 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8496 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8497 RETURN_SANS_WARNINGS position; \
|
|
|
8498 } while (0)
|
|
|
8499
|
|
|
8500 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8501 information about what is located under those coordinates.
|
|
|
8502
|
|
|
8503 The return value will be one of:
|
|
|
8504
|
|
|
8505 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8506 OVER_MODELINE: over a modeline
|
|
|
8507 OVER_BORDER: over an internal border
|
|
|
8508 OVER_NOTHING: over the text area, but not over text
|
|
|
8509 OVER_OUTSIDE: outside of the frame border
|
|
|
8510 OVER_TEXT: over text in the text area
|
|
|
8511
|
|
|
8512 OBJ1 is one of
|
|
|
8513
|
|
|
8514 -- a toolbar button
|
|
|
8515 -- a glyph
|
|
|
8516 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8517
|
|
|
8518 OBJ2 is one of
|
|
|
8519
|
|
|
8520 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8521 -- nil otherwise.
|
|
|
8522
|
|
|
8523 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8524 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8525
|
|
|
8526 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8527 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8528
|
|
|
8529 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8530 */
|
|
|
8531
|
|
|
8532 int
|
|
|
8533 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8534 int *col, int *row, int *obj_x, int *obj_y,
|
|
826
|
8535 struct window **w, Charbpos *charpos,
|
|
665
|
8536 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8537 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8538 {
|
|
|
8539 struct device *d;
|
|
|
8540 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8541 Lisp_Object window;
|
|
|
8542 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8543 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8544 int position = OVER_NOTHING;
|
|
|
8545 int device_check_failed = 0;
|
|
|
8546 display_line_dynarr *dla;
|
|
|
8547
|
|
|
8548 /* This is a safety valve in case this got called with a frame in
|
|
|
8549 the middle of being deleted. */
|
|
|
8550 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8551 {
|
|
|
8552 device_check_failed = 1;
|
|
|
8553 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8554 }
|
|
|
8555 else
|
|
|
8556 {
|
|
|
8557 d = XDEVICE (f->device);
|
|
|
8558 cache = &d->pixel_to_glyph_cache;
|
|
|
8559 }
|
|
|
8560
|
|
|
8561 if (!device_check_failed
|
|
|
8562 && cache->valid
|
|
|
8563 && cache->frame == f
|
|
|
8564 && cache->low_x_coord <= x_coord
|
|
|
8565 && cache->high_x_coord > x_coord
|
|
|
8566 && cache->low_y_coord <= y_coord
|
|
|
8567 && cache->high_y_coord > y_coord)
|
|
|
8568 {
|
|
|
8569 *col = cache->col;
|
|
|
8570 *row = cache->row;
|
|
|
8571 *obj_x = cache->obj_x;
|
|
|
8572 *obj_y = cache->obj_y;
|
|
|
8573 *w = cache->w;
|
|
826
|
8574 *charpos = cache->charpos;
|
|
428
|
8575 *closest = cache->closest;
|
|
|
8576 *modeline_closest = cache->modeline_closest;
|
|
|
8577 *obj1 = cache->obj1;
|
|
|
8578 *obj2 = cache->obj2;
|
|
|
8579
|
|
|
8580 return cache->retval;
|
|
|
8581 }
|
|
|
8582 else
|
|
|
8583 {
|
|
|
8584 *col = 0;
|
|
|
8585 *row = 0;
|
|
|
8586 *obj_x = 0;
|
|
|
8587 *obj_y = 0;
|
|
|
8588 *w = 0;
|
|
826
|
8589 *charpos = 0;
|
|
428
|
8590 *closest = 0;
|
|
|
8591 *modeline_closest = -1;
|
|
|
8592 *obj1 = Qnil;
|
|
|
8593 *obj2 = Qnil;
|
|
|
8594
|
|
|
8595 low_x_coord = x_coord;
|
|
|
8596 high_x_coord = x_coord + 1;
|
|
|
8597 low_y_coord = y_coord;
|
|
|
8598 high_y_coord = y_coord + 1;
|
|
|
8599 }
|
|
|
8600
|
|
|
8601 if (device_check_failed)
|
|
|
8602 return OVER_NOTHING;
|
|
|
8603
|
|
|
8604 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8605 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8606 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8607 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8608
|
|
|
8609 /* Check if the mouse is outside of the text area actually used by
|
|
|
8610 redisplay. */
|
|
|
8611 if (y_coord < frm_top)
|
|
|
8612 {
|
|
|
8613 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8614 {
|
|
|
8615 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8616 high_y_coord = frm_top;
|
|
|
8617 position = OVER_BORDER;
|
|
|
8618 }
|
|
|
8619 else if (y_coord >= 0)
|
|
|
8620 {
|
|
|
8621 low_y_coord = 0;
|
|
|
8622 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8623 position = OVER_TOOLBAR;
|
|
|
8624 }
|
|
|
8625 else
|
|
|
8626 {
|
|
|
8627 low_y_coord = y_coord;
|
|
|
8628 high_y_coord = 0;
|
|
|
8629 position = OVER_OUTSIDE;
|
|
|
8630 }
|
|
|
8631 }
|
|
|
8632 else if (y_coord >= frm_bottom)
|
|
|
8633 {
|
|
|
8634 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
8635 {
|
|
|
8636 low_y_coord = frm_bottom;
|
|
|
8637 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8638 position = OVER_BORDER;
|
|
|
8639 }
|
|
|
8640 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
8641 {
|
|
|
8642 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8643 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8644 position = OVER_TOOLBAR;
|
|
|
8645 }
|
|
|
8646 else
|
|
|
8647 {
|
|
|
8648 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8649 high_y_coord = y_coord;
|
|
|
8650 position = OVER_OUTSIDE;
|
|
|
8651 }
|
|
|
8652 }
|
|
|
8653
|
|
|
8654 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
8655 {
|
|
|
8656 if (x_coord < frm_left)
|
|
|
8657 {
|
|
|
8658 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
8659 {
|
|
|
8660 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8661 high_x_coord = frm_left;
|
|
|
8662 position = OVER_BORDER;
|
|
|
8663 }
|
|
|
8664 else if (x_coord >= 0)
|
|
|
8665 {
|
|
|
8666 low_x_coord = 0;
|
|
|
8667 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8668 position = OVER_TOOLBAR;
|
|
|
8669 }
|
|
|
8670 else
|
|
|
8671 {
|
|
|
8672 low_x_coord = x_coord;
|
|
|
8673 high_x_coord = 0;
|
|
|
8674 position = OVER_OUTSIDE;
|
|
|
8675 }
|
|
|
8676 }
|
|
|
8677 else if (x_coord >= frm_right)
|
|
|
8678 {
|
|
|
8679 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
8680 {
|
|
|
8681 low_x_coord = frm_right;
|
|
|
8682 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8683 position = OVER_BORDER;
|
|
|
8684 }
|
|
|
8685 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
8686 {
|
|
|
8687 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8688 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8689 position = OVER_TOOLBAR;
|
|
|
8690 }
|
|
|
8691 else
|
|
|
8692 {
|
|
|
8693 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8694 high_x_coord = x_coord;
|
|
|
8695 position = OVER_OUTSIDE;
|
|
|
8696 }
|
|
|
8697 }
|
|
|
8698 }
|
|
|
8699
|
|
|
8700 #ifdef HAVE_TOOLBARS
|
|
|
8701 if (position == OVER_TOOLBAR)
|
|
|
8702 {
|
|
|
8703 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
8704 *obj2 = Qnil;
|
|
|
8705 *w = 0;
|
|
|
8706 UPDATE_CACHE_RETURN;
|
|
|
8707 }
|
|
|
8708 #endif /* HAVE_TOOLBARS */
|
|
|
8709
|
|
|
8710 /* We still have to return the window the pointer is next to and its
|
|
|
8711 relative y position even if it is outside the x boundary. */
|
|
|
8712 if (x_coord < frm_left)
|
|
|
8713 x_coord = frm_left;
|
|
|
8714 else if (x_coord > frm_right)
|
|
|
8715 x_coord = frm_right;
|
|
|
8716
|
|
|
8717 /* Same in reverse. */
|
|
|
8718 if (y_coord < frm_top)
|
|
|
8719 y_coord = frm_top;
|
|
|
8720 else if (y_coord > frm_bottom)
|
|
|
8721 y_coord = frm_bottom;
|
|
|
8722
|
|
|
8723 /* Find what window the given coordinates are actually in. */
|
|
|
8724 window = f->root_window;
|
|
|
8725 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
8726
|
|
|
8727 /* If we didn't find a window, we're done. */
|
|
|
8728 if (!*w)
|
|
|
8729 {
|
|
|
8730 UPDATE_CACHE_RETURN;
|
|
|
8731 }
|
|
|
8732 else if (position != OVER_NOTHING)
|
|
|
8733 {
|
|
|
8734 *closest = 0;
|
|
|
8735 *modeline_closest = -1;
|
|
|
8736
|
|
|
8737 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
8738 {
|
|
|
8739 *w = 0;
|
|
|
8740 UPDATE_CACHE_RETURN;
|
|
|
8741 }
|
|
|
8742 }
|
|
|
8743
|
|
|
8744 /* Check if the window is a minibuffer but isn't active. */
|
|
|
8745 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
8746 {
|
|
|
8747 /* Must reset the window value since some callers will ignore
|
|
|
8748 the return value if it is set. */
|
|
|
8749 *w = 0;
|
|
|
8750 UPDATE_CACHE_RETURN;
|
|
|
8751 }
|
|
|
8752
|
|
|
8753 /* See if the point is over window vertical divider */
|
|
|
8754 if (window_needs_vertical_divider (*w))
|
|
|
8755 {
|
|
|
8756 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
8757 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
8758 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
8759 int div_y_low = WINDOW_TOP (*w);
|
|
|
8760
|
|
|
8761 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
8762 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
8763 {
|
|
|
8764 low_x_coord = div_x_low;
|
|
|
8765 high_x_coord = div_x_high;
|
|
|
8766 low_y_coord = div_y_low;
|
|
|
8767 high_y_coord = div_y_high;
|
|
|
8768 position = OVER_V_DIVIDER;
|
|
|
8769 UPDATE_CACHE_RETURN;
|
|
|
8770 }
|
|
|
8771 }
|
|
|
8772
|
|
|
8773 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
8774
|
|
|
8775 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
8776 {
|
|
|
8777 int really_over_nothing = 0;
|
|
|
8778 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
8779
|
|
|
8780 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
8781 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
8782 {
|
|
|
8783 int check_margin_glyphs = 0;
|
|
|
8784 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8785 struct rune *rb = 0;
|
|
|
8786
|
|
|
8787 if (x_coord < dl->bounds.left_white
|
|
|
8788 || x_coord >= dl->bounds.right_white)
|
|
|
8789 check_margin_glyphs = 1;
|
|
|
8790
|
|
|
8791 low_y_coord = dl->ypos - dl->ascent;
|
|
|
8792 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
8793
|
|
|
8794 if (position == OVER_BORDER
|
|
|
8795 || position == OVER_OUTSIDE
|
|
|
8796 || check_margin_glyphs)
|
|
|
8797 {
|
|
|
8798 int x_check, left_bound;
|
|
|
8799
|
|
|
8800 if (check_margin_glyphs)
|
|
|
8801 {
|
|
|
8802 x_check = x_coord;
|
|
|
8803 left_bound = dl->bounds.left_white;
|
|
|
8804 }
|
|
|
8805 else
|
|
|
8806 {
|
|
|
8807 x_check = high_x_coord;
|
|
|
8808 left_bound = frm_left;
|
|
|
8809 }
|
|
|
8810
|
|
|
8811 if (Dynarr_length (db->runes))
|
|
|
8812 {
|
|
|
8813 if (x_check <= left_bound)
|
|
|
8814 {
|
|
|
8815 if (dl->modeline)
|
|
826
|
8816 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8817 else
|
|
826
|
8818 *closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8819 }
|
|
|
8820 else
|
|
|
8821 {
|
|
|
8822 if (dl->modeline)
|
|
|
8823 *modeline_closest =
|
|
|
8824 Dynarr_atp (db->runes,
|
|
826
|
8825 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8826 else
|
|
|
8827 *closest =
|
|
|
8828 Dynarr_atp (db->runes,
|
|
826
|
8829 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8830 }
|
|
|
8831
|
|
|
8832 if (dl->modeline)
|
|
|
8833 *modeline_closest += dl->offset;
|
|
|
8834 else
|
|
|
8835 *closest += dl->offset;
|
|
|
8836 }
|
|
|
8837 else
|
|
|
8838 {
|
|
|
8839 /* #### What should be here. */
|
|
|
8840 if (dl->modeline)
|
|
|
8841 *modeline_closest = 0;
|
|
|
8842 else
|
|
|
8843 *closest = 0;
|
|
|
8844 }
|
|
|
8845
|
|
|
8846 if (check_margin_glyphs)
|
|
|
8847 {
|
|
|
8848 if (x_coord < dl->bounds.left_in
|
|
|
8849 || x_coord >= dl->bounds.right_in)
|
|
|
8850 {
|
|
|
8851 /* If we are over the outside margins then we
|
|
|
8852 know the loop over the text block isn't going
|
|
|
8853 to accomplish anything. So we go ahead and
|
|
|
8854 set what information we can right here and
|
|
|
8855 return. */
|
|
|
8856 (*row)--;
|
|
|
8857 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8858 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8859 &low_x_coord, &high_x_coord);
|
|
|
8860
|
|
|
8861 UPDATE_CACHE_RETURN;
|
|
|
8862 }
|
|
|
8863 }
|
|
|
8864 else
|
|
|
8865 UPDATE_CACHE_RETURN;
|
|
|
8866 }
|
|
|
8867
|
|
|
8868 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
8869 {
|
|
|
8870 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
8871
|
|
|
8872 if (!past_end)
|
|
|
8873 rb = Dynarr_atp (db->runes, *col);
|
|
|
8874
|
|
|
8875 if (past_end ||
|
|
|
8876 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
8877 {
|
|
|
8878 if (past_end)
|
|
|
8879 {
|
|
|
8880 (*col)--;
|
|
|
8881 rb = Dynarr_atp (db->runes, *col);
|
|
|
8882 }
|
|
|
8883
|
|
826
|
8884 *charpos = rb->charpos + dl->offset;
|
|
428
|
8885 low_x_coord = rb->xpos;
|
|
|
8886 high_x_coord = rb->xpos + rb->width;
|
|
|
8887
|
|
|
8888 if (rb->type == RUNE_DGLYPH)
|
|
|
8889 {
|
|
|
8890 int elt = *col + 1;
|
|
|
8891
|
|
|
8892 /* Find the first character after the glyph. */
|
|
|
8893 while (elt < Dynarr_length (db->runes))
|
|
|
8894 {
|
|
|
8895 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
8896 {
|
|
|
8897 if (dl->modeline)
|
|
|
8898 *modeline_closest =
|
|
826
|
8899 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8900 dl->offset);
|
|
|
8901 else
|
|
|
8902 *closest =
|
|
826
|
8903 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8904 dl->offset);
|
|
|
8905 break;
|
|
|
8906 }
|
|
|
8907
|
|
|
8908 elt++;
|
|
|
8909 }
|
|
|
8910
|
|
|
8911 /* In this case we failed to find a non-glyph
|
|
|
8912 character so we return the last position
|
|
|
8913 displayed on the line. */
|
|
|
8914 if (elt == Dynarr_length (db->runes))
|
|
|
8915 {
|
|
|
8916 if (dl->modeline)
|
|
826
|
8917 *modeline_closest = dl->end_charpos + dl->offset;
|
|
428
|
8918 else
|
|
826
|
8919 *closest = dl->end_charpos + dl->offset;
|
|
428
|
8920 really_over_nothing = 1;
|
|
|
8921 }
|
|
|
8922 }
|
|
|
8923 else
|
|
|
8924 {
|
|
|
8925 if (dl->modeline)
|
|
826
|
8926 *modeline_closest = rb->charpos + dl->offset;
|
|
428
|
8927 else
|
|
826
|
8928 *closest = rb->charpos + dl->offset;
|
|
428
|
8929 }
|
|
|
8930
|
|
|
8931 if (dl->modeline)
|
|
|
8932 {
|
|
|
8933 *row = window_displayed_height (*w);
|
|
|
8934
|
|
|
8935 if (position == OVER_NOTHING)
|
|
|
8936 position = OVER_MODELINE;
|
|
|
8937
|
|
|
8938 if (rb->type == RUNE_DGLYPH)
|
|
|
8939 {
|
|
|
8940 *obj1 = rb->object.dglyph.glyph;
|
|
|
8941 *obj2 = rb->object.dglyph.extent;
|
|
|
8942 }
|
|
|
8943 else if (rb->type == RUNE_CHAR)
|
|
|
8944 {
|
|
|
8945 *obj1 = Qnil;
|
|
|
8946 *obj2 = Qnil;
|
|
|
8947 }
|
|
|
8948 else
|
|
|
8949 {
|
|
|
8950 *obj1 = Qnil;
|
|
|
8951 *obj2 = Qnil;
|
|
|
8952 }
|
|
|
8953
|
|
|
8954 UPDATE_CACHE_RETURN;
|
|
|
8955 }
|
|
|
8956 else if (past_end
|
|
|
8957 || (rb->type == RUNE_CHAR
|
|
|
8958 && rb->object.chr.ch == '\n'))
|
|
|
8959 {
|
|
|
8960 (*row)--;
|
|
|
8961 /* At this point we may have glyphs in the right
|
|
|
8962 inside margin. */
|
|
|
8963 if (check_margin_glyphs)
|
|
|
8964 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8965 &low_x_coord, &high_x_coord);
|
|
|
8966 UPDATE_CACHE_RETURN;
|
|
|
8967 }
|
|
|
8968 else
|
|
|
8969 {
|
|
|
8970 (*row)--;
|
|
|
8971 if (rb->type == RUNE_DGLYPH)
|
|
|
8972 {
|
|
|
8973 *obj1 = rb->object.dglyph.glyph;
|
|
|
8974 *obj2 = rb->object.dglyph.extent;
|
|
|
8975 }
|
|
|
8976 else if (rb->type == RUNE_CHAR)
|
|
|
8977 {
|
|
|
8978 *obj1 = Qnil;
|
|
|
8979 *obj2 = Qnil;
|
|
|
8980 }
|
|
|
8981 else
|
|
|
8982 {
|
|
|
8983 *obj1 = Qnil;
|
|
|
8984 *obj2 = Qnil;
|
|
|
8985 }
|
|
|
8986
|
|
|
8987 *obj_x = x_coord - rb->xpos;
|
|
|
8988 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8989
|
|
|
8990 /* At this point we may have glyphs in the left
|
|
|
8991 inside margin. */
|
|
|
8992 if (check_margin_glyphs)
|
|
|
8993 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
8994
|
|
|
8995 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
8996 position = OVER_TEXT;
|
|
|
8997
|
|
|
8998 UPDATE_CACHE_RETURN;
|
|
|
8999 }
|
|
|
9000 }
|
|
|
9001 }
|
|
|
9002 }
|
|
|
9003 }
|
|
|
9004
|
|
|
9005 *row = Dynarr_length (dla) - 1;
|
|
|
9006 if (FRAME_WIN_P (f))
|
|
|
9007 {
|
|
|
9008 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
9009
|
|
|
9010 if (bot_elt >= 0)
|
|
|
9011 {
|
|
|
9012 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
9013 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
9014 Lisp_Object lwin;
|
|
|
9015 int defheight;
|
|
|
9016
|
|
793
|
9017 lwin = wrap_window (*w);
|
|
428
|
9018 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
9019
|
|
|
9020 *row += (adj_area / defheight);
|
|
|
9021 }
|
|
|
9022 }
|
|
|
9023
|
|
|
9024 /* #### This should be checked out some more to determine what
|
|
|
9025 should really be going on. */
|
|
|
9026 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
9027 *closest = 0;
|
|
|
9028 else
|
|
442
|
9029 *closest = end_of_last_line_may_error (*w,
|
|
428
|
9030 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
9031 *col = 0;
|
|
|
9032 UPDATE_CACHE_RETURN;
|
|
|
9033 }
|
|
|
9034 #undef UPDATE_CACHE_RETURN
|
|
|
9035
|
|
|
9036
|
|
|
9037 /***************************************************************************/
|
|
|
9038 /* */
|
|
|
9039 /* Lisp functions */
|
|
|
9040 /* */
|
|
|
9041 /***************************************************************************/
|
|
|
9042
|
|
|
9043 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
9044 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
9045 */
|
|
|
9046 ())
|
|
|
9047 {
|
|
|
9048 Lisp_Object devcons, concons;
|
|
|
9049
|
|
|
9050 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
9051 {
|
|
|
9052 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
9053 Lisp_Object frmcons;
|
|
|
9054
|
|
|
9055 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9056 {
|
|
|
9057 struct frame *f = XFRAME (XCAR (frmcons));
|
|
853
|
9058 int depth;
|
|
428
|
9059
|
|
|
9060 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9061 {
|
|
|
9062 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9063
|
|
|
9064 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9065
|
|
428
|
9066 /*
|
|
|
9067 * If the frame size has changed, there may be random
|
|
|
9068 * chud on the screen left from previous messages
|
|
|
9069 * because redisplay_frame hasn't been called yet.
|
|
|
9070 * Clear the screen to get rid of the potential mess.
|
|
|
9071 */
|
|
|
9072 if (f->echo_area_garbaged)
|
|
|
9073 {
|
|
442
|
9074 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9075 f->echo_area_garbaged = 0;
|
|
|
9076 }
|
|
853
|
9077 depth = enter_redisplay_critical_section ();
|
|
428
|
9078 redisplay_window (window, 0);
|
|
853
|
9079 exit_redisplay_critical_section (depth);
|
|
442
|
9080 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
|
9081
|
|
428
|
9082 call_redisplay_end_triggers (XWINDOW (window), 0);
|
|
|
9083 }
|
|
|
9084 }
|
|
|
9085 }
|
|
|
9086
|
|
|
9087 return Qnil;
|
|
|
9088 }
|
|
|
9089
|
|
|
9090 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9091 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9092 FRAME defaults to the selected frame if omitted.
|
|
|
9093 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9094 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9095 input and is guaranteed to proceed to completion.
|
|
|
9096 */
|
|
|
9097 (frame, no_preempt))
|
|
|
9098 {
|
|
|
9099 struct frame *f = decode_frame (frame);
|
|
|
9100 int count = specpdl_depth ();
|
|
|
9101
|
|
|
9102 if (!NILP (no_preempt))
|
|
853
|
9103 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9104
|
|
|
9105 f->clear = 1;
|
|
|
9106 redisplay_frame (f, 1);
|
|
|
9107
|
|
442
|
9108 /* See the comment in Fredisplay_frame. */
|
|
|
9109 RESET_CHANGED_SET_FLAGS;
|
|
|
9110
|
|
771
|
9111 return unbind_to (count);
|
|
428
|
9112 }
|
|
|
9113
|
|
|
9114 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9115 Ensure that FRAME's contents are correctly displayed.
|
|
|
9116 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9117 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9118 the frame.
|
|
|
9119 FRAME defaults to the selected frame if omitted.
|
|
|
9120 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9121 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9122 input and is guaranteed to proceed to completion.
|
|
|
9123 */
|
|
|
9124 (frame, no_preempt))
|
|
|
9125 {
|
|
|
9126 struct frame *f = decode_frame (frame);
|
|
|
9127 int count = specpdl_depth ();
|
|
|
9128
|
|
|
9129 if (!NILP (no_preempt))
|
|
853
|
9130 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9131
|
|
|
9132 redisplay_frame (f, 1);
|
|
|
9133
|
|
442
|
9134 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9135 changes to the display will not get registered by redisplay
|
|
|
9136 because it thinks it already has registered changes. If you
|
|
|
9137 really knew what you were doing you could confuse redisplay by
|
|
|
9138 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9139 that if you know what you are doing you will not be that
|
|
|
9140 stupid. */
|
|
|
9141 RESET_CHANGED_SET_FLAGS;
|
|
|
9142
|
|
771
|
9143 return unbind_to (count);
|
|
428
|
9144 }
|
|
|
9145
|
|
|
9146 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9147 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9148 DEVICE defaults to the selected device if omitted.
|
|
|
9149 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9150 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9151 input and is guaranteed to proceed to completion.
|
|
|
9152 */
|
|
|
9153 (device, no_preempt))
|
|
|
9154 {
|
|
|
9155 struct device *d = decode_device (device);
|
|
|
9156 Lisp_Object frmcons;
|
|
|
9157 int count = specpdl_depth ();
|
|
|
9158
|
|
|
9159 if (!NILP (no_preempt))
|
|
853
|
9160 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9161
|
|
|
9162 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9163 {
|
|
|
9164 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9165 }
|
|
440
|
9166 redisplay_device (d, 0);
|
|
428
|
9167
|
|
442
|
9168 /* See the comment in Fredisplay_frame. */
|
|
|
9169 RESET_CHANGED_SET_FLAGS;
|
|
|
9170
|
|
771
|
9171 return unbind_to (count);
|
|
428
|
9172 }
|
|
|
9173
|
|
|
9174 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9175 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9176 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9177 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9178 the device.
|
|
|
9179 DEVICE defaults to the selected device if omitted.
|
|
|
9180 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9181 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9182 input and is guaranteed to proceed to completion.
|
|
853
|
9183
|
|
|
9184 Note: If you simply want everything redisplayed, the current idiom is
|
|
|
9185 `(sit-for 0)'.
|
|
428
|
9186 */
|
|
|
9187 (device, no_preempt))
|
|
|
9188 {
|
|
|
9189 struct device *d = decode_device (device);
|
|
|
9190 int count = specpdl_depth ();
|
|
|
9191
|
|
|
9192 if (!NILP (no_preempt))
|
|
853
|
9193 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9194
|
|
440
|
9195 redisplay_device (d, 0);
|
|
428
|
9196
|
|
442
|
9197 /* See the comment in Fredisplay_frame. */
|
|
|
9198 RESET_CHANGED_SET_FLAGS;
|
|
|
9199
|
|
771
|
9200 return unbind_to (count);
|
|
428
|
9201 }
|
|
|
9202
|
|
|
9203 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9204 regardless if the all flag is set or not. It remains in existence
|
|
|
9205 solely for backwards compatibility. */
|
|
|
9206 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9207 Force the modeline of the current buffer to be redisplayed.
|
|
|
9208 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9209 */
|
|
|
9210 (all))
|
|
|
9211 {
|
|
|
9212 MARK_MODELINE_CHANGED;
|
|
|
9213 return Qnil;
|
|
|
9214 }
|
|
|
9215
|
|
|
9216 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9217 Force an immediate update of the cursor on FRAME.
|
|
|
9218 FRAME defaults to the selected frame if omitted.
|
|
|
9219 */
|
|
|
9220 (frame))
|
|
|
9221 {
|
|
|
9222 redisplay_redraw_cursor (decode_frame (frame), 1);
|
|
|
9223 return Qnil;
|
|
|
9224 }
|
|
|
9225
|
|
|
9226
|
|
|
9227 /***************************************************************************/
|
|
|
9228 /* */
|
|
872
|
9229 /* Change flags */
|
|
428
|
9230 /* */
|
|
|
9231 /***************************************************************************/
|
|
|
9232
|
|
|
9233 static void
|
|
|
9234 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
9235 Lisp_Object oldval)
|
|
|
9236 {
|
|
|
9237 /* Nothing to be done? */
|
|
|
9238 }
|
|
|
9239
|
|
|
9240 int
|
|
|
9241 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
9242 Lisp_Object in_object, int flags)
|
|
|
9243 {
|
|
|
9244 /* #### clip_changed should really be renamed something like
|
|
|
9245 global_redisplay_change. */
|
|
|
9246 MARK_CLIP_CHANGED;
|
|
|
9247 return 0;
|
|
|
9248 }
|
|
|
9249
|
|
|
9250 /* This is called if the built-in glyphs have their properties
|
|
|
9251 changed. */
|
|
|
9252 void
|
|
|
9253 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
9254 Lisp_Object locale)
|
|
|
9255 {
|
|
|
9256 if (WINDOWP (locale))
|
|
|
9257 {
|
|
|
9258 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9259 }
|
|
|
9260 else if (FRAMEP (locale))
|
|
|
9261 {
|
|
|
9262 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9263 }
|
|
|
9264 else if (DEVICEP (locale))
|
|
|
9265 {
|
|
|
9266 Lisp_Object frmcons;
|
|
|
9267 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9268 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9269 }
|
|
|
9270 else if (CONSOLEP (locale))
|
|
|
9271 {
|
|
|
9272 Lisp_Object frmcons, devcons;
|
|
|
9273 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9274 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9275 }
|
|
|
9276 else /* global or buffer */
|
|
|
9277 {
|
|
|
9278 Lisp_Object frmcons, devcons, concons;
|
|
|
9279 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9280 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9281 }
|
|
|
9282 }
|
|
|
9283
|
|
|
9284 static void
|
|
|
9285 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
9286 Lisp_Object oldval)
|
|
|
9287 {
|
|
|
9288 if (XFRAME (w->frame)->init_finished)
|
|
|
9289 Fforce_cursor_redisplay (w->frame);
|
|
|
9290 }
|
|
|
9291
|
|
872
|
9292 void
|
|
|
9293 mark_buffers_changed (void)
|
|
|
9294 {
|
|
|
9295 MARK_TYPE_CHANGED (buffers);
|
|
|
9296 }
|
|
|
9297
|
|
|
9298 void
|
|
|
9299 mark_clip_changed (void)
|
|
|
9300 {
|
|
|
9301 MARK_TYPE_CHANGED (clip);
|
|
|
9302 }
|
|
|
9303
|
|
|
9304 void
|
|
|
9305 mark_extents_changed (void)
|
|
|
9306 {
|
|
|
9307 MARK_TYPE_CHANGED (extents);
|
|
|
9308 }
|
|
|
9309
|
|
|
9310 void
|
|
|
9311 mark_icon_changed (void)
|
|
|
9312 {
|
|
|
9313 MARK_TYPE_CHANGED (icon);
|
|
|
9314 }
|
|
|
9315
|
|
|
9316 void
|
|
|
9317 mark_menubar_changed (void)
|
|
|
9318 {
|
|
|
9319 MARK_TYPE_CHANGED (menubar);
|
|
|
9320 }
|
|
|
9321
|
|
|
9322 void
|
|
|
9323 mark_modeline_changed (void)
|
|
|
9324 {
|
|
|
9325 MARK_TYPE_CHANGED (modeline);
|
|
|
9326 }
|
|
|
9327
|
|
|
9328 void
|
|
|
9329 mark_point_changed (void)
|
|
|
9330 {
|
|
|
9331 MARK_TYPE_CHANGED (point);
|
|
|
9332 }
|
|
|
9333
|
|
|
9334 void
|
|
|
9335 mark_toolbar_changed (void)
|
|
|
9336 {
|
|
|
9337 MARK_TYPE_CHANGED (toolbar);
|
|
|
9338 }
|
|
|
9339
|
|
|
9340 void
|
|
|
9341 mark_gutter_changed (void)
|
|
|
9342 {
|
|
|
9343 MARK_TYPE_CHANGED (gutter);
|
|
|
9344 }
|
|
|
9345
|
|
|
9346 void
|
|
|
9347 mark_glyphs_changed (void)
|
|
|
9348 {
|
|
|
9349 MARK_TYPE_CHANGED (glyphs);
|
|
|
9350 }
|
|
|
9351
|
|
|
9352 void
|
|
|
9353 mark_subwindows_changed (void)
|
|
|
9354 {
|
|
|
9355 MARK_TYPE_CHANGED (subwindows);
|
|
|
9356 }
|
|
|
9357
|
|
|
9358 void
|
|
|
9359 mark_subwindows_state_changed (void)
|
|
|
9360 {
|
|
|
9361 MARK_TYPE_CHANGED (subwindows_state);
|
|
|
9362 }
|
|
|
9363
|
|
428
|
9364 #ifdef MEMORY_USAGE_STATS
|
|
|
9365
|
|
|
9366
|
|
|
9367 /***************************************************************************/
|
|
|
9368 /* */
|
|
|
9369 /* memory usage computation */
|
|
|
9370 /* */
|
|
|
9371 /***************************************************************************/
|
|
|
9372
|
|
|
9373 static int
|
|
|
9374 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9375 {
|
|
|
9376 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9377 }
|
|
|
9378
|
|
|
9379 static int
|
|
|
9380 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9381 struct overhead_stats *ovstats)
|
|
|
9382 {
|
|
|
9383 int total, i;
|
|
|
9384
|
|
|
9385 if (!dyn)
|
|
|
9386 return 0;
|
|
|
9387
|
|
|
9388 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9389 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9390 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9391
|
|
|
9392 return total;
|
|
|
9393 }
|
|
|
9394
|
|
|
9395 static int
|
|
|
9396 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9397 struct overhead_stats *ovstats)
|
|
|
9398 {
|
|
|
9399 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9400 }
|
|
|
9401
|
|
|
9402 int
|
|
|
9403 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9404 struct overhead_stats *ovstats)
|
|
|
9405 {
|
|
|
9406 int total, i;
|
|
|
9407
|
|
|
9408 if (!dyn)
|
|
|
9409 return 0;
|
|
|
9410
|
|
|
9411 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9412 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9413 {
|
|
|
9414 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9415 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9416 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9417 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9418 }
|
|
|
9419
|
|
|
9420 return total;
|
|
|
9421 }
|
|
|
9422
|
|
|
9423 int
|
|
|
9424 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9425 struct overhead_stats *ovstats)
|
|
|
9426 {
|
|
|
9427 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9428 }
|
|
|
9429
|
|
|
9430 #endif /* MEMORY_USAGE_STATS */
|
|
|
9431
|
|
800
|
9432 static int
|
|
|
9433 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
|
|
|
9434 {
|
|
|
9435 int i, j;
|
|
|
9436 display_line_dynarr *dl;
|
|
|
9437
|
|
|
9438 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9439
|
|
|
9440 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9441 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9442 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9443 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9444
|
|
|
9445 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9446
|
|
|
9447 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9448 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9449 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9450 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9451
|
|
|
9452 return 0;
|
|
|
9453 }
|
|
|
9454
|
|
|
9455 static void
|
|
|
9456 sledgehammer_check_redisplay_structs (void)
|
|
|
9457 {
|
|
|
9458 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9459 }
|
|
|
9460
|
|
428
|
9461
|
|
|
9462 /***************************************************************************/
|
|
|
9463 /* */
|
|
|
9464 /* initialization */
|
|
|
9465 /* */
|
|
|
9466 /***************************************************************************/
|
|
|
9467
|
|
|
9468 void
|
|
|
9469 init_redisplay (void)
|
|
|
9470 {
|
|
|
9471 disable_preemption = 0;
|
|
|
9472 preemption_count = 0;
|
|
|
9473 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
9474
|
|
|
9475 #ifndef PDUMP
|
|
|
9476 if (!initialized)
|
|
|
9477 #endif
|
|
|
9478 {
|
|
440
|
9479 if (!cmotion_display_lines)
|
|
|
9480 cmotion_display_lines = Dynarr_new (display_line);
|
|
867
|
9481 if (!mode_spec_ibyte_string)
|
|
|
9482 mode_spec_ibyte_string = Dynarr_new (Ibyte);
|
|
440
|
9483 if (!formatted_string_extent_dynarr)
|
|
|
9484 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9485 if (!formatted_string_extent_start_dynarr)
|
|
|
9486 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9487 if (!formatted_string_extent_end_dynarr)
|
|
|
9488 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9489 if (!internal_cache)
|
|
|
9490 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9491 }
|
|
|
9492
|
|
|
9493 /* window system is nil when in -batch mode */
|
|
|
9494 if (!initialized || noninteractive)
|
|
|
9495 return;
|
|
|
9496
|
|
|
9497 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9498 initializing the terminal. This is especially important when the
|
|
|
9499 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9500 using the window system.
|
|
|
9501
|
|
|
9502 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9503 with an error message if that doesn't work. */
|
|
|
9504
|
|
|
9505 #ifdef HAVE_X_WINDOWS
|
|
|
9506 if (!strcmp (display_use, "x"))
|
|
|
9507 {
|
|
|
9508 /* Some stuff checks this way early. */
|
|
|
9509 Vwindow_system = Qx;
|
|
|
9510 Vinitial_window_system = Qx;
|
|
|
9511 return;
|
|
|
9512 }
|
|
|
9513 #endif /* HAVE_X_WINDOWS */
|
|
|
9514
|
|
462
|
9515 #ifdef HAVE_GTK
|
|
|
9516 if (!strcmp (display_use, "gtk"))
|
|
|
9517 {
|
|
|
9518 Vwindow_system = Qgtk;
|
|
|
9519 Vinitial_window_system = Qgtk;
|
|
|
9520 return;
|
|
|
9521 }
|
|
|
9522 #endif
|
|
|
9523
|
|
428
|
9524 #ifdef HAVE_MS_WINDOWS
|
|
|
9525 if (!strcmp (display_use, "mswindows"))
|
|
|
9526 {
|
|
|
9527 /* Some stuff checks this way early. */
|
|
|
9528 Vwindow_system = Qmswindows;
|
|
|
9529 Vinitial_window_system = Qmswindows;
|
|
|
9530 return;
|
|
|
9531 }
|
|
|
9532 #endif /* HAVE_MS_WINDOWS */
|
|
|
9533
|
|
|
9534 #ifdef HAVE_TTY
|
|
|
9535 /* If no window system has been specified, try to use the terminal. */
|
|
|
9536 if (!isatty (0))
|
|
|
9537 {
|
|
|
9538 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9539 exit (1);
|
|
|
9540 }
|
|
|
9541
|
|
|
9542 /* Look at the TERM variable */
|
|
771
|
9543 if (!egetenv ("TERM"))
|
|
428
|
9544 {
|
|
|
9545 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9546 exit (1);
|
|
|
9547 }
|
|
|
9548
|
|
|
9549 Vinitial_window_system = Qtty;
|
|
|
9550 return;
|
|
|
9551 #else /* not HAVE_TTY */
|
|
|
9552 /* No DISPLAY specified, and no TTY support. */
|
|
|
9553 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9554 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9555 exit (1);
|
|
|
9556 #endif
|
|
|
9557 /* Unreached. */
|
|
|
9558 }
|
|
|
9559
|
|
|
9560 void
|
|
|
9561 syms_of_redisplay (void)
|
|
|
9562 {
|
|
563
|
9563 DEFSYMBOL (Qcursor_in_echo_area);
|
|
428
|
9564 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
563
|
9565 DEFSYMBOL (Qpre_redisplay_hook);
|
|
|
9566 DEFSYMBOL (Qpost_redisplay_hook);
|
|
428
|
9567 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
563
|
9568 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9569 DEFSYMBOL (Qbar_cursor);
|
|
|
9570 DEFSYMBOL (Qredisplay_end_trigger_functions);
|
|
|
9571 DEFSYMBOL (Qtop_bottom);
|
|
|
9572 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9573
|
|
|
9574 DEFSUBR (Fredisplay_echo_area);
|
|
|
9575 DEFSUBR (Fredraw_frame);
|
|
|
9576 DEFSUBR (Fredisplay_frame);
|
|
|
9577 DEFSUBR (Fredraw_device);
|
|
|
9578 DEFSUBR (Fredisplay_device);
|
|
|
9579 DEFSUBR (Fredraw_modeline);
|
|
|
9580 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9581 }
|
|
|
9582
|
|
|
9583 void
|
|
|
9584 vars_of_redisplay (void)
|
|
|
9585 {
|
|
|
9586
|
|
|
9587 #if 0
|
|
|
9588 staticpro (&last_arrow_position);
|
|
|
9589 staticpro (&last_arrow_string);
|
|
|
9590 last_arrow_position = Qnil;
|
|
|
9591 last_arrow_string = Qnil;
|
|
|
9592 #endif /* 0 */
|
|
|
9593
|
|
|
9594 /* #### Probably temporary */
|
|
|
9595 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9596 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9597 line start cache.
|
|
|
9598 */ );
|
|
|
9599 cache_adjustment = 2;
|
|
|
9600
|
|
|
9601 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
9602 Minimum pixel height for clipped bottom display line.
|
|
|
9603 A clipped line shorter than this won't be displayed.
|
|
|
9604 */ ,
|
|
|
9605 redisplay_variable_changed);
|
|
|
9606 vertical_clip = 5;
|
|
|
9607
|
|
|
9608 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
9609 Minimum visible area for clipped glyphs at right boundary.
|
|
|
9610 Clipped glyphs shorter than this won't be displayed.
|
|
|
9611 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
9612 */ ,
|
|
|
9613 redisplay_variable_changed);
|
|
|
9614 horizontal_clip = 5;
|
|
|
9615
|
|
|
9616 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
9617 String displayed by modeline-format's "%m" specification.
|
|
|
9618 */ );
|
|
|
9619 Vglobal_mode_string = Qnil;
|
|
|
9620
|
|
|
9621 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
9622 Marker for where to display an arrow on top of the buffer text.
|
|
|
9623 This must be the beginning of a line in order to work.
|
|
|
9624 See also `overlay-arrow-string'.
|
|
|
9625 */ ,
|
|
|
9626 redisplay_variable_changed);
|
|
|
9627 Voverlay_arrow_position = Qnil;
|
|
|
9628
|
|
|
9629 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
9630 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
9631 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
9632 well as a string.)
|
|
428
|
9633 */ ,
|
|
|
9634 redisplay_variable_changed);
|
|
|
9635 Voverlay_arrow_string = Qnil;
|
|
|
9636
|
|
|
9637 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
9638 *The number of lines to try scrolling a window by when point moves out.
|
|
|
9639 If that fails to bring point back on frame, point is centered instead.
|
|
|
9640 If this is zero, point is always centered after it moves off screen.
|
|
|
9641 */ );
|
|
|
9642 scroll_step = 0;
|
|
|
9643
|
|
|
9644 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
9645 *Scroll up to this many lines, to bring point back on screen.
|
|
|
9646 */ );
|
|
|
9647 scroll_conservatively = 0;
|
|
|
9648
|
|
|
9649 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
9650 &truncate_partial_width_windows /*
|
|
|
9651 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
9652 */ ,
|
|
|
9653 redisplay_variable_changed);
|
|
|
9654 truncate_partial_width_windows = 1;
|
|
|
9655
|
|
442
|
9656 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
9657 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
9658
|
|
|
9659 Default behavior is to flash the whole screen. On some platforms,
|
|
|
9660 special effects are available using the following values:
|
|
|
9661
|
|
|
9662 'display Flash the whole screen (ie, the default behavior).
|
|
|
9663 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
9664
|
|
|
9665 When effects are unavailable on a platform, the visual bell is the
|
|
|
9666 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
9667 */ );
|
|
442
|
9668 Vvisible_bell = Qnil;
|
|
428
|
9669
|
|
|
9670 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
9671 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
9672 A non-nil value is useful if the terminal can automatically preserve
|
|
|
9673 Emacs's frame display when you reenter Emacs.
|
|
|
9674 It is up to you to set this variable if your terminal can do that.
|
|
|
9675 */ );
|
|
|
9676 no_redraw_on_reenter = 0;
|
|
|
9677
|
|
|
9678 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
9679 A symbol naming the window-system under which Emacs is running,
|
|
|
9680 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
9681
|
|
|
9682 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
9683 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
9684 instead.
|
|
|
9685 */ );
|
|
|
9686 Vwindow_system = Qnil;
|
|
|
9687
|
|
|
9688 /* #### Temporary shit until window-system is eliminated. */
|
|
|
9689 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
9690 DON'T TOUCH
|
|
|
9691 */ );
|
|
|
9692 Vinitial_window_system = Qnil;
|
|
|
9693
|
|
|
9694 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
9695 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
9696 */ );
|
|
|
9697 cursor_in_echo_area = 0;
|
|
|
9698
|
|
|
9699 /* #### Shouldn't this be generalized as follows:
|
|
|
9700
|
|
|
9701 if nil, use block cursor.
|
|
|
9702 if a number, use a bar cursor of that width.
|
|
|
9703 Otherwise, use a 1-pixel bar cursor.
|
|
|
9704
|
|
|
9705 #### Or better yet, this variable should be trashed entirely
|
|
|
9706 (use a Lisp-magic variable to maintain compatibility)
|
|
|
9707 and a specifier `cursor-shape' added, which allows a block
|
|
|
9708 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
9709 maybe a caret cursor, etc. */
|
|
|
9710
|
|
|
9711 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
9712 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
9713 */ );
|
|
|
9714 Vbar_cursor = Qnil;
|
|
|
9715
|
|
|
9716 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
9717 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
|
|
|
9718 Function or functions to run before every redisplay.
|
|
|
9719 */ );
|
|
|
9720 Vpre_redisplay_hook = Qnil;
|
|
|
9721
|
|
|
9722 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
|
|
|
9723 Function or functions to run after every redisplay.
|
|
|
9724 */ );
|
|
|
9725 Vpost_redisplay_hook = Qnil;
|
|
|
9726 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
9727
|
|
442
|
9728 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
9729 Function or functions to call when a frame's buffer list has changed.
|
|
|
9730 This is called during redisplay, before redisplaying each frame.
|
|
|
9731 Functions on this hook are called with one argument, the frame.
|
|
|
9732 */ );
|
|
|
9733 Vbuffer_list_changed_hook = Qnil;
|
|
|
9734
|
|
428
|
9735 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
9736 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
9737 at next redisplay. You should not normally change this; the function
|
|
|
9738 `display-warning' automatically does this at appropriate times.
|
|
|
9739 */ );
|
|
|
9740 display_warning_tick = 0;
|
|
|
9741
|
|
|
9742 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
9743 Non-nil means inhibit display of warning messages.
|
|
|
9744 You should *bind* this, not set it. Any pending warning messages
|
|
|
9745 will be displayed when the binding no longer applies.
|
|
|
9746 */ );
|
|
|
9747 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
9748 This way, the warnings don't obliterate the splash screen. */
|
|
|
9749 inhibit_warning_display = 1;
|
|
|
9750
|
|
|
9751 DEFVAR_LISP ("window-size-change-functions",
|
|
|
9752 &Vwindow_size_change_functions /*
|
|
|
9753 Not currently implemented.
|
|
|
9754 Functions called before redisplay, if window sizes have changed.
|
|
|
9755 The value should be a list of functions that take one argument.
|
|
|
9756 Just before redisplay, for each frame, if any of its windows have changed
|
|
|
9757 size since the last redisplay, or have been split or deleted,
|
|
|
9758 all the functions in the list are called, with the frame as argument.
|
|
|
9759 */ );
|
|
|
9760 Vwindow_size_change_functions = Qnil;
|
|
|
9761
|
|
|
9762 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
|
|
|
9763 Not currently implemented.
|
|
|
9764 Functions to call before redisplaying a window with scrolling.
|
|
|
9765 Each function is called with two arguments, the window
|
|
|
9766 and its new display-start position. Note that the value of `window-end'
|
|
|
9767 is not valid when these functions are called.
|
|
|
9768 */ );
|
|
|
9769 Vwindow_scroll_functions = Qnil;
|
|
|
9770
|
|
|
9771 DEFVAR_LISP ("redisplay-end-trigger-functions",
|
|
|
9772 &Vredisplay_end_trigger_functions /*
|
|
|
9773 See `set-window-redisplay-end-trigger'.
|
|
|
9774 */ );
|
|
|
9775 Vredisplay_end_trigger_functions = Qnil;
|
|
|
9776
|
|
|
9777 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
9778 *Non-nil means column display number starts at 1.
|
|
|
9779 */ );
|
|
|
9780 column_number_start_at_one = 0;
|
|
|
9781 }
|
|
|
9782
|
|
|
9783 void
|
|
|
9784 specifier_vars_of_redisplay (void)
|
|
|
9785 {
|
|
|
9786 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
9787 *Width of left margin.
|
|
|
9788 This is a specifier; use `set-specifier' to change it.
|
|
|
9789 */ );
|
|
|
9790 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9791 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9792 set_specifier_caching (Vleft_margin_width,
|
|
438
|
9793 offsetof (struct window, left_margin_width),
|
|
428
|
9794 some_window_value_changed,
|
|
438
|
9795 offsetof (struct frame, left_margin_width),
|
|
444
|
9796 margin_width_changed_in_frame, 0);
|
|
428
|
9797
|
|
|
9798 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
9799 *Width of right margin.
|
|
|
9800 This is a specifier; use `set-specifier' to change it.
|
|
|
9801 */ );
|
|
|
9802 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9803 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9804 set_specifier_caching (Vright_margin_width,
|
|
438
|
9805 offsetof (struct window, right_margin_width),
|
|
428
|
9806 some_window_value_changed,
|
|
438
|
9807 offsetof (struct frame, right_margin_width),
|
|
444
|
9808 margin_width_changed_in_frame, 0);
|
|
428
|
9809
|
|
|
9810 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
9811 *Minimum ascent height of lines.
|
|
|
9812 This is a specifier; use `set-specifier' to change it.
|
|
|
9813 */ );
|
|
|
9814 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
9815 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9816 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
9817 offsetof (struct window, minimum_line_ascent),
|
|
428
|
9818 some_window_value_changed,
|
|
444
|
9819 0, 0, 0);
|
|
428
|
9820
|
|
|
9821 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
9822 *Minimum descent height of lines.
|
|
|
9823 This is a specifier; use `set-specifier' to change it.
|
|
|
9824 */ );
|
|
|
9825 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
9826 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9827 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
9828 offsetof (struct window, minimum_line_descent),
|
|
428
|
9829 some_window_value_changed,
|
|
444
|
9830 0, 0, 0);
|
|
428
|
9831
|
|
|
9832 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
9833 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
9834 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9835 This is a specifier; use `set-specifier' to change it.
|
|
|
9836 */ );
|
|
|
9837 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
9838 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9839 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
9840 offsetof (struct window, use_left_overflow),
|
|
428
|
9841 some_window_value_changed,
|
|
444
|
9842 0, 0, 0);
|
|
428
|
9843
|
|
|
9844 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
9845 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
9846 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9847 This is a specifier; use `set-specifier' to change it.
|
|
|
9848 */ );
|
|
|
9849 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
9850 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9851 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
9852 offsetof (struct window, use_right_overflow),
|
|
428
|
9853 some_window_value_changed,
|
|
444
|
9854 0, 0, 0);
|
|
428
|
9855
|
|
|
9856 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
9857 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
9858 This is a specifier; use `set-specifier' to change it.
|
|
|
9859 */ );
|
|
|
9860 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
9861 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
9862 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
9863 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
9864 text_cursor_visible_p_changed,
|
|
444
|
9865 0, 0, 0);
|
|
428
|
9866
|
|
|
9867 }
|
