|
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
|
|
905
|
439 /* Nonzero if some frame has changed the layout of internal elements
|
|
|
440 (gutters or toolbars). */
|
|
|
441 int frame_layout_changed;
|
|
|
442
|
|
428
|
443 /* non-nil if any gutter has changed */
|
|
|
444 int gutter_changed;
|
|
|
445 int gutter_changed_set;
|
|
|
446
|
|
|
447 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
448 int windows_changed;
|
|
|
449
|
|
|
450 /* non-nil if any frame's window structure has changed since the last
|
|
|
451 time redisplay completed */
|
|
|
452 int windows_structure_changed;
|
|
|
453
|
|
|
454 /* If non-nil, use vertical bar cursor. */
|
|
|
455 Lisp_Object Vbar_cursor;
|
|
|
456 Lisp_Object Qbar_cursor;
|
|
|
457
|
|
442
|
458 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
|
|
|
459 then the frame will flash instead of
|
|
|
460 beeping when an error occurs */
|
|
428
|
461
|
|
|
462 /* Nonzero means no need to redraw the entire frame on resuming
|
|
|
463 a suspended Emacs. This is useful on terminals with multiple pages,
|
|
|
464 where one page is used for Emacs and another for all else. */
|
|
|
465 int no_redraw_on_reenter;
|
|
|
466
|
|
|
467 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
|
|
|
468 under which emacs is running
|
|
|
469 ('x is the only current possibility) */
|
|
|
470 Lisp_Object Vinitial_window_system;
|
|
|
471
|
|
|
472 Lisp_Object Vglobal_mode_string;
|
|
|
473
|
|
|
474 /* The number of lines scroll a window by when point leaves the window; if
|
|
|
475 it is <=0 then point is centered in the window */
|
|
458
|
476 Fixnum scroll_step;
|
|
428
|
477
|
|
|
478 /* Scroll up to this many lines, to bring point back on screen. */
|
|
458
|
479 Fixnum scroll_conservatively;
|
|
428
|
480
|
|
|
481 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
482 Lisp_Object Voverlay_arrow_position;
|
|
|
483 /* String to display for the arrow. */
|
|
|
484 Lisp_Object Voverlay_arrow_string;
|
|
|
485
|
|
|
486 Lisp_Object Vwindow_size_change_functions;
|
|
|
487 Lisp_Object Vwindow_scroll_functions;
|
|
|
488 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
|
|
|
489
|
|
442
|
490 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
|
|
|
491
|
|
|
492
|
|
428
|
493 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
|
|
|
494 this more. */
|
|
|
495 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
496 /* #### Chuck says: I think this needs more thought.
|
|
|
497 Think about this for 19.14. */
|
|
|
498 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
|
|
|
499 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
|
|
|
500 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
501
|
|
458
|
502 static Fixnum last_display_warning_tick;
|
|
|
503 static Fixnum display_warning_tick;
|
|
428
|
504 Lisp_Object Qdisplay_warning_buffer;
|
|
|
505 int inhibit_warning_display;
|
|
|
506
|
|
|
507 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
508 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
509 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
510 Lisp_Object Vtext_cursor_visible_p;
|
|
|
511
|
|
|
512 int column_number_start_at_one;
|
|
|
513
|
|
442
|
514 Lisp_Object Qtop_bottom;
|
|
|
515
|
|
444
|
516 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
|
|
428
|
517
|
|
|
518
|
|
|
519 /***************************************************************************/
|
|
|
520 /* */
|
|
|
521 /* low-level interfaces onto device routines */
|
|
|
522 /* */
|
|
|
523 /***************************************************************************/
|
|
|
524
|
|
|
525 static int
|
|
867
|
526 redisplay_text_width_ichar_string (struct window *w, int findex,
|
|
|
527 Ichar *str, Charcount len)
|
|
428
|
528 {
|
|
|
529 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
530 Lisp_Object window;
|
|
|
531
|
|
867
|
532 find_charsets_in_ichar_string (charsets, str, len);
|
|
793
|
533 window = wrap_window (w);
|
|
428
|
534 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
535 charsets);
|
|
|
536 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
537 text_width, (XFRAME (WINDOW_FRAME (w)),
|
|
|
538 WINDOW_FACE_CACHEL (w, findex), str, len));
|
|
|
539 }
|
|
|
540
|
|
867
|
541 static Ichar_dynarr *rtw_ichar_dynarr;
|
|
428
|
542
|
|
|
543 int
|
|
|
544 redisplay_text_width_string (struct window *w, int findex,
|
|
867
|
545 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
546 Bytecount offset, Bytecount len)
|
|
|
547 {
|
|
867
|
548 if (!rtw_ichar_dynarr)
|
|
|
549 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
550 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
551
|
|
|
552 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
553 if (STRINGP (reloc))
|
|
|
554 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
555 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
556 return redisplay_text_width_ichar_string
|
|
|
557 (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
558 Dynarr_length (rtw_ichar_dynarr));
|
|
428
|
559 }
|
|
|
560
|
|
|
561 int
|
|
|
562 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
867
|
563 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
564 Bytecount offset, Bytecount len)
|
|
|
565 {
|
|
|
566 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
567 Lisp_Object frame;
|
|
|
568 struct face_cachel cachel;
|
|
|
569
|
|
867
|
570 if (!rtw_ichar_dynarr)
|
|
|
571 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
572 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
573
|
|
|
574 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
575 if (STRINGP (reloc))
|
|
|
576 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
577 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
578 find_charsets_in_ibyte_string (charsets, nonreloc, len);
|
|
428
|
579 reset_face_cachel (&cachel);
|
|
|
580 cachel.face = face;
|
|
793
|
581 frame = wrap_frame (f);
|
|
428
|
582 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
583 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
867
|
584 text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
585 Dynarr_length (rtw_ichar_dynarr)));
|
|
428
|
586 }
|
|
|
587
|
|
|
588 /* Return the display block from DL of the given TYPE. A display line
|
|
|
589 can have only one display block of each possible type. If DL does
|
|
|
590 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
591
|
|
|
592 struct display_block *
|
|
|
593 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
594 {
|
|
|
595 int elt;
|
|
|
596 struct display_block db;
|
|
|
597
|
|
|
598 /* Check if this display line already has a block of the desired type and
|
|
|
599 if so, return it. */
|
|
|
600 if (dl->display_blocks)
|
|
|
601 {
|
|
|
602 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
603 {
|
|
|
604 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
605 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
606 }
|
|
|
607
|
|
|
608 /* There isn't an active block of the desired type, but there
|
|
|
609 might still be allocated blocks we need to reuse. */
|
|
|
610 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
611 {
|
|
|
612 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
613
|
|
|
614 /* 'add' the block to the list */
|
|
|
615 Dynarr_increment (dl->display_blocks);
|
|
|
616
|
|
|
617 /* initialize and return */
|
|
|
618 dbp->type = type;
|
|
|
619 return dbp;
|
|
|
620 }
|
|
|
621 }
|
|
|
622 else
|
|
|
623 {
|
|
|
624 /* This line doesn't have any display blocks, so initialize the display
|
|
|
625 bock array. */
|
|
|
626 dl->display_blocks = Dynarr_new (display_block);
|
|
|
627 }
|
|
|
628
|
|
|
629 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
630 one and add it to the line. */
|
|
|
631 xzero (db);
|
|
|
632 db.type = type;
|
|
|
633 db.runes = Dynarr_new (rune);
|
|
|
634 Dynarr_add (dl->display_blocks, db);
|
|
|
635
|
|
|
636 /* Return the newly added display block. */
|
|
|
637 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
638
|
|
|
639 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
640 }
|
|
|
641
|
|
|
642 static int
|
|
|
643 tab_char_width (struct window *w)
|
|
|
644 {
|
|
|
645 struct buffer *b = XBUFFER (w->buffer);
|
|
|
646 int char_tab_width = XINT (b->tab_width);
|
|
|
647
|
|
|
648 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
649
|
|
|
650 return char_tab_width;
|
|
|
651 }
|
|
|
652
|
|
|
653 static int
|
|
|
654 space_width (struct window *w)
|
|
|
655 {
|
|
|
656 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
657 fonts the space character tends to give too narrow a value. So
|
|
|
658 we use 'n' instead. Except that we don't. We use the default
|
|
|
659 character width for the default face. If this is actually
|
|
|
660 defined by the font then it is probably the best thing to
|
|
|
661 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
662 already calculated its width. Thus we can avoid a call to
|
|
|
663 XTextWidth on X frames by just querying the default width. */
|
|
|
664 return XFONT_INSTANCE
|
|
|
665 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
666 }
|
|
|
667
|
|
|
668 static int
|
|
|
669 tab_pix_width (struct window *w)
|
|
|
670 {
|
|
|
671 return space_width (w) * tab_char_width (w);
|
|
|
672 }
|
|
|
673
|
|
|
674 /* Given a pixel position in a window, return the pixel location of
|
|
|
675 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
676 terms of spaces displayed in the default face. Formerly the space
|
|
|
677 width was determined using the currently active face. That method
|
|
|
678 leads to tabstops which do not line up. */
|
|
|
679
|
|
|
680 static int
|
|
|
681 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
682 {
|
|
|
683 int n_pos = left_pixpos;
|
|
|
684 int pix_tab_width = tab_pix_width (w);
|
|
|
685
|
|
|
686 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
687 if (WINDOW_SCROLLED (w))
|
|
|
688 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
|
|
|
689
|
|
|
690 while (n_pos <= start_pixpos)
|
|
|
691 n_pos += pix_tab_width;
|
|
|
692
|
|
|
693 return n_pos;
|
|
|
694 }
|
|
|
695
|
|
|
696 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
697 display line. The whitespace boundaries must be calculated by the text
|
|
|
698 layout routines. */
|
|
|
699
|
|
|
700 layout_bounds
|
|
|
701 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
702 {
|
|
|
703 layout_bounds bounds;
|
|
|
704
|
|
|
705 /* Set the outermost boundaries which are the boundaries of the
|
|
|
706 window itself minus the gutters (and minus the scrollbars if this
|
|
|
707 is for the modeline). */
|
|
|
708 if (!modeline)
|
|
|
709 {
|
|
|
710 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
711 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
712 }
|
|
|
713 else
|
|
|
714 {
|
|
|
715 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
716 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
717 }
|
|
|
718
|
|
|
719 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
720 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
721 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
722
|
|
|
723 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
724 depend on the contents of the line being displayed. */
|
|
|
725 bounds.left_white = bounds.left_in;
|
|
|
726 bounds.right_white = bounds.right_in;
|
|
|
727
|
|
|
728 return bounds;
|
|
|
729 }
|
|
|
730
|
|
819
|
731 /* This takes a display_block and its containing line and corrects the yoffset
|
|
|
732 of each glyph in the block to cater for the ascent of the line as a
|
|
|
733 whole. Must be called *after* the line-ascent is known! */
|
|
|
734
|
|
|
735 static void
|
|
|
736 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
|
|
|
737 {
|
|
|
738 int i;
|
|
|
739 for (i=0; i<Dynarr_length (fixup->runes); i++)
|
|
|
740 {
|
|
|
741 struct rune *r = Dynarr_atp (fixup->runes,i);
|
|
|
742 if (r->type == RUNE_DGLYPH)
|
|
|
743 {
|
|
|
744 if (r->object.dglyph.ascent < dl->ascent)
|
|
|
745 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
|
|
|
746 r->object.dglyph.descent;
|
|
|
747 }
|
|
|
748 }
|
|
|
749 }
|
|
|
750
|
|
|
751 /* Calculate the textual baseline (the ascent and descent values for the
|
|
|
752 display_line as a whole).
|
|
|
753
|
|
|
754 If the baseline is completely blank, or contains no manually positioned
|
|
|
755 glyphs, then the textual baseline is simply the baseline of the default font.
|
|
|
756 (The `contains no manually positioned glyphs' part is actually done for
|
|
867
|
757 us by `add_ichar_rune'.)
|
|
819
|
758
|
|
|
759 If the baseline contains pixmaps, and they're all manually positioned, then
|
|
|
760 the textual baseline location is constrained that way, and we need do no
|
|
|
761 work.
|
|
|
762
|
|
|
763 If the baseline contains pixmaps, and at least one is automatically
|
|
|
764 positioned, then the textual ascent is the largest ascent on the line, and
|
|
|
765 the textual descent is the largest descent (which is how things are set up at
|
|
|
766 entry to this function anyway): except that if the max_ascent + max_descent
|
|
|
767 is too small for the height of the line (say you've adjusted the baseline of
|
|
|
768 a short glyph, and there's a tall one next to it), then take the ascent and
|
|
|
769 descent for the line individually from the largest of the explicitly set
|
|
|
770 ascent/descent, and the rescaled ascent/descent of the default font, scaled
|
|
|
771 such that the largest glyph will fit.
|
|
|
772
|
|
|
773 This means that if you have a short glyph (but taller than the default
|
|
|
774 font's descent) forced right under the baseline, and a really tall
|
|
|
775 automatically positioned glyph, that the descent for the line is just big
|
|
|
776 enough for the manually positioned short glyph, and the tall one uses as
|
|
|
777 much of that space as the default font would were it as tall as the tall
|
|
|
778 glyph; but that the ascent is big enough for the tall glyph to fit.
|
|
|
779
|
|
|
780 This behaviour means that under no circumstances will changing the baseline
|
|
|
781 of a short glyph cause a tall glyph to move around; nor will it move the
|
|
|
782 textual baseline more than necessary. (Changing a tall glyph's baseline
|
|
|
783 might move the text's baseline arbitrarily, of course.) */
|
|
|
784
|
|
|
785 static void
|
|
|
786 calculate_baseline (pos_data *data)
|
|
|
787 {
|
|
|
788 /* Blank line: baseline is default font's baseline. */
|
|
|
789
|
|
|
790 if (!data->new_ascent && !data->new_descent)
|
|
|
791 {
|
|
|
792 /* We've got a blank line so initialize these values from the default
|
|
|
793 face. */
|
|
|
794 default_face_font_info (data->window, &data->new_ascent,
|
|
|
795 &data->new_descent, 0, 0, 0);
|
|
|
796 }
|
|
|
797
|
|
|
798 /* No automatically positioned glyphs? Return at once. */
|
|
|
799 if (!data->need_baseline_computation)
|
|
|
800 return;
|
|
|
801
|
|
|
802 /* Is the tallest glyph on the line automatically positioned?
|
|
|
803 If it's manually positioned, or it's automatically positioned
|
|
|
804 and there's enough room for it anyway, we need do no more work. */
|
|
|
805 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
806 {
|
|
|
807 int default_font_ascent, default_font_descent, default_font_height;
|
|
|
808 int scaled_default_font_ascent, scaled_default_font_descent;
|
|
|
809
|
|
|
810 default_face_font_info (data->window, &default_font_ascent,
|
|
|
811 &default_font_descent, &default_font_height,
|
|
|
812 0, 0);
|
|
|
813
|
|
|
814 scaled_default_font_ascent = data->max_pixmap_height *
|
|
|
815 default_font_ascent / default_font_height;
|
|
|
816
|
|
|
817 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
|
|
|
818
|
|
|
819 /* The ascent may have expanded now. Do we still need to grow the descent,
|
|
|
820 or are things big enough?
|
|
|
821
|
|
|
822 The +1 caters for the baseline row itself. */
|
|
|
823 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
824 {
|
|
|
825 scaled_default_font_descent = (data->max_pixmap_height *
|
|
|
826 default_font_descent / default_font_height) + 1;
|
|
|
827
|
|
|
828 data->new_descent = max (data->new_descent, scaled_default_font_descent);
|
|
|
829 }
|
|
|
830 }
|
|
|
831 }
|
|
|
832
|
|
428
|
833 /* Given a display line and a starting position, ensure that the
|
|
|
834 contents of the display line accurately represent the visual
|
|
|
835 representation of the buffer contents starting from the given
|
|
|
836 position when displayed in the given window. The display line ends
|
|
|
837 when the contents of the line reach the right boundary of the given
|
|
|
838 window. */
|
|
|
839
|
|
665
|
840 static Charbpos
|
|
428
|
841 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
665
|
842 Charbpos start_pos, prop_block_dynarr **prop,
|
|
428
|
843 int type)
|
|
|
844 {
|
|
826
|
845 Charbpos ret_charpos;
|
|
428
|
846 int overlay_width;
|
|
|
847 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
848
|
|
|
849 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
850 if (!bounds)
|
|
|
851 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
852
|
|
|
853 /* Reset what this line is using. */
|
|
|
854 if (dl->display_blocks)
|
|
|
855 Dynarr_reset (dl->display_blocks);
|
|
|
856 if (dl->left_glyphs)
|
|
|
857 {
|
|
|
858 Dynarr_free (dl->left_glyphs);
|
|
|
859 dl->left_glyphs = 0;
|
|
|
860 }
|
|
|
861 if (dl->right_glyphs)
|
|
|
862 {
|
|
|
863 Dynarr_free (dl->right_glyphs);
|
|
|
864 dl->right_glyphs = 0;
|
|
|
865 }
|
|
|
866
|
|
|
867 /* We aren't generating a modeline at the moment. */
|
|
|
868 dl->modeline = 0;
|
|
|
869
|
|
|
870 /* Create a display block for the text region of the line. */
|
|
|
871 {
|
|
|
872 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
665
|
873 Bytebpos hacked_up_bytebpos =
|
|
|
874 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
|
|
428
|
875 prop, type);
|
|
826
|
876 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
|
|
|
877 ret_charpos = BUF_ZV (b) + 1;
|
|
428
|
878 else
|
|
826
|
879 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
|
|
428
|
880 }
|
|
826
|
881 dl->charpos = start_pos;
|
|
|
882 if (dl->end_charpos < dl->charpos)
|
|
|
883 dl->end_charpos = dl->charpos;
|
|
428
|
884
|
|
|
885 if (MARKERP (Voverlay_arrow_position)
|
|
|
886 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
887 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
888 && (STRINGP (Voverlay_arrow_string)
|
|
|
889 || GLYPHP (Voverlay_arrow_string)))
|
|
|
890 {
|
|
|
891 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
892 }
|
|
|
893 else
|
|
|
894 overlay_width = 0;
|
|
|
895
|
|
|
896 /* If there are left glyphs associated with any character in the
|
|
|
897 text block, then create a display block to handle them. */
|
|
|
898 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
899 create_left_glyph_block (w, dl, overlay_width);
|
|
|
900
|
|
|
901 /* If there are right glyphs associated with any character in the
|
|
|
902 text block, then create a display block to handle them. */
|
|
|
903 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
904 create_right_glyph_block (w, dl);
|
|
|
905
|
|
|
906 /* In the future additional types of display blocks may be generated
|
|
|
907 here. */
|
|
|
908
|
|
826
|
909 w->last_redisplay_pos = ret_charpos;
|
|
|
910
|
|
|
911 return ret_charpos;
|
|
428
|
912 }
|
|
|
913
|
|
|
914 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
915 the block had better be empty.
|
|
|
916
|
|
|
917 Yes, there are multiple places where this function is called but
|
|
|
918 that is the way it has to be. Each calling function has to deal
|
|
826
|
919 with byte_start_col_enabled a little differently depending on the
|
|
428
|
920 object being worked with. */
|
|
|
921
|
|
|
922 static prop_block_dynarr *
|
|
|
923 add_hscroll_rune (pos_data *data)
|
|
|
924 {
|
|
|
925 struct glyph_block gb;
|
|
|
926 prop_block_dynarr *retval;
|
|
826
|
927 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
928 int old_cursor_type = data->cursor_type;
|
|
826
|
929 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
930
|
|
|
931 if (data->cursor_type == CURSOR_ON
|
|
826
|
932 && data->byte_cursor_charpos >= data->byte_start_col_enabled
|
|
|
933 && data->byte_cursor_charpos <= data->byte_charpos)
|
|
|
934 {
|
|
|
935 data->byte_cursor_charpos = data->byte_start_col_enabled;
|
|
428
|
936 }
|
|
|
937 else
|
|
|
938 {
|
|
|
939 data->cursor_type = NO_CURSOR;
|
|
|
940 }
|
|
|
941
|
|
826
|
942 data->byte_endpos = data->byte_charpos;
|
|
|
943 data->byte_charpos = data->byte_start_col_enabled;
|
|
428
|
944
|
|
|
945 gb.extent = Qnil;
|
|
|
946 gb.glyph = Vhscroll_glyph;
|
|
|
947 {
|
|
|
948 int oldpixpos = data->pixpos;
|
|
442
|
949 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
|
|
428
|
950 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
951 HSCROLL_GLYPH_INDEX));
|
|
|
952 data->hscroll_glyph_width_adjust =
|
|
|
953 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
|
|
|
954 }
|
|
826
|
955 data->byte_endpos = 0;
|
|
|
956 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
957 data->cursor_type = old_cursor_type;
|
|
826
|
958 data->byte_charpos = byte_old_charpos;
|
|
|
959
|
|
|
960 data->byte_start_col_enabled = 0;
|
|
428
|
961 return retval;
|
|
|
962 }
|
|
|
963
|
|
793
|
964 /* Adds a character rune to a display block. If there is not enough room
|
|
|
965 to fit the rune on the display block (as determined by the MAX_PIXPOS)
|
|
|
966 then it adds nothing and returns ADD_FAILED. If
|
|
|
967 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
|
|
867
|
968 to affect the total line height. (See add_ibyte_string_runes()). */
|
|
428
|
969
|
|
|
970 static prop_block_dynarr *
|
|
867
|
971 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height)
|
|
428
|
972 {
|
|
|
973 struct rune rb, *crb;
|
|
|
974 int width, local;
|
|
|
975
|
|
|
976 if (data->start_col)
|
|
|
977 {
|
|
|
978 data->start_col--;
|
|
|
979
|
|
|
980 if (data->start_col)
|
|
|
981 return NULL;
|
|
|
982 }
|
|
|
983
|
|
826
|
984 if (data->byte_start_col_enabled)
|
|
428
|
985 {
|
|
|
986 return add_hscroll_rune (data);
|
|
|
987 }
|
|
|
988
|
|
|
989 if (data->ch == '\n')
|
|
|
990 {
|
|
|
991 data->font_is_bogus = 0;
|
|
|
992 /* Cheesy end-of-line pseudo-character. */
|
|
|
993 width = data->blank_width;
|
|
|
994 }
|
|
|
995 else
|
|
|
996 {
|
|
867
|
997 Lisp_Object charset = ichar_charset (data->ch);
|
|
428
|
998 if (!EQ (charset, data->last_charset) ||
|
|
|
999 data->findex != data->last_findex)
|
|
|
1000 {
|
|
|
1001 /* OK, we need to do things the hard way. */
|
|
|
1002 struct window *w = XWINDOW (data->window);
|
|
|
1003 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
1004 Lisp_Object font_instance =
|
|
|
1005 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
1006 charset);
|
|
440
|
1007 Lisp_Font_Instance *fi;
|
|
428
|
1008
|
|
|
1009 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
1010 {
|
|
|
1011 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
1012 data->font_is_bogus = 1;
|
|
|
1013 }
|
|
|
1014 else
|
|
|
1015 data->font_is_bogus = 0;
|
|
|
1016
|
|
|
1017 fi = XFONT_INSTANCE (font_instance);
|
|
771
|
1018 if (!fi->proportional_p || data->font_is_bogus)
|
|
|
1019 {
|
|
867
|
1020 Ichar ch = data->font_is_bogus ? '~' : data->ch;
|
|
771
|
1021
|
|
|
1022 data->last_char_width =
|
|
867
|
1023 redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1024 data->findex, &ch, 1);
|
|
|
1025 }
|
|
428
|
1026 else
|
|
|
1027 data->last_char_width = -1;
|
|
819
|
1028
|
|
793
|
1029 if (!no_contribute_to_line_height)
|
|
|
1030 {
|
|
|
1031 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
|
1032 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
1033 }
|
|
819
|
1034
|
|
428
|
1035 data->last_charset = charset;
|
|
|
1036 data->last_findex = data->findex;
|
|
|
1037 }
|
|
|
1038
|
|
|
1039 width = data->last_char_width;
|
|
771
|
1040 if (width < 0) /* proportional fonts */
|
|
867
|
1041 width = redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1042 data->findex,
|
|
|
1043 &data->ch, 1);
|
|
428
|
1044 }
|
|
|
1045
|
|
|
1046 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
1047 {
|
|
|
1048 return ADD_FAILED;
|
|
|
1049 }
|
|
|
1050
|
|
|
1051 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
1052 {
|
|
|
1053 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
1054 local = 0;
|
|
|
1055 }
|
|
|
1056 else
|
|
|
1057 {
|
|
|
1058 crb = &rb;
|
|
|
1059 local = 1;
|
|
|
1060 }
|
|
|
1061
|
|
|
1062 crb->findex = data->findex;
|
|
|
1063 crb->xpos = data->pixpos;
|
|
|
1064 crb->width = width;
|
|
826
|
1065 if (data->byte_charpos)
|
|
428
|
1066 {
|
|
|
1067 if (NILP (data->string))
|
|
826
|
1068 crb->charpos =
|
|
793
|
1069 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
|
|
|
1070 (XWINDOW (data->window))),
|
|
826
|
1071 data->byte_charpos);
|
|
428
|
1072 else
|
|
826
|
1073 crb->charpos =
|
|
|
1074 string_index_byte_to_char (data->string, data->byte_charpos);
|
|
428
|
1075 }
|
|
|
1076 else if (data->is_modeline)
|
|
826
|
1077 crb->charpos = data->modeline_charpos;
|
|
428
|
1078 else
|
|
442
|
1079 /* Text but not in buffer */
|
|
826
|
1080 crb->charpos = 0;
|
|
428
|
1081 crb->type = RUNE_CHAR;
|
|
|
1082 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1083 crb->endpos = 0;
|
|
|
1084
|
|
|
1085 if (data->cursor_type == CURSOR_ON)
|
|
|
1086 {
|
|
826
|
1087 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1088 {
|
|
|
1089 crb->cursor_type = CURSOR_ON;
|
|
|
1090 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1091 }
|
|
|
1092 else
|
|
|
1093 crb->cursor_type = CURSOR_OFF;
|
|
|
1094 }
|
|
|
1095 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1096 {
|
|
|
1097 crb->cursor_type = CURSOR_ON;
|
|
|
1098 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1099 data->cursor_type = NO_CURSOR;
|
|
|
1100 }
|
|
|
1101 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1102 crb->cursor_type = IGNORE_CURSOR;
|
|
|
1103 else
|
|
|
1104 crb->cursor_type = CURSOR_OFF;
|
|
|
1105
|
|
|
1106 if (local)
|
|
|
1107 Dynarr_add (data->db->runes, *crb);
|
|
|
1108 else
|
|
|
1109 Dynarr_increment (data->db->runes);
|
|
|
1110
|
|
|
1111 data->pixpos += width;
|
|
|
1112
|
|
|
1113 return NULL;
|
|
|
1114 }
|
|
|
1115
|
|
793
|
1116 static prop_block_dynarr *
|
|
867
|
1117 add_ichar_rune (pos_data *data)
|
|
|
1118 {
|
|
|
1119 return add_ichar_rune_1 (data, 0);
|
|
|
1120 }
|
|
|
1121
|
|
|
1122 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for
|
|
793
|
1123 each character in the string. Propagate any left-over data unless
|
|
|
1124 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
|
|
|
1125 allow this character to increase the total height of the line. (This is
|
|
|
1126 used when the character is part of a text glyph. In that case, the
|
|
|
1127 glyph code itself adjusts the line height as necessary, depending on
|
|
|
1128 whether glyph-contrib-p is true.) */
|
|
428
|
1129
|
|
|
1130 static prop_block_dynarr *
|
|
867
|
1131 add_ibyte_string_runes (pos_data *data, Ibyte *c_string,
|
|
793
|
1132 Bytecount c_length, int no_prop,
|
|
|
1133 int no_contribute_to_line_height)
|
|
428
|
1134 {
|
|
867
|
1135 Ibyte *pos, *end = c_string + c_length;
|
|
428
|
1136 prop_block_dynarr *prop;
|
|
|
1137
|
|
|
1138 /* #### This function is too simplistic. It needs to do the same
|
|
|
1139 sort of character interpretation (display-table lookup,
|
|
|
1140 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
1141 The functionality to do this in that routine needs to be
|
|
|
1142 modularized. */
|
|
|
1143
|
|
|
1144 for (pos = c_string; pos < end;)
|
|
|
1145 {
|
|
867
|
1146 Ibyte *old_pos = pos;
|
|
|
1147
|
|
|
1148 data->ch = itext_ichar (pos);
|
|
|
1149
|
|
|
1150 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
|
|
428
|
1151
|
|
|
1152 if (prop)
|
|
|
1153 {
|
|
|
1154 if (no_prop)
|
|
|
1155 return ADD_FAILED;
|
|
|
1156 else
|
|
|
1157 {
|
|
|
1158 struct prop_block pb;
|
|
|
1159 Bytecount len = end - pos;
|
|
|
1160 prop = Dynarr_new (prop_block);
|
|
|
1161
|
|
|
1162 pb.type = PROP_STRING;
|
|
867
|
1163 pb.data.p_string.str = xnew_array (Ibyte, len);
|
|
428
|
1164 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
1165 pb.data.p_string.len = len;
|
|
|
1166
|
|
|
1167 Dynarr_add (prop, pb);
|
|
|
1168 return prop;
|
|
|
1169 }
|
|
|
1170 }
|
|
867
|
1171 INC_IBYTEPTR (pos);
|
|
428
|
1172 assert (pos <= end);
|
|
464
|
1173 /* #### Duplicate code from add_string_to_fstring_db_runes
|
|
|
1174 should we do more?*/
|
|
|
1175 data->bytepos += pos - old_pos;
|
|
428
|
1176 }
|
|
|
1177
|
|
|
1178 return NULL;
|
|
|
1179 }
|
|
|
1180
|
|
|
1181 /* Add a single rune of the specified width. The area covered by this
|
|
|
1182 rune will be displayed in the foreground color of the associated
|
|
|
1183 face. */
|
|
|
1184
|
|
|
1185 static prop_block_dynarr *
|
|
|
1186 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1187 {
|
|
|
1188 struct rune rb;
|
|
|
1189
|
|
|
1190 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1191 been to add it as a tab. */
|
|
|
1192 if (data->start_col)
|
|
|
1193 {
|
|
|
1194 /* assert (w != NULL) */
|
|
|
1195 prop_block_dynarr *retval;
|
|
|
1196
|
|
|
1197 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1198 the width of this tab and return. */
|
|
|
1199 if (char_tab_width < data->start_col)
|
|
|
1200 {
|
|
|
1201 data->start_col -= char_tab_width;
|
|
|
1202 return NULL;
|
|
|
1203 }
|
|
|
1204 else if (char_tab_width == data->start_col)
|
|
|
1205 data->blank_width = 0;
|
|
|
1206 else
|
|
|
1207 {
|
|
|
1208 int spcwid = space_width (w);
|
|
|
1209
|
|
|
1210 if (spcwid >= data->blank_width)
|
|
|
1211 data->blank_width = 0;
|
|
|
1212 else
|
|
|
1213 data->blank_width -= spcwid;
|
|
|
1214 }
|
|
|
1215
|
|
|
1216 data->start_col = 0;
|
|
|
1217 retval = add_hscroll_rune (data);
|
|
|
1218
|
|
|
1219 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1220 if (retval != NULL || !data->blank_width)
|
|
|
1221 return retval;
|
|
|
1222 }
|
|
|
1223
|
|
|
1224 /* Blank runes are always calculated to fit. */
|
|
|
1225 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1226
|
|
|
1227 rb.findex = data->findex;
|
|
|
1228 rb.xpos = data->pixpos;
|
|
|
1229 rb.width = data->blank_width;
|
|
826
|
1230 if (data->byte_charpos)
|
|
|
1231 rb.charpos =
|
|
665
|
1232 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
|
|
826
|
1233 data->byte_charpos);
|
|
428
|
1234 else
|
|
|
1235 /* #### and this is really correct too? */
|
|
826
|
1236 rb.charpos = 0;
|
|
428
|
1237 rb.endpos = 0;
|
|
|
1238 rb.type = RUNE_BLANK;
|
|
|
1239
|
|
|
1240 if (data->cursor_type == CURSOR_ON)
|
|
|
1241 {
|
|
826
|
1242 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1243 {
|
|
|
1244 rb.cursor_type = CURSOR_ON;
|
|
|
1245 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1246 }
|
|
|
1247 else
|
|
|
1248 rb.cursor_type = CURSOR_OFF;
|
|
|
1249 }
|
|
|
1250 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1251 {
|
|
|
1252 rb.cursor_type = CURSOR_ON;
|
|
|
1253 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1254 data->cursor_type = NO_CURSOR;
|
|
|
1255 }
|
|
|
1256 else
|
|
|
1257 rb.cursor_type = CURSOR_OFF;
|
|
|
1258
|
|
|
1259 Dynarr_add (data->db->runes, rb);
|
|
|
1260 data->pixpos += data->blank_width;
|
|
|
1261
|
|
|
1262 return NULL;
|
|
|
1263 }
|
|
|
1264
|
|
|
1265 /* Add runes representing a character in octal. */
|
|
|
1266
|
|
|
1267 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1268 { \
|
|
867
|
1269 if (add_failed || (add_failed = add_ichar_rune (data))) \
|
|
428
|
1270 { \
|
|
|
1271 struct prop_block pb; \
|
|
|
1272 if (!prop) \
|
|
|
1273 prop = Dynarr_new (prop_block); \
|
|
|
1274 \
|
|
|
1275 pb.type = PROP_CHAR; \
|
|
|
1276 pb.data.p_char.ch = data->ch; \
|
|
|
1277 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1278 Dynarr_add (prop, pb); \
|
|
|
1279 } \
|
|
|
1280 } while (0)
|
|
|
1281
|
|
|
1282 static prop_block_dynarr *
|
|
|
1283 add_octal_runes (pos_data *data)
|
|
|
1284 {
|
|
819
|
1285 prop_block_dynarr *add_failed, *prop = 0;
|
|
867
|
1286 Ichar orig_char = data->ch;
|
|
647
|
1287 int orig_cursor_type = data->cursor_type;
|
|
428
|
1288
|
|
|
1289 /* Initialize */
|
|
|
1290 add_failed = NULL;
|
|
|
1291
|
|
|
1292 if (data->start_col)
|
|
|
1293 data->start_col--;
|
|
|
1294
|
|
|
1295 if (!data->start_col)
|
|
|
1296 {
|
|
826
|
1297 if (data->byte_start_col_enabled)
|
|
428
|
1298 {
|
|
|
1299 add_failed = add_hscroll_rune (data);
|
|
|
1300 }
|
|
|
1301 else
|
|
|
1302 {
|
|
|
1303 struct glyph_block gb;
|
|
|
1304 struct window *w = XWINDOW (data->window);
|
|
|
1305
|
|
|
1306 gb.extent = Qnil;
|
|
|
1307 gb.glyph = Voctal_escape_glyph;
|
|
|
1308 add_failed =
|
|
|
1309 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1310 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1311 }
|
|
|
1312 }
|
|
|
1313
|
|
|
1314 /* We only propagate information if the glyph was partially
|
|
|
1315 added. */
|
|
|
1316 if (add_failed)
|
|
|
1317 return add_failed;
|
|
|
1318
|
|
|
1319 data->cursor_type = IGNORE_CURSOR;
|
|
|
1320
|
|
|
1321 if (data->ch >= 0x100)
|
|
|
1322 {
|
|
|
1323 /* If the character is an extended Mule character, it could have
|
|
|
1324 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1325 octal number. This is not that pretty, but whatever. */
|
|
|
1326 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1327 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1328
|
|
|
1329 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1330 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1331
|
|
|
1332 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1333 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1334
|
|
|
1335 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1336 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1337 }
|
|
|
1338
|
|
|
1339 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1340 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1341
|
|
|
1342 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1343 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1344
|
|
|
1345 data->ch = (7 & orig_char) + '0';
|
|
|
1346 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1347
|
|
|
1348 data->cursor_type = orig_cursor_type;
|
|
819
|
1349 return NULL;
|
|
428
|
1350 }
|
|
|
1351
|
|
|
1352 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1353
|
|
|
1354 /* Add runes representing a control character to a display block. */
|
|
|
1355
|
|
|
1356 static prop_block_dynarr *
|
|
|
1357 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1358 {
|
|
|
1359 if (!NILP (b->ctl_arrow))
|
|
|
1360 {
|
|
|
1361 prop_block_dynarr *prop;
|
|
867
|
1362 Ichar orig_char = data->ch;
|
|
647
|
1363 int old_cursor_type = data->cursor_type;
|
|
428
|
1364
|
|
|
1365 /* Initialize */
|
|
|
1366 prop = NULL;
|
|
|
1367
|
|
|
1368 if (data->start_col)
|
|
|
1369 data->start_col--;
|
|
|
1370
|
|
|
1371 if (!data->start_col)
|
|
|
1372 {
|
|
826
|
1373 if (data->byte_start_col_enabled)
|
|
428
|
1374 {
|
|
|
1375 prop_block_dynarr *retval;
|
|
|
1376
|
|
|
1377 retval = add_hscroll_rune (data);
|
|
|
1378 if (retval)
|
|
|
1379 return retval;
|
|
|
1380 }
|
|
|
1381 else
|
|
|
1382 {
|
|
|
1383 struct glyph_block gb;
|
|
|
1384 struct window *w = XWINDOW (data->window);
|
|
|
1385
|
|
|
1386 gb.extent = Qnil;
|
|
|
1387 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1388
|
|
|
1389 /* We only propagate information if the glyph was partially
|
|
|
1390 added. */
|
|
|
1391 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1392 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1393 return ADD_FAILED;
|
|
|
1394 }
|
|
|
1395 }
|
|
|
1396
|
|
|
1397 if (orig_char == 0177)
|
|
|
1398 data->ch = '?';
|
|
|
1399 else
|
|
|
1400 data->ch = orig_char ^ 0100;
|
|
|
1401 data->cursor_type = IGNORE_CURSOR;
|
|
|
1402
|
|
867
|
1403 if (add_ichar_rune (data))
|
|
428
|
1404 {
|
|
|
1405 struct prop_block pb;
|
|
|
1406 if (!prop)
|
|
|
1407 prop = Dynarr_new (prop_block);
|
|
|
1408
|
|
|
1409 pb.type = PROP_CHAR;
|
|
|
1410 pb.data.p_char.ch = data->ch;
|
|
|
1411 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1412 Dynarr_add (prop, pb);
|
|
|
1413 }
|
|
|
1414
|
|
|
1415 data->cursor_type = old_cursor_type;
|
|
|
1416 return prop;
|
|
|
1417 }
|
|
|
1418 else
|
|
|
1419 {
|
|
|
1420 return add_octal_runes (data);
|
|
|
1421 }
|
|
|
1422 }
|
|
|
1423
|
|
|
1424 static prop_block_dynarr *
|
|
|
1425 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
|
|
|
1426 {
|
|
|
1427 prop_block_dynarr *prop = NULL;
|
|
|
1428
|
|
|
1429 if (STRINGP (entry))
|
|
|
1430 {
|
|
867
|
1431 prop = add_ibyte_string_runes (data,
|
|
428
|
1432 XSTRING_DATA (entry),
|
|
|
1433 XSTRING_LENGTH (entry),
|
|
793
|
1434 0, 0);
|
|
428
|
1435 }
|
|
|
1436 else if (GLYPHP (entry))
|
|
|
1437 {
|
|
|
1438 if (data->start_col)
|
|
|
1439 data->start_col--;
|
|
|
1440
|
|
826
|
1441 if (!data->start_col && data->byte_start_col_enabled)
|
|
428
|
1442 {
|
|
|
1443 prop = add_hscroll_rune (data);
|
|
|
1444 }
|
|
|
1445 else
|
|
|
1446 {
|
|
|
1447 struct glyph_block gb;
|
|
|
1448
|
|
|
1449 gb.glyph = entry;
|
|
|
1450 gb.extent = Qnil;
|
|
|
1451 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1452 }
|
|
|
1453 }
|
|
|
1454 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1455 {
|
|
|
1456 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
867
|
1457 prop = add_ichar_rune (data);
|
|
428
|
1458 }
|
|
|
1459 else if (CONSP (entry))
|
|
|
1460 {
|
|
|
1461 if (EQ (XCAR (entry), Qformat)
|
|
|
1462 && CONSP (XCDR (entry))
|
|
|
1463 && STRINGP (XCAR (XCDR (entry))))
|
|
|
1464 {
|
|
|
1465 Lisp_Object format = XCAR (XCDR (entry));
|
|
665
|
1466 Bytebpos len = XSTRING_LENGTH (format);
|
|
867
|
1467 Ibyte *src = XSTRING_DATA (format), *end = src + len;
|
|
|
1468 Ibyte *result = alloca_array (Ibyte, len);
|
|
|
1469 Ibyte *dst = result;
|
|
428
|
1470
|
|
|
1471 while (src < end)
|
|
|
1472 {
|
|
867
|
1473 Ichar c = itext_ichar (src);
|
|
|
1474 INC_IBYTEPTR (src);
|
|
428
|
1475 if (c != '%' || src == end)
|
|
867
|
1476 dst += set_itext_ichar (dst, c);
|
|
428
|
1477 else
|
|
|
1478 {
|
|
867
|
1479 c = itext_ichar (src);
|
|
|
1480 INC_IBYTEPTR (src);
|
|
428
|
1481 switch (c)
|
|
|
1482 {
|
|
|
1483 /*case 'x':
|
|
|
1484 dst += long_to_string_base ((char *)dst, data->ch, 16);
|
|
|
1485 break;*/
|
|
|
1486 case '%':
|
|
867
|
1487 dst += set_itext_ichar (dst, '%');
|
|
428
|
1488 break;
|
|
442
|
1489 /* #### unimplemented */
|
|
428
|
1490 }
|
|
|
1491 }
|
|
|
1492 }
|
|
867
|
1493 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
|
|
428
|
1494 }
|
|
|
1495 }
|
|
|
1496
|
|
|
1497 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1498 have any safe way of signaling an error. */
|
|
|
1499 return prop;
|
|
|
1500 }
|
|
|
1501
|
|
|
1502 /* Given a display table entry, call the appropriate functions to
|
|
|
1503 display each element of the entry. */
|
|
|
1504
|
|
|
1505 static prop_block_dynarr *
|
|
|
1506 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1507 {
|
|
|
1508 prop_block_dynarr *prop = NULL;
|
|
|
1509 if (VECTORP (entry))
|
|
|
1510 {
|
|
440
|
1511 Lisp_Vector *de = XVECTOR (entry);
|
|
428
|
1512 EMACS_INT len = vector_length (de);
|
|
|
1513 int elt;
|
|
|
1514
|
|
|
1515 for (elt = 0; elt < len; elt++)
|
|
|
1516 {
|
|
|
1517 if (NILP (vector_data (de)[elt]))
|
|
|
1518 continue;
|
|
|
1519 else
|
|
|
1520 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
|
|
|
1521 /* Else blow it off because someone added a bad entry and we
|
|
|
1522 don't have any safe way of signaling an error. Hey, this
|
|
|
1523 comment sounds familiar. */
|
|
|
1524
|
|
|
1525 /* #### Still need to add any remaining elements to the
|
|
|
1526 propagation information. */
|
|
|
1527 if (prop)
|
|
|
1528 return prop;
|
|
|
1529 }
|
|
|
1530 }
|
|
|
1531 else
|
|
|
1532 prop = add_disp_table_entry_runes_1 (data, entry);
|
|
|
1533 return prop;
|
|
|
1534 }
|
|
|
1535
|
|
|
1536 /* Add runes which were propagated from the previous line. */
|
|
|
1537
|
|
|
1538 static prop_block_dynarr *
|
|
|
1539 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1540 {
|
|
|
1541 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1542 this is finished. */
|
|
|
1543 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1544 case of not all the propagation blocks being added was not handled
|
|
|
1545 well. */
|
|
|
1546 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1547 of bogus. A cleaner solution is just to check for
|
|
|
1548 Dynarr_length (prop) > 0. */
|
|
|
1549 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1550 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1551 record? */
|
|
|
1552 int elt;
|
|
|
1553 prop_block_dynarr *add_failed;
|
|
826
|
1554 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
1555 int old_cursor_type = data->cursor_type;
|
|
428
|
1556
|
|
|
1557 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1558 {
|
|
|
1559 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1560
|
|
|
1561 switch (pb->type)
|
|
|
1562 {
|
|
|
1563 case PROP_CHAR:
|
|
|
1564 data->ch = pb->data.p_char.ch;
|
|
826
|
1565 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
|
|
428
|
1566 data->cursor_type = pb->data.p_char.cursor_type;
|
|
867
|
1567 add_failed = add_ichar_rune (data);
|
|
428
|
1568
|
|
|
1569 if (add_failed)
|
|
|
1570 goto oops_no_more_space;
|
|
|
1571 break;
|
|
|
1572 case PROP_STRING:
|
|
|
1573 if (pb->data.p_string.str)
|
|
|
1574 xfree (pb->data.p_string.str);
|
|
|
1575 /* #### bogus bogus -- this doesn't do anything!
|
|
867
|
1576 Should probably call add_ibyte_string_runes(),
|
|
428
|
1577 once that function is fixed. */
|
|
|
1578 break;
|
|
|
1579 case PROP_MINIBUF_PROMPT:
|
|
|
1580 {
|
|
|
1581 face_index old_findex = data->findex;
|
|
826
|
1582 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
1583
|
|
|
1584 data->findex = DEFAULT_INDEX;
|
|
826
|
1585 data->byte_charpos = 0;
|
|
428
|
1586 data->cursor_type = NO_CURSOR;
|
|
|
1587
|
|
|
1588 while (pb->data.p_string.len > 0)
|
|
|
1589 {
|
|
867
|
1590 data->ch = itext_ichar (pb->data.p_string.str);
|
|
|
1591 add_failed = add_ichar_rune (data);
|
|
428
|
1592
|
|
|
1593 if (add_failed)
|
|
|
1594 {
|
|
|
1595 data->findex = old_findex;
|
|
826
|
1596 data->byte_charpos = byte_old_charpos;
|
|
428
|
1597 goto oops_no_more_space;
|
|
|
1598 }
|
|
|
1599 else
|
|
|
1600 {
|
|
|
1601 /* Complicated equivalent of ptr++, len-- */
|
|
867
|
1602 Ibyte *oldpos = pb->data.p_string.str;
|
|
|
1603 INC_IBYTEPTR (pb->data.p_string.str);
|
|
428
|
1604 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1605 }
|
|
|
1606 }
|
|
|
1607
|
|
|
1608 data->findex = old_findex;
|
|
|
1609 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
826
|
1610 this function, data->byte_charpos is automatically incremented.
|
|
428
|
1611 However, we don't want that to happen if we were adding
|
|
|
1612 the minibuffer prompt. */
|
|
|
1613 {
|
|
|
1614 struct buffer *buf =
|
|
|
1615 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1616 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
826
|
1617 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
|
|
|
1618 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
|
|
428
|
1619 else
|
|
|
1620 /* #### is this correct? Does anyone know?
|
|
|
1621 Does anyone care? Is this a cheesy hack or what? */
|
|
826
|
1622 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
|
|
428
|
1623 }
|
|
|
1624 }
|
|
|
1625 break;
|
|
|
1626 case PROP_BLANK:
|
|
|
1627 {
|
|
|
1628 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1629 the blank_width, as it implies that the value carries
|
|
|
1630 over from one rune to the next, which is wrong. */
|
|
|
1631 int old_width = data->blank_width;
|
|
|
1632 face_index old_findex = data->findex;
|
|
|
1633
|
|
|
1634 data->findex = pb->data.p_blank.findex;
|
|
|
1635 data->blank_width = pb->data.p_blank.width;
|
|
826
|
1636 data->byte_cursor_charpos = 0;
|
|
428
|
1637 data->cursor_type = IGNORE_CURSOR;
|
|
|
1638
|
|
|
1639 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1640 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1641
|
|
|
1642 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1643 matter because unless something is really screwed up
|
|
|
1644 this call won't cause that arg to be used. */
|
|
|
1645 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1646
|
|
|
1647 /* This can happen in the case where we have a tab which
|
|
|
1648 is wider than the window. */
|
|
|
1649 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1650 {
|
|
|
1651 pb->data.p_blank.width -= data->blank_width;
|
|
|
1652 add_failed = ADD_FAILED;
|
|
|
1653 }
|
|
|
1654
|
|
|
1655 data->findex = old_findex;
|
|
|
1656 data->blank_width = old_width;
|
|
|
1657
|
|
|
1658 if (add_failed)
|
|
|
1659 goto oops_no_more_space;
|
|
|
1660 }
|
|
|
1661 break;
|
|
|
1662 default:
|
|
|
1663 abort ();
|
|
|
1664 }
|
|
|
1665 }
|
|
|
1666
|
|
|
1667 oops_no_more_space:
|
|
|
1668
|
|
826
|
1669 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
1670 data->cursor_type = old_cursor_type;
|
|
|
1671 if (elt < Dynarr_length (*prop))
|
|
|
1672 {
|
|
|
1673 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1674 return *prop;
|
|
|
1675 }
|
|
|
1676 else
|
|
|
1677 {
|
|
|
1678 Dynarr_free (*prop);
|
|
|
1679 return NULL;
|
|
|
1680 }
|
|
|
1681 }
|
|
|
1682
|
|
|
1683 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1684 the display block, but add all other types to the appropriate list
|
|
|
1685 of the display line. They will be added later by different
|
|
|
1686 routines. */
|
|
|
1687
|
|
|
1688 static prop_block_dynarr *
|
|
|
1689 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1690 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1691 {
|
|
|
1692 struct window *w = XWINDOW (data->window);
|
|
|
1693
|
|
440
|
1694 /* If window faces changed, and glyph instance is text, then
|
|
|
1695 glyph sizes might have changed too */
|
|
|
1696 invalidate_glyph_geometry_maybe (gb->glyph, w);
|
|
|
1697
|
|
442
|
1698 /* This makes sure the glyph is in the cachels.
|
|
|
1699
|
|
|
1700 #### We do this to make sure the glyph is in the glyph cachels,
|
|
|
1701 so that the dirty flag can be reset after redisplay has
|
|
|
1702 finished. We should do this some other way, maybe by iterating
|
|
|
1703 over the window cache of subwindows. */
|
|
|
1704 get_glyph_cachel_index (w, gb->glyph);
|
|
|
1705
|
|
428
|
1706 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1707 if (NILP (gb->extent)
|
|
|
1708 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1709 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1710 || (pos_type == END_GLYPHS &&
|
|
442
|
1711 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1712 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
|
|
428
|
1713 {
|
|
|
1714 struct rune rb;
|
|
|
1715 int width;
|
|
|
1716 int xoffset = 0;
|
|
|
1717 int ascent, descent;
|
|
|
1718 Lisp_Object baseline;
|
|
|
1719 Lisp_Object face;
|
|
442
|
1720 Lisp_Object instance;
|
|
|
1721 face_index findex;
|
|
819
|
1722 prop_block_dynarr *retval = 0;
|
|
428
|
1723
|
|
|
1724 if (cachel)
|
|
|
1725 width = cachel->width;
|
|
|
1726 else
|
|
438
|
1727 width = glyph_width (gb->glyph, data->window);
|
|
428
|
1728
|
|
|
1729 if (!width)
|
|
|
1730 return NULL;
|
|
|
1731
|
|
|
1732 if (data->start_col || data->start_col_xoffset)
|
|
|
1733 {
|
|
|
1734 int glyph_char_width = width / space_width (w);
|
|
|
1735
|
|
|
1736 /* If we still have not fully scrolled horizontally after
|
|
|
1737 taking into account the width of the glyph, subtract its
|
|
|
1738 width and return. */
|
|
|
1739 if (glyph_char_width < data->start_col)
|
|
|
1740 {
|
|
|
1741 data->start_col -= glyph_char_width;
|
|
|
1742 return NULL;
|
|
|
1743 }
|
|
|
1744 else if (glyph_char_width == data->start_col)
|
|
|
1745 width = 0;
|
|
|
1746 else
|
|
|
1747 {
|
|
|
1748 xoffset = space_width (w) * data->start_col;
|
|
|
1749 width -= xoffset;
|
|
|
1750
|
|
|
1751 /* #### Can this happen? */
|
|
|
1752 if (width < 0)
|
|
|
1753 width = 0;
|
|
|
1754 }
|
|
|
1755
|
|
|
1756 data->start_col = 0;
|
|
|
1757 retval = add_hscroll_rune (data);
|
|
|
1758
|
|
|
1759 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1760 if (retval != NULL || !width)
|
|
|
1761 return retval;
|
|
|
1762 }
|
|
|
1763 else
|
|
|
1764 xoffset = 0;
|
|
|
1765
|
|
|
1766 if (data->pixpos + width > data->max_pixpos)
|
|
|
1767 {
|
|
|
1768 /* If this is the first object we are attempting to add to
|
|
819
|
1769 the line then we ignore the horizontal_clip threshold.
|
|
|
1770 Otherwise we will loop until the bottom of the window
|
|
|
1771 continually failing to add this glyph because it is wider
|
|
|
1772 than the window. We could alternatively just completely
|
|
|
1773 ignore the glyph and proceed from there but I think that
|
|
|
1774 this is a better solution.
|
|
|
1775
|
|
|
1776 This does, however, create a different problem in that we
|
|
|
1777 can end up adding the object to every single line, never
|
|
|
1778 getting any further - for instance an extent with a long
|
|
|
1779 start-glyph that covers multitple following
|
|
|
1780 characters. */
|
|
428
|
1781 if (Dynarr_length (data->db->runes)
|
|
|
1782 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1783 return ADD_FAILED;
|
|
819
|
1784 else {
|
|
|
1785 struct prop_block pb;
|
|
|
1786
|
|
|
1787 /* We need to account for the width of the end-of-line
|
|
|
1788 glyph if there is nothing more in the line to display,
|
|
|
1789 since we will not display it in this instance. It seems
|
|
|
1790 kind of gross doing it here, but otherwise we have to
|
|
|
1791 search the runes in create_text_block(). */
|
|
|
1792 if (data->ch == '\n')
|
|
|
1793 data->max_pixpos += data->end_glyph_width;
|
|
428
|
1794 width = data->max_pixpos - data->pixpos;
|
|
819
|
1795 /* Add the glyph we are displaying, but clipping, to the
|
|
|
1796 propagation data so that we don't try and do it
|
|
|
1797 again. */
|
|
|
1798 retval = Dynarr_new (prop_block);
|
|
|
1799 pb.type = PROP_GLYPH;
|
|
|
1800 pb.data.p_glyph.glyph = gb->glyph;
|
|
|
1801 pb.data.p_glyph.width = width;
|
|
|
1802 Dynarr_add (retval, pb);
|
|
|
1803 }
|
|
428
|
1804 }
|
|
|
1805
|
|
|
1806 if (cachel)
|
|
|
1807 {
|
|
|
1808 ascent = cachel->ascent;
|
|
|
1809 descent = cachel->descent;
|
|
|
1810 }
|
|
|
1811 else
|
|
|
1812 {
|
|
438
|
1813 ascent = glyph_ascent (gb->glyph, data->window);
|
|
|
1814 descent = glyph_descent (gb->glyph, data->window);
|
|
428
|
1815 }
|
|
|
1816
|
|
|
1817 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1818
|
|
819
|
1819 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
|
|
|
1820
|
|
428
|
1821 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1822 {
|
|
|
1823 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1824 contribution will be determined later. */
|
|
|
1825 if (NILP (baseline))
|
|
|
1826 {
|
|
|
1827 int height = ascent + descent;
|
|
819
|
1828 data->need_baseline_computation = 1;
|
|
428
|
1829 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1830 }
|
|
|
1831
|
|
|
1832 /* A string so determine contribution normally. */
|
|
|
1833 else if (EQ (baseline, Qt))
|
|
|
1834 {
|
|
|
1835 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1836 data->new_descent = max (data->new_descent, descent);
|
|
|
1837 }
|
|
|
1838
|
|
|
1839 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1840 contribution here. */
|
|
|
1841 else if (INTP (baseline))
|
|
|
1842 {
|
|
|
1843 int height = ascent + descent;
|
|
|
1844 int pix_ascent, pix_descent;
|
|
|
1845
|
|
|
1846 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1847 pix_descent = height - pix_ascent;
|
|
|
1848
|
|
|
1849 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1850 data->new_descent = max (data->new_descent, pix_descent);
|
|
819
|
1851 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1852
|
|
|
1853 rb.object.dglyph.descent = pix_descent;
|
|
428
|
1854 }
|
|
|
1855
|
|
|
1856 /* Otherwise something is screwed up. */
|
|
|
1857 else
|
|
|
1858 abort ();
|
|
|
1859 }
|
|
|
1860
|
|
|
1861 face = glyph_face (gb->glyph, data->window);
|
|
|
1862 if (NILP (face))
|
|
442
|
1863 findex = data->findex;
|
|
428
|
1864 else
|
|
442
|
1865 findex = get_builtin_face_cache_index (w, face);
|
|
|
1866
|
|
|
1867 instance = glyph_image_instance (gb->glyph, data->window,
|
|
793
|
1868 ERROR_ME_DEBUG_WARN, 1);
|
|
442
|
1869 if (TEXT_IMAGE_INSTANCEP (instance))
|
|
|
1870 {
|
|
|
1871 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
|
|
|
1872 face_index orig_findex = data->findex;
|
|
826
|
1873 Bytebpos orig_charpos = data->byte_charpos;
|
|
|
1874 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
|
|
442
|
1875
|
|
|
1876 data->findex = findex;
|
|
826
|
1877 data->byte_start_col_enabled = 0;
|
|
442
|
1878 if (!allow_cursor)
|
|
826
|
1879 data->byte_charpos = 0;
|
|
867
|
1880 add_ibyte_string_runes (data, XSTRING_DATA (string),
|
|
793
|
1881 XSTRING_LENGTH (string), 0, 1);
|
|
442
|
1882 data->findex = orig_findex;
|
|
826
|
1883 data->byte_charpos = orig_charpos;
|
|
|
1884 data->byte_start_col_enabled = orig_start_col_enabled;
|
|
819
|
1885 return retval;
|
|
442
|
1886 }
|
|
|
1887
|
|
|
1888 rb.findex = findex;
|
|
428
|
1889 rb.xpos = data->pixpos;
|
|
|
1890 rb.width = width;
|
|
826
|
1891 rb.charpos = 0; /* glyphs are never "at" anywhere */
|
|
|
1892 if (data->byte_endpos)
|
|
428
|
1893 /* #### is this necessary at all? */
|
|
665
|
1894 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
826
|
1895 data->byte_endpos);
|
|
428
|
1896 else
|
|
|
1897 rb.endpos = 0;
|
|
|
1898 rb.type = RUNE_DGLYPH;
|
|
|
1899 rb.object.dglyph.glyph = gb->glyph;
|
|
|
1900 rb.object.dglyph.extent = gb->extent;
|
|
|
1901 rb.object.dglyph.xoffset = xoffset;
|
|
819
|
1902 rb.object.dglyph.ascent = ascent;
|
|
|
1903 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
|
|
|
1904 a normal (textual) baseline. */
|
|
428
|
1905
|
|
|
1906 if (allow_cursor)
|
|
|
1907 {
|
|
826
|
1908 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
|
1909 data->byte_charpos);
|
|
428
|
1910
|
|
|
1911 if (data->cursor_type == CURSOR_ON)
|
|
|
1912 {
|
|
826
|
1913 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1914 {
|
|
|
1915 rb.cursor_type = CURSOR_ON;
|
|
|
1916 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1917 }
|
|
|
1918 else
|
|
|
1919 rb.cursor_type = CURSOR_OFF;
|
|
|
1920 }
|
|
|
1921 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1922 {
|
|
|
1923 rb.cursor_type = CURSOR_ON;
|
|
|
1924 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1925 data->cursor_type = NO_CURSOR;
|
|
|
1926 }
|
|
|
1927 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1928 rb.cursor_type = IGNORE_CURSOR;
|
|
|
1929 else if (data->cursor_type == NO_CURSOR)
|
|
|
1930 rb.cursor_type = NO_CURSOR;
|
|
|
1931 else
|
|
|
1932 rb.cursor_type = CURSOR_OFF;
|
|
|
1933 }
|
|
|
1934 else
|
|
|
1935 rb.cursor_type = CURSOR_OFF;
|
|
|
1936
|
|
|
1937 Dynarr_add (data->db->runes, rb);
|
|
|
1938 data->pixpos += width;
|
|
|
1939
|
|
819
|
1940 return retval;
|
|
428
|
1941 }
|
|
|
1942 else
|
|
|
1943 {
|
|
|
1944 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
1945 gb->findex =
|
|
|
1946 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
1947 data->window));
|
|
|
1948 else
|
|
|
1949 gb->findex = data->findex;
|
|
|
1950
|
|
|
1951 if (pos_type == BEGIN_GLYPHS)
|
|
|
1952 {
|
|
|
1953 if (!data->dl->left_glyphs)
|
|
|
1954 data->dl->left_glyphs = Dynarr_new (glyph_block);
|
|
|
1955 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
1956 return NULL;
|
|
|
1957 }
|
|
|
1958 else if (pos_type == END_GLYPHS)
|
|
|
1959 {
|
|
|
1960 if (!data->dl->right_glyphs)
|
|
|
1961 data->dl->right_glyphs = Dynarr_new (glyph_block);
|
|
|
1962 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
1963 return NULL;
|
|
|
1964 }
|
|
|
1965 else
|
|
|
1966 abort (); /* there are no unknown types */
|
|
|
1967 }
|
|
|
1968
|
|
819
|
1969 return NULL;
|
|
428
|
1970 }
|
|
|
1971
|
|
|
1972 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
1973 data. */
|
|
|
1974
|
|
|
1975 static prop_block_dynarr *
|
|
|
1976 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
1977 {
|
|
|
1978 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
1979 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
1980 int elt;
|
|
|
1981 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
1982 ? data->ef->begin_glyphs
|
|
|
1983 : data->ef->end_glyphs);
|
|
|
1984 prop_block_dynarr *prop;
|
|
|
1985
|
|
|
1986 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
1987 {
|
|
|
1988 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
1989 0);
|
|
|
1990
|
|
|
1991 if (prop)
|
|
|
1992 {
|
|
|
1993 /* #### Add some propagation information. */
|
|
|
1994 return prop;
|
|
|
1995 }
|
|
|
1996 }
|
|
|
1997
|
|
|
1998 Dynarr_reset (glyph_arr);
|
|
|
1999
|
|
|
2000 return NULL;
|
|
|
2001 }
|
|
|
2002
|
|
|
2003 /* Given a position for a buffer in a window, ensure that the given
|
|
|
2004 display line DL accurately represents the text on a line starting
|
|
|
2005 at the given position.
|
|
|
2006
|
|
826
|
2007 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's.
|
|
428
|
2008 You must do appropriate conversion. */
|
|
|
2009
|
|
665
|
2010 static Bytebpos
|
|
428
|
2011 create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
2012 Bytebpos byte_start_pos, prop_block_dynarr **prop,
|
|
428
|
2013 int type)
|
|
|
2014 {
|
|
|
2015 struct frame *f = XFRAME (w->frame);
|
|
|
2016 struct buffer *b = XBUFFER (w->buffer);
|
|
|
2017 struct device *d = XDEVICE (f->device);
|
|
|
2018
|
|
|
2019 pos_data data;
|
|
|
2020
|
|
|
2021 /* Don't display anything in the minibuffer if this window is not on
|
|
|
2022 a selected frame. We consider all other windows to be active
|
|
|
2023 minibuffers as it simplifies the coding. */
|
|
|
2024 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
2025 (f == device_selected_frame (d)) ||
|
|
|
2026 is_surrogate_for_selected_frame (f));
|
|
|
2027
|
|
|
2028 int truncate_win = window_truncation_on (w);
|
|
|
2029
|
|
|
2030 /* If the buffer's value of selective_display is an integer then
|
|
|
2031 only lines that start with less than selective_display columns of
|
|
|
2032 space will be displayed. If selective_display is t then all text
|
|
|
2033 after a ^M is invisible. */
|
|
|
2034 int selective = (INTP (b->selective_display)
|
|
|
2035 ? XINT (b->selective_display)
|
|
434
|
2036 : (!NILP (b->selective_display) ? -1 : 0));
|
|
428
|
2037
|
|
|
2038 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
2039 can actually be displayed and which octal should be used for.
|
|
|
2040 #### This variable should probably have some rethought done to
|
|
|
2041 it.
|
|
|
2042
|
|
|
2043 #### It would also be really nice if you could specify that
|
|
|
2044 the characters come out in hex instead of in octal. Mule
|
|
|
2045 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
2046 but that's bogus -- we need a more general solution. I
|
|
|
2047 think you need to extend the concept of display tables
|
|
|
2048 into a more general conversion mechanism. Ideally you
|
|
|
2049 could specify a Lisp function that converts characters,
|
|
|
2050 but this violates the Second Golden Rule and besides would
|
|
|
2051 make things way way way way slow.
|
|
|
2052
|
|
|
2053 So instead, we extend the display-table concept, which was
|
|
|
2054 historically limited to 256-byte vectors, to one of the
|
|
|
2055 following:
|
|
|
2056
|
|
|
2057 a) A 256-entry vector, for backward compatibility;
|
|
|
2058 b) char-table, mapping characters to values;
|
|
|
2059 c) range-table, mapping ranges of characters to values;
|
|
|
2060 d) a list of the above.
|
|
|
2061
|
|
|
2062 The (d) option allows you to specify multiple display tables
|
|
|
2063 instead of just one. Each display table can specify conversions
|
|
|
2064 for some characters and leave others unchanged. The way the
|
|
|
2065 character gets displayed is determined by the first display table
|
|
|
2066 with a binding for that character. This way, you could call a
|
|
|
2067 function `enable-hex-display' that adds a hex display-table to
|
|
|
2068 the list of display tables for the current buffer.
|
|
|
2069
|
|
|
2070 #### ...not yet implemented... Also, we extend the concept of
|
|
|
2071 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
2072 extended characters show up as hex with a display table like
|
|
|
2073 this:
|
|
|
2074
|
|
|
2075 #s(range-table data ((256 524288) (format "%x")))
|
|
|
2076
|
|
|
2077 Since more than one display table is possible, you have
|
|
|
2078 great flexibility in mapping ranges of characters. */
|
|
867
|
2079 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
2080 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2081 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2082 ? 255 : 160));
|
|
|
2083
|
|
|
2084 Lisp_Object face_dt, window_dt;
|
|
|
2085
|
|
|
2086 /* The text display block for this display line. */
|
|
|
2087 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2088
|
|
|
2089 /* The first time through the main loop we need to force the glyph
|
|
|
2090 data to be updated. */
|
|
|
2091 int initial = 1;
|
|
|
2092
|
|
|
2093 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2094 equal to the position passed in if there are no more runs to be
|
|
|
2095 displayed. */
|
|
|
2096 int no_more_frags = 0;
|
|
|
2097
|
|
|
2098 Lisp_Object synch_minibuffers_value =
|
|
|
2099 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2100
|
|
|
2101 dl->used_prop_data = 0;
|
|
|
2102 dl->num_chars = 0;
|
|
442
|
2103 dl->line_continuation = 0;
|
|
428
|
2104
|
|
|
2105 xzero (data);
|
|
|
2106 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2107
|
|
|
2108 /* These values are used by all of the rune addition routines. We add
|
|
|
2109 them to this structure for ease of passing. */
|
|
|
2110 data.d = d;
|
|
793
|
2111 data.window = wrap_window (w);
|
|
428
|
2112 data.string = Qnil;
|
|
|
2113 data.db = db;
|
|
|
2114 data.dl = dl;
|
|
|
2115
|
|
826
|
2116 data.byte_charpos = byte_start_pos;
|
|
428
|
2117 data.pixpos = dl->bounds.left_in;
|
|
|
2118 data.last_charset = Qunbound;
|
|
|
2119 data.last_findex = DEFAULT_INDEX;
|
|
|
2120 data.result_str = Qnil;
|
|
|
2121
|
|
|
2122 /* Set the right boundary adjusting it to take into account any end
|
|
|
2123 glyph. Save the width of the end glyph for later use. */
|
|
|
2124 data.max_pixpos = dl->bounds.right_in;
|
|
|
2125 if (truncate_win)
|
|
819
|
2126 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2127 else
|
|
819
|
2128 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2129 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2130
|
|
|
2131 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2132 {
|
|
826
|
2133 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2134 data.cursor_type = CURSOR_ON;
|
|
|
2135 }
|
|
|
2136 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2137 data.cursor_type = NO_CURSOR;
|
|
|
2138 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2139 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2140 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2141 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2142 {
|
|
826
|
2143 data.byte_cursor_charpos = BYTE_BUF_PT (b);
|
|
428
|
2144 data.cursor_type = CURSOR_ON;
|
|
|
2145 }
|
|
|
2146 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2147 {
|
|
826
|
2148 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
|
|
428
|
2149 data.cursor_type = CURSOR_ON;
|
|
|
2150 }
|
|
|
2151 else
|
|
|
2152 data.cursor_type = NO_CURSOR;
|
|
|
2153 data.cursor_x = -1;
|
|
|
2154
|
|
|
2155 data.start_col = w->hscroll;
|
|
|
2156 data.start_col_xoffset = w->left_xoffset;
|
|
826
|
2157 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
2158 data.hscroll_glyph_width_adjust = 0;
|
|
|
2159
|
|
|
2160 /* We regenerate the line from the very beginning. */
|
|
|
2161 Dynarr_reset (db->runes);
|
|
|
2162
|
|
|
2163 /* Why is this less than or equal and not just less than? If the
|
|
|
2164 starting position is already equal to the maximum we can't add
|
|
|
2165 anything else, right? Wrong. We might still have a newline to
|
|
|
2166 add. A newline can use the room allocated for an end glyph since
|
|
|
2167 if we add it we know we aren't going to be adding any end
|
|
|
2168 glyph. */
|
|
|
2169
|
|
|
2170 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2171 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2172 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2173 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2174 that the loop terminates only when either (a) there is
|
|
|
2175 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2176
|
|
|
2177 #### Also I think you need to ensure that the operation
|
|
|
2178 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2179 can't get interrupted in the middle. If you run off the end
|
|
|
2180 of the line during that operation, then you keep accumulating
|
|
|
2181 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2182 there's a begin glyph at a particular position and attempting
|
|
|
2183 to display that glyph results in window-end being hit and
|
|
|
2184 propagation data being generated, then the character at that
|
|
|
2185 position won't be displayed.
|
|
|
2186
|
|
|
2187 #### See also the comment after the end of this loop, below.
|
|
|
2188 */
|
|
|
2189 while (data.pixpos <= data.max_pixpos
|
|
|
2190 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2191 {
|
|
|
2192 /* #### This check probably should not be necessary. */
|
|
826
|
2193 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
428
|
2194 {
|
|
|
2195 /* #### urk! More of this lossage! */
|
|
826
|
2196 data.byte_charpos--;
|
|
428
|
2197 goto done;
|
|
|
2198 }
|
|
|
2199
|
|
|
2200 /* If selective display was an integer and we aren't working on
|
|
|
2201 a continuation line then find the next line we are actually
|
|
|
2202 supposed to display. */
|
|
|
2203 if (selective > 0
|
|
826
|
2204 && (data.byte_charpos == BYTE_BUF_BEGV (b)
|
|
|
2205 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
|
|
|
2206 {
|
|
|
2207 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2208 {
|
|
826
|
2209 data.byte_charpos =
|
|
|
2210 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2211 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2212 {
|
|
826
|
2213 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2214 goto done;
|
|
|
2215 }
|
|
|
2216 }
|
|
|
2217 }
|
|
|
2218
|
|
|
2219 /* Check for face changes. */
|
|
826
|
2220 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
2221 {
|
|
819
|
2222 Lisp_Object last_glyph = Qnil;
|
|
|
2223
|
|
|
2224 /* Deal with glyphs that we have already displayed. The
|
|
|
2225 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2226 propagation data then we are clipping the glyph and there
|
|
|
2227 can be no propagation data before that point. The theory
|
|
|
2228 works because we always recalculate the extent-fragments
|
|
|
2229 for propagated data, we never actually propagate the
|
|
|
2230 fragments that still need to be displayed. */
|
|
|
2231 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2232 {
|
|
|
2233 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2234 Dynarr_free (*prop);
|
|
|
2235 *prop = 0;
|
|
|
2236 }
|
|
428
|
2237 /* Now compute the face and begin/end-glyph information. */
|
|
|
2238 data.findex =
|
|
665
|
2239 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
826
|
2240 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
2241
|
|
|
2242 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2243
|
|
826
|
2244 if (data.byte_charpos == data.ef->end)
|
|
428
|
2245 no_more_frags = 1;
|
|
|
2246 }
|
|
|
2247 initial = 0;
|
|
|
2248
|
|
|
2249 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2250 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2251 display then we determine what to do based on the character at the
|
|
|
2252 current buffer position. */
|
|
|
2253
|
|
|
2254 /* If the current position is covered by an invisible extent, do
|
|
|
2255 nothing (except maybe add some ellipses).
|
|
|
2256
|
|
|
2257 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2258 invisible extent should be investigated further. This is
|
|
|
2259 fairly low priority though. */
|
|
|
2260 if (data.ef->invisible)
|
|
|
2261 {
|
|
|
2262 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2263 really know what I'm doing. */
|
|
|
2264 if (*prop)
|
|
|
2265 {
|
|
|
2266 Dynarr_free (*prop);
|
|
|
2267 *prop = 0;
|
|
|
2268 }
|
|
|
2269
|
|
|
2270 /* The extent fragment code only sets this when we should
|
|
|
2271 really display the ellipses. It makes sure the ellipses
|
|
|
2272 don't get displayed more than once in a row. */
|
|
|
2273 if (data.ef->invisible_ellipses)
|
|
|
2274 {
|
|
|
2275 struct glyph_block gb;
|
|
|
2276
|
|
|
2277 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2278 data.ef->invisible_ellipses = 0;
|
|
|
2279 gb.extent = Qnil;
|
|
|
2280 gb.glyph = Vinvisible_text_glyph;
|
|
|
2281 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2282 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2283 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2284 is to display a newline (for compatibility with
|
|
|
2285 selective-display-ellipses)? Maybe that's too
|
|
|
2286 abstruse. */
|
|
|
2287 if (*prop)
|
|
|
2288 goto done;
|
|
|
2289 }
|
|
|
2290
|
|
|
2291 /* If point is in an invisible region we place it on the
|
|
|
2292 next visible character. */
|
|
|
2293 if (data.cursor_type == CURSOR_ON
|
|
826
|
2294 && data.byte_charpos == data.byte_cursor_charpos)
|
|
428
|
2295 {
|
|
|
2296 data.cursor_type = NEXT_CURSOR;
|
|
|
2297 }
|
|
|
2298
|
|
|
2299 /* #### What if we we're dealing with a display table? */
|
|
|
2300 if (data.start_col)
|
|
|
2301 data.start_col--;
|
|
|
2302
|
|
826
|
2303 if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2304 goto done;
|
|
|
2305 else
|
|
826
|
2306 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2307 }
|
|
|
2308
|
|
|
2309 /* If there is propagation data, then it represents the current
|
|
819
|
2310 buffer position being displayed. Add them and advance the
|
|
|
2311 position counter. This might also add the minibuffer
|
|
|
2312 prompt. */
|
|
428
|
2313 else if (*prop)
|
|
|
2314 {
|
|
|
2315 dl->used_prop_data = 1;
|
|
|
2316 *prop = add_propagation_runes (prop, &data);
|
|
|
2317
|
|
|
2318 if (*prop)
|
|
|
2319 goto done; /* gee, a really narrow window */
|
|
826
|
2320 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2321 goto done;
|
|
826
|
2322 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
|
|
428
|
2323 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
2324 data.byte_charpos = BYTE_BUF_BEGV (b);
|
|
428
|
2325 else
|
|
826
|
2326 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2327 }
|
|
|
2328
|
|
|
2329 /* If there are end glyphs, add them to the line. These are
|
|
|
2330 the end glyphs for the previous run of text. We add them
|
|
|
2331 here rather than doing them at the end of handling the
|
|
|
2332 previous run so that glyphs at the beginning and end of
|
|
|
2333 a line are handled correctly. */
|
|
819
|
2334 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2335 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2336 {
|
|
|
2337 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2338 /* #### I think this is safe, but could be wrong. */
|
|
826
|
2339 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
819
|
2340
|
|
|
2341 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2342 {
|
|
|
2343 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2344 tmpglyphs = data.ef->end_glyphs;
|
|
|
2345 }
|
|
|
2346
|
|
|
2347 /* If there are begin glyphs, add them to the line. */
|
|
|
2348 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2349 {
|
|
|
2350 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2351 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2352 }
|
|
|
2353
|
|
|
2354 if (*prop)
|
|
|
2355 {
|
|
|
2356 /* If we just clipped a glyph and we are at the end of a
|
|
|
2357 line and there are more glyphs to display then do
|
|
|
2358 appropriate processing to not get a continuation
|
|
|
2359 glyph. */
|
|
|
2360 if (*prop != ADD_FAILED
|
|
|
2361 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2362 && data.ch == '\n')
|
|
|
2363 {
|
|
|
2364 /* If there are no more glyphs then do the normal
|
|
|
2365 processing.
|
|
|
2366
|
|
|
2367 #### This doesn't actually work if the same glyph is
|
|
|
2368 present more than once in the block. To solve
|
|
|
2369 this we would have to carry the index around
|
|
|
2370 which might be problematic since the fragment is
|
|
|
2371 recalculated for each line. */
|
|
|
2372 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2373 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2374 {
|
|
|
2375 Dynarr_free (*prop);
|
|
|
2376 *prop = 0;
|
|
|
2377 }
|
|
|
2378 else {
|
|
|
2379 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2380 add_ichar_rune (&data); /* discard prop data. */
|
|
819
|
2381 goto done;
|
|
|
2382 }
|
|
|
2383 }
|
|
|
2384 else
|
|
|
2385 goto done;
|
|
|
2386 }
|
|
428
|
2387 }
|
|
|
2388
|
|
|
2389 /* If at end-of-buffer, we've already processed begin and
|
|
|
2390 end-glyphs at this point and there's no text to process,
|
|
|
2391 so we're done. */
|
|
826
|
2392 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2393 goto done;
|
|
|
2394
|
|
|
2395 else
|
|
|
2396 {
|
|
|
2397 Lisp_Object entry = Qnil;
|
|
|
2398 /* Get the character at the current buffer position. */
|
|
826
|
2399 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2400 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2401 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2402
|
|
|
2403 /* If there is a display table entry for it, hand it off to
|
|
|
2404 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2405 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2406 {
|
|
|
2407 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2408
|
|
|
2409 if (*prop)
|
|
|
2410 goto done;
|
|
|
2411 }
|
|
|
2412
|
|
|
2413 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2414 to the line and end this loop. */
|
|
|
2415 else if (data.ch == '\n')
|
|
|
2416 {
|
|
|
2417 /* We aren't going to be adding an end glyph so give its
|
|
|
2418 space back in order to make sure that the cursor can
|
|
|
2419 fit. */
|
|
819
|
2420 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2421
|
|
|
2422 if (selective > 0
|
|
826
|
2423 && (byte_spaces_at_point
|
|
|
2424 (b, next_bytebpos (b, data.byte_charpos))
|
|
428
|
2425 >= selective))
|
|
|
2426 {
|
|
|
2427 if (!NILP (b->selective_display_ellipses))
|
|
|
2428 {
|
|
|
2429 struct glyph_block gb;
|
|
|
2430
|
|
|
2431 gb.extent = Qnil;
|
|
|
2432 gb.glyph = Vinvisible_text_glyph;
|
|
|
2433 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2434 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2435 }
|
|
|
2436 else
|
|
|
2437 {
|
|
|
2438 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2439 line with a special "character rune" whose width
|
|
|
2440 is the EOL cursor width and whose character is
|
|
|
2441 the non-printing character '\n'. */
|
|
|
2442 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2443 *prop = add_ichar_rune (&data);
|
|
428
|
2444 }
|
|
|
2445
|
|
826
|
2446 /* We need to set data.byte_charpos to the start of the
|
|
428
|
2447 next visible region in order to make this line
|
|
|
2448 appear to contain all of the invisible area.
|
|
|
2449 Otherwise, the line cache won't work
|
|
|
2450 correctly. */
|
|
826
|
2451 INC_BYTEBPOS (b, data.byte_charpos);
|
|
|
2452 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2453 {
|
|
826
|
2454 data.byte_charpos =
|
|
|
2455 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2456 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2457 {
|
|
826
|
2458 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2459 break;
|
|
|
2460 }
|
|
|
2461 }
|
|
826
|
2462 if (BYTE_BUF_FETCH_CHAR
|
|
|
2463 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
|
|
|
2464 DEC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2465 }
|
|
|
2466 else
|
|
|
2467 {
|
|
|
2468 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2469 *prop = add_ichar_rune (&data);
|
|
428
|
2470 }
|
|
|
2471
|
|
|
2472 goto done;
|
|
|
2473 }
|
|
|
2474
|
|
|
2475 /* If the current character is ^M, and selective display is
|
|
|
2476 enabled, then add the invisible-text-glyph if
|
|
|
2477 selective-display-ellipses is set. In any case, this
|
|
|
2478 line is done. */
|
|
|
2479 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2480 {
|
|
826
|
2481 Bytebpos byte_next_charpos;
|
|
428
|
2482
|
|
|
2483 /* Find the buffer position at the end of the line. */
|
|
826
|
2484 byte_next_charpos =
|
|
|
2485 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2486 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
|
|
428
|
2487 == '\n')
|
|
826
|
2488 DEC_BYTEBPOS (b, byte_next_charpos);
|
|
428
|
2489
|
|
|
2490 /* If the cursor is somewhere in the elided text make
|
|
|
2491 sure that the cursor gets drawn appropriately. */
|
|
|
2492 if (data.cursor_type == CURSOR_ON
|
|
826
|
2493 && (data.byte_cursor_charpos >= data.byte_charpos &&
|
|
|
2494 data.byte_cursor_charpos < byte_next_charpos))
|
|
428
|
2495 {
|
|
|
2496 data.cursor_type = NEXT_CURSOR;
|
|
|
2497 }
|
|
|
2498
|
|
|
2499 /* We won't be adding a truncation or continuation glyph
|
|
|
2500 so give up the room allocated for them. */
|
|
819
|
2501 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2502
|
|
|
2503 if (!NILP (b->selective_display_ellipses))
|
|
|
2504 {
|
|
|
2505 /* We don't propagate anything from the invisible
|
|
|
2506 text glyph if it fails to fit. This is
|
|
|
2507 intentional. */
|
|
|
2508 struct glyph_block gb;
|
|
|
2509
|
|
|
2510 gb.extent = Qnil;
|
|
|
2511 gb.glyph = Vinvisible_text_glyph;
|
|
|
2512 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2513 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2514 }
|
|
|
2515
|
|
|
2516 /* Set the buffer position to the end of the line. We
|
|
|
2517 need to do this before potentially adding a newline
|
|
|
2518 so that the cursor flag will get set correctly (if
|
|
|
2519 needed). */
|
|
826
|
2520 data.byte_charpos = byte_next_charpos;
|
|
428
|
2521
|
|
|
2522 if (NILP (b->selective_display_ellipses)
|
|
826
|
2523 || data.byte_cursor_charpos == byte_next_charpos)
|
|
428
|
2524 {
|
|
|
2525 /* We have to at least add a newline character so
|
|
|
2526 that the cursor shows up properly. */
|
|
|
2527 data.ch = '\n';
|
|
|
2528 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2529 data.findex = DEFAULT_INDEX;
|
|
|
2530 data.start_col = 0;
|
|
|
2531 data.start_col_xoffset = 0;
|
|
826
|
2532 data.byte_start_col_enabled = 0;
|
|
428
|
2533
|
|
867
|
2534 add_ichar_rune (&data);
|
|
428
|
2535 }
|
|
|
2536
|
|
|
2537 /* This had better be a newline but doing it this way
|
|
|
2538 we'll see obvious incorrect results if it isn't. No
|
|
|
2539 need to abort here. */
|
|
826
|
2540 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2541
|
|
|
2542 goto done;
|
|
|
2543 }
|
|
|
2544
|
|
|
2545 /* If the current character is considered to be printable, then
|
|
|
2546 just add it. */
|
|
|
2547 else if (data.ch >= printable_min)
|
|
|
2548 {
|
|
867
|
2549 *prop = add_ichar_rune (&data);
|
|
428
|
2550 if (*prop)
|
|
|
2551 goto done;
|
|
|
2552 }
|
|
|
2553
|
|
|
2554 /* If the current character is a tab, determine the next tab
|
|
|
2555 starting position and add a blank rune which extends from the
|
|
|
2556 current pixel position to that starting position. */
|
|
|
2557 else if (data.ch == '\t')
|
|
|
2558 {
|
|
|
2559 int tab_start_pixpos = data.pixpos;
|
|
|
2560 int next_tab_start;
|
|
|
2561 int char_tab_width;
|
|
|
2562 int prop_width = 0;
|
|
|
2563
|
|
|
2564 if (data.start_col > 1)
|
|
434
|
2565 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2566 + data.start_col_xoffset;
|
|
|
2567
|
|
|
2568 next_tab_start =
|
|
|
2569 next_tab_position (w, tab_start_pixpos,
|
|
|
2570 dl->bounds.left_in +
|
|
|
2571 data.hscroll_glyph_width_adjust);
|
|
|
2572 if (next_tab_start > data.max_pixpos)
|
|
|
2573 {
|
|
|
2574 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2575 next_tab_start = data.max_pixpos;
|
|
|
2576 }
|
|
|
2577 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2578 char_tab_width =
|
|
|
2579 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2580
|
|
|
2581 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2582
|
|
|
2583 /* add_blank_rune is only supposed to be called with
|
|
|
2584 sizes guaranteed to fit in the available space. */
|
|
|
2585 assert (!(*prop));
|
|
|
2586
|
|
|
2587 if (prop_width)
|
|
|
2588 {
|
|
|
2589 struct prop_block pb;
|
|
|
2590 *prop = Dynarr_new (prop_block);
|
|
|
2591
|
|
|
2592 pb.type = PROP_BLANK;
|
|
|
2593 pb.data.p_blank.width = prop_width;
|
|
|
2594 pb.data.p_blank.findex = data.findex;
|
|
|
2595 Dynarr_add (*prop, pb);
|
|
|
2596
|
|
|
2597 goto done;
|
|
|
2598 }
|
|
|
2599 }
|
|
|
2600
|
|
|
2601 /* If character is a control character, pass it off to
|
|
|
2602 add_control_char_runes.
|
|
|
2603
|
|
|
2604 The is_*() routines have undefined results on
|
|
|
2605 arguments outside of the range [-1, 255]. (This
|
|
|
2606 often bites people who carelessly use `char' instead
|
|
|
2607 of `unsigned char'.)
|
|
|
2608 */
|
|
867
|
2609 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
2610 {
|
|
|
2611 *prop = add_control_char_runes (&data, b);
|
|
|
2612
|
|
|
2613 if (*prop)
|
|
|
2614 goto done;
|
|
|
2615 }
|
|
|
2616
|
|
|
2617 /* If the character is above the ASCII range and we have not
|
|
|
2618 already handled it, then print it as an octal number. */
|
|
|
2619 else if (data.ch >= 0200)
|
|
|
2620 {
|
|
|
2621 *prop = add_octal_runes (&data);
|
|
|
2622
|
|
|
2623 if (*prop)
|
|
|
2624 goto done;
|
|
|
2625 }
|
|
|
2626
|
|
|
2627 /* Assume the current character is considered to be printable,
|
|
|
2628 then just add it. */
|
|
|
2629 else
|
|
|
2630 {
|
|
867
|
2631 *prop = add_ichar_rune (&data);
|
|
428
|
2632 if (*prop)
|
|
|
2633 goto done;
|
|
|
2634 }
|
|
|
2635
|
|
826
|
2636 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2637 }
|
|
|
2638 }
|
|
|
2639
|
|
|
2640 done:
|
|
|
2641
|
|
|
2642 /* Determine the starting point of the next line if we did not hit the
|
|
|
2643 end of the buffer. */
|
|
826
|
2644 if (data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2645 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2646 {
|
|
|
2647 /* #### This check is not correct. If the line terminated
|
|
|
2648 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
2649 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
2650 you make the two changes mentioned at the top of this loop,
|
|
|
2651 you should be able to say '(if (*prop))'. That should also
|
|
826
|
2652 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2653 check. */
|
|
|
2654
|
|
|
2655 /* The common case is that the line ended because we hit a newline.
|
|
|
2656 In that case, the next character is just the next buffer
|
|
|
2657 position. */
|
|
|
2658 if (data.ch == '\n')
|
|
|
2659 {
|
|
|
2660 /* If data.start_col_enabled is still true, then the window is
|
|
|
2661 scrolled far enough so that nothing on this line is visible.
|
|
|
2662 We need to stick a truncation glyph at the beginning of the
|
|
|
2663 line in that case unless the line is completely blank. */
|
|
826
|
2664 if (data.byte_start_col_enabled)
|
|
428
|
2665 {
|
|
|
2666 if (data.cursor_type == CURSOR_ON)
|
|
|
2667 {
|
|
826
|
2668 if (data.byte_cursor_charpos >= byte_start_pos
|
|
|
2669 && data.byte_cursor_charpos <= data.byte_charpos)
|
|
|
2670 data.byte_cursor_charpos = data.byte_charpos;
|
|
428
|
2671 }
|
|
|
2672 data.findex = DEFAULT_INDEX;
|
|
|
2673 data.start_col = 0;
|
|
826
|
2674 data.byte_start_col_enabled = 0;
|
|
|
2675
|
|
|
2676 if (data.byte_charpos != byte_start_pos)
|
|
428
|
2677 {
|
|
|
2678 struct glyph_block gb;
|
|
|
2679
|
|
|
2680 gb.extent = Qnil;
|
|
|
2681 gb.glyph = Vhscroll_glyph;
|
|
|
2682 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2683 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2684 }
|
|
|
2685 else
|
|
|
2686 {
|
|
|
2687 /* This duplicates code down below to add a newline to
|
|
|
2688 the end of an otherwise empty line.*/
|
|
|
2689 data.ch = '\n';
|
|
|
2690 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2691
|
|
867
|
2692 add_ichar_rune (&data);
|
|
428
|
2693 }
|
|
|
2694 }
|
|
|
2695
|
|
826
|
2696 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2697 }
|
|
|
2698
|
|
|
2699 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2700 line. */
|
|
|
2701 else
|
|
|
2702 {
|
|
|
2703 struct glyph_block gb;
|
|
|
2704 struct glyph_cachel *cachel;
|
|
|
2705
|
|
|
2706 /* If the line is to be truncated then we actually have to look
|
|
|
2707 for the next newline. We also add the end-of-line glyph which
|
|
|
2708 we know will fit because we adjusted the right border before
|
|
|
2709 we starting laying out the line. */
|
|
819
|
2710 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2711 data.findex = DEFAULT_INDEX;
|
|
|
2712 gb.extent = Qnil;
|
|
|
2713
|
|
|
2714 if (truncate_win)
|
|
|
2715 {
|
|
826
|
2716 Bytebpos byte_pos;
|
|
428
|
2717
|
|
|
2718 /* Now find the start of the next line. */
|
|
826
|
2719 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
428
|
2720
|
|
|
2721 /* If the cursor is past the truncation line then we
|
|
|
2722 make it appear on the truncation glyph. If we've hit
|
|
|
2723 the end of the buffer then we also make the cursor
|
|
|
2724 appear unless eob is immediately preceded by a
|
|
|
2725 newline. In that case the cursor should actually
|
|
|
2726 appear on the next line. */
|
|
|
2727 if (data.cursor_type == CURSOR_ON
|
|
826
|
2728 && data.byte_cursor_charpos >= data.byte_charpos
|
|
|
2729 && (data.byte_cursor_charpos < byte_pos ||
|
|
|
2730 (byte_pos == BYTE_BUF_ZV (b)
|
|
|
2731 && (byte_pos == BYTE_BUF_BEGV (b)
|
|
|
2732 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
|
|
428
|
2733 != '\n')))))
|
|
826
|
2734 data.byte_cursor_charpos = byte_pos;
|
|
428
|
2735 else
|
|
|
2736 data.cursor_type = NO_CURSOR;
|
|
|
2737
|
|
826
|
2738 data.byte_charpos = byte_pos;
|
|
428
|
2739 gb.glyph = Vtruncation_glyph;
|
|
|
2740 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2741 }
|
|
|
2742 else
|
|
|
2743 {
|
|
|
2744 /* The cursor can never be on the continuation glyph. */
|
|
|
2745 data.cursor_type = NO_CURSOR;
|
|
|
2746
|
|
826
|
2747 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
2748
|
|
442
|
2749 dl->line_continuation = 1;
|
|
428
|
2750 gb.glyph = Vcontinuation_glyph;
|
|
|
2751 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2752 }
|
|
|
2753
|
|
442
|
2754 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2755
|
|
826
|
2756 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
|
|
|
2757 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
|
|
428
|
2758 /* #### Damn this losing shit. */
|
|
826
|
2759 data.byte_charpos++;
|
|
428
|
2760 }
|
|
|
2761 }
|
|
|
2762 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
826
|
2763 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
|
|
428
|
2764 {
|
|
|
2765 /* We need to add a marker to the end of the line since there is no
|
|
|
2766 newline character in order for the cursor to get drawn. We label
|
|
|
2767 it as a newline so that it gets handled correctly by the
|
|
|
2768 whitespace routines below. */
|
|
|
2769
|
|
|
2770 data.ch = '\n';
|
|
|
2771 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2772 data.findex = DEFAULT_INDEX;
|
|
|
2773 data.start_col = 0;
|
|
|
2774 data.start_col_xoffset = 0;
|
|
826
|
2775 data.byte_start_col_enabled = 0;
|
|
428
|
2776
|
|
|
2777 data.max_pixpos += data.blank_width;
|
|
867
|
2778 add_ichar_rune (&data);
|
|
428
|
2779 data.max_pixpos -= data.blank_width;
|
|
|
2780
|
|
|
2781 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2782 manipulating invalid positions is guaranteed to result in
|
|
|
2783 trouble sooner or later. */
|
|
826
|
2784 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
|
|
428
|
2785 }
|
|
|
2786
|
|
|
2787 /* Calculate left whitespace boundary. */
|
|
|
2788 {
|
|
|
2789 int elt = 0;
|
|
|
2790
|
|
|
2791 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2792 while (elt < Dynarr_length (db->runes))
|
|
|
2793 {
|
|
|
2794 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2795
|
|
|
2796 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2797 || rb->type == RUNE_BLANK)
|
|
|
2798 {
|
|
|
2799 dl->bounds.left_white += rb->width;
|
|
|
2800 elt++;
|
|
|
2801 }
|
|
|
2802 else
|
|
|
2803 elt = Dynarr_length (db->runes);
|
|
|
2804 }
|
|
|
2805 }
|
|
|
2806
|
|
|
2807 /* Calculate right whitespace boundary. */
|
|
|
2808 {
|
|
|
2809 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2810 int done = 0;
|
|
|
2811
|
|
|
2812 while (!done && elt >= 0)
|
|
|
2813 {
|
|
|
2814 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2815
|
|
|
2816 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2817 && isspace (rb->object.chr.ch))
|
|
|
2818 && !rb->type == RUNE_BLANK)
|
|
|
2819 {
|
|
|
2820 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2821 done = 1;
|
|
|
2822 }
|
|
|
2823
|
|
|
2824 elt--;
|
|
|
2825
|
|
|
2826 }
|
|
|
2827
|
|
|
2828 /* The line is blank so everything is considered to be right
|
|
|
2829 whitespace. */
|
|
|
2830 if (!done)
|
|
|
2831 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2832 }
|
|
|
2833
|
|
|
2834 /* Set the display blocks bounds. */
|
|
|
2835 db->start_pos = dl->bounds.left_in;
|
|
|
2836 if (Dynarr_length (db->runes))
|
|
|
2837 {
|
|
|
2838 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2839
|
|
|
2840 db->end_pos = rb->xpos + rb->width;
|
|
|
2841 }
|
|
|
2842 else
|
|
|
2843 db->end_pos = dl->bounds.right_white;
|
|
|
2844
|
|
819
|
2845 calculate_baseline (&data);
|
|
428
|
2846
|
|
|
2847 dl->ascent = data.new_ascent;
|
|
|
2848 dl->descent = data.new_descent;
|
|
|
2849
|
|
|
2850 {
|
|
|
2851 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2852
|
|
|
2853 if (dl->ascent < ascent)
|
|
|
2854 dl->ascent = ascent;
|
|
|
2855 }
|
|
|
2856 {
|
|
|
2857 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2858
|
|
|
2859 if (dl->descent < descent)
|
|
|
2860 dl->descent = descent;
|
|
|
2861 }
|
|
|
2862
|
|
819
|
2863 calculate_yoffset (dl, db);
|
|
|
2864
|
|
428
|
2865 dl->cursor_elt = data.cursor_x;
|
|
|
2866 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
2867 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
|
2868 dl->end_charpos = BUF_ZV (b);
|
|
428
|
2869 else
|
|
826
|
2870 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
|
|
428
|
2871 if (truncate_win)
|
|
826
|
2872 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
|
|
428
|
2873 else
|
|
|
2874 /* This doesn't correctly take into account tabs and control
|
|
|
2875 characters but if the window isn't being truncated then this
|
|
|
2876 value isn't going to end up being used anyhow. */
|
|
826
|
2877 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
2878
|
|
|
2879 /* #### handle horizontally scrolled line with text none of which
|
|
|
2880 was actually laid out. */
|
|
|
2881
|
|
|
2882 /* #### handle any remainder of overlay arrow */
|
|
|
2883
|
|
|
2884 if (*prop == ADD_FAILED)
|
|
|
2885 *prop = NULL;
|
|
|
2886
|
|
|
2887 if (truncate_win && *prop)
|
|
|
2888 {
|
|
|
2889 Dynarr_free (*prop);
|
|
|
2890 *prop = NULL;
|
|
|
2891 }
|
|
|
2892
|
|
|
2893 extent_fragment_delete (data.ef);
|
|
|
2894
|
|
|
2895 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2896 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2897 The main loop should get fixed so that it isn't necessary to call
|
|
|
2898 this function if we are already at EOB. */
|
|
|
2899
|
|
826
|
2900 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
|
|
|
2901 return data.byte_charpos + 1; /* Yuck! */
|
|
428
|
2902 else
|
|
826
|
2903 return data.byte_charpos;
|
|
428
|
2904 }
|
|
|
2905
|
|
|
2906 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2907
|
|
|
2908 static int
|
|
|
2909 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2910 {
|
|
|
2911 struct frame *f = XFRAME (w->frame);
|
|
|
2912 struct device *d = XDEVICE (f->device);
|
|
|
2913 pos_data data;
|
|
|
2914
|
|
|
2915 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2916 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2917 return 0;
|
|
|
2918
|
|
|
2919 xzero (data);
|
|
|
2920 data.ef = NULL;
|
|
|
2921 data.d = d;
|
|
793
|
2922 data.window = wrap_window (w);
|
|
428
|
2923 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2924 data.dl = dl;
|
|
|
2925 data.pixpos = dl->bounds.left_in;
|
|
|
2926 data.max_pixpos = dl->bounds.right_in;
|
|
|
2927 data.cursor_type = NO_CURSOR;
|
|
|
2928 data.cursor_x = -1;
|
|
|
2929 data.findex = DEFAULT_INDEX;
|
|
|
2930 data.last_charset = Qunbound;
|
|
|
2931 data.last_findex = DEFAULT_INDEX;
|
|
|
2932 data.result_str = Qnil;
|
|
|
2933 data.string = Qnil;
|
|
|
2934
|
|
|
2935 Dynarr_reset (data.db->runes);
|
|
|
2936
|
|
|
2937 if (STRINGP (Voverlay_arrow_string))
|
|
|
2938 {
|
|
867
|
2939 add_ibyte_string_runes
|
|
428
|
2940 (&data,
|
|
|
2941 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
2942 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
2943 1, 0);
|
|
428
|
2944 }
|
|
|
2945 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
2946 {
|
|
|
2947 struct glyph_block gb;
|
|
|
2948
|
|
|
2949 gb.glyph = Voverlay_arrow_string;
|
|
|
2950 gb.extent = Qnil;
|
|
|
2951 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
2952 }
|
|
819
|
2953
|
|
428
|
2954 if (data.max_pixmap_height)
|
|
|
2955 {
|
|
|
2956 int height = data.new_ascent + data.new_descent;
|
|
|
2957 int pix_ascent, pix_descent;
|
|
819
|
2958
|
|
428
|
2959 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2960 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
2961 calculate_baseline (&data);
|
|
428
|
2962
|
|
|
2963 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2964 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2965 }
|
|
|
2966
|
|
|
2967 dl->ascent = data.new_ascent;
|
|
|
2968 dl->descent = data.new_descent;
|
|
|
2969
|
|
|
2970 data.db->start_pos = dl->bounds.left_in;
|
|
|
2971 data.db->end_pos = data.pixpos;
|
|
|
2972
|
|
819
|
2973 calculate_yoffset (dl, data.db);
|
|
|
2974
|
|
428
|
2975 return data.pixpos - dl->bounds.left_in;
|
|
|
2976 }
|
|
|
2977
|
|
|
2978 /* Add a type of glyph to a margin display block. */
|
|
|
2979
|
|
|
2980 static int
|
|
|
2981 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
2982 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
2983 {
|
|
|
2984 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
2985 ? dl->left_glyphs
|
|
|
2986 : dl->right_glyphs);
|
|
|
2987 int elt, end;
|
|
|
2988 int reverse;
|
|
442
|
2989 struct window *w = XWINDOW (window);
|
|
|
2990 struct frame *f = XFRAME (w->frame);
|
|
|
2991 struct device *d = XDEVICE (f->device);
|
|
|
2992 pos_data data;
|
|
|
2993
|
|
|
2994 xzero (data);
|
|
|
2995 data.d = d;
|
|
|
2996 data.window = window;
|
|
|
2997 data.db = db;
|
|
|
2998 data.dl = dl;
|
|
|
2999 data.pixpos = start;
|
|
|
3000 data.cursor_type = NO_CURSOR;
|
|
|
3001 data.cursor_x = -1;
|
|
|
3002 data.last_charset = Qunbound;
|
|
|
3003 data.last_findex = DEFAULT_INDEX;
|
|
|
3004 data.result_str = Qnil;
|
|
|
3005 data.string = Qnil;
|
|
|
3006 data.new_ascent = dl->ascent;
|
|
|
3007 data.new_descent = dl->descent;
|
|
428
|
3008
|
|
|
3009 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
3010 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
3011 {
|
|
|
3012 reverse = 1;
|
|
|
3013 elt = Dynarr_length (gbd) - 1;
|
|
|
3014 end = 0;
|
|
|
3015 }
|
|
|
3016 else
|
|
|
3017 {
|
|
|
3018 reverse = 0;
|
|
|
3019 elt = 0;
|
|
|
3020 end = Dynarr_length (gbd);
|
|
|
3021 }
|
|
|
3022
|
|
|
3023 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
3024 {
|
|
|
3025 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3026
|
|
|
3027 if (NILP (gb->extent))
|
|
|
3028 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3029
|
|
|
3030 if (gb->active &&
|
|
|
3031 ((side == LEFT_GLYPHS &&
|
|
|
3032 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3033 || (side == RIGHT_GLYPHS &&
|
|
|
3034 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3035 {
|
|
442
|
3036 data.findex = gb->findex;
|
|
|
3037 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3038 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3039 count--;
|
|
|
3040 gb->active = 0;
|
|
|
3041 }
|
|
|
3042
|
|
|
3043 (reverse ? elt-- : elt++);
|
|
|
3044 }
|
|
|
3045
|
|
819
|
3046 calculate_baseline (&data);
|
|
442
|
3047
|
|
|
3048 dl->ascent = data.new_ascent;
|
|
|
3049 dl->descent = data.new_descent;
|
|
|
3050
|
|
819
|
3051 calculate_yoffset (dl, data.db);
|
|
|
3052
|
|
442
|
3053 return data.pixpos;
|
|
428
|
3054 }
|
|
|
3055
|
|
|
3056 /* Add a blank to a margin display block. */
|
|
|
3057
|
|
|
3058 static void
|
|
|
3059 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
3060 struct window *w, int xpos, int width, int side)
|
|
|
3061 {
|
|
|
3062 struct rune rb;
|
|
|
3063
|
|
|
3064 rb.findex = (side == LEFT_GLYPHS
|
|
|
3065 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3066 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3067 rb.xpos = xpos;
|
|
|
3068 rb.width = width;
|
|
826
|
3069 rb.charpos = -1;
|
|
428
|
3070 rb.endpos = 0;
|
|
|
3071 rb.type = RUNE_BLANK;
|
|
|
3072 rb.cursor_type = CURSOR_OFF;
|
|
|
3073
|
|
|
3074 Dynarr_add (db->runes, rb);
|
|
|
3075 }
|
|
|
3076
|
|
|
3077 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3078 left whitespace area. */
|
|
|
3079
|
|
|
3080 static void
|
|
|
3081 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3082 int overlay_width)
|
|
|
3083 {
|
|
|
3084 Lisp_Object window;
|
|
|
3085
|
|
|
3086 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3087 int elt, end_xpos;
|
|
|
3088 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3089 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3090 int left_in_start = dl->bounds.left_in;
|
|
|
3091 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3092
|
|
|
3093 struct display_block *odb, *idb;
|
|
|
3094
|
|
793
|
3095 window = wrap_window (w);
|
|
428
|
3096
|
|
|
3097 /* We have to add the glyphs to the line in the order outside,
|
|
|
3098 inside, whitespace. However the precedence dictates that we
|
|
|
3099 determine how many will fit in the reverse order. */
|
|
|
3100
|
|
|
3101 /* Determine how many whitespace glyphs we can display and where
|
|
|
3102 they should start. */
|
|
|
3103 white_in_start = dl->bounds.left_white;
|
|
|
3104 white_out_start = left_in_start;
|
|
|
3105 white_out_cnt = white_in_cnt = 0;
|
|
|
3106 elt = 0;
|
|
|
3107
|
|
|
3108 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3109 {
|
|
|
3110 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3111
|
|
|
3112 if (NILP (gb->extent))
|
|
|
3113 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3114
|
|
|
3115 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3116 {
|
|
|
3117 int width;
|
|
|
3118
|
|
438
|
3119 width = glyph_width (gb->glyph, window);
|
|
428
|
3120
|
|
|
3121 if (white_in_start - width >= left_in_end)
|
|
|
3122 {
|
|
|
3123 white_in_cnt++;
|
|
|
3124 white_in_start -= width;
|
|
|
3125 gb->width = width;
|
|
|
3126 gb->active = 1;
|
|
|
3127 }
|
|
|
3128 else if (use_overflow
|
|
|
3129 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3130 {
|
|
|
3131 white_out_cnt++;
|
|
|
3132 white_out_start -= width;
|
|
|
3133 gb->width = width;
|
|
|
3134 gb->active = 1;
|
|
|
3135 }
|
|
|
3136 else
|
|
|
3137 gb->active = 0;
|
|
|
3138 }
|
|
|
3139
|
|
|
3140 elt++;
|
|
|
3141 }
|
|
|
3142
|
|
|
3143 /* Determine how many inside margin glyphs we can display and where
|
|
|
3144 they should start. The inside margin glyphs get whatever space
|
|
|
3145 is left after the whitespace glyphs have been displayed. These
|
|
|
3146 are tricky to calculate since if we decide to use the overflow
|
|
|
3147 area we basically have to start over. So for these we build up a
|
|
|
3148 list of just the inside margin glyphs and manipulate it to
|
|
|
3149 determine the needed info. */
|
|
|
3150 {
|
|
|
3151 glyph_block_dynarr *ib;
|
|
|
3152 int avail_in, avail_out;
|
|
|
3153 int done = 0;
|
|
|
3154 int marker = 0;
|
|
|
3155 int used_in, used_out;
|
|
|
3156
|
|
|
3157 elt = 0;
|
|
|
3158 used_in = used_out = 0;
|
|
|
3159 ib = Dynarr_new (glyph_block);
|
|
|
3160 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3161 {
|
|
|
3162 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3163
|
|
|
3164 if (NILP (gb->extent))
|
|
|
3165 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3166
|
|
|
3167 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3168 GL_INSIDE_MARGIN)
|
|
|
3169 {
|
|
438
|
3170 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3171 used_in += gb->width;
|
|
|
3172 Dynarr_add (ib, *gb);
|
|
|
3173 }
|
|
|
3174
|
|
|
3175 elt++;
|
|
|
3176 }
|
|
|
3177
|
|
|
3178 if (white_out_cnt)
|
|
|
3179 avail_in = 0;
|
|
|
3180 else
|
|
|
3181 {
|
|
|
3182 avail_in = white_in_start - left_in_end;
|
|
|
3183 if (avail_in < 0)
|
|
|
3184 avail_in = 0;
|
|
|
3185 }
|
|
|
3186
|
|
|
3187 if (!use_overflow)
|
|
|
3188 avail_out = 0;
|
|
|
3189 else
|
|
|
3190 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3191
|
|
|
3192 marker = 0;
|
|
|
3193 while (!done && marker < Dynarr_length (ib))
|
|
|
3194 {
|
|
|
3195 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3196
|
|
|
3197 /* If everything now fits in the available inside margin
|
|
|
3198 space, we're done. */
|
|
|
3199 if (used_in <= avail_in)
|
|
|
3200 done = 1;
|
|
|
3201 else
|
|
|
3202 {
|
|
|
3203 /* Otherwise see if we have room to move a glyph to the
|
|
|
3204 outside. */
|
|
|
3205 if (used_out + width <= avail_out)
|
|
|
3206 {
|
|
|
3207 used_out += width;
|
|
|
3208 used_in -= width;
|
|
|
3209 }
|
|
|
3210 else
|
|
|
3211 done = 1;
|
|
|
3212 }
|
|
|
3213
|
|
|
3214 if (!done)
|
|
|
3215 marker++;
|
|
|
3216 }
|
|
|
3217
|
|
|
3218 /* At this point we now know that everything from marker on goes in
|
|
|
3219 the inside margin and everything before it goes in the outside
|
|
|
3220 margin. The stuff going into the outside margin is guaranteed
|
|
|
3221 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3222
|
|
|
3223 in_in_end = left_in_end;
|
|
|
3224 in_out_start = white_out_start;
|
|
|
3225 in_out_cnt = in_in_cnt = 0;
|
|
|
3226
|
|
|
3227 Dynarr_free (ib);
|
|
|
3228 elt = 0;
|
|
|
3229 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3230 {
|
|
|
3231 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3232
|
|
|
3233 if (NILP (gb->extent))
|
|
|
3234 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3235
|
|
|
3236 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3237 GL_INSIDE_MARGIN)
|
|
|
3238 {
|
|
438
|
3239 int width = glyph_width (gb->glyph, window);
|
|
428
|
3240
|
|
|
3241 if (used_out)
|
|
|
3242 {
|
|
|
3243 in_out_cnt++;
|
|
|
3244 in_out_start -= width;
|
|
|
3245 gb->width = width;
|
|
|
3246 gb->active = 1;
|
|
|
3247 used_out -= width;
|
|
|
3248 }
|
|
|
3249 else if (in_in_end + width < white_in_start)
|
|
|
3250 {
|
|
|
3251 in_in_cnt++;
|
|
|
3252 in_in_end += width;
|
|
|
3253 gb->width = width;
|
|
|
3254 gb->active = 1;
|
|
|
3255 }
|
|
|
3256 else
|
|
|
3257 gb->active = 0;
|
|
|
3258 }
|
|
|
3259
|
|
|
3260 elt++;
|
|
|
3261 }
|
|
|
3262 }
|
|
|
3263
|
|
|
3264 /* Determine how many outside margin glyphs we can display. They
|
|
|
3265 always start at the left outside margin and can only use the
|
|
|
3266 outside margin space. */
|
|
|
3267 out_end = dl->bounds.left_out;
|
|
|
3268 out_cnt = 0;
|
|
|
3269 elt = 0;
|
|
|
3270
|
|
|
3271 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3272 {
|
|
|
3273 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3274
|
|
|
3275 if (NILP (gb->extent))
|
|
|
3276 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3277
|
|
|
3278 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3279 GL_OUTSIDE_MARGIN)
|
|
|
3280 {
|
|
438
|
3281 int width = glyph_width (gb->glyph, window);
|
|
428
|
3282
|
|
|
3283 if (out_end + width <= in_out_start)
|
|
|
3284 {
|
|
|
3285 out_cnt++;
|
|
|
3286 out_end += width;
|
|
|
3287 gb->width = width;
|
|
|
3288 gb->active = 1;
|
|
|
3289 }
|
|
|
3290 else
|
|
|
3291 gb->active = 0;
|
|
|
3292 }
|
|
|
3293
|
|
|
3294 elt++;
|
|
|
3295 }
|
|
|
3296
|
|
|
3297 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3298 runes to the appropriate display blocks. */
|
|
|
3299 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3300 {
|
|
|
3301 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3302 odb->start_pos = dl->bounds.left_out;
|
|
|
3303 /* #### We should stop adding a blank to account for the space
|
|
|
3304 between the end of the glyphs and the margin and instead set
|
|
|
3305 this accordingly. */
|
|
|
3306 odb->end_pos = dl->bounds.left_in;
|
|
|
3307 Dynarr_reset (odb->runes);
|
|
|
3308 }
|
|
|
3309 else
|
|
|
3310 odb = 0;
|
|
|
3311
|
|
|
3312 if (in_in_cnt || white_in_cnt)
|
|
|
3313 {
|
|
|
3314 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3315 idb->start_pos = dl->bounds.left_in;
|
|
|
3316 /* #### See above comment for odb->end_pos */
|
|
|
3317 idb->end_pos = dl->bounds.left_white;
|
|
|
3318 Dynarr_reset (idb->runes);
|
|
|
3319 }
|
|
|
3320 else
|
|
|
3321 idb = 0;
|
|
|
3322
|
|
|
3323 /* First add the outside margin glyphs. */
|
|
|
3324 if (out_cnt)
|
|
|
3325 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3326 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3327 else
|
|
|
3328 end_xpos = dl->bounds.left_out;
|
|
|
3329
|
|
|
3330 /* There may be blank space between the outside margin glyphs and
|
|
|
3331 the inside margin glyphs. If so, add a blank. */
|
|
|
3332 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3333 {
|
|
|
3334 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3335 LEFT_GLYPHS);
|
|
|
3336 }
|
|
|
3337
|
|
|
3338 /* Next add the inside margin glyphs which are actually in the
|
|
|
3339 outside margin. */
|
|
|
3340 if (in_out_cnt)
|
|
|
3341 {
|
|
|
3342 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3343 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3344 }
|
|
|
3345
|
|
|
3346 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3347 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3348 here. */
|
|
|
3349 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3350 {
|
|
|
3351 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3352 LEFT_GLYPHS);
|
|
|
3353 }
|
|
|
3354
|
|
|
3355 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3356 outside margin. */
|
|
|
3357 if (white_out_cnt)
|
|
|
3358 {
|
|
|
3359 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3360 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3361 }
|
|
|
3362
|
|
|
3363 /* We take care of clearing between the end of the glyphs and the
|
|
|
3364 start of the inside margin for lines which have glyphs. */
|
|
|
3365 if (odb && (left_in_start - end_xpos))
|
|
|
3366 {
|
|
|
3367 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3368 LEFT_GLYPHS);
|
|
|
3369 }
|
|
|
3370
|
|
|
3371 /* Next add the inside margin glyphs which are actually in the
|
|
|
3372 inside margin. */
|
|
|
3373 if (in_in_cnt)
|
|
|
3374 {
|
|
|
3375 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3376 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3377 }
|
|
|
3378 else
|
|
|
3379 end_xpos = left_in_end;
|
|
|
3380
|
|
|
3381 /* Make sure that the area between the end of the inside margin
|
|
|
3382 glyphs and the whitespace glyphs is cleared. */
|
|
|
3383 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3384 {
|
|
|
3385 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3386 LEFT_GLYPHS);
|
|
|
3387 }
|
|
|
3388
|
|
|
3389 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3390 inside margin. */
|
|
|
3391 if (white_in_cnt)
|
|
|
3392 {
|
|
|
3393 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3394 LEFT_GLYPHS, window);
|
|
|
3395 }
|
|
|
3396
|
|
|
3397 /* Whitespace glyphs always end right next to the text block so
|
|
|
3398 there is nothing we have to make sure is cleared after them. */
|
|
|
3399 }
|
|
|
3400
|
|
|
3401 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3402 right whitespace area. */
|
|
|
3403
|
|
|
3404 static void
|
|
|
3405 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3406 {
|
|
|
3407 Lisp_Object window;
|
|
|
3408
|
|
|
3409 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3410 int elt, end_xpos;
|
|
|
3411 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3412 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3413
|
|
|
3414 struct display_block *odb, *idb;
|
|
|
3415
|
|
793
|
3416 window = wrap_window (w);
|
|
428
|
3417
|
|
|
3418 /* We have to add the glyphs to the line in the order outside,
|
|
|
3419 inside, whitespace. However the precedence dictates that we
|
|
|
3420 determine how many will fit in the reverse order. */
|
|
|
3421
|
|
|
3422 /* Determine how many whitespace glyphs we can display and where
|
|
|
3423 they should start. */
|
|
|
3424 white_in_end = dl->bounds.right_white;
|
|
|
3425 white_out_end = dl->bounds.right_in;
|
|
|
3426 white_out_cnt = white_in_cnt = 0;
|
|
|
3427 elt = 0;
|
|
|
3428
|
|
|
3429 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3430 {
|
|
|
3431 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3432
|
|
|
3433 if (NILP (gb->extent))
|
|
|
3434 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3435
|
|
|
3436 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3437 {
|
|
438
|
3438 int width = glyph_width (gb->glyph, window);
|
|
428
|
3439
|
|
|
3440 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3441 {
|
|
|
3442 white_in_cnt++;
|
|
|
3443 white_in_end += width;
|
|
|
3444 gb->width = width;
|
|
|
3445 gb->active = 1;
|
|
|
3446 }
|
|
|
3447 else if (use_overflow
|
|
|
3448 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3449 {
|
|
|
3450 white_out_cnt++;
|
|
|
3451 white_out_end += width;
|
|
|
3452 gb->width = width;
|
|
|
3453 gb->active = 1;
|
|
|
3454 }
|
|
|
3455 else
|
|
|
3456 gb->active = 0;
|
|
|
3457 }
|
|
|
3458
|
|
|
3459 elt++;
|
|
|
3460 }
|
|
|
3461
|
|
|
3462 /* Determine how many inside margin glyphs we can display and where
|
|
|
3463 they should start. The inside margin glyphs get whatever space
|
|
|
3464 is left after the whitespace glyphs have been displayed. These
|
|
|
3465 are tricky to calculate since if we decide to use the overflow
|
|
|
3466 area we basically have to start over. So for these we build up a
|
|
|
3467 list of just the inside margin glyphs and manipulate it to
|
|
|
3468 determine the needed info. */
|
|
|
3469 {
|
|
|
3470 glyph_block_dynarr *ib;
|
|
|
3471 int avail_in, avail_out;
|
|
|
3472 int done = 0;
|
|
|
3473 int marker = 0;
|
|
|
3474 int used_in, used_out;
|
|
|
3475
|
|
|
3476 elt = 0;
|
|
|
3477 used_in = used_out = 0;
|
|
|
3478 ib = Dynarr_new (glyph_block);
|
|
|
3479 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3480 {
|
|
|
3481 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3482
|
|
|
3483 if (NILP (gb->extent))
|
|
|
3484 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3485
|
|
|
3486 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3487 {
|
|
438
|
3488 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3489 used_in += gb->width;
|
|
|
3490 Dynarr_add (ib, *gb);
|
|
|
3491 }
|
|
|
3492
|
|
|
3493 elt++;
|
|
|
3494 }
|
|
|
3495
|
|
|
3496 if (white_out_cnt)
|
|
|
3497 avail_in = 0;
|
|
|
3498 else
|
|
|
3499 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3500
|
|
|
3501 if (!use_overflow)
|
|
|
3502 avail_out = 0;
|
|
|
3503 else
|
|
|
3504 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3505
|
|
|
3506 marker = 0;
|
|
|
3507 while (!done && marker < Dynarr_length (ib))
|
|
|
3508 {
|
|
|
3509 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3510
|
|
|
3511 /* If everything now fits in the available inside margin
|
|
|
3512 space, we're done. */
|
|
|
3513 if (used_in <= avail_in)
|
|
|
3514 done = 1;
|
|
|
3515 else
|
|
|
3516 {
|
|
|
3517 /* Otherwise see if we have room to move a glyph to the
|
|
|
3518 outside. */
|
|
|
3519 if (used_out + width <= avail_out)
|
|
|
3520 {
|
|
|
3521 used_out += width;
|
|
|
3522 used_in -= width;
|
|
|
3523 }
|
|
|
3524 else
|
|
|
3525 done = 1;
|
|
|
3526 }
|
|
|
3527
|
|
|
3528 if (!done)
|
|
|
3529 marker++;
|
|
|
3530 }
|
|
|
3531
|
|
|
3532 /* At this point we now know that everything from marker on goes in
|
|
|
3533 the inside margin and everything before it goes in the outside
|
|
|
3534 margin. The stuff going into the outside margin is guaranteed
|
|
|
3535 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3536
|
|
|
3537 in_in_start = dl->bounds.right_in;
|
|
|
3538 in_out_end = dl->bounds.right_in;
|
|
|
3539 in_out_cnt = in_in_cnt = 0;
|
|
|
3540
|
|
|
3541 Dynarr_free (ib);
|
|
|
3542 elt = 0;
|
|
|
3543 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3544 {
|
|
|
3545 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3546
|
|
|
3547 if (NILP (gb->extent))
|
|
|
3548 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3549
|
|
|
3550 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3551 {
|
|
438
|
3552 int width = glyph_width (gb->glyph, window);
|
|
428
|
3553
|
|
|
3554 if (used_out)
|
|
|
3555 {
|
|
|
3556 in_out_cnt++;
|
|
|
3557 in_out_end += width;
|
|
|
3558 gb->width = width;
|
|
|
3559 gb->active = 1;
|
|
|
3560 used_out -= width;
|
|
|
3561 }
|
|
|
3562 else if (in_in_start - width >= white_in_end)
|
|
|
3563 {
|
|
|
3564 in_in_cnt++;
|
|
|
3565 in_in_start -= width;
|
|
|
3566 gb->width = width;
|
|
|
3567 gb->active = 1;
|
|
|
3568 }
|
|
|
3569 else
|
|
|
3570 gb->active = 0;
|
|
|
3571 }
|
|
|
3572
|
|
|
3573 elt++;
|
|
|
3574 }
|
|
|
3575 }
|
|
|
3576
|
|
|
3577 /* Determine how many outside margin glyphs we can display. They
|
|
|
3578 always start at the right outside margin and can only use the
|
|
|
3579 outside margin space. */
|
|
|
3580 out_start = dl->bounds.right_out;
|
|
|
3581 out_cnt = 0;
|
|
|
3582 elt = 0;
|
|
|
3583
|
|
|
3584 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3585 {
|
|
|
3586 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3587
|
|
|
3588 if (NILP (gb->extent))
|
|
|
3589 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3590
|
|
|
3591 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3592 {
|
|
438
|
3593 int width = glyph_width (gb->glyph, window);
|
|
428
|
3594
|
|
|
3595 if (out_start - width >= in_out_end)
|
|
|
3596 {
|
|
|
3597 out_cnt++;
|
|
|
3598 out_start -= width;
|
|
|
3599 gb->width = width;
|
|
|
3600 gb->active = 1;
|
|
|
3601 }
|
|
|
3602 else
|
|
|
3603 gb->active = 0;
|
|
|
3604 }
|
|
|
3605
|
|
|
3606 elt++;
|
|
|
3607 }
|
|
|
3608
|
|
|
3609 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3610 to the appropriate display blocks. */
|
|
|
3611 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3612 {
|
|
|
3613 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3614 /* #### See comments before odb->start_pos init in
|
|
|
3615 create_left_glyph_block */
|
|
|
3616 odb->start_pos = dl->bounds.right_in;
|
|
|
3617 odb->end_pos = dl->bounds.right_out;
|
|
|
3618 Dynarr_reset (odb->runes);
|
|
|
3619 }
|
|
|
3620 else
|
|
|
3621 odb = 0;
|
|
|
3622
|
|
|
3623 if (in_in_cnt || white_in_cnt)
|
|
|
3624 {
|
|
|
3625 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3626 idb->start_pos = dl->bounds.right_white;
|
|
|
3627 /* #### See comments before odb->start_pos init in
|
|
|
3628 create_left_glyph_block */
|
|
|
3629 idb->end_pos = dl->bounds.right_in;
|
|
|
3630 Dynarr_reset (idb->runes);
|
|
|
3631 }
|
|
|
3632 else
|
|
|
3633 idb = 0;
|
|
|
3634
|
|
|
3635 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3636 inside margin. */
|
|
|
3637 if (white_in_cnt)
|
|
|
3638 {
|
|
|
3639 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3640 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3641 window);
|
|
|
3642 }
|
|
|
3643 else
|
|
|
3644 end_xpos = dl->bounds.right_white;
|
|
|
3645
|
|
|
3646 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3647 and the inside margin glyphs is cleared. */
|
|
|
3648 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3649 {
|
|
|
3650 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3651 RIGHT_GLYPHS);
|
|
|
3652 }
|
|
|
3653
|
|
|
3654 /* Next add the inside margin glyphs which are actually in the
|
|
|
3655 inside margin. */
|
|
|
3656 if (in_in_cnt)
|
|
|
3657 {
|
|
|
3658 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3659 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3660 }
|
|
|
3661
|
|
|
3662 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3663 of the inside margin area gets cleared. */
|
|
|
3664 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3665 {
|
|
|
3666 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3667 RIGHT_GLYPHS);
|
|
|
3668 }
|
|
|
3669
|
|
|
3670 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3671 if (white_out_cnt)
|
|
|
3672 {
|
|
|
3673 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3674 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3675 }
|
|
|
3676 else
|
|
|
3677 end_xpos = dl->bounds.right_in;
|
|
|
3678
|
|
|
3679 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3680 if (in_out_cnt)
|
|
|
3681 {
|
|
|
3682 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3683 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3684 }
|
|
|
3685
|
|
|
3686 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3687 in the outside margin and the actual outside margin glyphs. */
|
|
|
3688 if (odb && (out_start - end_xpos))
|
|
|
3689 {
|
|
|
3690 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3691 RIGHT_GLYPHS);
|
|
|
3692 }
|
|
|
3693
|
|
|
3694 /* Finally, add the outside margin glyphs. */
|
|
|
3695 if (out_cnt)
|
|
|
3696 {
|
|
|
3697 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3698 RIGHT_GLYPHS, window);
|
|
|
3699 }
|
|
|
3700 }
|
|
|
3701
|
|
|
3702
|
|
|
3703 /***************************************************************************/
|
|
|
3704 /* */
|
|
|
3705 /* modeline routines */
|
|
|
3706 /* */
|
|
|
3707 /***************************************************************************/
|
|
|
3708
|
|
438
|
3709 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3710 void
|
|
|
3711 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3712 struct window *w, struct display_line *dl,
|
|
|
3713 struct display_block *db, face_index findex,
|
|
|
3714 int min_pixpos, int max_pixpos, int type)
|
|
|
3715 {
|
|
|
3716 struct frame *f = XFRAME (w->frame);
|
|
|
3717 struct device *d = XDEVICE (f->device);
|
|
|
3718
|
|
|
3719 pos_data data;
|
|
|
3720 int c_pixpos;
|
|
|
3721 Charcount offset = 0;
|
|
|
3722
|
|
|
3723 xzero (data);
|
|
|
3724 data.d = d;
|
|
|
3725 data.db = db;
|
|
|
3726 data.dl = dl;
|
|
|
3727 data.findex = findex;
|
|
|
3728 data.pixpos = min_pixpos;
|
|
|
3729 data.max_pixpos = max_pixpos;
|
|
|
3730 data.cursor_type = NO_CURSOR;
|
|
|
3731 data.last_charset = Qunbound;
|
|
|
3732 data.last_findex = DEFAULT_INDEX;
|
|
|
3733 data.result_str = result_str;
|
|
|
3734 data.is_modeline = 1;
|
|
|
3735 data.string = Qnil;
|
|
793
|
3736 data.window = wrap_window (w);
|
|
438
|
3737
|
|
|
3738 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3739 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3740 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3741
|
|
|
3742 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3743 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3744 horizontal scrolling amount */
|
|
438
|
3745 if (! NILP (result_str))
|
|
|
3746 offset = w->modeline_hscroll;
|
|
|
3747 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3748 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3749 Qnil);
|
|
|
3750
|
|
|
3751 if (Dynarr_length (db->runes))
|
|
|
3752 {
|
|
|
3753 struct rune *rb =
|
|
|
3754 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3755 c_pixpos = rb->xpos + rb->width;
|
|
|
3756 }
|
|
|
3757 else
|
|
|
3758 c_pixpos = min_pixpos;
|
|
|
3759
|
|
|
3760 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3761 to make up the difference. This usually only occurs if the
|
|
|
3762 modeline face is using a proportional width font or a fixed width
|
|
|
3763 font of a different size from the default face font. */
|
|
|
3764
|
|
|
3765 if (c_pixpos < max_pixpos)
|
|
|
3766 {
|
|
|
3767 data.pixpos = c_pixpos;
|
|
|
3768 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3769
|
|
|
3770 add_blank_rune (&data, NULL, 0);
|
|
|
3771 }
|
|
|
3772
|
|
|
3773 /* Now create the result string and frob the extents into it. */
|
|
|
3774 if (!NILP (result_str))
|
|
|
3775 {
|
|
|
3776 int elt;
|
|
|
3777 Bytecount len;
|
|
867
|
3778 Ibyte *strdata;
|
|
438
|
3779 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3780
|
|
442
|
3781 in_modeline_generation = 1;
|
|
|
3782
|
|
771
|
3783 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3784 detach_all_extents (result_str);
|
|
793
|
3785 resize_string (result_str, -1,
|
|
438
|
3786 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3787
|
|
|
3788 strdata = XSTRING_DATA (result_str);
|
|
|
3789
|
|
|
3790 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3791 {
|
|
|
3792 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3793 {
|
|
867
|
3794 len += (set_itext_ichar
|
|
438
|
3795 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3796 elt)->object.chr.ch));
|
|
|
3797 }
|
|
|
3798 }
|
|
|
3799
|
|
771
|
3800 init_string_ascii_begin (result_str);
|
|
|
3801 bump_string_modiff (result_str);
|
|
|
3802 sledgehammer_check_ascii_begin (result_str);
|
|
|
3803
|
|
438
|
3804 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3805 elt++)
|
|
|
3806 {
|
|
|
3807 Lisp_Object extent = Qnil;
|
|
|
3808 Lisp_Object child;
|
|
|
3809
|
|
793
|
3810 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3811 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3812 if (NILP (child))
|
|
|
3813 {
|
|
|
3814 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3815 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3816 }
|
|
|
3817 Fset_extent_parent (child, extent);
|
|
|
3818 set_extent_endpoints
|
|
|
3819 (XEXTENT (child),
|
|
|
3820 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3821 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3822 result_str);
|
|
|
3823 }
|
|
442
|
3824
|
|
|
3825 in_modeline_generation = 0;
|
|
438
|
3826 }
|
|
|
3827 }
|
|
|
3828
|
|
428
|
3829 /* Ensure that the given display line DL accurately represents the
|
|
|
3830 modeline for the given window. */
|
|
|
3831 static void
|
|
|
3832 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3833 {
|
|
|
3834 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3835 struct frame *f = XFRAME (w->frame);
|
|
|
3836 struct device *d = XDEVICE (f->device);
|
|
|
3837
|
|
|
3838 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3839 our feet. */
|
|
|
3840 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3841 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3842 Lisp_Object font_inst;
|
|
|
3843
|
|
|
3844 /* This will actually determine incorrect inside boundaries for the
|
|
|
3845 modeline since it ignores the margins. However being aware of this fact
|
|
|
3846 we never use those values anywhere so it doesn't matter. */
|
|
|
3847 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3848
|
|
|
3849 /* We are generating a modeline. */
|
|
|
3850 dl->modeline = 1;
|
|
|
3851 dl->cursor_elt = -1;
|
|
|
3852
|
|
|
3853 /* Reset the runes on the modeline. */
|
|
|
3854 Dynarr_reset (db->runes);
|
|
|
3855
|
|
|
3856 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3857 {
|
|
|
3858 struct rune rb;
|
|
|
3859
|
|
|
3860 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3861 if (window_scrollbar_height (w))
|
|
|
3862 return;
|
|
|
3863
|
|
|
3864 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3865 dl->descent = 0;
|
|
|
3866 /* The modeline is at the bottom of the gutters. */
|
|
|
3867 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3868
|
|
|
3869 rb.findex = MODELINE_INDEX;
|
|
|
3870 rb.xpos = dl->bounds.left_out;
|
|
|
3871 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
826
|
3872 rb.charpos = 0;
|
|
428
|
3873 rb.endpos = 0;
|
|
|
3874 rb.type = RUNE_HLINE;
|
|
|
3875 rb.object.hline.thickness = 1;
|
|
|
3876 rb.object.hline.yoffset = 0;
|
|
|
3877 rb.cursor_type = NO_CURSOR;
|
|
|
3878
|
|
|
3879 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3880 && FRAME_WIN_P (f))
|
|
|
3881 {
|
|
|
3882 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3883
|
|
|
3884 dl->ypos -= shadow_thickness;
|
|
|
3885 rb.xpos += shadow_thickness;
|
|
|
3886 rb.width -= 2 * shadow_thickness;
|
|
|
3887 }
|
|
|
3888
|
|
|
3889 Dynarr_add (db->runes, rb);
|
|
|
3890 return;
|
|
|
3891 }
|
|
|
3892
|
|
|
3893 /* !!#### not right; needs to compute the max height of
|
|
|
3894 all the charsets */
|
|
|
3895 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3896
|
|
|
3897 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3898 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3899
|
|
|
3900 min_pixpos = dl->bounds.left_out;
|
|
|
3901 max_pixpos = dl->bounds.right_out;
|
|
|
3902
|
|
|
3903 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3904 {
|
|
|
3905 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3906
|
|
|
3907 ypos_adj = shadow_thickness;
|
|
|
3908 min_pixpos += shadow_thickness;
|
|
|
3909 max_pixpos -= shadow_thickness;
|
|
|
3910 }
|
|
|
3911 else
|
|
|
3912 ypos_adj = 0;
|
|
|
3913
|
|
|
3914 generate_formatted_string_db (b->modeline_format,
|
|
|
3915 b->generated_modeline_string, w, dl, db,
|
|
|
3916 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3917
|
|
|
3918 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3919 set this until we've generated the modeline in order to account
|
|
|
3920 for any embedded faces. */
|
|
|
3921 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3922 }
|
|
|
3923
|
|
|
3924 static Charcount
|
|
867
|
3925 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
|
|
771
|
3926 Charcount pos, Charcount min_pos,
|
|
|
3927 Charcount max_pos)
|
|
428
|
3928 {
|
|
|
3929 /* This function has been Mule-ized. */
|
|
|
3930 Charcount end;
|
|
867
|
3931 const Ibyte *cur_pos = str;
|
|
428
|
3932 struct display_block *db = data->db;
|
|
|
3933
|
|
|
3934 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3935 while (Dynarr_length (db->runes) < pos)
|
|
|
3936 add_blank_rune (data, NULL, 0);
|
|
|
3937
|
|
|
3938 end = (Dynarr_length (db->runes) +
|
|
442
|
3939 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
3940 if (max_pos != -1)
|
|
|
3941 end = min (max_pos, end);
|
|
|
3942
|
|
|
3943 while (pos < end && *cur_pos)
|
|
|
3944 {
|
|
867
|
3945 const Ibyte *old_cur_pos = cur_pos;
|
|
428
|
3946 int succeeded;
|
|
|
3947
|
|
867
|
3948 data->ch = itext_ichar (cur_pos);
|
|
|
3949 succeeded = (add_ichar_rune (data) != ADD_FAILED);
|
|
|
3950 INC_IBYTEPTR (cur_pos);
|
|
428
|
3951 if (succeeded)
|
|
|
3952 {
|
|
|
3953 pos++;
|
|
|
3954 data->modeline_charpos++;
|
|
|
3955 data->bytepos += cur_pos - old_cur_pos;
|
|
|
3956 }
|
|
|
3957 }
|
|
|
3958
|
|
|
3959 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
3960 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3961 add_blank_rune (data, NULL, 0);
|
|
|
3962
|
|
|
3963 return Dynarr_length (db->runes);
|
|
|
3964 }
|
|
|
3965
|
|
|
3966 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
3967 modeline extents. */
|
|
|
3968 static Charcount
|
|
|
3969 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
438
|
3970 Charcount pos, Charcount min_pos,
|
|
|
3971 Charcount max_pos, Lisp_Object extent)
|
|
428
|
3972 {
|
|
|
3973 /* This function has been Mule-ized. */
|
|
|
3974 Charcount end;
|
|
|
3975 struct display_block *db = data->db;
|
|
|
3976 struct glyph_block gb;
|
|
|
3977
|
|
|
3978 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3979 while (Dynarr_length (db->runes) < pos)
|
|
|
3980 add_blank_rune (data, NULL, 0);
|
|
|
3981
|
|
|
3982 end = Dynarr_length (db->runes) + 1;
|
|
|
3983 if (max_pos != -1)
|
|
|
3984 end = min (max_pos, end);
|
|
|
3985
|
|
|
3986 gb.glyph = glyph;
|
|
438
|
3987 gb.extent = extent;
|
|
428
|
3988 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3989 pos++;
|
|
|
3990
|
|
|
3991 while (Dynarr_length (db->runes) < pos &&
|
|
|
3992 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3993 add_blank_rune (data, NULL, 0);
|
|
|
3994
|
|
|
3995 return Dynarr_length (db->runes);
|
|
|
3996 }
|
|
|
3997
|
|
|
3998 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
3999 true of max_pixsize. */
|
|
|
4000 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
4001 if (Dynarr_length (data->db->runes)) \
|
|
|
4002 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
4003 else \
|
|
|
4004 cur_pixsize = 0;
|
|
|
4005
|
|
|
4006 /* Note that this function does "positions" in terms of characters and
|
|
|
4007 not in terms of columns. This is necessary to make the formatting
|
|
|
4008 work correctly when proportional width fonts are used in the
|
|
|
4009 modeline. */
|
|
|
4010 static Charcount
|
|
|
4011 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
4012 Charcount min_pos, Charcount max_pos,
|
|
|
4013 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
4014 face_index findex, int type, Charcount *offset,
|
|
|
4015 Lisp_Object cur_ext)
|
|
428
|
4016 {
|
|
|
4017 /* This function has been Mule-ized. */
|
|
|
4018 /* #### The other losing things in this function are:
|
|
|
4019
|
|
|
4020 -- C zero-terminated-string lossage.
|
|
|
4021 -- Non-printable characters should be converted into something
|
|
|
4022 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
4023 */
|
|
|
4024
|
|
|
4025 tail_recurse:
|
|
|
4026 if (depth > 10)
|
|
|
4027 goto invalid;
|
|
|
4028
|
|
|
4029 depth++;
|
|
|
4030
|
|
|
4031 if (STRINGP (elt))
|
|
|
4032 {
|
|
|
4033 /* A string. Add to the display line and check for %-constructs
|
|
|
4034 within it. */
|
|
|
4035
|
|
867
|
4036 Ibyte *this = XSTRING_DATA (elt);
|
|
428
|
4037
|
|
|
4038 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4039 {
|
|
867
|
4040 Ibyte *last = this;
|
|
428
|
4041
|
|
|
4042 while (*this && *this != '%')
|
|
|
4043 this++;
|
|
|
4044
|
|
|
4045 if (this != last)
|
|
|
4046 {
|
|
438
|
4047 /* No %-construct */
|
|
428
|
4048 Charcount size =
|
|
438
|
4049 bytecount_to_charcount (last, this - last);
|
|
|
4050
|
|
|
4051 if (size <= *offset)
|
|
|
4052 *offset -= size;
|
|
|
4053 else
|
|
|
4054 {
|
|
|
4055 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4056 min (pos + size - *offset, max_pos));
|
|
867
|
4057 const Ibyte *tmp_last = itext_n_addr (last, *offset);
|
|
438
|
4058
|
|
|
4059 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4060 pos, pos, tmp_max);
|
|
|
4061 *offset = 0;
|
|
|
4062 }
|
|
428
|
4063 }
|
|
|
4064 else /* *this == '%' */
|
|
|
4065 {
|
|
|
4066 Charcount spec_width = 0;
|
|
|
4067
|
|
|
4068 this++; /* skip over '%' */
|
|
|
4069
|
|
|
4070 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4071 * Argument specifies minwidth but not maxwidth
|
|
|
4072 * (maxwidth can be specified by
|
|
|
4073 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4074 */
|
|
|
4075 while (isdigit (*this))
|
|
|
4076 {
|
|
|
4077 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4078 this++;
|
|
|
4079 }
|
|
|
4080 spec_width += pos;
|
|
|
4081
|
|
|
4082 if (*this == 'M')
|
|
|
4083 {
|
|
|
4084 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4085 max_pos, Vglobal_mode_string,
|
|
|
4086 depth, max_pixsize, findex,
|
|
438
|
4087 type, offset, cur_ext);
|
|
428
|
4088 }
|
|
|
4089 else if (*this == '-')
|
|
|
4090 {
|
|
|
4091 Charcount num_to_add;
|
|
|
4092
|
|
|
4093 if (max_pixsize < 0)
|
|
|
4094 num_to_add = 0;
|
|
|
4095 else if (max_pos != -1)
|
|
|
4096 num_to_add = max_pos - pos;
|
|
|
4097 else
|
|
|
4098 {
|
|
|
4099 int cur_pixsize;
|
|
|
4100 int dash_pixsize;
|
|
867
|
4101 Ibyte ch = '-';
|
|
428
|
4102 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4103
|
|
|
4104 dash_pixsize =
|
|
|
4105 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4106 1);
|
|
|
4107
|
|
|
4108 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4109 num_to_add++;
|
|
|
4110 }
|
|
|
4111
|
|
|
4112 while (num_to_add--)
|
|
|
4113 pos = add_string_to_fstring_db_runes
|
|
867
|
4114 (data, (const Ibyte *) "-", pos, pos, max_pos);
|
|
428
|
4115 }
|
|
|
4116 else if (*this != 0)
|
|
|
4117 {
|
|
867
|
4118 Ichar ch = itext_ichar (this);
|
|
|
4119 Ibyte *str;
|
|
438
|
4120 Charcount size;
|
|
|
4121
|
|
428
|
4122 decode_mode_spec (w, ch, type);
|
|
|
4123
|
|
867
|
4124 str = Dynarr_atp (mode_spec_ibyte_string, 0);
|
|
438
|
4125 size = bytecount_to_charcount
|
|
|
4126 /* Skip the null character added by `decode_mode_spec' */
|
|
867
|
4127 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
|
|
438
|
4128
|
|
|
4129 if (size <= *offset)
|
|
|
4130 *offset -= size;
|
|
|
4131 else
|
|
|
4132 {
|
|
867
|
4133 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4134
|
|
440
|
4135 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4136 computed and used here as in the plain string case
|
|
|
4137 above. -- dv */
|
|
|
4138 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4139 pos, pos,
|
|
|
4140 max_pos);
|
|
|
4141 *offset = 0;
|
|
|
4142 }
|
|
428
|
4143 }
|
|
|
4144
|
|
|
4145 /* NOT this++. There could be any sort of character at
|
|
|
4146 the current position. */
|
|
867
|
4147 INC_IBYTEPTR (this);
|
|
428
|
4148 }
|
|
|
4149
|
|
|
4150 if (max_pixsize > 0)
|
|
|
4151 {
|
|
|
4152 int cur_pixsize;
|
|
|
4153 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4154
|
|
|
4155 if (cur_pixsize >= max_pixsize)
|
|
|
4156 break;
|
|
|
4157 }
|
|
|
4158 }
|
|
|
4159 }
|
|
|
4160 else if (SYMBOLP (elt))
|
|
|
4161 {
|
|
|
4162 /* A symbol: process the value of the symbol recursively
|
|
|
4163 as if it appeared here directly. */
|
|
|
4164 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4165
|
|
|
4166 if (!UNBOUNDP (tem))
|
|
|
4167 {
|
|
438
|
4168 /* If value is a string, output that string literally:
|
|
428
|
4169 don't check for % within it. */
|
|
|
4170 if (STRINGP (tem))
|
|
|
4171 {
|
|
867
|
4172 Ibyte *str = XSTRING_DATA (tem);
|
|
826
|
4173 Charcount size = string_char_length (tem);
|
|
438
|
4174
|
|
|
4175 if (size <= *offset)
|
|
|
4176 *offset -= size;
|
|
|
4177 else
|
|
|
4178 {
|
|
867
|
4179 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4180
|
|
440
|
4181 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4182 computed and used here as in the plain string case
|
|
|
4183 above. -- dv */
|
|
|
4184 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4185 min_pos, max_pos);
|
|
|
4186 *offset = 0;
|
|
|
4187 }
|
|
428
|
4188 }
|
|
|
4189 /* Give up right away for nil or t. */
|
|
|
4190 else if (!EQ (tem, elt))
|
|
|
4191 {
|
|
|
4192 elt = tem;
|
|
|
4193 goto tail_recurse;
|
|
|
4194 }
|
|
|
4195 }
|
|
|
4196 }
|
|
|
4197 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4198 {
|
|
|
4199 Lisp_Object window, tem;
|
|
793
|
4200 window = wrap_window (w);
|
|
428
|
4201 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4202 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4203 if (!UNBOUNDP (tem))
|
|
|
4204 {
|
|
|
4205 elt = tem;
|
|
|
4206 goto tail_recurse;
|
|
|
4207 }
|
|
|
4208 }
|
|
|
4209 else if (CONSP (elt))
|
|
|
4210 {
|
|
|
4211 /* A cons cell: four distinct cases.
|
|
438
|
4212 * - If first element is a string or a cons, process all the elements
|
|
|
4213 * and effectively concatenate them.
|
|
|
4214 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4215 * at most that many characters. If positive, pad (with spaces)
|
|
|
4216 * to at least that many characters.
|
|
771
|
4217 * - If first element is another symbol or a boolean specifier, process
|
|
|
4218 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4219 * value or specifier's instance is non-nil or nil.
|
|
|
4220 * - If first element is , process the cadr or caddr
|
|
|
4221 * recursively according to whether the instance of the specifier in
|
|
|
4222 * the modeline's window is non-nil or nil.
|
|
442
|
4223 * - If first element is an extent, process the cdr recursively
|
|
|
4224 * and handle the extent's face.
|
|
428
|
4225 */
|
|
438
|
4226
|
|
428
|
4227 Lisp_Object car, tem;
|
|
|
4228
|
|
|
4229 car = XCAR (elt);
|
|
771
|
4230 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4231 {
|
|
|
4232 elt = XCDR (elt);
|
|
|
4233 if (!CONSP (elt))
|
|
|
4234 goto invalid;
|
|
|
4235
|
|
771
|
4236 if (SYMBOLP (car))
|
|
|
4237 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4238 else
|
|
|
4239 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4240 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4241 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4242 Use its car if CAR has a non-nil value. */
|
|
771
|
4243 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4244 {
|
|
771
|
4245 elt = XCAR (elt);
|
|
|
4246 goto tail_recurse;
|
|
438
|
4247 }
|
|
771
|
4248 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4249 * Get the cddr of the original list
|
|
|
4250 * and if possible find the caddr and use that.
|
|
|
4251 */
|
|
|
4252 elt = XCDR (elt);
|
|
|
4253 if (NILP (elt))
|
|
|
4254 ;
|
|
|
4255 else if (!CONSP (elt))
|
|
|
4256 goto invalid;
|
|
|
4257 else
|
|
|
4258 {
|
|
|
4259 elt = XCAR (elt);
|
|
|
4260 goto tail_recurse;
|
|
|
4261 }
|
|
|
4262 }
|
|
428
|
4263 else if (INTP (car))
|
|
|
4264 {
|
|
|
4265 Charcount lim = XINT (car);
|
|
|
4266
|
|
|
4267 elt = XCDR (elt);
|
|
|
4268
|
|
|
4269 if (lim < 0)
|
|
|
4270 {
|
|
|
4271 /* Negative int means reduce maximum width.
|
|
|
4272 * DO NOT change MIN_PIXPOS here!
|
|
|
4273 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4274 * and then pad to 20.
|
|
|
4275 */
|
|
|
4276 if (max_pos == -1)
|
|
|
4277 max_pos = pos - lim;
|
|
|
4278 else
|
|
|
4279 max_pos = min (max_pos, pos - lim);
|
|
|
4280 }
|
|
|
4281 else if (lim > 0)
|
|
|
4282 {
|
|
|
4283 /* Padding specified. Don't let it be more than
|
|
|
4284 * current maximum.
|
|
|
4285 */
|
|
|
4286 lim += pos;
|
|
|
4287 if (max_pos != -1 && lim > max_pos)
|
|
|
4288 lim = max_pos;
|
|
|
4289 /* If that's more padding than already wanted, queue it.
|
|
|
4290 * But don't reduce padding already specified even if
|
|
|
4291 * that is beyond the current truncation point.
|
|
|
4292 */
|
|
|
4293 if (lim > min_pos)
|
|
|
4294 min_pos = lim;
|
|
|
4295 }
|
|
|
4296 goto tail_recurse;
|
|
|
4297 }
|
|
|
4298 else if (STRINGP (car) || CONSP (car))
|
|
|
4299 {
|
|
|
4300 int limit = 50;
|
|
438
|
4301
|
|
428
|
4302 /* LIMIT is to protect against circular lists. */
|
|
|
4303 while (CONSP (elt) && --limit > 0
|
|
|
4304 && (pos < max_pos || max_pos == -1))
|
|
|
4305 {
|
|
|
4306 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4307 XCAR (elt), depth, max_pixsize,
|
|
|
4308 findex, type, offset, cur_ext);
|
|
428
|
4309 elt = XCDR (elt);
|
|
|
4310 }
|
|
|
4311 }
|
|
|
4312 else if (EXTENTP (car))
|
|
|
4313 {
|
|
|
4314 struct extent *ext = XEXTENT (car);
|
|
|
4315
|
|
|
4316 if (EXTENT_LIVE_P (ext))
|
|
|
4317 {
|
|
|
4318 face_index old_findex = data->findex;
|
|
|
4319 Lisp_Object face;
|
|
|
4320 Lisp_Object font_inst;
|
|
|
4321 face_index new_findex;
|
|
|
4322 Bytecount start = data->bytepos;
|
|
|
4323
|
|
|
4324 face = extent_face (ext);
|
|
|
4325 if (FACEP (face))
|
|
|
4326 {
|
|
|
4327 /* #### needs to merge faces, sigh */
|
|
|
4328 /* #### needs to handle list of faces */
|
|
|
4329 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4330 /* !!#### not right; needs to compute the max height of
|
|
|
4331 all the charsets */
|
|
|
4332 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4333 Vcharset_ascii);
|
|
|
4334
|
|
|
4335 data->dl->ascent = max (data->dl->ascent,
|
|
|
4336 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4337 data->dl->descent = max (data->dl->descent,
|
|
|
4338 XFONT_INSTANCE (font_inst)->
|
|
|
4339 descent);
|
|
|
4340 }
|
|
|
4341 else
|
|
|
4342 new_findex = old_findex;
|
|
|
4343
|
|
|
4344 data->findex = new_findex;
|
|
|
4345 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4346 XCDR (elt), depth - 1,
|
|
438
|
4347 max_pixsize, new_findex, type,
|
|
|
4348 offset, car);
|
|
428
|
4349 data->findex = old_findex;
|
|
|
4350 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4351 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4352 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4353 }
|
|
|
4354 }
|
|
|
4355 }
|
|
|
4356 else if (GLYPHP (elt))
|
|
|
4357 {
|
|
438
|
4358 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4359 horizontal scrolling facility. -- dv */
|
|
|
4360 if (*offset > 0)
|
|
|
4361 *offset -= 1;
|
|
|
4362 else
|
|
|
4363 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4364 cur_ext);
|
|
428
|
4365 }
|
|
|
4366 else
|
|
|
4367 {
|
|
|
4368 invalid:
|
|
438
|
4369 {
|
|
|
4370 char *str = GETTEXT ("*invalid*");
|
|
|
4371 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4372
|
|
|
4373 if (size <= *offset)
|
|
|
4374 *offset -= size;
|
|
|
4375 else
|
|
|
4376 {
|
|
867
|
4377 const Ibyte *tmp_str =
|
|
|
4378 itext_n_addr ((const Ibyte *) str, *offset);
|
|
438
|
4379
|
|
440
|
4380 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4381 used here as in the plain string case above. -- dv */
|
|
|
4382 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4383 min_pos, max_pos);
|
|
|
4384 *offset = 0;
|
|
|
4385 }
|
|
|
4386 }
|
|
428
|
4387 }
|
|
|
4388
|
|
|
4389 if (min_pos > pos)
|
|
|
4390 {
|
|
867
|
4391 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
|
|
438
|
4392 min_pos, -1);
|
|
428
|
4393 }
|
|
|
4394
|
|
|
4395 return pos;
|
|
|
4396 }
|
|
|
4397
|
|
|
4398 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4399 they do not have a modeline block, it does nothing. */
|
|
|
4400 static void
|
|
|
4401 regenerate_modeline (struct window *w)
|
|
|
4402 {
|
|
|
4403 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4404
|
|
|
4405 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4406 return;
|
|
|
4407 else
|
|
|
4408 {
|
|
|
4409 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4410 redisplay_update_line (w, 0, 0, 0);
|
|
|
4411 }
|
|
|
4412 }
|
|
|
4413
|
|
|
4414 /* Make sure that modeline display line is present in the given
|
|
|
4415 display structs if the window has a modeline and update that
|
|
|
4416 line. Returns true if a modeline was needed. */
|
|
|
4417 static int
|
|
|
4418 ensure_modeline_generated (struct window *w, int type)
|
|
|
4419 {
|
|
|
4420 int need_modeline;
|
|
|
4421
|
|
|
4422 /* minibuffer windows don't have modelines */
|
|
|
4423 if (MINI_WINDOW_P (w))
|
|
|
4424 need_modeline = 0;
|
|
|
4425 /* windows which haven't had it turned off do */
|
|
|
4426 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4427 need_modeline = 1;
|
|
|
4428 /* windows which have it turned off don't have a divider if there is
|
|
|
4429 a horizontal scrollbar */
|
|
|
4430 else if (window_scrollbar_height (w))
|
|
|
4431 need_modeline = 0;
|
|
|
4432 /* and in this case there is none */
|
|
|
4433 else
|
|
|
4434 need_modeline = 1;
|
|
|
4435
|
|
|
4436 if (need_modeline)
|
|
|
4437 {
|
|
|
4438 display_line_dynarr *dla;
|
|
|
4439
|
|
|
4440 dla = window_display_lines (w, type);
|
|
|
4441
|
|
|
4442 /* We don't care if there is a display line which is not
|
|
|
4443 currently a modeline because it is definitely going to become
|
|
|
4444 one if we have gotten to this point. */
|
|
|
4445 if (Dynarr_length (dla) == 0)
|
|
|
4446 {
|
|
|
4447 if (Dynarr_largest (dla) > 0)
|
|
800
|
4448 Dynarr_increment (dla);
|
|
428
|
4449 else
|
|
|
4450 {
|
|
|
4451 struct display_line modeline;
|
|
|
4452 xzero (modeline);
|
|
|
4453 Dynarr_add (dla, modeline);
|
|
|
4454 }
|
|
|
4455 }
|
|
|
4456
|
|
|
4457 /* If we're adding a new place marker go ahead and generate the
|
|
|
4458 modeline so that it is available for use by
|
|
|
4459 window_modeline_height. */
|
|
|
4460 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4461 }
|
|
|
4462
|
|
|
4463 return need_modeline;
|
|
|
4464 }
|
|
|
4465
|
|
|
4466 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4467 int
|
|
|
4468 real_current_modeline_height (struct window *w)
|
|
|
4469 {
|
|
|
4470 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4471 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4472
|
|
|
4473 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4474 {
|
|
|
4475 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4476
|
|
|
4477 if (Dynarr_length (dla))
|
|
|
4478 {
|
|
|
4479 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4480 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4481 Dynarr_atp (dla, 0)->descent);
|
|
|
4482 }
|
|
|
4483 }
|
|
|
4484 return 0;
|
|
|
4485 }
|
|
|
4486
|
|
|
4487
|
|
|
4488 /***************************************************************************/
|
|
819
|
4489 /* */
|
|
826
|
4490 /* displayable string routines */
|
|
819
|
4491 /* */
|
|
428
|
4492 /***************************************************************************/
|
|
|
4493
|
|
|
4494 /* Given a position for a string in a window, ensure that the given
|
|
|
4495 display line DL accurately represents the text on a line starting
|
|
|
4496 at the given position.
|
|
|
4497
|
|
|
4498 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4499 looked just too hard to change create_text_block to handle strings
|
|
|
4500 *and* buffers. We already make a distinction between the two
|
|
|
4501 elsewhere in the code so I think unifying them would require a
|
|
|
4502 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4503 functions cover text that the user *cannot edit* so we can remove
|
|
|
4504 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4505 modeline routines should be modified to use this code as it copes
|
|
|
4506 with many more types of display situation. */
|
|
|
4507
|
|
665
|
4508 static Charbpos
|
|
428
|
4509 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4510 struct display_line *dl,
|
|
826
|
4511 Charcount start_pos,
|
|
428
|
4512 prop_block_dynarr **prop,
|
|
|
4513 face_index default_face)
|
|
|
4514 {
|
|
|
4515 struct frame *f = XFRAME (w->frame);
|
|
|
4516 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4517 because you might well want to make use of it (selective display
|
|
|
4518 etc), its just the buffer text that we do not use. However, it
|
|
|
4519 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4520 against this case. */
|
|
|
4521 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4522 struct device *d = XDEVICE (f->device);
|
|
|
4523
|
|
|
4524 /* we're working with these a lot so precalculate them */
|
|
|
4525 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
826
|
4526 Bytecount byte_string_zv = slen;
|
|
|
4527 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4528
|
|
|
4529 pos_data data;
|
|
|
4530
|
|
|
4531 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4532
|
|
442
|
4533 /* We're going to ditch selective display for static text, it's an
|
|
|
4534 FSF thing and invisible extents are the way to go here.
|
|
|
4535 Implementing it also relies on a number of buffer-specific
|
|
428
|
4536 functions that we don't have the luxury of being able to use
|
|
|
4537 here. */
|
|
|
4538
|
|
|
4539 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4540 can actually be displayed and which octal should be used for.
|
|
|
4541 #### This variable should probably have some rethought done to
|
|
|
4542 it.
|
|
|
4543
|
|
|
4544 #### It would also be really nice if you could specify that
|
|
|
4545 the characters come out in hex instead of in octal. Mule
|
|
|
4546 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4547 but that's bogus -- we need a more general solution. I
|
|
|
4548 think you need to extend the concept of display tables
|
|
|
4549 into a more general conversion mechanism. Ideally you
|
|
|
4550 could specify a Lisp function that converts characters,
|
|
|
4551 but this violates the Second Golden Rule and besides would
|
|
|
4552 make things way way way way slow.
|
|
|
4553
|
|
|
4554 So instead, we extend the display-table concept, which was
|
|
|
4555 historically limited to 256-byte vectors, to one of the
|
|
|
4556 following:
|
|
|
4557
|
|
|
4558 a) A 256-entry vector, for backward compatibility;
|
|
|
4559 b) char-table, mapping characters to values;
|
|
|
4560 c) range-table, mapping ranges of characters to values;
|
|
|
4561 d) a list of the above.
|
|
|
4562
|
|
|
4563 The (d) option allows you to specify multiple display tables
|
|
|
4564 instead of just one. Each display table can specify conversions
|
|
|
4565 for some characters and leave others unchanged. The way the
|
|
|
4566 character gets displayed is determined by the first display table
|
|
|
4567 with a binding for that character. This way, you could call a
|
|
|
4568 function `enable-hex-display' that adds a hex display-table to
|
|
|
4569 the list of display tables for the current buffer.
|
|
|
4570
|
|
|
4571 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4572 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4573 extended characters show up as hex with a display table like
|
|
|
4574 this:
|
|
|
4575
|
|
|
4576 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4577
|
|
|
4578 Since more than one display table is possible, you have
|
|
|
4579 great flexibility in mapping ranges of characters. */
|
|
867
|
4580 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
4581 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4582 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4583 ? 255 : 160)) : 255;
|
|
|
4584
|
|
|
4585 Lisp_Object face_dt, window_dt;
|
|
|
4586
|
|
|
4587 /* The text display block for this display line. */
|
|
|
4588 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4589
|
|
|
4590 /* The first time through the main loop we need to force the glyph
|
|
|
4591 data to be updated. */
|
|
|
4592 int initial = 1;
|
|
|
4593
|
|
|
4594 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4595 equal to the position passed in if there are no more runs to be
|
|
|
4596 displayed. */
|
|
|
4597 int no_more_frags = 0;
|
|
|
4598
|
|
|
4599 dl->used_prop_data = 0;
|
|
|
4600 dl->num_chars = 0;
|
|
442
|
4601 dl->line_continuation = 0;
|
|
428
|
4602
|
|
|
4603 /* set up faces to use for clearing areas, used by
|
|
|
4604 output_display_line */
|
|
|
4605 dl->default_findex = default_face;
|
|
|
4606 if (default_face)
|
|
|
4607 {
|
|
|
4608 dl->left_margin_findex = default_face;
|
|
|
4609 dl->right_margin_findex = default_face;
|
|
|
4610 }
|
|
|
4611 else
|
|
|
4612 {
|
|
434
|
4613 dl->left_margin_findex =
|
|
428
|
4614 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4615 dl->right_margin_findex =
|
|
428
|
4616 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4617 }
|
|
|
4618
|
|
|
4619 xzero (data);
|
|
|
4620 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4621
|
|
|
4622 /* These values are used by all of the rune addition routines. We add
|
|
|
4623 them to this structure for ease of passing. */
|
|
|
4624 data.d = d;
|
|
793
|
4625 data.window = wrap_window (w);
|
|
428
|
4626 data.db = db;
|
|
|
4627 data.dl = dl;
|
|
|
4628
|
|
826
|
4629 data.byte_charpos = byte_start_pos;
|
|
428
|
4630 data.pixpos = dl->bounds.left_in;
|
|
|
4631 data.last_charset = Qunbound;
|
|
|
4632 data.last_findex = default_face;
|
|
|
4633 data.result_str = Qnil;
|
|
|
4634 data.string = disp_string;
|
|
|
4635
|
|
|
4636 /* Set the right boundary adjusting it to take into account any end
|
|
|
4637 glyph. Save the width of the end glyph for later use. */
|
|
|
4638 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4639 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4640
|
|
|
4641 data.cursor_type = NO_CURSOR;
|
|
|
4642 data.cursor_x = -1;
|
|
|
4643
|
|
|
4644 data.start_col = 0;
|
|
|
4645 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4646 the window
|
|
428
|
4647 data.start_col = w->hscroll;
|
|
826
|
4648 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
4649 */
|
|
826
|
4650 data.byte_start_col_enabled = 0;
|
|
428
|
4651 data.hscroll_glyph_width_adjust = 0;
|
|
|
4652
|
|
|
4653 /* We regenerate the line from the very beginning. */
|
|
|
4654 Dynarr_reset (db->runes);
|
|
|
4655
|
|
|
4656 /* Why is this less than or equal and not just less than? If the
|
|
|
4657 starting position is already equal to the maximum we can't add
|
|
|
4658 anything else, right? Wrong. We might still have a newline to
|
|
|
4659 add. A newline can use the room allocated for an end glyph since
|
|
|
4660 if we add it we know we aren't going to be adding any end
|
|
|
4661 glyph. */
|
|
|
4662
|
|
|
4663 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4664 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4665 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4666 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4667 that the loop terminates only when either (a) there is
|
|
|
4668 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4669
|
|
|
4670 #### Also I think you need to ensure that the operation
|
|
|
4671 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4672 can't get interrupted in the middle. If you run off the end
|
|
|
4673 of the line during that operation, then you keep accumulating
|
|
|
4674 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4675 there's a begin glyph at a particular position and attempting
|
|
|
4676 to display that glyph results in window-end being hit and
|
|
|
4677 propagation data being generated, then the character at that
|
|
|
4678 position won't be displayed.
|
|
|
4679
|
|
|
4680 #### See also the comment after the end of this loop, below.
|
|
|
4681 */
|
|
|
4682 while (data.pixpos <= data.max_pixpos)
|
|
|
4683 {
|
|
|
4684 /* #### This check probably should not be necessary. */
|
|
826
|
4685 if (data.byte_charpos > byte_string_zv)
|
|
428
|
4686 {
|
|
|
4687 /* #### urk! More of this lossage! */
|
|
826
|
4688 data.byte_charpos--;
|
|
428
|
4689 goto done;
|
|
|
4690 }
|
|
|
4691
|
|
|
4692 /* Check for face changes. */
|
|
826
|
4693 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
4694 {
|
|
819
|
4695 Lisp_Object last_glyph = Qnil;
|
|
|
4696 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4697 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4698 {
|
|
|
4699 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4700 Dynarr_free (*prop);
|
|
|
4701 *prop = 0;
|
|
|
4702 }
|
|
428
|
4703 /* Now compute the face and begin/end-glyph information. */
|
|
|
4704 data.findex =
|
|
793
|
4705 /* Remember that the extent-fragment routines deal in
|
|
826
|
4706 Bytexpos's. */
|
|
|
4707 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
4708 /* This is somewhat cheesy but the alternative is to
|
|
|
4709 propagate default_face into extent_fragment_update. */
|
|
|
4710 if (data.findex == DEFAULT_INDEX)
|
|
|
4711 data.findex = default_face;
|
|
|
4712
|
|
|
4713 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4714
|
|
826
|
4715 if (data.byte_charpos == data.ef->end)
|
|
428
|
4716 no_more_frags = 1;
|
|
|
4717 }
|
|
|
4718 initial = 0;
|
|
|
4719
|
|
|
4720 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4721 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4722 display then we determine what to do based on the character at the
|
|
|
4723 current buffer position. */
|
|
|
4724
|
|
|
4725 /* If the current position is covered by an invisible extent, do
|
|
|
4726 nothing (except maybe add some ellipses).
|
|
|
4727
|
|
|
4728 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4729 invisible extent should be investigated further. This is
|
|
|
4730 fairly low priority though. */
|
|
|
4731 if (data.ef->invisible)
|
|
|
4732 {
|
|
|
4733 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4734 really know what I'm doing. */
|
|
|
4735 if (*prop)
|
|
|
4736 {
|
|
|
4737 Dynarr_free (*prop);
|
|
|
4738 *prop = 0;
|
|
|
4739 }
|
|
|
4740
|
|
|
4741 /* The extent fragment code only sets this when we should
|
|
|
4742 really display the ellipses. It makes sure the ellipses
|
|
|
4743 don't get displayed more than once in a row. */
|
|
|
4744 if (data.ef->invisible_ellipses)
|
|
|
4745 {
|
|
|
4746 struct glyph_block gb;
|
|
|
4747
|
|
|
4748 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4749 data.ef->invisible_ellipses = 0;
|
|
|
4750 gb.extent = Qnil;
|
|
|
4751 gb.glyph = Vinvisible_text_glyph;
|
|
|
4752 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4753 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4754 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4755 is to display a newline (for compatibility with
|
|
|
4756 selective-display-ellipses)? Maybe that's too
|
|
|
4757 abstruse. */
|
|
|
4758 if (*prop)
|
|
|
4759 goto done;
|
|
|
4760 }
|
|
|
4761
|
|
638
|
4762 /* #### What if we're dealing with a display table? */
|
|
428
|
4763 if (data.start_col)
|
|
|
4764 data.start_col--;
|
|
|
4765
|
|
826
|
4766 if (data.byte_charpos == byte_string_zv)
|
|
428
|
4767 goto done;
|
|
|
4768 else
|
|
826
|
4769 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4770 }
|
|
|
4771
|
|
|
4772 /* If there is propagation data, then it represents the current
|
|
|
4773 buffer position being displayed. Add them and advance the
|
|
|
4774 position counter. This might also add the minibuffer
|
|
|
4775 prompt. */
|
|
|
4776 else if (*prop)
|
|
|
4777 {
|
|
|
4778 dl->used_prop_data = 1;
|
|
|
4779 *prop = add_propagation_runes (prop, &data);
|
|
|
4780
|
|
|
4781 if (*prop)
|
|
|
4782 goto done; /* gee, a really narrow window */
|
|
826
|
4783 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4784 goto done;
|
|
826
|
4785 else if (data.byte_charpos < 0)
|
|
428
|
4786 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
4787 data.byte_charpos = 0;
|
|
428
|
4788 else
|
|
826
|
4789 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4790 }
|
|
|
4791
|
|
|
4792 /* If there are end glyphs, add them to the line. These are
|
|
|
4793 the end glyphs for the previous run of text. We add them
|
|
|
4794 here rather than doing them at the end of handling the
|
|
|
4795 previous run so that glyphs at the beginning and end of
|
|
|
4796 a line are handled correctly. */
|
|
|
4797 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4798 {
|
|
867
|
4799 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4800 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4801
|
|
|
4802 if (*prop) {
|
|
428
|
4803 goto done;
|
|
819
|
4804 }
|
|
428
|
4805 }
|
|
|
4806
|
|
|
4807 /* If there are begin glyphs, add them to the line. */
|
|
|
4808 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4809 {
|
|
867
|
4810 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4811 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4812
|
|
|
4813 if (*prop) {
|
|
428
|
4814 goto done;
|
|
819
|
4815 }
|
|
428
|
4816 }
|
|
|
4817
|
|
|
4818 /* If at end-of-buffer, we've already processed begin and
|
|
|
4819 end-glyphs at this point and there's no text to process,
|
|
|
4820 so we're done. */
|
|
826
|
4821 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4822 goto done;
|
|
|
4823
|
|
|
4824 else
|
|
|
4825 {
|
|
|
4826 Lisp_Object entry = Qnil;
|
|
|
4827 /* Get the character at the current buffer position. */
|
|
867
|
4828 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4829 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4830 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4831
|
|
|
4832 /* If there is a display table entry for it, hand it off to
|
|
|
4833 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4834 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4835 {
|
|
|
4836 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4837
|
|
|
4838 if (*prop)
|
|
|
4839 goto done;
|
|
|
4840 }
|
|
|
4841
|
|
|
4842 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4843 to the line and end this loop. */
|
|
|
4844 else if (data.ch == '\n')
|
|
|
4845 {
|
|
|
4846 /* We aren't going to be adding an end glyph so give its
|
|
|
4847 space back in order to make sure that the cursor can
|
|
|
4848 fit. */
|
|
819
|
4849 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4850 goto done;
|
|
|
4851 }
|
|
|
4852
|
|
|
4853 /* If the current character is considered to be printable, then
|
|
|
4854 just add it. */
|
|
|
4855 else if (data.ch >= printable_min)
|
|
|
4856 {
|
|
867
|
4857 *prop = add_ichar_rune (&data);
|
|
428
|
4858 if (*prop)
|
|
|
4859 goto done;
|
|
|
4860 }
|
|
|
4861
|
|
|
4862 /* If the current character is a tab, determine the next tab
|
|
|
4863 starting position and add a blank rune which extends from the
|
|
|
4864 current pixel position to that starting position. */
|
|
|
4865 else if (data.ch == '\t')
|
|
|
4866 {
|
|
|
4867 int tab_start_pixpos = data.pixpos;
|
|
|
4868 int next_tab_start;
|
|
|
4869 int char_tab_width;
|
|
|
4870 int prop_width = 0;
|
|
|
4871
|
|
|
4872 if (data.start_col > 1)
|
|
|
4873 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4874
|
|
|
4875 next_tab_start =
|
|
|
4876 next_tab_position (w, tab_start_pixpos,
|
|
|
4877 dl->bounds.left_in +
|
|
|
4878 data.hscroll_glyph_width_adjust);
|
|
|
4879 if (next_tab_start > data.max_pixpos)
|
|
|
4880 {
|
|
|
4881 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4882 next_tab_start = data.max_pixpos;
|
|
|
4883 }
|
|
|
4884 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4885 char_tab_width =
|
|
|
4886 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4887
|
|
|
4888 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4889
|
|
|
4890 /* add_blank_rune is only supposed to be called with
|
|
819
|
4891 sizes guaranteed to fit in the available space. */
|
|
428
|
4892 assert (!(*prop));
|
|
|
4893
|
|
|
4894 if (prop_width)
|
|
|
4895 {
|
|
|
4896 struct prop_block pb;
|
|
|
4897 *prop = Dynarr_new (prop_block);
|
|
|
4898
|
|
|
4899 pb.type = PROP_BLANK;
|
|
|
4900 pb.data.p_blank.width = prop_width;
|
|
|
4901 pb.data.p_blank.findex = data.findex;
|
|
|
4902 Dynarr_add (*prop, pb);
|
|
|
4903
|
|
|
4904 goto done;
|
|
|
4905 }
|
|
|
4906 }
|
|
|
4907
|
|
|
4908 /* If character is a control character, pass it off to
|
|
|
4909 add_control_char_runes.
|
|
|
4910
|
|
|
4911 The is_*() routines have undefined results on
|
|
|
4912 arguments outside of the range [-1, 255]. (This
|
|
|
4913 often bites people who carelessly use `char' instead
|
|
|
4914 of `unsigned char'.)
|
|
|
4915 */
|
|
867
|
4916 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
4917 {
|
|
|
4918 *prop = add_control_char_runes (&data, b);
|
|
|
4919
|
|
|
4920 if (*prop)
|
|
|
4921 goto done;
|
|
|
4922 }
|
|
|
4923
|
|
|
4924 /* If the character is above the ASCII range and we have not
|
|
|
4925 already handled it, then print it as an octal number. */
|
|
|
4926 else if (data.ch >= 0200)
|
|
|
4927 {
|
|
|
4928 *prop = add_octal_runes (&data);
|
|
|
4929
|
|
|
4930 if (*prop)
|
|
|
4931 goto done;
|
|
|
4932 }
|
|
|
4933
|
|
|
4934 /* Assume the current character is considered to be printable,
|
|
|
4935 then just add it. */
|
|
|
4936 else
|
|
|
4937 {
|
|
867
|
4938 *prop = add_ichar_rune (&data);
|
|
428
|
4939 if (*prop)
|
|
|
4940 goto done;
|
|
|
4941 }
|
|
|
4942
|
|
826
|
4943 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4944 }
|
|
|
4945 }
|
|
|
4946
|
|
819
|
4947 done:
|
|
428
|
4948
|
|
|
4949 /* Determine the starting point of the next line if we did not hit the
|
|
|
4950 end of the buffer. */
|
|
826
|
4951 if (data.byte_charpos < byte_string_zv)
|
|
428
|
4952 {
|
|
|
4953 /* #### This check is not correct. If the line terminated
|
|
|
4954 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
4955 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
4956 you make the two changes mentioned at the top of this loop,
|
|
|
4957 you should be able to say '(if (*prop))'. That should also
|
|
826
|
4958 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
4959 check. */
|
|
|
4960
|
|
|
4961 /* The common case is that the line ended because we hit a newline.
|
|
|
4962 In that case, the next character is just the next buffer
|
|
|
4963 position. */
|
|
|
4964 if (data.ch == '\n')
|
|
|
4965 {
|
|
826
|
4966 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4967 }
|
|
|
4968
|
|
|
4969 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
4970 line. */
|
|
|
4971 else
|
|
|
4972 {
|
|
|
4973 struct glyph_block gb;
|
|
|
4974 struct glyph_cachel *cachel;
|
|
|
4975
|
|
|
4976 /* If the line is to be truncated then we actually have to look
|
|
|
4977 for the next newline. We also add the end-of-line glyph which
|
|
|
4978 we know will fit because we adjusted the right border before
|
|
|
4979 we starting laying out the line. */
|
|
819
|
4980 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4981 data.findex = default_face;
|
|
|
4982 gb.extent = Qnil;
|
|
|
4983
|
|
|
4984 if (truncate_win)
|
|
|
4985 {
|
|
826
|
4986 Bytecount byte_pos;
|
|
428
|
4987
|
|
|
4988 /* Now find the start of the next line. */
|
|
867
|
4989 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
|
|
826
|
4990 data.byte_charpos, 1);
|
|
428
|
4991
|
|
|
4992 data.cursor_type = NO_CURSOR;
|
|
826
|
4993 data.byte_charpos = byte_pos;
|
|
428
|
4994 gb.glyph = Vtruncation_glyph;
|
|
|
4995 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
4996 }
|
|
|
4997 else
|
|
|
4998 {
|
|
|
4999 /* The cursor can never be on the continuation glyph. */
|
|
|
5000 data.cursor_type = NO_CURSOR;
|
|
|
5001
|
|
826
|
5002 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
5003
|
|
442
|
5004 dl->line_continuation = 1;
|
|
428
|
5005 gb.glyph = Vcontinuation_glyph;
|
|
|
5006 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
5007 }
|
|
|
5008
|
|
819
|
5009 if (data.end_glyph_width)
|
|
428
|
5010 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
5011
|
|
826
|
5012 if (truncate_win && data.byte_charpos == byte_string_zv)
|
|
428
|
5013 {
|
|
867
|
5014 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
|
|
826
|
5015 byte_string_zv);
|
|
867
|
5016 DEC_IBYTEPTR (endb);
|
|
|
5017 if (itext_ichar (endb) != '\n')
|
|
428
|
5018 {
|
|
|
5019 /* #### Damn this losing shit. */
|
|
826
|
5020 data.byte_charpos++;
|
|
428
|
5021 }
|
|
|
5022 }
|
|
|
5023 }
|
|
|
5024 }
|
|
826
|
5025 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
5026 {
|
|
|
5027 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5028 up subwindow display. Since we never have a cursor in the
|
|
|
5029 gutter we can safely ignore it. */
|
|
|
5030 }
|
|
|
5031 /* Calculate left whitespace boundary. */
|
|
|
5032 {
|
|
|
5033 int elt = 0;
|
|
|
5034
|
|
|
5035 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5036 while (elt < Dynarr_length (db->runes))
|
|
|
5037 {
|
|
|
5038 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5039
|
|
|
5040 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5041 || rb->type == RUNE_BLANK)
|
|
|
5042 {
|
|
|
5043 dl->bounds.left_white += rb->width;
|
|
|
5044 elt++;
|
|
|
5045 }
|
|
|
5046 else
|
|
|
5047 elt = Dynarr_length (db->runes);
|
|
|
5048 }
|
|
|
5049 }
|
|
|
5050
|
|
|
5051 /* Calculate right whitespace boundary. */
|
|
|
5052 {
|
|
|
5053 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5054 int done = 0;
|
|
|
5055
|
|
|
5056 while (!done && elt >= 0)
|
|
|
5057 {
|
|
|
5058 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5059
|
|
|
5060 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5061 && isspace (rb->object.chr.ch))
|
|
|
5062 && !rb->type == RUNE_BLANK)
|
|
|
5063 {
|
|
|
5064 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5065 done = 1;
|
|
|
5066 }
|
|
|
5067
|
|
|
5068 elt--;
|
|
|
5069
|
|
|
5070 }
|
|
|
5071
|
|
|
5072 /* The line is blank so everything is considered to be right
|
|
|
5073 whitespace. */
|
|
|
5074 if (!done)
|
|
|
5075 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5076 }
|
|
|
5077
|
|
|
5078 /* Set the display blocks bounds. */
|
|
|
5079 db->start_pos = dl->bounds.left_in;
|
|
|
5080 if (Dynarr_length (db->runes))
|
|
|
5081 {
|
|
|
5082 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5083
|
|
|
5084 db->end_pos = rb->xpos + rb->width;
|
|
|
5085 }
|
|
|
5086 else
|
|
|
5087 db->end_pos = dl->bounds.right_white;
|
|
|
5088
|
|
819
|
5089 calculate_baseline (&data);
|
|
428
|
5090
|
|
|
5091 dl->ascent = data.new_ascent;
|
|
|
5092 dl->descent = data.new_descent;
|
|
|
5093
|
|
|
5094 {
|
|
|
5095 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5096
|
|
|
5097 if (dl->ascent < ascent)
|
|
|
5098 dl->ascent = ascent;
|
|
|
5099 }
|
|
|
5100 {
|
|
|
5101 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5102
|
|
|
5103 if (dl->descent < descent)
|
|
|
5104 dl->descent = descent;
|
|
|
5105 }
|
|
|
5106
|
|
819
|
5107 calculate_yoffset (dl, db);
|
|
|
5108
|
|
428
|
5109 dl->cursor_elt = data.cursor_x;
|
|
|
5110 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
5111 if (data.byte_charpos > byte_string_zv)
|
|
|
5112 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5113 byte_string_zv);
|
|
428
|
5114 else
|
|
826
|
5115 dl->end_charpos =
|
|
|
5116 buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5117 data.byte_charpos) - 1;
|
|
428
|
5118 if (truncate_win)
|
|
434
|
5119 data.dl->num_chars =
|
|
826
|
5120 string_column_at_point (disp_string, dl->end_charpos,
|
|
793
|
5121 b ? XINT (b->tab_width) : 8);
|
|
428
|
5122 else
|
|
|
5123 /* This doesn't correctly take into account tabs and control
|
|
|
5124 characters but if the window isn't being truncated then this
|
|
|
5125 value isn't going to end up being used anyhow. */
|
|
826
|
5126 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
5127
|
|
|
5128 /* #### handle horizontally scrolled line with text none of which
|
|
|
5129 was actually laid out. */
|
|
|
5130
|
|
|
5131 /* #### handle any remainder of overlay arrow */
|
|
|
5132
|
|
|
5133 if (*prop == ADD_FAILED)
|
|
|
5134 *prop = NULL;
|
|
|
5135
|
|
|
5136 if (truncate_win && *prop)
|
|
|
5137 {
|
|
|
5138 Dynarr_free (*prop);
|
|
|
5139 *prop = NULL;
|
|
|
5140 }
|
|
|
5141
|
|
|
5142 extent_fragment_delete (data.ef);
|
|
|
5143
|
|
|
5144 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5145 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5146 The main loop should get fixed so that it isn't necessary to call
|
|
|
5147 this function if we are already at EOB. */
|
|
|
5148
|
|
826
|
5149 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
|
|
793
|
5150 return string_index_byte_to_char (disp_string,
|
|
826
|
5151 data.byte_charpos) + 1; /* Yuck! */
|
|
428
|
5152 else
|
|
826
|
5153 return string_index_byte_to_char (disp_string, data.byte_charpos);
|
|
428
|
5154 }
|
|
|
5155
|
|
|
5156 /* Given a display line and a starting position, ensure that the
|
|
|
5157 contents of the display line accurately represent the visual
|
|
|
5158 representation of the buffer contents starting from the given
|
|
|
5159 position when displayed in the given window. The display line ends
|
|
|
5160 when the contents of the line reach the right boundary of the given
|
|
434
|
5161 window.
|
|
|
5162
|
|
428
|
5163 This is very similar to generate_display_line but with the same
|
|
|
5164 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5165 of fixing the bytebpos stuff though.*/
|
|
|
5166
|
|
|
5167 static Charbpos
|
|
428
|
5168 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5169 struct display_line *dl,
|
|
826
|
5170 Charcount start_pos,
|
|
428
|
5171 prop_block_dynarr **prop,
|
|
|
5172 face_index default_face)
|
|
|
5173 {
|
|
826
|
5174 Charcount ret_charcount;
|
|
428
|
5175
|
|
|
5176 /* you must set bounds before calling this. */
|
|
434
|
5177
|
|
428
|
5178 /* Reset what this line is using. */
|
|
|
5179 if (dl->display_blocks)
|
|
|
5180 Dynarr_reset (dl->display_blocks);
|
|
|
5181 if (dl->left_glyphs)
|
|
|
5182 {
|
|
|
5183 Dynarr_free (dl->left_glyphs);
|
|
|
5184 dl->left_glyphs = 0;
|
|
|
5185 }
|
|
|
5186 if (dl->right_glyphs)
|
|
|
5187 {
|
|
|
5188 Dynarr_free (dl->right_glyphs);
|
|
|
5189 dl->right_glyphs = 0;
|
|
|
5190 }
|
|
|
5191
|
|
|
5192 /* We aren't generating a modeline at the moment. */
|
|
|
5193 dl->modeline = 0;
|
|
|
5194
|
|
|
5195 /* Create a display block for the text region of the line. */
|
|
826
|
5196 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
|
|
|
5197 prop, default_face);
|
|
|
5198 dl->charpos = start_pos;
|
|
|
5199 if (dl->end_charpos < dl->charpos)
|
|
|
5200 dl->end_charpos = dl->charpos;
|
|
428
|
5201
|
|
|
5202 /* If there are left glyphs associated with any character in the
|
|
|
5203 text block, then create a display block to handle them. */
|
|
|
5204 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5205 create_left_glyph_block (w, dl, 0);
|
|
|
5206
|
|
|
5207 /* If there are right glyphs associated with any character in the
|
|
|
5208 text block, then create a display block to handle them. */
|
|
|
5209 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5210 create_right_glyph_block (w, dl);
|
|
|
5211
|
|
826
|
5212 return ret_charcount;
|
|
428
|
5213 }
|
|
|
5214
|
|
|
5215 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5216 loop through elements in the string creating display lines until we
|
|
|
5217 have covered the provided area. Simple really. */
|
|
|
5218 void
|
|
|
5219 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5220 int xpos, int ypos, int width, int height,
|
|
|
5221 display_line_dynarr* dla,
|
|
826
|
5222 Charcount start_pos,
|
|
428
|
5223 face_index default_face)
|
|
|
5224 {
|
|
|
5225 int yend = ypos + height;
|
|
|
5226 Charcount s_zv;
|
|
|
5227
|
|
|
5228 prop_block_dynarr *prop = 0;
|
|
|
5229 layout_bounds bounds;
|
|
|
5230 assert (dla);
|
|
|
5231
|
|
|
5232 Dynarr_reset (dla);
|
|
|
5233 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5234 there is something to do. */
|
|
|
5235 if (NILP (disp_string))
|
|
|
5236 return;
|
|
|
5237
|
|
826
|
5238 s_zv = string_char_length (disp_string);
|
|
428
|
5239
|
|
|
5240 bounds.left_out = xpos;
|
|
|
5241 bounds.right_out = xpos + width;
|
|
|
5242 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5243 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5244 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5245 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5246 depend on the contents of the line being displayed. */
|
|
|
5247 bounds.left_white = bounds.left_in;
|
|
|
5248 bounds.right_white = bounds.right_in;
|
|
|
5249
|
|
|
5250 while (ypos < yend)
|
|
|
5251 {
|
|
|
5252 struct display_line dl;
|
|
|
5253 struct display_line *dlp;
|
|
826
|
5254 Charcount next_pos;
|
|
428
|
5255 int local;
|
|
851
|
5256 int pos_of_dlp = -1;
|
|
428
|
5257
|
|
|
5258 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5259 {
|
|
851
|
5260 pos_of_dlp = Dynarr_length (dla);
|
|
|
5261 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5262 local = 0;
|
|
|
5263 }
|
|
|
5264 else
|
|
|
5265 {
|
|
|
5266
|
|
|
5267 xzero (dl);
|
|
|
5268 dlp = &dl;
|
|
|
5269 local = 1;
|
|
|
5270 }
|
|
|
5271
|
|
|
5272 dlp->bounds = bounds;
|
|
|
5273 dlp->offset = 0;
|
|
|
5274 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5275 &prop, default_face);
|
|
|
5276 /* we need to make sure that we continue along the line if there
|
|
|
5277 is more left to display otherwise we just end up redisplaying
|
|
|
5278 the same chunk over and over again. */
|
|
|
5279 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5280 start_pos++;
|
|
|
5281 else
|
|
|
5282 start_pos = next_pos;
|
|
|
5283
|
|
|
5284 dlp->ypos = ypos + dlp->ascent;
|
|
|
5285 ypos = dlp->ypos + dlp->descent;
|
|
|
5286
|
|
|
5287 if (ypos > yend)
|
|
|
5288 {
|
|
|
5289 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5290
|
|
|
5291 dlp->clip = (ypos - yend);
|
|
|
5292 visible_height -= dlp->clip;
|
|
|
5293
|
|
|
5294 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5295 {
|
|
|
5296 if (local)
|
|
|
5297 free_display_line (dlp);
|
|
|
5298 break;
|
|
|
5299 }
|
|
|
5300 }
|
|
|
5301 else
|
|
|
5302 dlp->clip = 0;
|
|
|
5303
|
|
851
|
5304 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5305 Dynarr_add (dla, *dlp);
|
|
|
5306
|
|
|
5307 /* #### This type of check needs to be done down in the
|
|
|
5308 generate_display_line call. */
|
|
|
5309 if (start_pos >= s_zv)
|
|
|
5310 break;
|
|
|
5311 }
|
|
|
5312
|
|
|
5313 if (prop)
|
|
|
5314 Dynarr_free (prop);
|
|
|
5315 }
|
|
|
5316
|
|
|
5317
|
|
|
5318 /***************************************************************************/
|
|
|
5319 /* */
|
|
|
5320 /* window-regeneration routines */
|
|
|
5321 /* */
|
|
|
5322 /***************************************************************************/
|
|
|
5323
|
|
|
5324 /* For a given window and starting position in the buffer it contains,
|
|
|
5325 ensure that the TYPE display lines accurately represent the
|
|
|
5326 presentation of the window. We pass the buffer instead of getting
|
|
|
5327 it from the window since redisplay_window may have temporarily
|
|
|
5328 changed it to the echo area buffer. */
|
|
|
5329
|
|
|
5330 static void
|
|
665
|
5331 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5332 {
|
|
|
5333 struct frame *f = XFRAME (w->frame);
|
|
|
5334 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5335 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5336 int yend; /* set farther down */
|
|
|
5337 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5338 int force;
|
|
428
|
5339
|
|
|
5340 prop_block_dynarr *prop;
|
|
|
5341 layout_bounds bounds;
|
|
|
5342 display_line_dynarr *dla;
|
|
|
5343 int need_modeline;
|
|
|
5344
|
|
|
5345 /* The lines had better exist by this point. */
|
|
|
5346 if (!(dla = window_display_lines (w, type)))
|
|
|
5347 abort ();
|
|
|
5348 Dynarr_reset (dla);
|
|
|
5349 w->max_line_len = 0;
|
|
|
5350
|
|
|
5351 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5352 for this function to get called from some other points where that
|
|
|
5353 update may not have occurred. This acts as a safety check. */
|
|
|
5354 if (!Dynarr_length (w->face_cachels))
|
|
|
5355 reset_face_cachels (w);
|
|
|
5356 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5357 reset_glyph_cachels (w);
|
|
|
5358
|
|
|
5359 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5360 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5361 w->last_point_x[type] = -1;
|
|
|
5362 w->last_point_y[type] = -1;
|
|
|
5363
|
|
|
5364 /* Make sure a modeline is in the structs if needed. */
|
|
|
5365 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5366
|
|
|
5367 /* Wait until here to set this so that the structs have a modeline
|
|
|
5368 generated in the case where one didn't exist. */
|
|
|
5369 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5370
|
|
|
5371 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5372
|
|
|
5373 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5374 if (MINI_WINDOW_P (w)
|
|
|
5375 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5376 && !echo_area_active (f)
|
|
|
5377 && start_pos == BUF_BEGV (b))
|
|
|
5378 {
|
|
|
5379 struct prop_block pb;
|
|
|
5380 Lisp_Object string;
|
|
|
5381 prop = Dynarr_new (prop_block);
|
|
|
5382
|
|
|
5383 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5384 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5385 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5386 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5387 Dynarr_add (prop, pb);
|
|
|
5388 }
|
|
|
5389 else
|
|
|
5390 prop = 0;
|
|
|
5391
|
|
442
|
5392 /* When we are computing things for scrolling purposes, make
|
|
|
5393 sure at least one line is always generated */
|
|
|
5394 force = (type == CMOTION_DISP);
|
|
|
5395
|
|
|
5396 /* Make sure this is set always */
|
|
|
5397 /* Note the conversion at end */
|
|
|
5398 w->window_end_pos[type] = start_pos;
|
|
|
5399 while (ypos < yend || force)
|
|
428
|
5400 {
|
|
|
5401 struct display_line dl;
|
|
|
5402 struct display_line *dlp;
|
|
|
5403 int local;
|
|
851
|
5404 int pos_of_dlp = -1;
|
|
428
|
5405
|
|
|
5406 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5407 {
|
|
851
|
5408 pos_of_dlp = Dynarr_length (dla);
|
|
|
5409 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5410 local = 0;
|
|
|
5411 }
|
|
|
5412 else
|
|
|
5413 {
|
|
|
5414
|
|
|
5415 xzero (dl);
|
|
|
5416 dlp = &dl;
|
|
|
5417 local = 1;
|
|
|
5418 }
|
|
|
5419
|
|
|
5420 dlp->bounds = bounds;
|
|
|
5421 dlp->offset = 0;
|
|
|
5422 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
|
5423
|
|
|
5424 if (yclip > dlp->ascent)
|
|
|
5425 {
|
|
|
5426 /* this should never happen, but if it does just display the
|
|
|
5427 whole line */
|
|
|
5428 yclip = 0;
|
|
|
5429 }
|
|
|
5430
|
|
|
5431 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5432 ypos = dlp->ypos + dlp->descent;
|
|
|
5433
|
|
|
5434 /* See if we've been asked to start midway through a line, for
|
|
|
5435 partial display line scrolling. */
|
|
434
|
5436 if (yclip)
|
|
428
|
5437 {
|
|
|
5438 dlp->top_clip = yclip;
|
|
|
5439 yclip = 0;
|
|
|
5440 }
|
|
|
5441 else
|
|
|
5442 dlp->top_clip = 0;
|
|
|
5443
|
|
|
5444 if (ypos > yend)
|
|
|
5445 {
|
|
|
5446 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5447
|
|
|
5448 dlp->clip = (ypos - yend);
|
|
|
5449 /* Although this seems strange we could have a single very
|
|
|
5450 tall line visible for which we need to account for both
|
|
|
5451 the top clip and the bottom clip. */
|
|
|
5452 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5453
|
|
442
|
5454 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5455 {
|
|
|
5456 if (local)
|
|
|
5457 free_display_line (dlp);
|
|
|
5458 break;
|
|
|
5459 }
|
|
|
5460 }
|
|
|
5461 else
|
|
|
5462 dlp->clip = 0;
|
|
|
5463
|
|
|
5464 if (dlp->cursor_elt != -1)
|
|
|
5465 {
|
|
|
5466 /* #### This check is steaming crap. Have to get things
|
|
|
5467 fixed so when create_text_block hits EOB, we're done,
|
|
|
5468 period. */
|
|
|
5469 if (w->last_point_x[type] == -1)
|
|
|
5470 {
|
|
|
5471 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5472 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5473 }
|
|
|
5474 else
|
|
|
5475 {
|
|
|
5476 /* #### This means that we've added a cursor at EOB
|
|
|
5477 twice. Yuck oh yuck. */
|
|
|
5478 struct display_block *db =
|
|
|
5479 get_display_block_from_line (dlp, TEXT);
|
|
|
5480
|
|
|
5481 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5482 dlp->cursor_elt = -1;
|
|
|
5483 }
|
|
|
5484 }
|
|
|
5485
|
|
|
5486 if (dlp->num_chars > w->max_line_len)
|
|
|
5487 w->max_line_len = dlp->num_chars;
|
|
|
5488
|
|
851
|
5489 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5490 Dynarr_add (dla, *dlp);
|
|
|
5491
|
|
|
5492 /* #### This isn't right, but it is close enough for now. */
|
|
|
5493 w->window_end_pos[type] = start_pos;
|
|
|
5494
|
|
|
5495 /* #### This type of check needs to be done down in the
|
|
|
5496 generate_display_line call. */
|
|
|
5497 if (start_pos > BUF_ZV (b))
|
|
|
5498 break;
|
|
442
|
5499
|
|
|
5500 force = 0;
|
|
428
|
5501 }
|
|
|
5502
|
|
|
5503 if (prop)
|
|
|
5504 Dynarr_free (prop);
|
|
|
5505
|
|
|
5506 /* #### More not quite right, but close enough. */
|
|
442
|
5507 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5508 as the number of characters between the window end and the
|
|
|
5509 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5510 the justification for this?
|
|
|
5511
|
|
|
5512 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5513 that can change. This representation allows initalizing with 0.
|
|
|
5514 */
|
|
428
|
5515 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5516
|
|
|
5517 if (need_modeline)
|
|
|
5518 {
|
|
|
5519 /* We know that this is the right thing to use because we put it
|
|
|
5520 there when we first started working in this function. */
|
|
|
5521 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5522 }
|
|
|
5523 }
|
|
|
5524
|
|
826
|
5525 #define REGEN_INC_FIND_START_END \
|
|
|
5526 do { \
|
|
|
5527 /* Determine start and end of lines. */ \
|
|
|
5528 if (!Dynarr_length (cdla)) \
|
|
|
5529 return 0; \
|
|
|
5530 else \
|
|
|
5531 { \
|
|
428
|
5532 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
826
|
5533 { \
|
|
|
5534 dla_start = 1; \
|
|
|
5535 } \
|
|
|
5536 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5537 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5538 { \
|
|
|
5539 dla_start = 0; \
|
|
|
5540 } \
|
|
|
5541 else \
|
|
|
5542 abort (); /* structs differ */ \
|
|
|
5543 \
|
|
|
5544 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5545 } \
|
|
|
5546 \
|
|
|
5547 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
|
|
|
5548 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5549 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5550 full regen. */ \
|
|
|
5551 if (startp != start_pos) \
|
|
|
5552 return 0; \
|
|
|
5553 \
|
|
|
5554 /* Point is outside the visible region so give up. */ \
|
|
|
5555 if (pointm < start_pos) \
|
|
|
5556 return 0; \
|
|
|
5557 \
|
|
428
|
5558 } while (0)
|
|
|
5559
|
|
|
5560 /* This attempts to incrementally update the display structures. It
|
|
|
5561 returns a boolean indicating success or failure. This function is
|
|
|
5562 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5563 called from that function. However, because of the nature of the
|
|
|
5564 changes it deals with it sometimes makes different assumptions
|
|
|
5565 which can lead to success which are much more difficult to make
|
|
|
5566 when dealing with buffer changes. */
|
|
|
5567
|
|
|
5568 static int
|
|
665
|
5569 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5570 Charbpos pointm,
|
|
428
|
5571 Charcount beg_unchanged,
|
|
|
5572 Charcount end_unchanged)
|
|
|
5573 {
|
|
|
5574 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5575 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5576 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5577
|
|
|
5578 int dla_start = 0;
|
|
|
5579 int dla_end, line;
|
|
|
5580 int first_line, last_line;
|
|
665
|
5581 Charbpos start_pos;
|
|
428
|
5582 /* Don't define this in the loop where it is used because we
|
|
|
5583 definitely want its value to survive between passes. */
|
|
|
5584 prop_block_dynarr *prop = NULL;
|
|
|
5585
|
|
|
5586 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5587 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5588 under which this can happen, but I believe that it is probably a
|
|
|
5589 reasonable happening. */
|
|
|
5590 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5591 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5592 return 0;
|
|
|
5593
|
|
|
5594 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5595 go ahead and proceed with the optimization attempt. */
|
|
|
5596 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5597 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5598 {
|
|
|
5599 struct frame *f = XFRAME (w->frame);
|
|
|
5600 struct device *d = XDEVICE (f->device);
|
|
|
5601 struct frame *sel_f = device_selected_frame (d);
|
|
|
5602 int success = 0;
|
|
|
5603
|
|
|
5604 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5605 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5606 {
|
|
|
5607
|
|
|
5608 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5609 {
|
|
|
5610 /* Always regenerate the modeline in case it is
|
|
|
5611 displaying the current line or column. */
|
|
|
5612 regenerate_modeline (w);
|
|
|
5613 success = 1;
|
|
|
5614 }
|
|
|
5615 }
|
|
|
5616 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5617 {
|
|
|
5618 if (f->modeline_changed)
|
|
|
5619 regenerate_modeline (w);
|
|
|
5620 success = 1;
|
|
|
5621 }
|
|
|
5622
|
|
|
5623 if (!success)
|
|
|
5624 return 0;
|
|
|
5625 }
|
|
|
5626
|
|
|
5627 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5628 return 1;
|
|
|
5629
|
|
|
5630 /* assert: There are no buffer modifications or they are all below the
|
|
|
5631 visible region. We assume that regenerate_window_incrementally has
|
|
|
5632 not called us unless this is true. */
|
|
|
5633
|
|
|
5634 REGEN_INC_FIND_START_END;
|
|
|
5635
|
|
|
5636 /* If the changed are starts before the visible area, give up. */
|
|
|
5637 if (beg_unchanged < startp)
|
|
|
5638 return 0;
|
|
|
5639
|
|
|
5640 /* Find what display line the extent changes first affect. */
|
|
|
5641 line = dla_start;
|
|
|
5642 while (line <= dla_end)
|
|
|
5643 {
|
|
|
5644 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5645 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5646 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5647
|
|
|
5648 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5649 break;
|
|
|
5650
|
|
|
5651 line++;
|
|
|
5652 }
|
|
|
5653
|
|
|
5654 /* If the changes are below the visible area then if point hasn't
|
|
|
5655 moved return success otherwise fail in order to be safe. */
|
|
|
5656 if (line > dla_end)
|
|
|
5657 {
|
|
|
5658 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5659 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5660 return 1;
|
|
|
5661 else
|
|
|
5662 return 0;
|
|
|
5663 }
|
|
|
5664
|
|
|
5665 /* At this point we know what line the changes first affect. We now
|
|
|
5666 begin redrawing lines as long as we are still in the affected
|
|
|
5667 region and the line's size and positioning don't change.
|
|
|
5668 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5669 structs which could lead to an assertion failure. However, if we
|
|
|
5670 fail the next thing that is going to happen is a full regen so we
|
|
|
5671 will actually end up being safe. */
|
|
|
5672 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5673 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5674 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5675 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5676
|
|
|
5677 first_line = last_line = line;
|
|
|
5678 while (line <= dla_end)
|
|
|
5679 {
|
|
665
|
5680 Charbpos old_start, old_end, new_start;
|
|
428
|
5681 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5682 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5683 struct display_block *db;
|
|
|
5684 int initial_size;
|
|
|
5685
|
|
826
|
5686 assert (cdl->charpos == ddl->charpos);
|
|
|
5687 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5688 assert (cdl->offset == ddl->offset);
|
|
|
5689
|
|
|
5690 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5691 initial_size = Dynarr_length (db->runes);
|
|
826
|
5692 old_start = ddl->charpos + ddl->offset;
|
|
|
5693 old_end = ddl->end_charpos + ddl->offset;
|
|
428
|
5694
|
|
|
5695 /* If this is the first line being updated and it used
|
|
|
5696 propagation data, fail. Otherwise we'll be okay because
|
|
|
5697 we'll have the necessary propagation data. */
|
|
|
5698 if (line == first_line && ddl->used_prop_data)
|
|
|
5699 return 0;
|
|
|
5700
|
|
826
|
5701 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5702 &prop, DESIRED_DISP);
|
|
|
5703 ddl->offset = 0;
|
|
|
5704
|
|
|
5705 /* #### If there is propagated stuff the fail. We could
|
|
|
5706 probably actually deal with this if the line had propagated
|
|
|
5707 information when originally created by a full
|
|
|
5708 regeneration. */
|
|
|
5709 if (prop)
|
|
|
5710 {
|
|
|
5711 Dynarr_free (prop);
|
|
|
5712 return 0;
|
|
|
5713 }
|
|
|
5714
|
|
|
5715 /* If any line position parameters have changed or a
|
|
|
5716 cursor has disappeared or disappeared, fail. */
|
|
|
5717 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5718 if (cdl->ypos != ddl->ypos
|
|
|
5719 || cdl->ascent != ddl->ascent
|
|
|
5720 || cdl->descent != ddl->descent
|
|
|
5721 || cdl->top_clip != ddl->top_clip
|
|
|
5722 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5723 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
826
|
5724 || old_start != ddl->charpos
|
|
|
5725 || old_end != ddl->end_charpos
|
|
428
|
5726 || initial_size != Dynarr_length (db->runes))
|
|
|
5727 {
|
|
|
5728 return 0;
|
|
|
5729 }
|
|
|
5730
|
|
|
5731 if (ddl->cursor_elt != -1)
|
|
|
5732 {
|
|
|
5733 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5734 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5735 }
|
|
|
5736
|
|
|
5737 last_line = line;
|
|
|
5738
|
|
|
5739 /* If the extent changes end on the line we just updated then
|
|
|
5740 we're done. Otherwise go on to the next line. */
|
|
826
|
5741 if (end_unchanged <= ddl->end_charpos)
|
|
428
|
5742 break;
|
|
|
5743 else
|
|
|
5744 line++;
|
|
|
5745 }
|
|
|
5746
|
|
|
5747 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5748 return 1;
|
|
|
5749 }
|
|
|
5750
|
|
|
5751 /* Attempt to update the display data structures based on knowledge of
|
|
|
5752 the changed region in the buffer. Returns a boolean indicating
|
|
|
5753 success or failure. If this function returns a failure then a
|
|
|
5754 regenerate_window _must_ be performed next in order to maintain
|
|
|
5755 invariants located here. */
|
|
|
5756
|
|
|
5757 static int
|
|
665
|
5758 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5759 Charbpos pointm)
|
|
428
|
5760 {
|
|
|
5761 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5762 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5763 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5764 Charcount beg_unchanged, end_unchanged;
|
|
|
5765 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5766
|
|
|
5767 int dla_start = 0;
|
|
|
5768 int dla_end, line;
|
|
665
|
5769 Charbpos start_pos;
|
|
428
|
5770
|
|
|
5771 /* If this function is called, the current and desired structures
|
|
|
5772 had better be identical. If they are not, then that is a bug. */
|
|
|
5773 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5774
|
|
|
5775 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5776 screws us up. */
|
|
|
5777 if (MINI_WINDOW_P (w))
|
|
|
5778 return 0;
|
|
|
5779
|
|
|
5780 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
5781 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
5782 ? -1
|
|
|
5783 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
5784
|
|
|
5785 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
5786 and succeed. */
|
|
|
5787 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
5788 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5789 extent_beg_unchanged,
|
|
|
5790 extent_end_unchanged);
|
|
|
5791
|
|
|
5792 /* We can't deal with deleted newlines. */
|
|
|
5793 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
5794 return 0;
|
|
|
5795
|
|
|
5796 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
5797 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
5798 ? -1
|
|
|
5799 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
5800
|
|
|
5801 REGEN_INC_FIND_START_END;
|
|
|
5802
|
|
|
5803 /* If the changed area starts before the visible area, give up. */
|
|
|
5804 if (beg_unchanged < startp)
|
|
|
5805 return 0;
|
|
|
5806
|
|
|
5807 /* Find what display line the buffer changes first affect. */
|
|
|
5808 line = dla_start;
|
|
|
5809 while (line <= dla_end)
|
|
|
5810 {
|
|
|
5811 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5812 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5813 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5814
|
|
|
5815 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5816 break;
|
|
|
5817
|
|
|
5818 line++;
|
|
|
5819 }
|
|
|
5820
|
|
|
5821 /* If the changes are below the visible area then if point hasn't
|
|
|
5822 moved return success otherwise fail in order to be safe. */
|
|
|
5823 if (line > dla_end)
|
|
|
5824 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5825 extent_beg_unchanged,
|
|
|
5826 extent_end_unchanged);
|
|
|
5827 else
|
|
|
5828 /* At this point we know what line the changes first affect. We
|
|
|
5829 now redraw that line. If the changes are contained within it
|
|
|
5830 we are going to succeed and can update just that one line.
|
|
|
5831 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5832 structs which could lead to an assertion failure. However, if
|
|
|
5833 we fail the next thing that is going to happen is a full regen
|
|
|
5834 so we will actually end up being safe. */
|
|
|
5835 {
|
|
665
|
5836 Charbpos new_start;
|
|
428
|
5837 prop_block_dynarr *prop = NULL;
|
|
|
5838 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5839 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5840
|
|
826
|
5841 assert (cdl->charpos == ddl->charpos);
|
|
|
5842 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5843 assert (cdl->offset == ddl->offset);
|
|
|
5844
|
|
442
|
5845 /* If the line continues to next display line, fail. */
|
|
|
5846 if (ddl->line_continuation)
|
|
|
5847 return 0;
|
|
428
|
5848
|
|
|
5849 /* If the line was generated using propagation data, fail. */
|
|
|
5850 if (ddl->used_prop_data)
|
|
|
5851 return 0;
|
|
|
5852
|
|
826
|
5853 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5854 &prop, DESIRED_DISP);
|
|
|
5855 ddl->offset = 0;
|
|
|
5856
|
|
|
5857 /* If there is propagated stuff then it is pretty much a
|
|
|
5858 guarantee that more than just the one line is affected. */
|
|
|
5859 if (prop)
|
|
|
5860 {
|
|
|
5861 Dynarr_free (prop);
|
|
|
5862 return 0;
|
|
|
5863 }
|
|
|
5864
|
|
442
|
5865 /* If the line continues to next display line, fail. */
|
|
|
5866 if (ddl->line_continuation)
|
|
|
5867 return 0;
|
|
428
|
5868
|
|
|
5869 /* If any line position parameters have changed or a
|
|
|
5870 cursor has disappeared or disappeared, fail. */
|
|
|
5871 if (cdl->ypos != ddl->ypos
|
|
|
5872 || cdl->ascent != ddl->ascent
|
|
|
5873 || cdl->descent != ddl->descent
|
|
|
5874 || cdl->top_clip != ddl->top_clip
|
|
|
5875 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5876 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
5877 {
|
|
|
5878 return 0;
|
|
|
5879 }
|
|
|
5880
|
|
|
5881 /* If the changed area also ends on this line, then we may be in
|
|
|
5882 business. Update everything and return success. */
|
|
826
|
5883 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
|
|
428
|
5884 {
|
|
|
5885 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5886 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5887 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
5888 w->buffer);
|
|
|
5889 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
5890 w->buffer);
|
|
|
5891
|
|
|
5892 if (ddl->cursor_elt != -1)
|
|
|
5893 {
|
|
|
5894 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5895 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5896 }
|
|
|
5897
|
|
|
5898 redisplay_update_line (w, line, line, 1);
|
|
|
5899 regenerate_modeline (w);
|
|
|
5900
|
|
|
5901 /* #### For now we just flush the cache until this has been
|
|
|
5902 tested. After that is done, this should correct the
|
|
|
5903 cache directly. */
|
|
|
5904 Dynarr_reset (w->line_start_cache);
|
|
|
5905
|
|
|
5906 /* Adjust the extent changed boundaries to remove any
|
|
|
5907 overlap with the buffer changes since we've just
|
|
|
5908 successfully updated that area. */
|
|
|
5909 if (extent_beg_unchanged != -1
|
|
|
5910 && extent_beg_unchanged >= beg_unchanged
|
|
|
5911 && extent_beg_unchanged < end_unchanged)
|
|
|
5912 extent_beg_unchanged = end_unchanged;
|
|
|
5913
|
|
|
5914 if (extent_end_unchanged != -1
|
|
|
5915 && extent_end_unchanged >= beg_unchanged
|
|
|
5916 && extent_end_unchanged < end_unchanged)
|
|
|
5917 extent_end_unchanged = beg_unchanged - 1;
|
|
|
5918
|
|
|
5919 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
5920 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
5921
|
|
|
5922 /* This could lead to odd results if it fails, but since the
|
|
|
5923 buffer changes update succeeded this probably will to.
|
|
|
5924 We already know that the extent changes start at or after
|
|
|
5925 the line because we checked before entering the loop. */
|
|
|
5926 if (extent_beg_unchanged != -1
|
|
|
5927 && extent_end_unchanged != -1
|
|
826
|
5928 && ((extent_beg_unchanged < ddl->charpos)
|
|
|
5929 || (extent_end_unchanged > ddl->end_charpos)))
|
|
428
|
5930 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5931 extent_beg_unchanged,
|
|
|
5932 extent_end_unchanged);
|
|
|
5933 else
|
|
|
5934 return 1;
|
|
|
5935 }
|
|
|
5936 }
|
|
|
5937
|
|
|
5938 /* Oh, well. */
|
|
|
5939 return 0;
|
|
|
5940 }
|
|
|
5941
|
|
|
5942 /* Given a window and a point, update the given display lines such
|
|
|
5943 that point is displayed in the middle of the window.
|
|
|
5944 Return the window's new start position. */
|
|
|
5945
|
|
665
|
5946 static Charbpos
|
|
|
5947 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
5948 {
|
|
665
|
5949 Charbpos startp;
|
|
428
|
5950
|
|
|
5951 /* We need to make sure that the modeline is generated so that the
|
|
|
5952 window height can be calculated correctly. */
|
|
|
5953 ensure_modeline_generated (w, type);
|
|
|
5954
|
|
|
5955 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
5956 regenerate_window (w, startp, point, type);
|
|
|
5957 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
5958
|
|
|
5959 return startp;
|
|
|
5960 }
|
|
|
5961
|
|
|
5962 /* Given a window and a set of display lines, return a boolean
|
|
|
5963 indicating whether the given point is contained within. */
|
|
|
5964
|
|
|
5965 static int
|
|
665
|
5966 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
5967 {
|
|
|
5968 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5969 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
5970 int first_line;
|
|
|
5971
|
|
|
5972 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
5973 first_line = 1;
|
|
|
5974 else
|
|
|
5975 first_line = 0;
|
|
|
5976
|
|
|
5977 if (Dynarr_length (dla) > first_line)
|
|
|
5978 {
|
|
665
|
5979 Charbpos start, end;
|
|
428
|
5980 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
5981
|
|
826
|
5982 start = dl->charpos;
|
|
428
|
5983 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
5984
|
|
|
5985 if (point >= start && point <= end)
|
|
|
5986 {
|
|
|
5987 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
5988 {
|
|
|
5989 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
5990
|
|
826
|
5991 if (point >= (dl->charpos + dl->offset)
|
|
|
5992 && point <= (dl->end_charpos + dl->offset))
|
|
428
|
5993 return !dl->clip;
|
|
|
5994 else
|
|
|
5995 return 1;
|
|
|
5996 }
|
|
|
5997 else
|
|
|
5998 return 1;
|
|
|
5999 }
|
|
|
6000 else
|
|
|
6001 return 0;
|
|
|
6002 }
|
|
|
6003 else
|
|
|
6004 return 0;
|
|
|
6005 }
|
|
|
6006
|
|
|
6007 /* Return pixel position the middle of the window, not including the
|
|
|
6008 modeline and any potential horizontal scrollbar. */
|
|
|
6009
|
|
|
6010 int
|
|
|
6011 window_half_pixpos (struct window *w)
|
|
|
6012 {
|
|
|
6013 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
6014 }
|
|
|
6015
|
|
|
6016 /* Return the display line which is currently in the middle of the
|
|
|
6017 window W for display lines TYPE. */
|
|
|
6018
|
|
|
6019 int
|
|
665
|
6020 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6021 {
|
|
|
6022 display_line_dynarr *dla;
|
|
|
6023 int half;
|
|
|
6024 int elt;
|
|
|
6025 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
6026
|
|
|
6027 if (type == CMOTION_DISP)
|
|
|
6028 regenerate_window (w, start, point, type);
|
|
|
6029
|
|
|
6030 dla = window_display_lines (w, type);
|
|
|
6031 half = window_half_pixpos (w);
|
|
|
6032
|
|
|
6033 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6034 {
|
|
|
6035 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6036 int line_bot = dl->ypos + dl->descent;
|
|
|
6037
|
|
|
6038 if (line_bot > half)
|
|
|
6039 return elt;
|
|
|
6040 }
|
|
|
6041
|
|
|
6042 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6043 being displayed. */
|
|
|
6044 return -1;
|
|
|
6045 }
|
|
|
6046
|
|
|
6047 /* Return a value for point that would place it at the beginning of
|
|
|
6048 the line which is in the middle of the window. */
|
|
|
6049
|
|
665
|
6050 Charbpos
|
|
|
6051 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6052 {
|
|
|
6053 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6054 int line = line_at_center (w, type, start, point);
|
|
|
6055
|
|
|
6056 if (line == -1)
|
|
|
6057 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6058 else
|
|
|
6059 {
|
|
|
6060 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6061 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6062
|
|
826
|
6063 return dl->charpos;
|
|
428
|
6064 }
|
|
|
6065 }
|
|
|
6066
|
|
|
6067 /* For a given window, ensure that the current visual representation
|
|
|
6068 is accurate. */
|
|
|
6069
|
|
|
6070 static void
|
|
|
6071 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6072 {
|
|
|
6073 struct window *w = XWINDOW (window);
|
|
|
6074 struct frame *f = XFRAME (w->frame);
|
|
|
6075 struct device *d = XDEVICE (f->device);
|
|
|
6076 Lisp_Object old_buffer = w->buffer;
|
|
|
6077 Lisp_Object the_buffer = w->buffer;
|
|
|
6078 struct buffer *b;
|
|
|
6079 int echo_active = 0;
|
|
|
6080 int startp = 1;
|
|
|
6081 int pointm;
|
|
|
6082 int old_startp = 1;
|
|
|
6083 int old_pointm = 1;
|
|
|
6084 int selected_in_its_frame;
|
|
|
6085 int selected_globally;
|
|
|
6086 int skip_output = 0;
|
|
|
6087 int truncation_changed;
|
|
|
6088 int inactive_minibuffer =
|
|
|
6089 (MINI_WINDOW_P (w) &&
|
|
|
6090 (f != device_selected_frame (d)) &&
|
|
|
6091 !is_surrogate_for_selected_frame (f));
|
|
|
6092
|
|
|
6093 /* #### In the new world this function actually does a bunch of
|
|
|
6094 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6095 implemented yet. */
|
|
|
6096
|
|
|
6097 /* If this is a combination window, do its children; that's all.
|
|
|
6098 The selected window is always a leaf so we don't check for
|
|
|
6099 skip_selected here. */
|
|
|
6100 if (!NILP (w->vchild))
|
|
|
6101 {
|
|
|
6102 redisplay_windows (w->vchild, skip_selected);
|
|
|
6103 return;
|
|
|
6104 }
|
|
|
6105 if (!NILP (w->hchild))
|
|
|
6106 {
|
|
|
6107 redisplay_windows (w->hchild, skip_selected);
|
|
|
6108 return;
|
|
|
6109 }
|
|
|
6110
|
|
|
6111 /* Is this window the selected window on its frame? */
|
|
|
6112 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6113 selected_globally =
|
|
|
6114 selected_in_its_frame &&
|
|
|
6115 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6116 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6117 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6118 if (skip_selected && selected_in_its_frame)
|
|
|
6119 return;
|
|
|
6120
|
|
|
6121 /* It is possible that the window is not fully initialized yet. */
|
|
|
6122 if (NILP (w->buffer))
|
|
|
6123 return;
|
|
|
6124
|
|
|
6125 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6126 {
|
|
|
6127 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6128 echo_active = 1;
|
|
|
6129 }
|
|
|
6130
|
|
|
6131 b = XBUFFER (w->buffer);
|
|
|
6132
|
|
|
6133 if (echo_active)
|
|
|
6134 {
|
|
|
6135 old_pointm = selected_globally
|
|
|
6136 ? BUF_PT (b)
|
|
|
6137 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6138 pointm = 1;
|
|
|
6139 }
|
|
|
6140 else
|
|
|
6141 {
|
|
|
6142 if (selected_globally)
|
|
|
6143 {
|
|
|
6144 pointm = BUF_PT (b);
|
|
|
6145 }
|
|
|
6146 else
|
|
|
6147 {
|
|
|
6148 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6149
|
|
|
6150 if (pointm < BUF_BEGV (b))
|
|
|
6151 pointm = BUF_BEGV (b);
|
|
|
6152 else if (pointm > BUF_ZV (b))
|
|
|
6153 pointm = BUF_ZV (b);
|
|
|
6154 }
|
|
|
6155 }
|
|
|
6156 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6157
|
|
|
6158 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6159 cache elements. */
|
|
|
6160 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6161 || !Dynarr_length (w->face_cachels)
|
|
|
6162 || f->faces_changed)
|
|
|
6163 reset_face_cachels (w);
|
|
|
6164 else
|
|
|
6165 mark_face_cachels_as_not_updated (w);
|
|
|
6166
|
|
|
6167 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6168 the cache purely because glyphs have changed - this is now
|
|
|
6169 handled by the dirty flag.*/
|
|
|
6170 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6171 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6172 reset_glyph_cachels (w);
|
|
|
6173 else
|
|
|
6174 mark_glyph_cachels_as_not_updated (w);
|
|
|
6175
|
|
|
6176 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6177 to find a new starting position. */
|
|
|
6178 if (!MINI_WINDOW_P (w)
|
|
|
6179 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6180 {
|
|
|
6181 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6182
|
|
|
6183 goto regeneration_done;
|
|
|
6184 }
|
|
|
6185
|
|
|
6186 if (echo_active)
|
|
|
6187 {
|
|
|
6188 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6189 startp = 1;
|
|
|
6190 }
|
|
|
6191 else
|
|
|
6192 {
|
|
|
6193 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6194 if (startp < BUF_BEGV (b))
|
|
|
6195 startp = BUF_BEGV (b);
|
|
|
6196 else if (startp > BUF_ZV (b))
|
|
|
6197 startp = BUF_ZV (b);
|
|
|
6198 }
|
|
|
6199 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6200
|
|
|
6201 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6202 (unsigned int) window_truncation_on (w));
|
|
428
|
6203
|
|
|
6204 /* If w->force_start is set, then some function set w->start and we
|
|
|
6205 should display from there and change point, if necessary, to
|
|
|
6206 ensure that it is visible. */
|
|
|
6207 if (w->force_start || inactive_minibuffer)
|
|
|
6208 {
|
|
|
6209 w->force_start = 0;
|
|
|
6210 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6211 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6212
|
|
|
6213 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6214
|
|
|
6215 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6216 {
|
|
|
6217 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6218
|
|
|
6219 if (selected_globally)
|
|
|
6220 BUF_SET_PT (b, pointm);
|
|
|
6221
|
|
|
6222 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6223 the_buffer);
|
|
|
6224
|
|
|
6225 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6226 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6227 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6228 }
|
|
|
6229
|
|
|
6230 goto regeneration_done;
|
|
|
6231 }
|
|
|
6232
|
|
|
6233 /* If nothing has changed since the last redisplay, then we just
|
|
|
6234 need to make sure that point is still visible. */
|
|
|
6235 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6236 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6237 && pointm >= startp
|
|
|
6238 /* This check is to make sure we restore the minibuffer after a
|
|
|
6239 temporary change to the echo area. */
|
|
|
6240 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6241 && !f->frame_changed
|
|
|
6242 && !truncation_changed
|
|
442
|
6243 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6244 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6245 )
|
|
|
6246 {
|
|
|
6247 /* Check if the cursor has actually moved. */
|
|
|
6248 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6249 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6250 && selected_globally
|
|
|
6251 && !w->windows_changed
|
|
|
6252 && !f->clip_changed
|
|
|
6253 && !f->extents_changed
|
|
|
6254 && !f->faces_changed
|
|
|
6255 && !f->glyphs_changed
|
|
|
6256 && !f->subwindows_changed
|
|
442
|
6257 /* && !f->subwindows_state_changed*/
|
|
428
|
6258 && !f->point_changed
|
|
|
6259 && !f->windows_structure_changed)
|
|
|
6260 {
|
|
|
6261 /* If not, we're done. */
|
|
|
6262 if (f->modeline_changed)
|
|
|
6263 regenerate_modeline (w);
|
|
|
6264
|
|
|
6265 skip_output = 1;
|
|
|
6266 goto regeneration_done;
|
|
|
6267 }
|
|
|
6268 else
|
|
|
6269 {
|
|
|
6270 /* If the new point is visible in the redisplay structures,
|
|
|
6271 then let the output update routines handle it, otherwise
|
|
|
6272 do things the hard way. */
|
|
|
6273 if (!w->windows_changed
|
|
|
6274 && !f->clip_changed
|
|
|
6275 && !f->extents_changed
|
|
|
6276 && !f->faces_changed
|
|
|
6277 && !f->glyphs_changed
|
|
|
6278 && !f->subwindows_changed
|
|
442
|
6279 /* && !f->subwindows_state_changed*/
|
|
428
|
6280 && !f->windows_structure_changed)
|
|
|
6281 {
|
|
|
6282 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6283 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6284 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6285 {
|
|
|
6286 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6287 {
|
|
|
6288 /* Always regenerate in case it is displaying
|
|
|
6289 the current line or column. */
|
|
|
6290 regenerate_modeline (w);
|
|
|
6291
|
|
|
6292 skip_output = 1;
|
|
|
6293 goto regeneration_done;
|
|
|
6294 }
|
|
|
6295 }
|
|
|
6296 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6297 {
|
|
|
6298 if (f->modeline_changed)
|
|
|
6299 regenerate_modeline (w);
|
|
|
6300
|
|
|
6301 skip_output = 1;
|
|
|
6302 goto regeneration_done;
|
|
|
6303 }
|
|
|
6304 }
|
|
|
6305
|
|
|
6306 /* If we weren't able to take the shortcut method, then use
|
|
|
6307 the brute force method. */
|
|
|
6308 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6309
|
|
|
6310 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6311 goto regeneration_done;
|
|
|
6312 }
|
|
|
6313 }
|
|
|
6314
|
|
|
6315 /* Check if the starting point is no longer at the beginning of a
|
|
|
6316 line, in which case find a new starting point. We also recenter
|
|
|
6317 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6318 up with a blank window. */
|
|
|
6319 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6320 && !(startp == BUF_BEGV (b)
|
|
|
6321 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6322 || (pointm == startp &&
|
|
|
6323 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6324 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6325 || (startp == BUF_ZV (b)))
|
|
|
6326 {
|
|
|
6327 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6328
|
|
|
6329 goto regeneration_done;
|
|
|
6330 }
|
|
|
6331 /* See if we can update the data structures locally based on
|
|
|
6332 knowledge of what changed in the buffer. */
|
|
|
6333 else if (!w->windows_changed
|
|
|
6334 && !f->clip_changed
|
|
|
6335 && !f->faces_changed
|
|
|
6336 && !f->glyphs_changed
|
|
|
6337 && !f->subwindows_changed
|
|
442
|
6338 /* && !f->subwindows_state_changed*/
|
|
428
|
6339 && !f->windows_structure_changed
|
|
|
6340 && !f->frame_changed
|
|
|
6341 && !truncation_changed
|
|
|
6342 && pointm >= startp
|
|
|
6343 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6344 {
|
|
|
6345 if (f->modeline_changed
|
|
|
6346 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6347 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6348 regenerate_modeline (w);
|
|
|
6349
|
|
|
6350 skip_output = 1;
|
|
|
6351 goto regeneration_done;
|
|
|
6352 }
|
|
|
6353 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6354 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6355 else
|
|
|
6356 {
|
|
|
6357 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6358
|
|
|
6359 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6360 goto regeneration_done;
|
|
|
6361 }
|
|
|
6362
|
|
|
6363 /* We still haven't gotten the window regenerated with point
|
|
|
6364 visible. Next we try scrolling a little and see if point comes
|
|
|
6365 back onto the screen. */
|
|
|
6366 if (scroll_step > 0)
|
|
|
6367 {
|
|
|
6368 int scrolled = scroll_conservatively;
|
|
|
6369 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6370 {
|
|
|
6371 startp = vmotion (w, startp,
|
|
|
6372 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6373 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6374
|
|
|
6375 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6376 goto regeneration_done;
|
|
|
6377 }
|
|
|
6378 }
|
|
|
6379
|
|
|
6380 /* We still haven't managed to get the screen drawn with point on
|
|
|
6381 the screen, so just center it and be done with it. */
|
|
|
6382 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6383
|
|
|
6384
|
|
|
6385 regeneration_done:
|
|
|
6386
|
|
|
6387 /* If the window's frame is changed then reset the current display
|
|
|
6388 lines in order to force a full repaint. */
|
|
|
6389 if (f->frame_changed)
|
|
|
6390 {
|
|
|
6391 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6392
|
|
|
6393 Dynarr_reset (cla);
|
|
|
6394 }
|
|
|
6395
|
|
|
6396 /* Must do this before calling redisplay_output_window because it
|
|
|
6397 sets some markers on the window. */
|
|
|
6398 if (echo_active)
|
|
|
6399 {
|
|
|
6400 w->buffer = old_buffer;
|
|
|
6401 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6402 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6403 }
|
|
|
6404
|
|
|
6405 /* These also have to be set before calling redisplay_output_window
|
|
|
6406 since it sets the CURRENT_DISP values based on them. */
|
|
|
6407 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6408 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6409 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6410 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6411
|
|
|
6412 if (!skip_output)
|
|
|
6413 {
|
|
665
|
6414 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6415 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6416 ? BUF_ZV (b)
|
|
|
6417 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6418 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6419 if (w->start_at_line_beg)
|
|
|
6420 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6421 redisplay_output_window (w);
|
|
|
6422 /*
|
|
|
6423 * If we just displayed the echo area, the line start cache is
|
|
|
6424 * no longer valid, because the minibuffer window is associated
|
|
|
6425 * with the window now.
|
|
|
6426 */
|
|
|
6427 if (echo_active)
|
|
|
6428 w->line_cache_last_updated = make_int (-1);
|
|
|
6429 }
|
|
|
6430
|
|
|
6431 /* #### This should be dependent on face changes and will need to be
|
|
|
6432 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6433 mark_face_cachels_as_clean (w);
|
|
|
6434
|
|
438
|
6435 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6436 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6437 flag since everything must be up-to-date. */
|
|
428
|
6438 if (glyphs_changed)
|
|
|
6439 mark_glyph_cachels_as_clean (w);
|
|
|
6440
|
|
|
6441 w->windows_changed = 0;
|
|
|
6442 }
|
|
|
6443
|
|
|
6444 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6445 currently visible in all frames on all devices. #### There has to
|
|
|
6446 be a better way to do this. */
|
|
|
6447
|
|
|
6448 static int
|
|
|
6449 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
6450 {
|
|
|
6451 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6452 return 0;
|
|
|
6453 }
|
|
|
6454
|
|
|
6455 static void
|
|
|
6456 reset_buffer_changes (void)
|
|
|
6457 {
|
|
|
6458 Lisp_Object frmcons, devcons, concons;
|
|
|
6459
|
|
|
6460 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6461 {
|
|
|
6462 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6463
|
|
|
6464 if (FRAME_REPAINT_P (f))
|
|
|
6465 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6466 }
|
|
|
6467 }
|
|
|
6468
|
|
|
6469 /* Ensure that all windows underneath the given window in the window
|
|
|
6470 hierarchy are correctly displayed. */
|
|
|
6471
|
|
|
6472 static void
|
|
|
6473 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6474 {
|
|
|
6475 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6476 {
|
|
|
6477 redisplay_window (window, skip_selected);
|
|
|
6478 }
|
|
|
6479 }
|
|
|
6480
|
|
|
6481 static int
|
|
|
6482 call_redisplay_end_triggers (struct window *w, void *closure)
|
|
|
6483 {
|
|
665
|
6484 Charbpos lrpos = w->last_redisplay_pos;
|
|
428
|
6485 w->last_redisplay_pos = 0;
|
|
|
6486 if (!NILP (w->buffer)
|
|
|
6487 && !NILP (w->redisplay_end_trigger)
|
|
|
6488 && lrpos > 0)
|
|
|
6489 {
|
|
665
|
6490 Charbpos pos;
|
|
428
|
6491
|
|
|
6492 if (MARKERP (w->redisplay_end_trigger)
|
|
|
6493 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
|
|
|
6494 pos = marker_position (w->redisplay_end_trigger);
|
|
|
6495 else if (INTP (w->redisplay_end_trigger))
|
|
|
6496 pos = XINT (w->redisplay_end_trigger);
|
|
|
6497 else
|
|
|
6498 {
|
|
|
6499 w->redisplay_end_trigger = Qnil;
|
|
|
6500 return 0;
|
|
|
6501 }
|
|
|
6502
|
|
|
6503 if (lrpos >= pos)
|
|
|
6504 {
|
|
793
|
6505 Lisp_Object window = wrap_window (w);
|
|
|
6506
|
|
853
|
6507 va_run_hook_with_args_in_buffer_trapping_problems
|
|
|
6508 ("Error in redisplay end trigger",
|
|
|
6509 XBUFFER (w->buffer),
|
|
|
6510 Qredisplay_end_trigger_functions,
|
|
|
6511 2, window,
|
|
|
6512 w->redisplay_end_trigger,
|
|
|
6513 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6514 w->redisplay_end_trigger = Qnil;
|
|
|
6515 }
|
|
|
6516 }
|
|
|
6517
|
|
|
6518 return 0;
|
|
|
6519 }
|
|
|
6520
|
|
|
6521 /* Ensure that all windows on the given frame are correctly displayed. */
|
|
|
6522
|
|
442
|
6523 int
|
|
428
|
6524 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6525 {
|
|
|
6526 struct device *d = XDEVICE (f->device);
|
|
853
|
6527 int depth;
|
|
428
|
6528
|
|
545
|
6529 if (preemption_check
|
|
|
6530 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6531 {
|
|
|
6532 /* The preemption check itself takes a lot of time,
|
|
|
6533 so normally don't do it here. We do it if called
|
|
|
6534 from Lisp, though (`redisplay-frame'). */
|
|
|
6535 int preempted;
|
|
|
6536
|
|
|
6537 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6538 if (preempted)
|
|
|
6539 return 1;
|
|
|
6540 }
|
|
|
6541
|
|
442
|
6542 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6543 {
|
|
|
6544 Lisp_Object frame;
|
|
|
6545
|
|
|
6546 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6547 f->buffer_alist);
|
|
793
|
6548 frame = wrap_frame (f);
|
|
442
|
6549 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6550 }
|
|
|
6551
|
|
428
|
6552 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6553 any which are already pending. */
|
|
|
6554 if (f->size_change_pending)
|
|
|
6555 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6556
|
|
|
6557 /* If frame size might need to be changed, due to changed size
|
|
|
6558 of toolbars, scrollbars etc, change it now */
|
|
|
6559 if (f->size_slipped)
|
|
|
6560 {
|
|
|
6561 adjust_frame_size (f);
|
|
|
6562 assert (!f->size_slipped);
|
|
|
6563 }
|
|
|
6564
|
|
|
6565 /* The menubar, toolbar, and icon updates must be done before
|
|
853
|
6566 enter_redisplay_critical_section is called and we are officially
|
|
428
|
6567 'in_display'. They may eval lisp code which may call Fsignal.
|
|
|
6568 If in_display is set Fsignal will abort. */
|
|
|
6569
|
|
|
6570 #ifdef HAVE_MENUBARS
|
|
|
6571 /* Update the menubar. It is done first since it could change
|
|
|
6572 the menubar's visibility. This way we avoid having flashing
|
|
|
6573 caused by an Expose event generated by the visibility change
|
|
|
6574 being handled. */
|
|
|
6575 update_frame_menubars (f);
|
|
|
6576 #endif /* HAVE_MENUBARS */
|
|
|
6577 #ifdef HAVE_TOOLBARS
|
|
905
|
6578 /* Update the toolbars geometry. We don't update the toolbars
|
|
|
6579 themselves at this point since the space they are trying to
|
|
|
6580 occupy may currently by occupied by gutter elements. Instead we
|
|
|
6581 update the geometry, then update the gutter geometry, then update
|
|
|
6582 the gutters - which will cause mapped windows to be repositioned
|
|
|
6583 - and finally update the toolbars. */
|
|
|
6584 update_frame_toolbars_geometry (f);
|
|
428
|
6585 #endif /* HAVE_TOOLBARS */
|
|
442
|
6586 /* Gutter update proper has to be done inside display when no frame
|
|
|
6587 size changes can occur, thus we separately update the gutter
|
|
|
6588 geometry here if it needs it. */
|
|
|
6589 update_frame_gutter_geometry (f);
|
|
428
|
6590
|
|
|
6591 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
6592 if (f->clear)
|
|
|
6593 f->frame_changed = 1;
|
|
|
6594
|
|
442
|
6595 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
6596 to cause subwindows to get instantiated. This is because
|
|
428
|
6597 subwindows_state_changed is less strict - dealing with things
|
|
|
6598 like the clicked state of button. We have to do this before
|
|
|
6599 redisplaying the gutters as subwindows get unmapped in the
|
|
|
6600 process.*/
|
|
442
|
6601 if (f->frame_changed)
|
|
|
6602 reset_frame_subwindow_instance_cache (f);
|
|
|
6603
|
|
|
6604 if (f->frame_changed || f->subwindows_changed)
|
|
|
6605 {
|
|
428
|
6606 /* we have to do this so the gutter gets regenerated. */
|
|
|
6607 reset_gutter_display_lines (f);
|
|
|
6608 }
|
|
|
6609
|
|
853
|
6610 depth = enter_redisplay_critical_section ();
|
|
428
|
6611
|
|
|
6612 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6613 /* Within this section, we are defenseless and assume that the
|
|
|
6614 following cannot happen:
|
|
|
6615
|
|
|
6616 1) garbage collection
|
|
|
6617 2) Lisp code evaluation
|
|
|
6618 3) frame size changes
|
|
|
6619
|
|
853
|
6620 We ensure (3) by calling enter_redisplay_critical_section(), which
|
|
428
|
6621 will cause any pending frame size changes to get put on hold
|
|
|
6622 till after the end of the critical section. (1) follows
|
|
|
6623 automatically if (2) is met. #### Unfortunately, there are
|
|
|
6624 some places where Lisp code can be called within this section.
|
|
|
6625 We need to remove them.
|
|
|
6626
|
|
|
6627 If Fsignal() is called during this critical section, we
|
|
|
6628 will abort().
|
|
|
6629
|
|
|
6630 If garbage collection is called during this critical section,
|
|
|
6631 we simply return. #### We should abort instead.
|
|
|
6632
|
|
|
6633 #### If a frame-size change does occur we should probably
|
|
|
6634 actually be preempting redisplay. */
|
|
|
6635
|
|
442
|
6636 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
6637
|
|
|
6638 /* We can now update the gutters, safe in the knowledge that our
|
|
|
6639 efforts won't get undone. */
|
|
|
6640
|
|
|
6641 /* This can call lisp, but redisplay is protected by binding
|
|
|
6642 inhibit_quit. More importantly the code involving display lines
|
|
|
6643 *assumes* that GC will not happen and so does not GCPRO
|
|
|
6644 anything. Since we use this code the whole time with the gutters
|
|
|
6645 we cannot allow GC to happen when manipulating the gutters. */
|
|
|
6646 update_frame_gutters (f);
|
|
|
6647
|
|
428
|
6648 /* Erase the frame before outputting its contents. */
|
|
|
6649 if (f->clear)
|
|
|
6650 {
|
|
442
|
6651 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
6652 }
|
|
|
6653
|
|
|
6654 /* Do the selected window first. */
|
|
|
6655 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
6656
|
|
|
6657 /* Then do the rest. */
|
|
|
6658 redisplay_windows (f->root_window, 1);
|
|
|
6659
|
|
442
|
6660 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
6661
|
|
|
6662 update_frame_title (f);
|
|
|
6663
|
|
905
|
6664 #ifdef HAVE_TOOLBARS
|
|
|
6665 /* Finally update the toolbars. It seems its possible to get in a
|
|
|
6666 cycle between updating the gutter and the toolbars. Basically we
|
|
|
6667 want to end up with both being up-to-date and this doesn't seem
|
|
|
6668 possible in a single pass. */
|
|
|
6669 update_frame_toolbars (f);
|
|
|
6670 #endif /* HAVE_TOOLBARS */
|
|
|
6671
|
|
428
|
6672 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
6673 f->window_face_cache_reset = 0;
|
|
|
6674 f->echo_area_garbaged = 0;
|
|
|
6675 f->clear = 0;
|
|
|
6676
|
|
|
6677 if (!f->size_change_pending)
|
|
|
6678 f->size_changed = 0;
|
|
|
6679
|
|
|
6680 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6681
|
|
853
|
6682 /* Allow frame size changes to occur again. */
|
|
|
6683 exit_redisplay_critical_section (depth);
|
|
428
|
6684
|
|
|
6685 map_windows (f, call_redisplay_end_triggers, 0);
|
|
|
6686 return 0;
|
|
|
6687 }
|
|
|
6688
|
|
440
|
6689 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
6690 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
6691 no automatic redisplay, as printers do, then the device is not
|
|
|
6692 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
6693 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
6694 when called from "lazy" redisplay();
|
|
|
6695 */
|
|
428
|
6696
|
|
|
6697 static int
|
|
440
|
6698 redisplay_device (struct device *d, int automatic)
|
|
428
|
6699 {
|
|
|
6700 Lisp_Object frame, frmcons;
|
|
|
6701 int size_change_failed = 0;
|
|
|
6702 struct frame *f;
|
|
|
6703
|
|
545
|
6704 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
6705 return 0;
|
|
|
6706
|
|
428
|
6707 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
6708 return 0;
|
|
|
6709
|
|
|
6710 /* It is possible that redisplay has been called before the
|
|
545
|
6711 device is fully initialized, or that the console implementation
|
|
|
6712 allows frameless devices. If so then continue with the next
|
|
|
6713 device. */
|
|
428
|
6714 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
6715 return 0;
|
|
|
6716
|
|
545
|
6717 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
6718 {
|
|
|
6719 int preempted;
|
|
|
6720 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6721 if (preempted)
|
|
|
6722 return 1;
|
|
|
6723 }
|
|
428
|
6724
|
|
|
6725 /* Always do the selected frame first. */
|
|
|
6726 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
6727
|
|
|
6728 f = XFRAME (frame);
|
|
|
6729
|
|
|
6730 if (f->icon_changed || f->windows_changed)
|
|
|
6731 update_frame_icon (f);
|
|
|
6732
|
|
|
6733 if (FRAME_REPAINT_P (f))
|
|
|
6734 {
|
|
|
6735 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
6736 {
|
|
588
|
6737 int preempted = redisplay_frame (f, 1);
|
|
545
|
6738 if (preempted)
|
|
|
6739 return 1;
|
|
|
6740 }
|
|
428
|
6741
|
|
|
6742 /* If the frame redisplay did not get preempted, then this flag
|
|
|
6743 should have gotten set to 0. It might be possible for that
|
|
|
6744 not to happen if a size change event were to occur at an odd
|
|
|
6745 time. To make sure we don't miss anything we simply don't
|
|
|
6746 reset the top level flags until the condition ends up being
|
|
|
6747 in the right state. */
|
|
|
6748 if (f->size_changed)
|
|
|
6749 size_change_failed = 1;
|
|
|
6750 }
|
|
|
6751
|
|
|
6752 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
6753 {
|
|
|
6754 f = XFRAME (XCAR (frmcons));
|
|
|
6755
|
|
|
6756 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
6757 continue;
|
|
|
6758
|
|
|
6759 if (f->icon_changed || f->windows_changed)
|
|
|
6760 update_frame_icon (f);
|
|
|
6761
|
|
|
6762 if (FRAME_REPAINT_P (f))
|
|
|
6763 {
|
|
430
|
6764 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
6765 {
|
|
588
|
6766 int preempted = redisplay_frame (f, 1);
|
|
545
|
6767 if (preempted)
|
|
|
6768 return 1;
|
|
428
|
6769 }
|
|
|
6770
|
|
|
6771 if (f->size_change_pending)
|
|
|
6772 size_change_failed = 1;
|
|
|
6773 }
|
|
|
6774 }
|
|
|
6775
|
|
|
6776 /* If we get here then we redisplayed all of our frames without
|
|
|
6777 getting preempted so mark ourselves as clean. */
|
|
|
6778 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
6779
|
|
|
6780 if (!size_change_failed)
|
|
|
6781 d->size_changed = 0;
|
|
|
6782
|
|
|
6783 return 0;
|
|
|
6784 }
|
|
|
6785
|
|
|
6786 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
6787 the current contents of their respective buffers. */
|
|
|
6788
|
|
|
6789 static void
|
|
|
6790 redisplay_without_hooks (void)
|
|
|
6791 {
|
|
|
6792 Lisp_Object devcons, concons;
|
|
|
6793 int size_change_failed = 0;
|
|
|
6794 int count = specpdl_depth ();
|
|
|
6795
|
|
|
6796 if (profiling_active)
|
|
853
|
6797 internal_bind_int (&profiling_redisplay_flag, 1);
|
|
428
|
6798
|
|
|
6799 if (asynch_device_change_pending)
|
|
|
6800 handle_asynch_device_change ();
|
|
|
6801
|
|
|
6802 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
6803 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
6804 goto done;
|
|
|
6805
|
|
|
6806 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
6807 {
|
|
|
6808 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
6809 int preempted;
|
|
|
6810
|
|
430
|
6811 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
6812 {
|
|
440
|
6813 preempted = redisplay_device (d, 1);
|
|
428
|
6814
|
|
|
6815 if (preempted)
|
|
|
6816 {
|
|
|
6817 preemption_count++;
|
|
|
6818 RESET_CHANGED_SET_FLAGS;
|
|
|
6819 goto done;
|
|
|
6820 }
|
|
|
6821
|
|
|
6822 /* See comment in redisplay_device. */
|
|
|
6823 if (d->size_changed)
|
|
|
6824 size_change_failed = 1;
|
|
|
6825 }
|
|
|
6826 }
|
|
|
6827 preemption_count = 0;
|
|
|
6828
|
|
|
6829 /* Mark redisplay as accurate */
|
|
|
6830 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
6831 RESET_CHANGED_SET_FLAGS;
|
|
|
6832
|
|
|
6833 if (faces_changed)
|
|
|
6834 {
|
|
|
6835 mark_all_faces_as_clean ();
|
|
|
6836 faces_changed = 0;
|
|
|
6837 }
|
|
|
6838
|
|
|
6839 if (!size_change_failed)
|
|
|
6840 size_changed = 0;
|
|
|
6841
|
|
|
6842 reset_buffer_changes ();
|
|
|
6843
|
|
|
6844 done:
|
|
771
|
6845 unbind_to (count);
|
|
800
|
6846 #ifdef ERROR_CHECK_DISPLAY
|
|
|
6847 sledgehammer_check_redisplay_structs ();
|
|
|
6848 #endif /* ERROR_CHECK_DISPLAY */
|
|
428
|
6849 }
|
|
|
6850
|
|
853
|
6851 /* Note: All places in the C code that call redisplay() are prepared
|
|
|
6852 to handle GCing. However, we can't currently handle GC inside the
|
|
|
6853 guts of redisplay (#### someone should fix this), so we need to use
|
|
|
6854 INHIBIT_GC when calling Lisp.
|
|
|
6855
|
|
|
6856 #### We probably can't handle any deletion of existing buffers, frames,
|
|
|
6857 windows, devices, consoles, text changes, etc. either. We should
|
|
|
6858
|
|
|
6859 (a) Create the appropriate INHIBIT_ flags for this.
|
|
|
6860 (b) In the longer run, fix redisplay to handle this.
|
|
|
6861
|
|
|
6862 (#### What about other external entry points to the redisplay code?
|
|
|
6863 Someone should go through and make sure that all callers can handle
|
|
|
6864 GC there, too.)
|
|
|
6865 */
|
|
|
6866
|
|
428
|
6867 void
|
|
|
6868 redisplay (void)
|
|
|
6869 {
|
|
853
|
6870 run_pre_idle_hook ();
|
|
|
6871 redisplay_no_pre_idle_hook ();
|
|
|
6872 }
|
|
|
6873
|
|
|
6874 void
|
|
|
6875 redisplay_no_pre_idle_hook (void)
|
|
|
6876 {
|
|
428
|
6877 if (last_display_warning_tick != display_warning_tick &&
|
|
|
6878 !inhibit_warning_display)
|
|
|
6879 {
|
|
|
6880 /* If an error occurs during this function, oh well.
|
|
|
6881 If we report another warning, we could get stuck in an
|
|
|
6882 infinite loop reporting warnings. */
|
|
853
|
6883 call0_trapping_problems
|
|
|
6884 (0, Qdisplay_warning_buffer,
|
|
|
6885 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6886 last_display_warning_tick = display_warning_tick;
|
|
|
6887 }
|
|
853
|
6888 /* The run_hook_trapping_problems functions are smart enough not
|
|
428
|
6889 to do any evalling if the hook function is empty, so there
|
|
853
|
6890 should not be any significant time loss. */
|
|
428
|
6891 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
853
|
6892 run_hook_trapping_problems
|
|
|
6893 ("Error in pre-redisplay-hook",
|
|
|
6894 Qpre_redisplay_hook,
|
|
|
6895 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6896 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6897
|
|
|
6898 redisplay_without_hooks ();
|
|
|
6899
|
|
|
6900 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
853
|
6901 run_hook_trapping_problems
|
|
|
6902 ("Error in post-redisplay-hook",
|
|
|
6903 Qpost_redisplay_hook,
|
|
|
6904 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
6905 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6906 }
|
|
|
6907
|
|
853
|
6908 Lisp_Object
|
|
|
6909 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker)
|
|
|
6910 {
|
|
|
6911 return
|
|
|
6912 eval_in_buffer_trapping_problems
|
|
|
6913 ("Error calling function within redisplay", current_buffer,
|
|
|
6914 dont_trust_this_damn_sucker,
|
|
|
6915 INHIBIT_GC | INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
|
|
|
6916 }
|
|
428
|
6917
|
|
|
6918 /* Efficiently determine the window line number, and return a pointer
|
|
|
6919 to its printed representation. Do this regardless of whether
|
|
|
6920 line-number-mode is on. The first line in the buffer is counted as
|
|
|
6921 1. If narrowing is in effect, the lines are counted from the
|
|
|
6922 beginning of the visible portion of the buffer. */
|
|
|
6923 static char *
|
|
|
6924 window_line_number (struct window *w, int type)
|
|
|
6925 {
|
|
|
6926 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
6927 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6928 /* Be careful in the order of these tests. The first clause will
|
|
|
6929 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
6930 This can occur when the frame title is computed really early */
|
|
665
|
6931 Charbpos pos =
|
|
428
|
6932 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
6933 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
6934 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6935 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
6936 ? BUF_PT (b)
|
|
|
6937 : marker_position (w->pointm[type]));
|
|
|
6938 EMACS_INT line;
|
|
|
6939
|
|
|
6940 line = buffer_line_number (b, pos, 1);
|
|
|
6941
|
|
603
|
6942 {
|
|
|
6943 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
6944
|
|
|
6945 long_to_string (window_line_number_buf, line + 1);
|
|
|
6946
|
|
|
6947 return window_line_number_buf;
|
|
|
6948 }
|
|
428
|
6949 }
|
|
|
6950
|
|
|
6951
|
|
|
6952 /* Given a character representing an object in a modeline
|
|
|
6953 specification, return a string (stored into the global array
|
|
867
|
6954 `mode_spec_ibyte_string') with the information that object
|
|
428
|
6955 represents.
|
|
|
6956
|
|
|
6957 This function is largely unchanged from previous versions of the
|
|
|
6958 redisplay engine.
|
|
|
6959
|
|
|
6960 Warning! This code is also used for frame titles and can be called
|
|
|
6961 very early in the device/frame update process! JV
|
|
|
6962 */
|
|
|
6963
|
|
|
6964 static void
|
|
867
|
6965 decode_mode_spec (struct window *w, Ichar spec, int type)
|
|
428
|
6966 {
|
|
|
6967 Lisp_Object obj = Qnil;
|
|
442
|
6968 const char *str = NULL;
|
|
428
|
6969 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6970
|
|
867
|
6971 Dynarr_reset (mode_spec_ibyte_string);
|
|
428
|
6972
|
|
|
6973 switch (spec)
|
|
|
6974 {
|
|
|
6975 /* print buffer name */
|
|
|
6976 case 'b':
|
|
|
6977 obj = b->name;
|
|
|
6978 break;
|
|
|
6979
|
|
|
6980 /* print visited file name */
|
|
|
6981 case 'f':
|
|
|
6982 obj = b->filename;
|
|
|
6983 break;
|
|
|
6984
|
|
|
6985 /* print the current column */
|
|
|
6986 case 'c':
|
|
|
6987 {
|
|
665
|
6988 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
6989 ? BUF_PT (b)
|
|
|
6990 : marker_position (w->pointm[type]);
|
|
|
6991 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
6992 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
6993
|
|
|
6994 long_to_string (buf, col);
|
|
|
6995
|
|
867
|
6996 Dynarr_add_many (mode_spec_ibyte_string,
|
|
|
6997 (const Ibyte *) buf, strlen (buf));
|
|
428
|
6998
|
|
|
6999 goto decode_mode_spec_done;
|
|
|
7000 }
|
|
|
7001 /* print the file coding system */
|
|
|
7002 case 'C':
|
|
|
7003 {
|
|
|
7004 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
7005 /* Be very careful here not to get an error. */
|
|
|
7006 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
7007 {
|
|
771
|
7008 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
7009 if (CODING_SYSTEMP (codesys))
|
|
|
7010 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
7011 }
|
|
|
7012 }
|
|
|
7013 break;
|
|
|
7014
|
|
|
7015 /* print the current line number */
|
|
|
7016 case 'l':
|
|
|
7017 str = window_line_number (w, type);
|
|
|
7018 break;
|
|
|
7019
|
|
|
7020 /* print value of mode-name (obsolete) */
|
|
|
7021 case 'm':
|
|
|
7022 obj = b->mode_name;
|
|
|
7023 break;
|
|
|
7024
|
|
|
7025 /* print hyphen and frame number, if != 1 */
|
|
|
7026 case 'N':
|
|
|
7027 #ifdef HAVE_TTY
|
|
|
7028 {
|
|
|
7029 struct frame *f = XFRAME (w->frame);
|
|
|
7030 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
7031 {
|
|
|
7032 /* Naughty, naughty */
|
|
|
7033 char * writable_str = alloca_array (char, 10);
|
|
|
7034 sprintf (writable_str, "-%d", f->order_count);
|
|
|
7035 str = writable_str;
|
|
|
7036 }
|
|
|
7037 }
|
|
|
7038 #endif /* HAVE_TTY */
|
|
|
7039 break;
|
|
|
7040
|
|
|
7041 /* print Narrow if appropriate */
|
|
|
7042 case 'n':
|
|
|
7043 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
7044 || BUF_ZV (b) < BUF_Z (b))
|
|
|
7045 str = " Narrow";
|
|
|
7046 break;
|
|
|
7047
|
|
|
7048 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
7049 case '*':
|
|
|
7050 str = (!NILP (b->read_only)
|
|
|
7051 ? "%"
|
|
|
7052 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7053 ? "*"
|
|
|
7054 : "-"));
|
|
|
7055 break;
|
|
|
7056
|
|
|
7057 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
7058 read-only but still indicate whether it is modified. */
|
|
|
7059 case '+':
|
|
|
7060 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7061 ? "*"
|
|
|
7062 : (!NILP (b->read_only)
|
|
|
7063 ? "%"
|
|
|
7064 : "-"));
|
|
|
7065 break;
|
|
|
7066
|
|
|
7067 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
7068 modeline-format doc string. */
|
|
|
7069 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
7070 case '&':
|
|
|
7071 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7072 ? "*"
|
|
|
7073 : "-");
|
|
|
7074 break;
|
|
|
7075
|
|
|
7076 /* print process status */
|
|
|
7077 case 's':
|
|
|
7078 obj = Fget_buffer_process (w->buffer);
|
|
|
7079 if (NILP (obj))
|
|
|
7080 str = GETTEXT ("no process");
|
|
|
7081 else
|
|
|
7082 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7083 break;
|
|
|
7084
|
|
|
7085 /* Print name of selected frame. */
|
|
|
7086 case 'S':
|
|
|
7087 obj = XFRAME (w->frame)->name;
|
|
|
7088 break;
|
|
|
7089
|
|
|
7090 /* indicate TEXT or BINARY */
|
|
|
7091 case 't':
|
|
|
7092 /* #### NT does not use this any more. Now what? */
|
|
|
7093 str = "T";
|
|
|
7094 break;
|
|
|
7095
|
|
|
7096 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7097 case 'p':
|
|
|
7098 {
|
|
665
|
7099 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7100
|
|
|
7101 /* This had better be while the desired lines are being done. */
|
|
|
7102 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7103 {
|
|
|
7104 if (pos <= BUF_BEGV (b))
|
|
|
7105 str = "All";
|
|
|
7106 else
|
|
|
7107 str = "Bottom";
|
|
|
7108 }
|
|
|
7109 else if (pos <= BUF_BEGV (b))
|
|
|
7110 str = "Top";
|
|
|
7111 else
|
|
|
7112 {
|
|
|
7113 /* This hard limit is ok since the string it will hold has a
|
|
|
7114 fixed maximum length of 3. But just to be safe... */
|
|
|
7115 char buf[10];
|
|
|
7116 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7117 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7118
|
|
|
7119 /* Avoid overflow on big buffers */
|
|
|
7120 int percent = total > LONG_MAX/200 ?
|
|
|
7121 (chars + total/200) / (total / 100) :
|
|
|
7122 (chars * 100 + total/2) / total;
|
|
|
7123
|
|
|
7124 /* We can't normally display a 3-digit number, so get us a
|
|
|
7125 2-digit number that is close. */
|
|
|
7126 if (percent == 100)
|
|
|
7127 percent = 99;
|
|
|
7128
|
|
|
7129 sprintf (buf, "%d%%", percent);
|
|
867
|
7130 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7131 strlen (buf));
|
|
|
7132
|
|
|
7133 goto decode_mode_spec_done;
|
|
|
7134 }
|
|
|
7135 break;
|
|
|
7136 }
|
|
|
7137
|
|
|
7138 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7139 Top, or print Bottom or All */
|
|
|
7140 case 'P':
|
|
|
7141 {
|
|
665
|
7142 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7143 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7144
|
|
|
7145 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7146 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7147 botpos may be negative. */
|
|
|
7148 if (botpos < toppos)
|
|
|
7149 botpos = toppos;
|
|
|
7150
|
|
|
7151 if (botpos >= BUF_ZV (b))
|
|
|
7152 {
|
|
|
7153 if (toppos <= BUF_BEGV (b))
|
|
|
7154 str = "All";
|
|
|
7155 else
|
|
|
7156 str = "Bottom";
|
|
|
7157 }
|
|
|
7158 else
|
|
|
7159 {
|
|
|
7160 /* This hard limit is ok since the string it will hold has a
|
|
|
7161 fixed maximum length of around 6. But just to be safe... */
|
|
|
7162 char buf[10];
|
|
|
7163 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7164 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7165
|
|
|
7166 /* Avoid overflow on big buffers */
|
|
|
7167 int percent = total > LONG_MAX/200 ?
|
|
|
7168 (chars + total/200) / (total / 100) :
|
|
|
7169 (chars * 100 + total/2) / max (total, 1);
|
|
|
7170
|
|
|
7171 /* We can't normally display a 3-digit number, so get us a
|
|
|
7172 2-digit number that is close. */
|
|
|
7173 if (percent == 100)
|
|
|
7174 percent = 99;
|
|
|
7175
|
|
|
7176 if (toppos <= BUF_BEGV (b))
|
|
|
7177 sprintf (buf, "Top%d%%", percent);
|
|
|
7178 else
|
|
|
7179 sprintf (buf, "%d%%", percent);
|
|
|
7180
|
|
867
|
7181 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7182 strlen (buf));
|
|
|
7183
|
|
|
7184 goto decode_mode_spec_done;
|
|
|
7185 }
|
|
|
7186 break;
|
|
|
7187 }
|
|
|
7188
|
|
|
7189 /* print % */
|
|
|
7190 case '%':
|
|
|
7191 str = "%";
|
|
|
7192 break;
|
|
|
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 one ] for each recursive editing level. */
|
|
|
7212 case ']':
|
|
|
7213 {
|
|
|
7214 int i;
|
|
|
7215
|
|
|
7216 if (command_loop_level > 5)
|
|
|
7217 {
|
|
|
7218 str = "...]]]";
|
|
|
7219 break;
|
|
|
7220 }
|
|
|
7221
|
|
|
7222 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7223 Dynarr_add (mode_spec_ibyte_string, ']');
|
|
428
|
7224
|
|
|
7225 goto decode_mode_spec_done;
|
|
|
7226 }
|
|
|
7227
|
|
|
7228 /* print infinitely many dashes -- handle at top level now */
|
|
|
7229 case '-':
|
|
|
7230 break;
|
|
|
7231
|
|
|
7232 }
|
|
|
7233
|
|
|
7234 if (STRINGP (obj))
|
|
867
|
7235 Dynarr_add_many (mode_spec_ibyte_string,
|
|
428
|
7236 XSTRING_DATA (obj),
|
|
|
7237 XSTRING_LENGTH (obj));
|
|
|
7238 else if (str)
|
|
867
|
7239 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
|
|
428
|
7240
|
|
|
7241 decode_mode_spec_done:
|
|
867
|
7242 Dynarr_add (mode_spec_ibyte_string, '\0');
|
|
428
|
7243 }
|
|
|
7244
|
|
|
7245 /* Given a display line, free all of its data structures. */
|
|
|
7246
|
|
|
7247 static void
|
|
|
7248 free_display_line (struct display_line *dl)
|
|
|
7249 {
|
|
|
7250 int block;
|
|
|
7251
|
|
|
7252 if (dl->display_blocks)
|
|
|
7253 {
|
|
|
7254 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
|
7255 {
|
|
|
7256 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7257
|
|
|
7258 Dynarr_free (db->runes);
|
|
|
7259 }
|
|
|
7260
|
|
|
7261 Dynarr_free (dl->display_blocks);
|
|
|
7262 dl->display_blocks = NULL;
|
|
|
7263 }
|
|
|
7264
|
|
|
7265 if (dl->left_glyphs)
|
|
|
7266 {
|
|
|
7267 Dynarr_free (dl->left_glyphs);
|
|
|
7268 dl->left_glyphs = NULL;
|
|
|
7269 }
|
|
|
7270
|
|
|
7271 if (dl->right_glyphs)
|
|
|
7272 {
|
|
|
7273 Dynarr_free (dl->right_glyphs);
|
|
|
7274 dl->right_glyphs = NULL;
|
|
|
7275 }
|
|
|
7276 }
|
|
|
7277
|
|
|
7278
|
|
|
7279 /* Given an array of display lines, free them and all data structures
|
|
|
7280 contained within them. */
|
|
|
7281
|
|
|
7282 void
|
|
|
7283 free_display_lines (display_line_dynarr *dla)
|
|
|
7284 {
|
|
|
7285 int line;
|
|
|
7286
|
|
|
7287 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7288 {
|
|
|
7289 free_display_line (Dynarr_atp (dla, line));
|
|
|
7290 }
|
|
|
7291
|
|
|
7292 Dynarr_free (dla);
|
|
|
7293 }
|
|
|
7294
|
|
|
7295 /* Call internal free routine for each set of display lines. */
|
|
|
7296
|
|
|
7297 void
|
|
|
7298 free_display_structs (struct window_mirror *mir)
|
|
|
7299 {
|
|
|
7300 if (mir->current_display_lines)
|
|
|
7301 {
|
|
|
7302 free_display_lines (mir->current_display_lines);
|
|
|
7303 mir->current_display_lines = 0;
|
|
|
7304 }
|
|
|
7305
|
|
|
7306 if (mir->desired_display_lines)
|
|
|
7307 {
|
|
|
7308 free_display_lines (mir->desired_display_lines);
|
|
|
7309 mir->desired_display_lines = 0;
|
|
|
7310 }
|
|
|
7311 }
|
|
|
7312
|
|
|
7313
|
|
|
7314 static void
|
|
|
7315 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7316 {
|
|
|
7317 if (gba)
|
|
|
7318 {
|
|
|
7319 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7320 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7321
|
|
|
7322 for (; gb < gb_last; gb++)
|
|
|
7323 {
|
|
|
7324 if (!NILP (gb->glyph))
|
|
|
7325 mark_object (gb->glyph);
|
|
|
7326 if (!NILP (gb->extent))
|
|
|
7327 mark_object (gb->extent);
|
|
|
7328 }
|
|
|
7329 }
|
|
|
7330 }
|
|
|
7331
|
|
442
|
7332 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7333 the glyph will also mark the image_instance. */
|
|
|
7334 void
|
|
428
|
7335 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7336 {
|
|
|
7337 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7338 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7339
|
|
|
7340 for (; dl < dl_last; dl++)
|
|
|
7341 {
|
|
|
7342 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7343 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7344 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7345
|
|
|
7346 for (; db < db_last; db++)
|
|
|
7347 {
|
|
|
7348 rune_dynarr *ra = db->runes;
|
|
|
7349 rune *r = Dynarr_atp (ra, 0);
|
|
|
7350 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7351
|
|
|
7352 for (; r < r_last; r++)
|
|
|
7353 {
|
|
|
7354 if (r->type == RUNE_DGLYPH)
|
|
|
7355 {
|
|
|
7356 if (!NILP (r->object.dglyph.glyph))
|
|
|
7357 mark_object (r->object.dglyph.glyph);
|
|
|
7358 if (!NILP (r->object.dglyph.extent))
|
|
|
7359 mark_object (r->object.dglyph.extent);
|
|
|
7360 }
|
|
|
7361 }
|
|
|
7362 }
|
|
|
7363
|
|
|
7364 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7365 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7366 }
|
|
|
7367 }
|
|
|
7368
|
|
|
7369
|
|
|
7370 /*****************************************************************************
|
|
|
7371 Line Start Cache Description and Rationale
|
|
|
7372
|
|
|
7373 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
7374 It depends on the key assumption that the number of lines that can be
|
|
|
7375 displayed at any given time is fixed. This led to a complete separation
|
|
|
7376 of the scrolling code from the redisplay code. In order to fully support
|
|
|
7377 variable height lines, the scrolling code must actually be tightly
|
|
|
7378 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
7379 will be displayed on a screen for any given starting point.
|
|
|
7380
|
|
|
7381 What is ideally wanted is a complete list of the starting buffer position
|
|
|
7382 for every possible display line of a buffer along with the height of that
|
|
|
7383 display line. Maintaining such a full list would be very expensive. We
|
|
|
7384 settle for having it include information for all areas which we happen to
|
|
|
7385 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
7386 areas we need to work with.
|
|
|
7387
|
|
|
7388 In order to ensure that the cache accurately represents what redisplay
|
|
|
7389 would actually show, it is necessary to invalidate it in many situations.
|
|
|
7390 If the buffer changes, the starting positions may no longer be correct.
|
|
|
7391 If a face or an extent has changed then the line heights may have altered.
|
|
|
7392 These events happen frequently enough that the cache can end up being
|
|
|
7393 constantly disabled. With this potentially constant invalidation when is
|
|
|
7394 the cache ever useful?
|
|
|
7395
|
|
|
7396 Even if the cache is invalidated before every single usage, it is
|
|
|
7397 necessary. Scrolling often requires knowledge about display lines which
|
|
|
7398 are actually above or below the visible region. The cache provides a
|
|
|
7399 convenient light-weight method of storing this information for multiple
|
|
|
7400 display regions. This knowledge is necessary for the scrolling code to
|
|
|
7401 always obey the First Golden Rule of Redisplay.
|
|
|
7402
|
|
|
7403 If the cache already contains all of the information that the scrolling
|
|
|
7404 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
7405 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
7406 do to help out the cache is to always add the displayed region. This
|
|
|
7407 region had to be generated anyway, so the cache ends up getting the
|
|
|
7408 information basically for free. In those cases where a user is simply
|
|
|
7409 scrolling around viewing a buffer there is a high probability that this is
|
|
|
7410 sufficient to always provide the needed information. The second thing we
|
|
|
7411 can do is be smart about invalidating the cache.
|
|
|
7412
|
|
|
7413 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
7414
|
|
|
7415 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
7416 starting positions of any display lines. These types of buffer
|
|
|
7417 modifications should not invalidate the cache. This is actually a large
|
|
|
7418 optimization for redisplay speed as well.
|
|
|
7419
|
|
|
7420 + Buffer modifications frequently only affect the display of lines at and
|
|
|
7421 below where they occur. In these situations we should only invalidate
|
|
|
7422 the part of the cache starting at where the modification occurs.
|
|
|
7423
|
|
|
7424 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
7425 applicable.
|
|
|
7426 ****************************************************************************/
|
|
|
7427
|
|
|
7428 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7429 allocating and freeing it. */
|
|
|
7430 static line_start_cache_dynarr *internal_cache;
|
|
|
7431
|
|
|
7432 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7433 the TYPE display structs. */
|
|
|
7434
|
|
|
7435 static void
|
|
|
7436 update_internal_cache_list (struct window *w, int type)
|
|
|
7437 {
|
|
|
7438 int line;
|
|
|
7439 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7440
|
|
|
7441 Dynarr_reset (internal_cache);
|
|
|
7442 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7443 {
|
|
|
7444 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7445
|
|
|
7446 if (dl->modeline)
|
|
|
7447 continue;
|
|
|
7448 else
|
|
|
7449 {
|
|
|
7450 struct line_start_cache lsc;
|
|
434
|
7451
|
|
826
|
7452 lsc.start = dl->charpos;
|
|
|
7453 lsc.end = dl->end_charpos;
|
|
428
|
7454 lsc.height = dl->ascent + dl->descent;
|
|
|
7455
|
|
|
7456 Dynarr_add (internal_cache, lsc);
|
|
|
7457 }
|
|
|
7458 }
|
|
|
7459 }
|
|
|
7460
|
|
|
7461 /* Reset the line cache if necessary. This should be run at the
|
|
|
7462 beginning of any function which access the cache. */
|
|
|
7463
|
|
|
7464 static void
|
|
|
7465 validate_line_start_cache (struct window *w)
|
|
|
7466 {
|
|
|
7467 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7468 struct frame *f = XFRAME (w->frame);
|
|
|
7469
|
|
|
7470 if (!w->line_cache_validation_override)
|
|
|
7471 {
|
|
|
7472 /* f->extents_changed used to be in here because extent face and
|
|
|
7473 size changes can cause text shifting. However, the extent
|
|
|
7474 covering the region is constantly having its face set and
|
|
|
7475 priority altered by the mouse code. This means that the line
|
|
|
7476 start cache is constantly being invalidated. This is bad
|
|
|
7477 since the mouse code also triggers heavy usage of the cache.
|
|
|
7478 Since it is an unlikely that f->extents being changed
|
|
|
7479 indicates that the cache really needs to be updated and if it
|
|
|
7480 does redisplay will catch it pretty quickly we no longer
|
|
|
7481 invalidate the cache if it is set. This greatly speeds up
|
|
|
7482 dragging out regions with the mouse. */
|
|
|
7483 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7484 || f->faces_changed
|
|
|
7485 || f->clip_changed)
|
|
|
7486 {
|
|
|
7487 Dynarr_reset (w->line_start_cache);
|
|
|
7488 }
|
|
|
7489 }
|
|
|
7490 }
|
|
|
7491
|
|
|
7492 /* Return the very first buffer position contained in the given
|
|
|
7493 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7494 cache is valid. */
|
|
|
7495
|
|
665
|
7496 static Charbpos
|
|
428
|
7497 line_start_cache_start (struct window *w)
|
|
|
7498 {
|
|
|
7499 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7500
|
|
|
7501 if (!Dynarr_length (cache))
|
|
|
7502 return -1;
|
|
|
7503 else
|
|
|
7504 return Dynarr_atp (cache, 0)->start;
|
|
|
7505 }
|
|
|
7506
|
|
|
7507 /* Return the very last buffer position contained in the given
|
|
|
7508 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7509 cache is valid. */
|
|
|
7510
|
|
665
|
7511 static Charbpos
|
|
428
|
7512 line_start_cache_end (struct window *w)
|
|
|
7513 {
|
|
|
7514 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7515
|
|
|
7516 if (!Dynarr_length (cache))
|
|
|
7517 return -1;
|
|
|
7518 else
|
|
|
7519 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7520 }
|
|
|
7521
|
|
|
7522 /* Return the index of the line POINT is contained within in window
|
|
|
7523 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7524 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7525 a guarantee of the number of entries in the cache present on either
|
|
|
7526 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7527 then it will be treated as 0, but the cache window will not be
|
|
|
7528 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7529 for any reason. */
|
|
|
7530
|
|
|
7531 int
|
|
665
|
7532 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7533 {
|
|
|
7534 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7535 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7536 int top, bottom, pos;
|
|
428
|
7537
|
|
|
7538 validate_line_start_cache (w);
|
|
|
7539 w->line_cache_validation_override++;
|
|
|
7540
|
|
|
7541 /* Let functions pass in negative values, but we still treat -1
|
|
|
7542 specially. */
|
|
|
7543 /* #### bogosity alert */
|
|
|
7544 if (min_past < 0 && min_past != -1)
|
|
|
7545 min_past = -min_past;
|
|
|
7546
|
|
|
7547 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7548 || line_start_cache_end (w) < point)
|
|
|
7549 {
|
|
|
7550 int loop;
|
|
|
7551 int win_char_height = window_char_height (w, 1);
|
|
|
7552
|
|
|
7553 /* Occasionally we get here with a 0 height
|
|
|
7554 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7555 count of 0 so handle that case. */
|
|
|
7556 if (!win_char_height)
|
|
|
7557 win_char_height = 1;
|
|
|
7558
|
|
|
7559 if (!Dynarr_length (cache))
|
|
|
7560 {
|
|
665
|
7561 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7562 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7563
|
|
|
7564 update_line_start_cache (w, from, to, point, 0);
|
|
|
7565
|
|
|
7566 if (!Dynarr_length (cache))
|
|
|
7567 {
|
|
|
7568 w->line_cache_validation_override--;
|
|
|
7569 return -1;
|
|
|
7570 }
|
|
|
7571 }
|
|
|
7572
|
|
|
7573 assert (Dynarr_length (cache));
|
|
|
7574
|
|
|
7575 loop = 0;
|
|
|
7576 while (line_start_cache_start (w) > point
|
|
|
7577 && (loop < cache_adjustment || min_past == -1))
|
|
|
7578 {
|
|
665
|
7579 Charbpos from, to;
|
|
428
|
7580
|
|
|
7581 from = line_start_cache_start (w);
|
|
|
7582 if (from <= BUF_BEGV (b))
|
|
|
7583 break;
|
|
|
7584
|
|
|
7585 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7586 to = line_start_cache_end (w);
|
|
|
7587
|
|
|
7588 update_line_start_cache (w, from, to, point, 0);
|
|
|
7589 loop++;
|
|
|
7590 }
|
|
|
7591
|
|
|
7592 if (line_start_cache_start (w) > point)
|
|
|
7593 {
|
|
665
|
7594 Charbpos from, to;
|
|
428
|
7595
|
|
|
7596 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7597 if (from >= BUF_ZV (b))
|
|
|
7598 {
|
|
|
7599 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7600 from = to;
|
|
|
7601 to = BUF_ZV (b);
|
|
|
7602 }
|
|
|
7603 else
|
|
|
7604 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7605
|
|
|
7606 update_line_start_cache (w, from, to, point, 0);
|
|
|
7607 }
|
|
|
7608
|
|
|
7609 loop = 0;
|
|
|
7610 while (line_start_cache_end (w) < point
|
|
|
7611 && (loop < cache_adjustment || min_past == -1))
|
|
|
7612 {
|
|
665
|
7613 Charbpos from, to;
|
|
428
|
7614
|
|
|
7615 to = line_start_cache_end (w);
|
|
|
7616 if (to >= BUF_ZV (b))
|
|
|
7617 break;
|
|
|
7618
|
|
|
7619 from = line_start_cache_end (w);
|
|
|
7620 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7621
|
|
|
7622 update_line_start_cache (w, from, to, point, 0);
|
|
|
7623 loop++;
|
|
|
7624 }
|
|
|
7625
|
|
|
7626 if (line_start_cache_end (w) < point)
|
|
|
7627 {
|
|
665
|
7628 Charbpos from, to;
|
|
428
|
7629
|
|
|
7630 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7631 if (from >= BUF_ZV (b))
|
|
|
7632 {
|
|
|
7633 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7634 from = to;
|
|
|
7635 to = BUF_ZV (b);
|
|
|
7636 }
|
|
|
7637 else
|
|
|
7638 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7639
|
|
|
7640 update_line_start_cache (w, from, to, point, 0);
|
|
|
7641 }
|
|
|
7642 }
|
|
|
7643
|
|
|
7644 assert (Dynarr_length (cache));
|
|
|
7645
|
|
|
7646 if (min_past == -1)
|
|
|
7647 min_past = 0;
|
|
|
7648
|
|
|
7649 /* This could happen if the buffer is narrowed. */
|
|
|
7650 if (line_start_cache_start (w) > point
|
|
|
7651 || line_start_cache_end (w) < point)
|
|
|
7652 {
|
|
|
7653 w->line_cache_validation_override--;
|
|
|
7654 return -1;
|
|
|
7655 }
|
|
|
7656
|
|
|
7657 find_point_loop:
|
|
|
7658
|
|
|
7659 top = Dynarr_length (cache) - 1;
|
|
|
7660 bottom = 0;
|
|
|
7661
|
|
|
7662 while (1)
|
|
|
7663 {
|
|
647
|
7664 int new_pos;
|
|
665
|
7665 Charbpos start, end;
|
|
428
|
7666
|
|
|
7667 pos = (bottom + top + 1) >> 1;
|
|
|
7668 start = Dynarr_atp (cache, pos)->start;
|
|
|
7669 end = Dynarr_atp (cache, pos)->end;
|
|
|
7670
|
|
|
7671 if (point >= start && point <= end)
|
|
|
7672 {
|
|
|
7673 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
7674 {
|
|
665
|
7675 Charbpos from =
|
|
428
|
7676 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
7677 -min_past - 1);
|
|
665
|
7678 Charbpos to = line_start_cache_end (w);
|
|
428
|
7679
|
|
|
7680 update_line_start_cache (w, from, to, point, 0);
|
|
|
7681 goto find_point_loop;
|
|
|
7682 }
|
|
|
7683 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
7684 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
7685 {
|
|
665
|
7686 Charbpos from = line_start_cache_end (w);
|
|
|
7687 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7688 (min_past
|
|
|
7689 ? min_past
|
|
|
7690 : 1));
|
|
|
7691
|
|
|
7692 update_line_start_cache (w, from, to, point, 0);
|
|
|
7693 goto find_point_loop;
|
|
|
7694 }
|
|
|
7695 else
|
|
|
7696 {
|
|
|
7697 w->line_cache_validation_override--;
|
|
|
7698 return pos;
|
|
|
7699 }
|
|
|
7700 }
|
|
|
7701 else if (point > end)
|
|
|
7702 bottom = pos + 1;
|
|
|
7703 else if (point < start)
|
|
|
7704 top = pos - 1;
|
|
|
7705 else
|
|
|
7706 abort ();
|
|
|
7707
|
|
|
7708 new_pos = (bottom + top + 1) >> 1;
|
|
|
7709 if (pos == new_pos)
|
|
|
7710 {
|
|
|
7711 w->line_cache_validation_override--;
|
|
|
7712 return -1;
|
|
|
7713 }
|
|
|
7714 }
|
|
|
7715 }
|
|
|
7716
|
|
|
7717 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
7718 if display of the window was to begin at STARTP. */
|
|
|
7719
|
|
|
7720 int
|
|
665
|
7721 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
|
|
428
|
7722 {
|
|
|
7723 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
7724 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
7725 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
7726 int start_elt;
|
|
|
7727
|
|
|
7728 /* If point is before the intended start it obviously can't be visible. */
|
|
|
7729 if (point < startp)
|
|
|
7730 return 0;
|
|
|
7731
|
|
|
7732 /* If point or start are not in the accessible buffer range, then
|
|
|
7733 fail. */
|
|
|
7734 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
7735 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
7736 return 0;
|
|
|
7737
|
|
|
7738 validate_line_start_cache (w);
|
|
|
7739 w->line_cache_validation_override++;
|
|
|
7740
|
|
|
7741 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
7742 if (start_elt == -1)
|
|
|
7743 {
|
|
|
7744 w->line_cache_validation_override--;
|
|
|
7745 return 0;
|
|
|
7746 }
|
|
|
7747
|
|
|
7748 assert (line_start_cache_start (w) <= startp
|
|
|
7749 && line_start_cache_end (w) >= startp);
|
|
|
7750
|
|
|
7751 while (1)
|
|
|
7752 {
|
|
|
7753 int height;
|
|
|
7754
|
|
|
7755 /* Expand the cache if necessary. */
|
|
|
7756 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7757 {
|
|
665
|
7758 Charbpos old_startp =
|
|
428
|
7759 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
7760
|
|
|
7761 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
7762 window_char_height (w, 0));
|
|
|
7763
|
|
|
7764 /* We've already actually processed old_startp, so increment
|
|
|
7765 immediately. */
|
|
|
7766 start_elt++;
|
|
|
7767
|
|
|
7768 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
7769 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7770 {
|
|
|
7771 w->line_cache_validation_override--;
|
|
|
7772 return 0;
|
|
|
7773 }
|
|
|
7774 }
|
|
|
7775
|
|
|
7776 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
7777
|
|
|
7778 if (pixpos + height > bottom)
|
|
|
7779 {
|
|
|
7780 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7781 {
|
|
|
7782 w->line_cache_validation_override--;
|
|
|
7783 return 0;
|
|
|
7784 }
|
|
|
7785 }
|
|
|
7786
|
|
|
7787 pixpos += height;
|
|
|
7788 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
7789 {
|
|
|
7790 w->line_cache_validation_override--;
|
|
|
7791 return 1;
|
|
|
7792 }
|
|
|
7793
|
|
|
7794 start_elt++;
|
|
|
7795 }
|
|
|
7796 }
|
|
|
7797
|
|
|
7798 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7799 the buffer position at the beginning or end of the last line
|
|
|
7800 displayed. The end of the last line is also know as the window end
|
|
|
7801 position.
|
|
|
7802
|
|
442
|
7803 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
7804 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
7805 does occur in the following situation: A mouse event has come in and we
|
|
|
7806 need to compute its location in a window. That code (in
|
|
|
7807 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
7808
|
|
428
|
7809 #### With a little work this could probably be reworked as just a
|
|
|
7810 call to start_with_line_at_pixpos. */
|
|
|
7811
|
|
665
|
7812 static Charbpos
|
|
|
7813 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
7814 int may_error)
|
|
428
|
7815 {
|
|
|
7816 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7817 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7818 int pixpos = 0;
|
|
|
7819 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
7820 Charbpos cur_start;
|
|
428
|
7821 int start_elt;
|
|
|
7822
|
|
|
7823 validate_line_start_cache (w);
|
|
|
7824 w->line_cache_validation_override++;
|
|
|
7825
|
|
|
7826 if (startp < BUF_BEGV (b))
|
|
|
7827 startp = BUF_BEGV (b);
|
|
|
7828 else if (startp > BUF_ZV (b))
|
|
|
7829 startp = BUF_ZV (b);
|
|
|
7830 cur_start = startp;
|
|
|
7831
|
|
|
7832 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
7833 if (start_elt == -1)
|
|
442
|
7834 return may_error ? 0 : startp;
|
|
428
|
7835
|
|
|
7836 while (1)
|
|
|
7837 {
|
|
|
7838 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
7839
|
|
|
7840 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
7841
|
|
|
7842 if (pixpos + height > bottom)
|
|
|
7843 {
|
|
|
7844 /* Adjust for any possible clip. */
|
|
|
7845 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7846 start_elt--;
|
|
|
7847
|
|
|
7848 if (start_elt < 0)
|
|
|
7849 {
|
|
|
7850 w->line_cache_validation_override--;
|
|
|
7851 if (end)
|
|
|
7852 return BUF_ZV (b);
|
|
|
7853 else
|
|
|
7854 return BUF_BEGV (b);
|
|
|
7855 }
|
|
|
7856 else
|
|
|
7857 {
|
|
|
7858 w->line_cache_validation_override--;
|
|
|
7859 if (end)
|
|
|
7860 return Dynarr_atp (cache, start_elt)->end;
|
|
|
7861 else
|
|
|
7862 return Dynarr_atp (cache, start_elt)->start;
|
|
|
7863 }
|
|
|
7864 }
|
|
|
7865
|
|
|
7866 pixpos += height;
|
|
|
7867 start_elt++;
|
|
|
7868 if (start_elt == Dynarr_length (cache))
|
|
|
7869 {
|
|
665
|
7870 Charbpos from = line_start_cache_end (w);
|
|
428
|
7871 int win_char_height = window_char_height (w, 0);
|
|
665
|
7872 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7873 (win_char_height
|
|
|
7874 ? win_char_height
|
|
|
7875 : 1));
|
|
|
7876
|
|
|
7877 /* We've hit the end of the bottom so that's what it is. */
|
|
|
7878 if (from >= BUF_ZV (b))
|
|
|
7879 {
|
|
|
7880 w->line_cache_validation_override--;
|
|
|
7881 return BUF_ZV (b);
|
|
|
7882 }
|
|
|
7883
|
|
|
7884 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
7885
|
|
|
7886 /* Updating the cache invalidates any current indexes. */
|
|
|
7887 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
7888 }
|
|
|
7889 }
|
|
|
7890 }
|
|
|
7891
|
|
|
7892 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7893 the buffer position at the beginning of the last line displayed. */
|
|
|
7894
|
|
665
|
7895 Charbpos
|
|
|
7896 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7897 {
|
|
442
|
7898 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
7899 }
|
|
|
7900
|
|
|
7901 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7902 the buffer position at the end of the last line displayed. This is
|
|
|
7903 also know as the window end position. */
|
|
|
7904
|
|
665
|
7905 Charbpos
|
|
|
7906 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7907 {
|
|
442
|
7908 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
7909 }
|
|
|
7910
|
|
665
|
7911 static Charbpos
|
|
|
7912 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
7913 {
|
|
|
7914 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
7915 }
|
|
|
7916
|
|
|
7917
|
|
428
|
7918 /* For window W, what does the starting position have to be so that
|
|
|
7919 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
7920
|
|
665
|
7921 Charbpos
|
|
|
7922 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
7923 {
|
|
|
7924 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7925 int cur_elt;
|
|
665
|
7926 Charbpos cur_pos, prev_pos = point;
|
|
428
|
7927 int point_line_height;
|
|
|
7928 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
7929
|
|
|
7930 validate_line_start_cache (w);
|
|
|
7931 w->line_cache_validation_override++;
|
|
|
7932
|
|
|
7933 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
7934 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
7935 if (cur_elt < 0)
|
|
|
7936 {
|
|
|
7937 w->line_cache_validation_override--;
|
|
|
7938 return point;
|
|
|
7939 }
|
|
|
7940
|
|
|
7941 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7942
|
|
|
7943 while (1)
|
|
|
7944 {
|
|
|
7945 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7946
|
|
|
7947 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7948
|
|
|
7949 /* Do not take into account the value of vertical_clip here.
|
|
|
7950 That is the responsibility of the calling functions. */
|
|
|
7951 if (pixheight < 0)
|
|
|
7952 {
|
|
|
7953 w->line_cache_validation_override--;
|
|
|
7954 if (-pixheight > point_line_height)
|
|
|
7955 /* We can't make the target line cover pixpos, so put it
|
|
|
7956 above pixpos. That way it will at least be visible. */
|
|
|
7957 return prev_pos;
|
|
|
7958 else
|
|
|
7959 return cur_pos;
|
|
|
7960 }
|
|
|
7961
|
|
|
7962 cur_elt--;
|
|
|
7963 while (cur_elt < 0)
|
|
|
7964 {
|
|
665
|
7965 Charbpos from, to;
|
|
428
|
7966 int win_char_height;
|
|
|
7967
|
|
|
7968 if (cur_pos <= BUF_BEGV (b))
|
|
|
7969 {
|
|
|
7970 w->line_cache_validation_override--;
|
|
|
7971 return BUF_BEGV (b);
|
|
|
7972 }
|
|
|
7973
|
|
|
7974 win_char_height = window_char_height (w, 0);
|
|
|
7975 if (!win_char_height)
|
|
|
7976 win_char_height = 1;
|
|
|
7977
|
|
|
7978 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
7979 to = line_start_cache_end (w);
|
|
|
7980 update_line_start_cache (w, from, to, point, 0);
|
|
|
7981
|
|
|
7982 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
7983 assert (cur_elt >= -1);
|
|
|
7984 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
7985 point is in the top line and not at BUF_BEGV, then
|
|
434
|
7986 setting the window_start to a newline before the start of
|
|
428
|
7987 the first line will always cause scrolling.
|
|
|
7988
|
|
|
7989 However in my (jv) opinion this is wrong. That new line
|
|
|
7990 can be hidden in various ways: invisible extents, an
|
|
|
7991 explicit window-start not at a newline character etc.
|
|
|
7992 The existence of those are indeed known to create crashes
|
|
|
7993 on that assert. So we have no option but to continue the
|
|
|
7994 search if we found point at the top of the line_start_cache
|
|
|
7995 again. */
|
|
434
|
7996 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
7997 }
|
|
|
7998 prev_pos = cur_pos;
|
|
|
7999 }
|
|
|
8000 }
|
|
|
8001
|
|
|
8002 /* For window W, what does the starting position have to be so that
|
|
|
8003 the line containing point is on display line LINE. If LINE is
|
|
|
8004 positive it is considered to be the number of lines from the top of
|
|
|
8005 the window (0 is the top line). If it is negative the number is
|
|
|
8006 considered to be the number of lines from the bottom (-1 is the
|
|
|
8007 bottom line). */
|
|
|
8008
|
|
665
|
8009 Charbpos
|
|
|
8010 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
8011 {
|
|
|
8012 validate_line_start_cache (w);
|
|
|
8013 w->line_cache_validation_override++;
|
|
|
8014
|
|
|
8015 if (line >= 0)
|
|
|
8016 {
|
|
|
8017 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
8018
|
|
|
8019 if (cur_elt - line < 0)
|
|
|
8020 cur_elt = 0; /* Hit the top */
|
|
|
8021 else
|
|
|
8022 cur_elt -= line;
|
|
|
8023
|
|
|
8024 w->line_cache_validation_override--;
|
|
|
8025 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8026 }
|
|
|
8027 else
|
|
|
8028 {
|
|
|
8029 /* The calculated value of pixpos is correct for the bottom line
|
|
|
8030 or what we want when line is -1. Therefore we subtract one
|
|
|
8031 because we have already handled one line. */
|
|
|
8032 int new_line = -line - 1;
|
|
|
8033 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
8034 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
8035 Charbpos retval, search_point;
|
|
428
|
8036
|
|
|
8037 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
8038 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
8039 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
8040 line, so back up from the bottom by the height of the line
|
|
|
8041 containing point. */
|
|
|
8042 if (scroll_on_clipped_lines)
|
|
|
8043 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8044 else
|
|
|
8045 pixpos -= 1;
|
|
|
8046
|
|
|
8047 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
8048 {
|
|
|
8049 /* Hit the bottom of the buffer. */
|
|
|
8050 int adjustment =
|
|
|
8051 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
8052 Lisp_Object window;
|
|
|
8053 int defheight;
|
|
|
8054
|
|
793
|
8055 window = wrap_window (w);
|
|
428
|
8056 default_face_height_and_width (window, &defheight, 0);
|
|
|
8057
|
|
|
8058 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
8059
|
|
|
8060 pixpos -= (adjustment * defheight);
|
|
|
8061 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
8062 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
8063 }
|
|
|
8064 else
|
|
|
8065 cur_elt = cur_elt + new_line;
|
|
|
8066
|
|
|
8067 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8068
|
|
|
8069 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
8070 w->line_cache_validation_override--;
|
|
|
8071 return retval;
|
|
|
8072 }
|
|
|
8073 }
|
|
|
8074
|
|
|
8075 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8076 buffer starting positions for display lines. This allows the
|
|
|
8077 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8078 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8079 display structs which are in the given range.
|
|
|
8080
|
|
|
8081 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8082 that this function will actually add information outside of the
|
|
|
8083 lines containing those positions. This can't hurt but it could
|
|
|
8084 possibly help.
|
|
|
8085
|
|
|
8086 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8087 It might help to make the cache a dynarr of caches so that we can
|
|
|
8088 cover more areas. This might, however, turn out to be a lot of
|
|
|
8089 overhead for too little gain. */
|
|
|
8090
|
|
|
8091 static void
|
|
665
|
8092 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8093 Charbpos point, int no_regen)
|
|
428
|
8094 {
|
|
|
8095 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8096 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8097 Charbpos low_bound, high_bound;
|
|
428
|
8098
|
|
|
8099 validate_line_start_cache (w);
|
|
|
8100 w->line_cache_validation_override++;
|
|
|
8101
|
|
|
8102 if (from < BUF_BEGV (b))
|
|
|
8103 from = BUF_BEGV (b);
|
|
|
8104 if (to > BUF_ZV (b))
|
|
|
8105 to = BUF_ZV (b);
|
|
|
8106
|
|
|
8107 if (from > to)
|
|
|
8108 {
|
|
|
8109 w->line_cache_validation_override--;
|
|
|
8110 return;
|
|
|
8111 }
|
|
|
8112
|
|
|
8113 if (Dynarr_length (cache))
|
|
|
8114 {
|
|
|
8115 low_bound = line_start_cache_start (w);
|
|
|
8116 high_bound = line_start_cache_end (w);
|
|
|
8117
|
|
|
8118 /* Check to see if the desired range is already in the cache. */
|
|
|
8119 if (from >= low_bound && to <= high_bound)
|
|
|
8120 {
|
|
|
8121 w->line_cache_validation_override--;
|
|
|
8122 return;
|
|
|
8123 }
|
|
|
8124
|
|
|
8125 /* Check to make sure that the desired range is adjacent to the
|
|
|
8126 current cache. If not, invalidate the cache. */
|
|
|
8127 if (to < low_bound || from > high_bound)
|
|
|
8128 {
|
|
|
8129 Dynarr_reset (cache);
|
|
|
8130 low_bound = high_bound = -1;
|
|
|
8131 }
|
|
|
8132 }
|
|
|
8133 else
|
|
|
8134 {
|
|
|
8135 low_bound = high_bound = -1;
|
|
|
8136 }
|
|
|
8137
|
|
|
8138 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8139
|
|
|
8140 /* This could be integrated into the next two sections, but it is easier
|
|
|
8141 to follow what's going on by having it separate. */
|
|
|
8142 if (no_regen)
|
|
|
8143 {
|
|
665
|
8144 Charbpos start, end;
|
|
428
|
8145
|
|
|
8146 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8147 if (!Dynarr_length (internal_cache))
|
|
|
8148 {
|
|
|
8149 w->line_cache_validation_override--;
|
|
|
8150 return;
|
|
|
8151 }
|
|
|
8152
|
|
|
8153 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8154 end =
|
|
|
8155 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8156
|
|
|
8157 /* We aren't allowed to generate additional information to fill in
|
|
|
8158 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8159 cache. */
|
|
|
8160 if (Dynarr_length (cache))
|
|
|
8161 {
|
|
|
8162 if (end < low_bound || start > high_bound)
|
|
|
8163 Dynarr_reset (cache);
|
|
|
8164
|
|
|
8165 /* #### What should really happen if what we are doing is
|
|
|
8166 extending a line (the last line)? */
|
|
|
8167 if (Dynarr_length (cache) == 1
|
|
|
8168 && Dynarr_length (internal_cache) == 1)
|
|
|
8169 Dynarr_reset (cache);
|
|
|
8170 }
|
|
|
8171
|
|
|
8172 if (!Dynarr_length (cache))
|
|
|
8173 {
|
|
|
8174 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8175 Dynarr_length (internal_cache));
|
|
|
8176 w->line_cache_validation_override--;
|
|
|
8177 return;
|
|
|
8178 }
|
|
|
8179
|
|
|
8180 /* An extra check just in case the calling function didn't pass in
|
|
|
8181 the bounds of the DESIRED structs in the first place. */
|
|
|
8182 if (start >= low_bound && end <= high_bound)
|
|
|
8183 {
|
|
|
8184 w->line_cache_validation_override--;
|
|
|
8185 return;
|
|
|
8186 }
|
|
|
8187
|
|
|
8188 /* At this point we know that the internal cache partially overlaps
|
|
|
8189 the main cache. */
|
|
|
8190 if (start < low_bound)
|
|
|
8191 {
|
|
|
8192 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8193 while (ic_elt >= 0)
|
|
|
8194 {
|
|
|
8195 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8196 break;
|
|
|
8197 else
|
|
|
8198 ic_elt--;
|
|
|
8199 }
|
|
|
8200
|
|
|
8201 if (!(ic_elt >= 0))
|
|
|
8202 {
|
|
|
8203 Dynarr_reset (cache);
|
|
|
8204 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8205 Dynarr_length (internal_cache));
|
|
|
8206 w->line_cache_validation_override--;
|
|
|
8207 return;
|
|
|
8208 }
|
|
|
8209
|
|
|
8210 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8211 ic_elt + 1);
|
|
|
8212 }
|
|
|
8213
|
|
|
8214 if (end > high_bound)
|
|
|
8215 {
|
|
|
8216 int ic_elt = 0;
|
|
|
8217
|
|
|
8218 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8219 {
|
|
|
8220 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8221 break;
|
|
|
8222 else
|
|
|
8223 ic_elt++;
|
|
|
8224 }
|
|
|
8225
|
|
|
8226 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8227 {
|
|
|
8228 Dynarr_reset (cache);
|
|
|
8229 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8230 Dynarr_length (internal_cache));
|
|
|
8231 w->line_cache_validation_override--;
|
|
|
8232 return;
|
|
|
8233 }
|
|
|
8234
|
|
|
8235 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8236 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8237 }
|
|
|
8238
|
|
|
8239 w->line_cache_validation_override--;
|
|
|
8240 return;
|
|
|
8241 }
|
|
|
8242
|
|
|
8243 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8244 {
|
|
665
|
8245 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8246 int marker = 0;
|
|
|
8247 int old_lb = low_bound;
|
|
|
8248
|
|
|
8249 while (startp < old_lb || low_bound == -1)
|
|
|
8250 {
|
|
|
8251 int ic_elt;
|
|
665
|
8252 Charbpos new_startp;
|
|
428
|
8253
|
|
|
8254 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8255 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8256
|
|
|
8257 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8258 to layout a single line. This is not possible since we
|
|
|
8259 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8260 assert (Dynarr_length (internal_cache));
|
|
428
|
8261 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8262
|
|
|
8263 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8264 if (low_bound != -1)
|
|
|
8265 {
|
|
|
8266 while (ic_elt >= 0)
|
|
|
8267 {
|
|
|
8268 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8269 break;
|
|
|
8270 else
|
|
|
8271 ic_elt--;
|
|
|
8272 }
|
|
|
8273 }
|
|
|
8274 assert (ic_elt >= 0);
|
|
|
8275
|
|
|
8276 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8277
|
|
|
8278 /*
|
|
|
8279 * Handle invisible text properly:
|
|
|
8280 * If the last line we're inserting has the same end as the
|
|
|
8281 * line before which it will be added, merge the two lines.
|
|
|
8282 */
|
|
|
8283 if (Dynarr_length (cache) &&
|
|
|
8284 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8285 Dynarr_atp (cache, marker)->end)
|
|
|
8286 {
|
|
|
8287 Dynarr_atp (cache, marker)->start
|
|
|
8288 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8289 Dynarr_atp (cache, marker)->height
|
|
|
8290 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8291 ic_elt--;
|
|
|
8292 }
|
|
|
8293
|
|
|
8294 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8295 {
|
|
|
8296 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8297 ic_elt + 1, marker);
|
|
|
8298 marker += (ic_elt + 1);
|
|
|
8299 }
|
|
|
8300
|
|
|
8301 if (startp < low_bound || low_bound == -1)
|
|
|
8302 low_bound = startp;
|
|
|
8303 startp = new_startp;
|
|
|
8304 if (startp > BUF_ZV (b))
|
|
|
8305 {
|
|
|
8306 w->line_cache_validation_override--;
|
|
|
8307 return;
|
|
|
8308 }
|
|
|
8309 }
|
|
|
8310 }
|
|
|
8311
|
|
|
8312 assert (Dynarr_length (cache));
|
|
|
8313 assert (from >= low_bound);
|
|
|
8314
|
|
|
8315 /* Readjust the high_bound to account for any changes made while
|
|
|
8316 correcting the low_bound. */
|
|
|
8317 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8318
|
|
|
8319 if (to > high_bound)
|
|
|
8320 {
|
|
665
|
8321 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8322
|
|
|
8323 do
|
|
|
8324 {
|
|
|
8325 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8326 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8327
|
|
|
8328 /* See comment above about regenerate_window failing. */
|
|
|
8329 assert (Dynarr_length (internal_cache));
|
|
|
8330
|
|
|
8331 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8332 Dynarr_length (internal_cache));
|
|
|
8333 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8334 startp = high_bound + 1;
|
|
|
8335 }
|
|
|
8336 while (to > high_bound);
|
|
|
8337 }
|
|
|
8338
|
|
|
8339 w->line_cache_validation_override--;
|
|
|
8340 assert (to <= high_bound);
|
|
|
8341 }
|
|
|
8342
|
|
|
8343
|
|
|
8344 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8345 return the pixel location corresponding to those coordinates. The
|
|
|
8346 pixel location returned is the center of the given character
|
|
|
8347 position. The pixel values are generated relative to the window,
|
|
|
8348 not the frame.
|
|
|
8349
|
|
|
8350 The modeline is considered to be part of the window. */
|
|
|
8351
|
|
|
8352 void
|
|
|
8353 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8354 int *pix_x, int *pix_y)
|
|
|
8355 {
|
|
|
8356 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8357 int num_disp_lines, modeline;
|
|
|
8358 Lisp_Object window;
|
|
|
8359 int defheight, defwidth;
|
|
|
8360
|
|
793
|
8361 window = wrap_window (w);
|
|
428
|
8362 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8363
|
|
|
8364 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8365 the window, use the first window line or character position
|
|
|
8366 instead. */
|
|
|
8367 if (char_y < 0)
|
|
|
8368 char_y = 0;
|
|
|
8369 if (char_x < 0)
|
|
|
8370 char_x = 0;
|
|
|
8371
|
|
|
8372 num_disp_lines = Dynarr_length (dla);
|
|
|
8373 modeline = 0;
|
|
|
8374 if (num_disp_lines)
|
|
|
8375 {
|
|
|
8376 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8377 {
|
|
|
8378 num_disp_lines--;
|
|
|
8379 modeline = 1;
|
|
|
8380 }
|
|
|
8381 }
|
|
|
8382
|
|
|
8383 /* First check if the y position intersects the display lines. */
|
|
|
8384 if (char_y < num_disp_lines)
|
|
|
8385 {
|
|
|
8386 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8387 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8388
|
|
|
8389 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8390 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8391
|
|
|
8392 if (char_x < Dynarr_length (db->runes))
|
|
|
8393 {
|
|
|
8394 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8395
|
|
|
8396 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8397 }
|
|
|
8398 else
|
|
|
8399 {
|
|
|
8400 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8401 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8402
|
|
|
8403 char_x -= last_rune;
|
|
|
8404
|
|
|
8405 *pix_x = rb->xpos + rb->width;
|
|
|
8406 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8407 *pix_x += (defwidth >> 1);
|
|
|
8408 }
|
|
|
8409 }
|
|
|
8410 else
|
|
|
8411 {
|
|
|
8412 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8413 modeline in this since we don't have true character positions in
|
|
|
8414 it. */
|
|
|
8415
|
|
|
8416 if (!Dynarr_length (w->face_cachels))
|
|
|
8417 reset_face_cachels (w);
|
|
|
8418
|
|
|
8419 char_y -= num_disp_lines;
|
|
|
8420
|
|
|
8421 if (Dynarr_length (dla))
|
|
|
8422 {
|
|
|
8423 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8424 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8425 }
|
|
|
8426 else
|
|
|
8427 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8428
|
|
|
8429 *pix_y += (char_y * defheight);
|
|
|
8430 *pix_y += (defheight >> 1);
|
|
|
8431
|
|
|
8432 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8433 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8434 *pix_x += (char_x * defwidth);
|
|
|
8435 *pix_x += (defwidth >> 1);
|
|
|
8436 }
|
|
|
8437
|
|
|
8438 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8439 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8440 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8441 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8442
|
|
|
8443 *pix_x -= w->pixel_left;
|
|
|
8444 *pix_y -= w->pixel_top;
|
|
|
8445 }
|
|
|
8446
|
|
|
8447 /* Given a display line and a position, determine if there is a glyph
|
|
|
8448 there and return information about it if there is. */
|
|
|
8449
|
|
|
8450 static void
|
|
|
8451 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8452 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8453 int *high_x_coord)
|
|
|
8454 {
|
|
|
8455 struct display_block *db;
|
|
|
8456 int elt;
|
|
|
8457 int block =
|
|
|
8458 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8459
|
|
|
8460 /* We use get_next_display_block to get the actual display block
|
|
|
8461 that would be displayed at x_coord. */
|
|
|
8462
|
|
|
8463 if (block == NO_BLOCK)
|
|
|
8464 return;
|
|
|
8465 else
|
|
|
8466 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8467
|
|
|
8468 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8469 {
|
|
|
8470 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8471
|
|
|
8472 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8473 {
|
|
|
8474 if (rb->type == RUNE_DGLYPH)
|
|
|
8475 {
|
|
|
8476 *obj1 = rb->object.dglyph.glyph;
|
|
|
8477 *obj2 = rb->object.dglyph.extent;
|
|
|
8478 }
|
|
|
8479 else
|
|
|
8480 {
|
|
|
8481 *obj1 = Qnil;
|
|
|
8482 *obj2 = Qnil;
|
|
|
8483 }
|
|
|
8484
|
|
|
8485 if (low_x_coord)
|
|
|
8486 *low_x_coord = rb->xpos;
|
|
|
8487 if (high_x_coord)
|
|
|
8488 *high_x_coord = rb->xpos + rb->width;
|
|
|
8489
|
|
|
8490 return;
|
|
|
8491 }
|
|
|
8492 }
|
|
|
8493 }
|
|
|
8494
|
|
|
8495 #define UPDATE_CACHE_RETURN \
|
|
|
8496 do { \
|
|
|
8497 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8498 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8499 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8500 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8501 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8502 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8503 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8504 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8505 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8506 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8507 d->pixel_to_glyph_cache.w = *w; \
|
|
826
|
8508 d->pixel_to_glyph_cache.charpos = *charpos; \
|
|
428
|
8509 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8510 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8511 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8512 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8513 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8514 RETURN_SANS_WARNINGS position; \
|
|
|
8515 } while (0)
|
|
|
8516
|
|
|
8517 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8518 information about what is located under those coordinates.
|
|
|
8519
|
|
|
8520 The return value will be one of:
|
|
|
8521
|
|
|
8522 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8523 OVER_MODELINE: over a modeline
|
|
|
8524 OVER_BORDER: over an internal border
|
|
|
8525 OVER_NOTHING: over the text area, but not over text
|
|
|
8526 OVER_OUTSIDE: outside of the frame border
|
|
|
8527 OVER_TEXT: over text in the text area
|
|
|
8528
|
|
|
8529 OBJ1 is one of
|
|
|
8530
|
|
|
8531 -- a toolbar button
|
|
|
8532 -- a glyph
|
|
|
8533 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8534
|
|
|
8535 OBJ2 is one of
|
|
|
8536
|
|
|
8537 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8538 -- nil otherwise.
|
|
|
8539
|
|
|
8540 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8541 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8542
|
|
|
8543 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8544 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8545
|
|
|
8546 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8547 */
|
|
|
8548
|
|
|
8549 int
|
|
|
8550 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8551 int *col, int *row, int *obj_x, int *obj_y,
|
|
826
|
8552 struct window **w, Charbpos *charpos,
|
|
665
|
8553 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8554 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8555 {
|
|
|
8556 struct device *d;
|
|
|
8557 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8558 Lisp_Object window;
|
|
|
8559 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8560 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8561 int position = OVER_NOTHING;
|
|
|
8562 int device_check_failed = 0;
|
|
|
8563 display_line_dynarr *dla;
|
|
|
8564
|
|
|
8565 /* This is a safety valve in case this got called with a frame in
|
|
|
8566 the middle of being deleted. */
|
|
|
8567 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8568 {
|
|
|
8569 device_check_failed = 1;
|
|
|
8570 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8571 }
|
|
|
8572 else
|
|
|
8573 {
|
|
|
8574 d = XDEVICE (f->device);
|
|
|
8575 cache = &d->pixel_to_glyph_cache;
|
|
|
8576 }
|
|
|
8577
|
|
|
8578 if (!device_check_failed
|
|
|
8579 && cache->valid
|
|
|
8580 && cache->frame == f
|
|
|
8581 && cache->low_x_coord <= x_coord
|
|
|
8582 && cache->high_x_coord > x_coord
|
|
|
8583 && cache->low_y_coord <= y_coord
|
|
|
8584 && cache->high_y_coord > y_coord)
|
|
|
8585 {
|
|
|
8586 *col = cache->col;
|
|
|
8587 *row = cache->row;
|
|
|
8588 *obj_x = cache->obj_x;
|
|
|
8589 *obj_y = cache->obj_y;
|
|
|
8590 *w = cache->w;
|
|
826
|
8591 *charpos = cache->charpos;
|
|
428
|
8592 *closest = cache->closest;
|
|
|
8593 *modeline_closest = cache->modeline_closest;
|
|
|
8594 *obj1 = cache->obj1;
|
|
|
8595 *obj2 = cache->obj2;
|
|
|
8596
|
|
|
8597 return cache->retval;
|
|
|
8598 }
|
|
|
8599 else
|
|
|
8600 {
|
|
|
8601 *col = 0;
|
|
|
8602 *row = 0;
|
|
|
8603 *obj_x = 0;
|
|
|
8604 *obj_y = 0;
|
|
|
8605 *w = 0;
|
|
826
|
8606 *charpos = 0;
|
|
428
|
8607 *closest = 0;
|
|
|
8608 *modeline_closest = -1;
|
|
|
8609 *obj1 = Qnil;
|
|
|
8610 *obj2 = Qnil;
|
|
|
8611
|
|
|
8612 low_x_coord = x_coord;
|
|
|
8613 high_x_coord = x_coord + 1;
|
|
|
8614 low_y_coord = y_coord;
|
|
|
8615 high_y_coord = y_coord + 1;
|
|
|
8616 }
|
|
|
8617
|
|
|
8618 if (device_check_failed)
|
|
|
8619 return OVER_NOTHING;
|
|
|
8620
|
|
|
8621 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8622 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8623 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8624 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8625
|
|
|
8626 /* Check if the mouse is outside of the text area actually used by
|
|
|
8627 redisplay. */
|
|
|
8628 if (y_coord < frm_top)
|
|
|
8629 {
|
|
|
8630 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8631 {
|
|
|
8632 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8633 high_y_coord = frm_top;
|
|
|
8634 position = OVER_BORDER;
|
|
|
8635 }
|
|
|
8636 else if (y_coord >= 0)
|
|
|
8637 {
|
|
|
8638 low_y_coord = 0;
|
|
|
8639 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8640 position = OVER_TOOLBAR;
|
|
|
8641 }
|
|
|
8642 else
|
|
|
8643 {
|
|
|
8644 low_y_coord = y_coord;
|
|
|
8645 high_y_coord = 0;
|
|
|
8646 position = OVER_OUTSIDE;
|
|
|
8647 }
|
|
|
8648 }
|
|
|
8649 else if (y_coord >= frm_bottom)
|
|
|
8650 {
|
|
|
8651 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
8652 {
|
|
|
8653 low_y_coord = frm_bottom;
|
|
|
8654 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8655 position = OVER_BORDER;
|
|
|
8656 }
|
|
|
8657 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
8658 {
|
|
|
8659 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8660 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8661 position = OVER_TOOLBAR;
|
|
|
8662 }
|
|
|
8663 else
|
|
|
8664 {
|
|
|
8665 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8666 high_y_coord = y_coord;
|
|
|
8667 position = OVER_OUTSIDE;
|
|
|
8668 }
|
|
|
8669 }
|
|
|
8670
|
|
|
8671 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
8672 {
|
|
|
8673 if (x_coord < frm_left)
|
|
|
8674 {
|
|
|
8675 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
8676 {
|
|
|
8677 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8678 high_x_coord = frm_left;
|
|
|
8679 position = OVER_BORDER;
|
|
|
8680 }
|
|
|
8681 else if (x_coord >= 0)
|
|
|
8682 {
|
|
|
8683 low_x_coord = 0;
|
|
|
8684 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8685 position = OVER_TOOLBAR;
|
|
|
8686 }
|
|
|
8687 else
|
|
|
8688 {
|
|
|
8689 low_x_coord = x_coord;
|
|
|
8690 high_x_coord = 0;
|
|
|
8691 position = OVER_OUTSIDE;
|
|
|
8692 }
|
|
|
8693 }
|
|
|
8694 else if (x_coord >= frm_right)
|
|
|
8695 {
|
|
|
8696 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
8697 {
|
|
|
8698 low_x_coord = frm_right;
|
|
|
8699 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8700 position = OVER_BORDER;
|
|
|
8701 }
|
|
|
8702 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
8703 {
|
|
|
8704 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8705 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8706 position = OVER_TOOLBAR;
|
|
|
8707 }
|
|
|
8708 else
|
|
|
8709 {
|
|
|
8710 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8711 high_x_coord = x_coord;
|
|
|
8712 position = OVER_OUTSIDE;
|
|
|
8713 }
|
|
|
8714 }
|
|
|
8715 }
|
|
|
8716
|
|
|
8717 #ifdef HAVE_TOOLBARS
|
|
|
8718 if (position == OVER_TOOLBAR)
|
|
|
8719 {
|
|
|
8720 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
8721 *obj2 = Qnil;
|
|
|
8722 *w = 0;
|
|
|
8723 UPDATE_CACHE_RETURN;
|
|
|
8724 }
|
|
|
8725 #endif /* HAVE_TOOLBARS */
|
|
|
8726
|
|
|
8727 /* We still have to return the window the pointer is next to and its
|
|
|
8728 relative y position even if it is outside the x boundary. */
|
|
|
8729 if (x_coord < frm_left)
|
|
|
8730 x_coord = frm_left;
|
|
|
8731 else if (x_coord > frm_right)
|
|
|
8732 x_coord = frm_right;
|
|
|
8733
|
|
|
8734 /* Same in reverse. */
|
|
|
8735 if (y_coord < frm_top)
|
|
|
8736 y_coord = frm_top;
|
|
|
8737 else if (y_coord > frm_bottom)
|
|
|
8738 y_coord = frm_bottom;
|
|
|
8739
|
|
|
8740 /* Find what window the given coordinates are actually in. */
|
|
|
8741 window = f->root_window;
|
|
|
8742 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
8743
|
|
|
8744 /* If we didn't find a window, we're done. */
|
|
|
8745 if (!*w)
|
|
|
8746 {
|
|
|
8747 UPDATE_CACHE_RETURN;
|
|
|
8748 }
|
|
|
8749 else if (position != OVER_NOTHING)
|
|
|
8750 {
|
|
|
8751 *closest = 0;
|
|
|
8752 *modeline_closest = -1;
|
|
|
8753
|
|
|
8754 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
8755 {
|
|
|
8756 *w = 0;
|
|
|
8757 UPDATE_CACHE_RETURN;
|
|
|
8758 }
|
|
|
8759 }
|
|
|
8760
|
|
|
8761 /* Check if the window is a minibuffer but isn't active. */
|
|
|
8762 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
8763 {
|
|
|
8764 /* Must reset the window value since some callers will ignore
|
|
|
8765 the return value if it is set. */
|
|
|
8766 *w = 0;
|
|
|
8767 UPDATE_CACHE_RETURN;
|
|
|
8768 }
|
|
|
8769
|
|
|
8770 /* See if the point is over window vertical divider */
|
|
|
8771 if (window_needs_vertical_divider (*w))
|
|
|
8772 {
|
|
|
8773 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
8774 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
8775 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
8776 int div_y_low = WINDOW_TOP (*w);
|
|
|
8777
|
|
|
8778 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
8779 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
8780 {
|
|
|
8781 low_x_coord = div_x_low;
|
|
|
8782 high_x_coord = div_x_high;
|
|
|
8783 low_y_coord = div_y_low;
|
|
|
8784 high_y_coord = div_y_high;
|
|
|
8785 position = OVER_V_DIVIDER;
|
|
|
8786 UPDATE_CACHE_RETURN;
|
|
|
8787 }
|
|
|
8788 }
|
|
|
8789
|
|
|
8790 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
8791
|
|
|
8792 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
8793 {
|
|
|
8794 int really_over_nothing = 0;
|
|
|
8795 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
8796
|
|
|
8797 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
8798 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
8799 {
|
|
|
8800 int check_margin_glyphs = 0;
|
|
|
8801 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8802 struct rune *rb = 0;
|
|
|
8803
|
|
|
8804 if (x_coord < dl->bounds.left_white
|
|
|
8805 || x_coord >= dl->bounds.right_white)
|
|
|
8806 check_margin_glyphs = 1;
|
|
|
8807
|
|
|
8808 low_y_coord = dl->ypos - dl->ascent;
|
|
|
8809 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
8810
|
|
|
8811 if (position == OVER_BORDER
|
|
|
8812 || position == OVER_OUTSIDE
|
|
|
8813 || check_margin_glyphs)
|
|
|
8814 {
|
|
|
8815 int x_check, left_bound;
|
|
|
8816
|
|
|
8817 if (check_margin_glyphs)
|
|
|
8818 {
|
|
|
8819 x_check = x_coord;
|
|
|
8820 left_bound = dl->bounds.left_white;
|
|
|
8821 }
|
|
|
8822 else
|
|
|
8823 {
|
|
|
8824 x_check = high_x_coord;
|
|
|
8825 left_bound = frm_left;
|
|
|
8826 }
|
|
|
8827
|
|
|
8828 if (Dynarr_length (db->runes))
|
|
|
8829 {
|
|
|
8830 if (x_check <= left_bound)
|
|
|
8831 {
|
|
|
8832 if (dl->modeline)
|
|
826
|
8833 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8834 else
|
|
826
|
8835 *closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8836 }
|
|
|
8837 else
|
|
|
8838 {
|
|
|
8839 if (dl->modeline)
|
|
|
8840 *modeline_closest =
|
|
|
8841 Dynarr_atp (db->runes,
|
|
826
|
8842 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8843 else
|
|
|
8844 *closest =
|
|
|
8845 Dynarr_atp (db->runes,
|
|
826
|
8846 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8847 }
|
|
|
8848
|
|
|
8849 if (dl->modeline)
|
|
|
8850 *modeline_closest += dl->offset;
|
|
|
8851 else
|
|
|
8852 *closest += dl->offset;
|
|
|
8853 }
|
|
|
8854 else
|
|
|
8855 {
|
|
|
8856 /* #### What should be here. */
|
|
|
8857 if (dl->modeline)
|
|
|
8858 *modeline_closest = 0;
|
|
|
8859 else
|
|
|
8860 *closest = 0;
|
|
|
8861 }
|
|
|
8862
|
|
|
8863 if (check_margin_glyphs)
|
|
|
8864 {
|
|
|
8865 if (x_coord < dl->bounds.left_in
|
|
|
8866 || x_coord >= dl->bounds.right_in)
|
|
|
8867 {
|
|
|
8868 /* If we are over the outside margins then we
|
|
|
8869 know the loop over the text block isn't going
|
|
|
8870 to accomplish anything. So we go ahead and
|
|
|
8871 set what information we can right here and
|
|
|
8872 return. */
|
|
|
8873 (*row)--;
|
|
|
8874 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8875 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8876 &low_x_coord, &high_x_coord);
|
|
|
8877
|
|
|
8878 UPDATE_CACHE_RETURN;
|
|
|
8879 }
|
|
|
8880 }
|
|
|
8881 else
|
|
|
8882 UPDATE_CACHE_RETURN;
|
|
|
8883 }
|
|
|
8884
|
|
|
8885 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
8886 {
|
|
|
8887 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
8888
|
|
|
8889 if (!past_end)
|
|
|
8890 rb = Dynarr_atp (db->runes, *col);
|
|
|
8891
|
|
|
8892 if (past_end ||
|
|
|
8893 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
8894 {
|
|
|
8895 if (past_end)
|
|
|
8896 {
|
|
|
8897 (*col)--;
|
|
|
8898 rb = Dynarr_atp (db->runes, *col);
|
|
|
8899 }
|
|
|
8900
|
|
826
|
8901 *charpos = rb->charpos + dl->offset;
|
|
428
|
8902 low_x_coord = rb->xpos;
|
|
|
8903 high_x_coord = rb->xpos + rb->width;
|
|
|
8904
|
|
|
8905 if (rb->type == RUNE_DGLYPH)
|
|
|
8906 {
|
|
|
8907 int elt = *col + 1;
|
|
|
8908
|
|
|
8909 /* Find the first character after the glyph. */
|
|
|
8910 while (elt < Dynarr_length (db->runes))
|
|
|
8911 {
|
|
|
8912 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
8913 {
|
|
|
8914 if (dl->modeline)
|
|
|
8915 *modeline_closest =
|
|
826
|
8916 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8917 dl->offset);
|
|
|
8918 else
|
|
|
8919 *closest =
|
|
826
|
8920 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8921 dl->offset);
|
|
|
8922 break;
|
|
|
8923 }
|
|
|
8924
|
|
|
8925 elt++;
|
|
|
8926 }
|
|
|
8927
|
|
|
8928 /* In this case we failed to find a non-glyph
|
|
|
8929 character so we return the last position
|
|
|
8930 displayed on the line. */
|
|
|
8931 if (elt == Dynarr_length (db->runes))
|
|
|
8932 {
|
|
|
8933 if (dl->modeline)
|
|
826
|
8934 *modeline_closest = dl->end_charpos + dl->offset;
|
|
428
|
8935 else
|
|
826
|
8936 *closest = dl->end_charpos + dl->offset;
|
|
428
|
8937 really_over_nothing = 1;
|
|
|
8938 }
|
|
|
8939 }
|
|
|
8940 else
|
|
|
8941 {
|
|
|
8942 if (dl->modeline)
|
|
826
|
8943 *modeline_closest = rb->charpos + dl->offset;
|
|
428
|
8944 else
|
|
826
|
8945 *closest = rb->charpos + dl->offset;
|
|
428
|
8946 }
|
|
|
8947
|
|
|
8948 if (dl->modeline)
|
|
|
8949 {
|
|
|
8950 *row = window_displayed_height (*w);
|
|
|
8951
|
|
|
8952 if (position == OVER_NOTHING)
|
|
|
8953 position = OVER_MODELINE;
|
|
|
8954
|
|
|
8955 if (rb->type == RUNE_DGLYPH)
|
|
|
8956 {
|
|
|
8957 *obj1 = rb->object.dglyph.glyph;
|
|
|
8958 *obj2 = rb->object.dglyph.extent;
|
|
|
8959 }
|
|
|
8960 else if (rb->type == RUNE_CHAR)
|
|
|
8961 {
|
|
|
8962 *obj1 = Qnil;
|
|
|
8963 *obj2 = Qnil;
|
|
|
8964 }
|
|
|
8965 else
|
|
|
8966 {
|
|
|
8967 *obj1 = Qnil;
|
|
|
8968 *obj2 = Qnil;
|
|
|
8969 }
|
|
|
8970
|
|
|
8971 UPDATE_CACHE_RETURN;
|
|
|
8972 }
|
|
|
8973 else if (past_end
|
|
|
8974 || (rb->type == RUNE_CHAR
|
|
|
8975 && rb->object.chr.ch == '\n'))
|
|
|
8976 {
|
|
|
8977 (*row)--;
|
|
|
8978 /* At this point we may have glyphs in the right
|
|
|
8979 inside margin. */
|
|
|
8980 if (check_margin_glyphs)
|
|
|
8981 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8982 &low_x_coord, &high_x_coord);
|
|
|
8983 UPDATE_CACHE_RETURN;
|
|
|
8984 }
|
|
|
8985 else
|
|
|
8986 {
|
|
|
8987 (*row)--;
|
|
|
8988 if (rb->type == RUNE_DGLYPH)
|
|
|
8989 {
|
|
|
8990 *obj1 = rb->object.dglyph.glyph;
|
|
|
8991 *obj2 = rb->object.dglyph.extent;
|
|
|
8992 }
|
|
|
8993 else if (rb->type == RUNE_CHAR)
|
|
|
8994 {
|
|
|
8995 *obj1 = Qnil;
|
|
|
8996 *obj2 = Qnil;
|
|
|
8997 }
|
|
|
8998 else
|
|
|
8999 {
|
|
|
9000 *obj1 = Qnil;
|
|
|
9001 *obj2 = Qnil;
|
|
|
9002 }
|
|
|
9003
|
|
|
9004 *obj_x = x_coord - rb->xpos;
|
|
|
9005 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
9006
|
|
|
9007 /* At this point we may have glyphs in the left
|
|
|
9008 inside margin. */
|
|
|
9009 if (check_margin_glyphs)
|
|
|
9010 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
9011
|
|
|
9012 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
9013 position = OVER_TEXT;
|
|
|
9014
|
|
|
9015 UPDATE_CACHE_RETURN;
|
|
|
9016 }
|
|
|
9017 }
|
|
|
9018 }
|
|
|
9019 }
|
|
|
9020 }
|
|
|
9021
|
|
|
9022 *row = Dynarr_length (dla) - 1;
|
|
|
9023 if (FRAME_WIN_P (f))
|
|
|
9024 {
|
|
|
9025 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
9026
|
|
|
9027 if (bot_elt >= 0)
|
|
|
9028 {
|
|
|
9029 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
9030 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
9031 Lisp_Object lwin;
|
|
|
9032 int defheight;
|
|
|
9033
|
|
793
|
9034 lwin = wrap_window (*w);
|
|
428
|
9035 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
9036
|
|
|
9037 *row += (adj_area / defheight);
|
|
|
9038 }
|
|
|
9039 }
|
|
|
9040
|
|
|
9041 /* #### This should be checked out some more to determine what
|
|
|
9042 should really be going on. */
|
|
|
9043 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
9044 *closest = 0;
|
|
|
9045 else
|
|
442
|
9046 *closest = end_of_last_line_may_error (*w,
|
|
428
|
9047 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
9048 *col = 0;
|
|
|
9049 UPDATE_CACHE_RETURN;
|
|
|
9050 }
|
|
|
9051 #undef UPDATE_CACHE_RETURN
|
|
|
9052
|
|
|
9053
|
|
|
9054 /***************************************************************************/
|
|
|
9055 /* */
|
|
|
9056 /* Lisp functions */
|
|
|
9057 /* */
|
|
|
9058 /***************************************************************************/
|
|
|
9059
|
|
|
9060 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
9061 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
9062 */
|
|
|
9063 ())
|
|
|
9064 {
|
|
|
9065 Lisp_Object devcons, concons;
|
|
|
9066
|
|
|
9067 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
9068 {
|
|
|
9069 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
9070 Lisp_Object frmcons;
|
|
|
9071
|
|
|
9072 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9073 {
|
|
|
9074 struct frame *f = XFRAME (XCAR (frmcons));
|
|
853
|
9075 int depth;
|
|
428
|
9076
|
|
|
9077 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9078 {
|
|
|
9079 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9080
|
|
|
9081 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9082
|
|
428
|
9083 /*
|
|
|
9084 * If the frame size has changed, there may be random
|
|
|
9085 * chud on the screen left from previous messages
|
|
|
9086 * because redisplay_frame hasn't been called yet.
|
|
|
9087 * Clear the screen to get rid of the potential mess.
|
|
|
9088 */
|
|
|
9089 if (f->echo_area_garbaged)
|
|
|
9090 {
|
|
442
|
9091 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9092 f->echo_area_garbaged = 0;
|
|
|
9093 }
|
|
853
|
9094 depth = enter_redisplay_critical_section ();
|
|
428
|
9095 redisplay_window (window, 0);
|
|
853
|
9096 exit_redisplay_critical_section (depth);
|
|
442
|
9097 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
|
9098
|
|
428
|
9099 call_redisplay_end_triggers (XWINDOW (window), 0);
|
|
|
9100 }
|
|
|
9101 }
|
|
|
9102 }
|
|
|
9103
|
|
|
9104 return Qnil;
|
|
|
9105 }
|
|
|
9106
|
|
|
9107 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9108 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9109 FRAME defaults to the selected frame if omitted.
|
|
|
9110 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9111 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9112 input and is guaranteed to proceed to completion.
|
|
|
9113 */
|
|
|
9114 (frame, no_preempt))
|
|
|
9115 {
|
|
|
9116 struct frame *f = decode_frame (frame);
|
|
|
9117 int count = specpdl_depth ();
|
|
|
9118
|
|
|
9119 if (!NILP (no_preempt))
|
|
853
|
9120 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9121
|
|
|
9122 f->clear = 1;
|
|
|
9123 redisplay_frame (f, 1);
|
|
|
9124
|
|
442
|
9125 /* See the comment in Fredisplay_frame. */
|
|
|
9126 RESET_CHANGED_SET_FLAGS;
|
|
|
9127
|
|
771
|
9128 return unbind_to (count);
|
|
428
|
9129 }
|
|
|
9130
|
|
|
9131 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9132 Ensure that FRAME's contents are correctly displayed.
|
|
|
9133 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9134 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9135 the frame.
|
|
|
9136 FRAME defaults to the selected frame if omitted.
|
|
|
9137 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9138 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9139 input and is guaranteed to proceed to completion.
|
|
|
9140 */
|
|
|
9141 (frame, no_preempt))
|
|
|
9142 {
|
|
|
9143 struct frame *f = decode_frame (frame);
|
|
|
9144 int count = specpdl_depth ();
|
|
|
9145
|
|
|
9146 if (!NILP (no_preempt))
|
|
853
|
9147 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9148
|
|
|
9149 redisplay_frame (f, 1);
|
|
|
9150
|
|
442
|
9151 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9152 changes to the display will not get registered by redisplay
|
|
|
9153 because it thinks it already has registered changes. If you
|
|
|
9154 really knew what you were doing you could confuse redisplay by
|
|
|
9155 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9156 that if you know what you are doing you will not be that
|
|
|
9157 stupid. */
|
|
|
9158 RESET_CHANGED_SET_FLAGS;
|
|
|
9159
|
|
771
|
9160 return unbind_to (count);
|
|
428
|
9161 }
|
|
|
9162
|
|
|
9163 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9164 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9165 DEVICE defaults to the selected device if omitted.
|
|
|
9166 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9167 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9168 input and is guaranteed to proceed to completion.
|
|
|
9169 */
|
|
|
9170 (device, no_preempt))
|
|
|
9171 {
|
|
|
9172 struct device *d = decode_device (device);
|
|
|
9173 Lisp_Object frmcons;
|
|
|
9174 int count = specpdl_depth ();
|
|
|
9175
|
|
|
9176 if (!NILP (no_preempt))
|
|
853
|
9177 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9178
|
|
|
9179 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9180 {
|
|
|
9181 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9182 }
|
|
440
|
9183 redisplay_device (d, 0);
|
|
428
|
9184
|
|
442
|
9185 /* See the comment in Fredisplay_frame. */
|
|
|
9186 RESET_CHANGED_SET_FLAGS;
|
|
|
9187
|
|
771
|
9188 return unbind_to (count);
|
|
428
|
9189 }
|
|
|
9190
|
|
|
9191 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9192 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9193 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9194 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9195 the device.
|
|
|
9196 DEVICE defaults to the selected device if omitted.
|
|
|
9197 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9198 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9199 input and is guaranteed to proceed to completion.
|
|
853
|
9200
|
|
|
9201 Note: If you simply want everything redisplayed, the current idiom is
|
|
|
9202 `(sit-for 0)'.
|
|
428
|
9203 */
|
|
|
9204 (device, no_preempt))
|
|
|
9205 {
|
|
|
9206 struct device *d = decode_device (device);
|
|
|
9207 int count = specpdl_depth ();
|
|
|
9208
|
|
|
9209 if (!NILP (no_preempt))
|
|
853
|
9210 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9211
|
|
440
|
9212 redisplay_device (d, 0);
|
|
428
|
9213
|
|
442
|
9214 /* See the comment in Fredisplay_frame. */
|
|
|
9215 RESET_CHANGED_SET_FLAGS;
|
|
|
9216
|
|
771
|
9217 return unbind_to (count);
|
|
428
|
9218 }
|
|
|
9219
|
|
|
9220 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9221 regardless if the all flag is set or not. It remains in existence
|
|
|
9222 solely for backwards compatibility. */
|
|
|
9223 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9224 Force the modeline of the current buffer to be redisplayed.
|
|
|
9225 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9226 */
|
|
|
9227 (all))
|
|
|
9228 {
|
|
|
9229 MARK_MODELINE_CHANGED;
|
|
|
9230 return Qnil;
|
|
|
9231 }
|
|
|
9232
|
|
|
9233 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9234 Force an immediate update of the cursor on FRAME.
|
|
|
9235 FRAME defaults to the selected frame if omitted.
|
|
|
9236 */
|
|
|
9237 (frame))
|
|
|
9238 {
|
|
|
9239 redisplay_redraw_cursor (decode_frame (frame), 1);
|
|
|
9240 return Qnil;
|
|
|
9241 }
|
|
|
9242
|
|
|
9243
|
|
|
9244 /***************************************************************************/
|
|
|
9245 /* */
|
|
872
|
9246 /* Change flags */
|
|
428
|
9247 /* */
|
|
|
9248 /***************************************************************************/
|
|
|
9249
|
|
|
9250 static void
|
|
|
9251 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
9252 Lisp_Object oldval)
|
|
|
9253 {
|
|
|
9254 /* Nothing to be done? */
|
|
|
9255 }
|
|
|
9256
|
|
|
9257 int
|
|
|
9258 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
9259 Lisp_Object in_object, int flags)
|
|
|
9260 {
|
|
|
9261 /* #### clip_changed should really be renamed something like
|
|
|
9262 global_redisplay_change. */
|
|
|
9263 MARK_CLIP_CHANGED;
|
|
|
9264 return 0;
|
|
|
9265 }
|
|
|
9266
|
|
|
9267 /* This is called if the built-in glyphs have their properties
|
|
|
9268 changed. */
|
|
|
9269 void
|
|
|
9270 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
9271 Lisp_Object locale)
|
|
|
9272 {
|
|
|
9273 if (WINDOWP (locale))
|
|
|
9274 {
|
|
|
9275 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9276 }
|
|
|
9277 else if (FRAMEP (locale))
|
|
|
9278 {
|
|
|
9279 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9280 }
|
|
|
9281 else if (DEVICEP (locale))
|
|
|
9282 {
|
|
|
9283 Lisp_Object frmcons;
|
|
|
9284 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9285 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9286 }
|
|
|
9287 else if (CONSOLEP (locale))
|
|
|
9288 {
|
|
|
9289 Lisp_Object frmcons, devcons;
|
|
|
9290 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9291 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9292 }
|
|
|
9293 else /* global or buffer */
|
|
|
9294 {
|
|
|
9295 Lisp_Object frmcons, devcons, concons;
|
|
|
9296 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9297 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9298 }
|
|
|
9299 }
|
|
|
9300
|
|
|
9301 static void
|
|
|
9302 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
9303 Lisp_Object oldval)
|
|
|
9304 {
|
|
|
9305 if (XFRAME (w->frame)->init_finished)
|
|
|
9306 Fforce_cursor_redisplay (w->frame);
|
|
|
9307 }
|
|
|
9308
|
|
872
|
9309 void
|
|
|
9310 mark_buffers_changed (void)
|
|
|
9311 {
|
|
|
9312 MARK_TYPE_CHANGED (buffers);
|
|
|
9313 }
|
|
|
9314
|
|
|
9315 void
|
|
|
9316 mark_clip_changed (void)
|
|
|
9317 {
|
|
|
9318 MARK_TYPE_CHANGED (clip);
|
|
|
9319 }
|
|
|
9320
|
|
|
9321 void
|
|
|
9322 mark_extents_changed (void)
|
|
|
9323 {
|
|
|
9324 MARK_TYPE_CHANGED (extents);
|
|
|
9325 }
|
|
|
9326
|
|
|
9327 void
|
|
|
9328 mark_icon_changed (void)
|
|
|
9329 {
|
|
|
9330 MARK_TYPE_CHANGED (icon);
|
|
|
9331 }
|
|
|
9332
|
|
|
9333 void
|
|
|
9334 mark_menubar_changed (void)
|
|
|
9335 {
|
|
|
9336 MARK_TYPE_CHANGED (menubar);
|
|
|
9337 }
|
|
|
9338
|
|
|
9339 void
|
|
|
9340 mark_modeline_changed (void)
|
|
|
9341 {
|
|
|
9342 MARK_TYPE_CHANGED (modeline);
|
|
|
9343 }
|
|
|
9344
|
|
|
9345 void
|
|
|
9346 mark_point_changed (void)
|
|
|
9347 {
|
|
|
9348 MARK_TYPE_CHANGED (point);
|
|
|
9349 }
|
|
|
9350
|
|
|
9351 void
|
|
|
9352 mark_toolbar_changed (void)
|
|
|
9353 {
|
|
|
9354 MARK_TYPE_CHANGED (toolbar);
|
|
|
9355 }
|
|
|
9356
|
|
|
9357 void
|
|
|
9358 mark_gutter_changed (void)
|
|
|
9359 {
|
|
|
9360 MARK_TYPE_CHANGED (gutter);
|
|
|
9361 }
|
|
|
9362
|
|
|
9363 void
|
|
|
9364 mark_glyphs_changed (void)
|
|
|
9365 {
|
|
|
9366 MARK_TYPE_CHANGED (glyphs);
|
|
|
9367 }
|
|
|
9368
|
|
|
9369 void
|
|
|
9370 mark_subwindows_changed (void)
|
|
|
9371 {
|
|
|
9372 MARK_TYPE_CHANGED (subwindows);
|
|
|
9373 }
|
|
|
9374
|
|
|
9375 void
|
|
|
9376 mark_subwindows_state_changed (void)
|
|
|
9377 {
|
|
|
9378 MARK_TYPE_CHANGED (subwindows_state);
|
|
|
9379 }
|
|
|
9380
|
|
428
|
9381 #ifdef MEMORY_USAGE_STATS
|
|
|
9382
|
|
|
9383
|
|
|
9384 /***************************************************************************/
|
|
|
9385 /* */
|
|
|
9386 /* memory usage computation */
|
|
|
9387 /* */
|
|
|
9388 /***************************************************************************/
|
|
|
9389
|
|
|
9390 static int
|
|
|
9391 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9392 {
|
|
|
9393 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9394 }
|
|
|
9395
|
|
|
9396 static int
|
|
|
9397 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9398 struct overhead_stats *ovstats)
|
|
|
9399 {
|
|
|
9400 int total, i;
|
|
|
9401
|
|
|
9402 if (!dyn)
|
|
|
9403 return 0;
|
|
|
9404
|
|
|
9405 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9406 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9407 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9408
|
|
|
9409 return total;
|
|
|
9410 }
|
|
|
9411
|
|
|
9412 static int
|
|
|
9413 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9414 struct overhead_stats *ovstats)
|
|
|
9415 {
|
|
|
9416 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9417 }
|
|
|
9418
|
|
|
9419 int
|
|
|
9420 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9421 struct overhead_stats *ovstats)
|
|
|
9422 {
|
|
|
9423 int total, i;
|
|
|
9424
|
|
|
9425 if (!dyn)
|
|
|
9426 return 0;
|
|
|
9427
|
|
|
9428 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9429 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9430 {
|
|
|
9431 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9432 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9433 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9434 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9435 }
|
|
|
9436
|
|
|
9437 return total;
|
|
|
9438 }
|
|
|
9439
|
|
|
9440 int
|
|
|
9441 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9442 struct overhead_stats *ovstats)
|
|
|
9443 {
|
|
|
9444 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9445 }
|
|
|
9446
|
|
|
9447 #endif /* MEMORY_USAGE_STATS */
|
|
|
9448
|
|
800
|
9449 static int
|
|
|
9450 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
|
|
|
9451 {
|
|
|
9452 int i, j;
|
|
|
9453 display_line_dynarr *dl;
|
|
|
9454
|
|
|
9455 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9456
|
|
|
9457 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9458 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9459 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9460 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9461
|
|
|
9462 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9463
|
|
|
9464 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9465 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9466 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9467 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9468
|
|
|
9469 return 0;
|
|
|
9470 }
|
|
|
9471
|
|
|
9472 static void
|
|
|
9473 sledgehammer_check_redisplay_structs (void)
|
|
|
9474 {
|
|
|
9475 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9476 }
|
|
|
9477
|
|
428
|
9478
|
|
|
9479 /***************************************************************************/
|
|
|
9480 /* */
|
|
|
9481 /* initialization */
|
|
|
9482 /* */
|
|
|
9483 /***************************************************************************/
|
|
|
9484
|
|
|
9485 void
|
|
|
9486 init_redisplay (void)
|
|
|
9487 {
|
|
|
9488 disable_preemption = 0;
|
|
|
9489 preemption_count = 0;
|
|
|
9490 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
9491
|
|
|
9492 #ifndef PDUMP
|
|
|
9493 if (!initialized)
|
|
|
9494 #endif
|
|
|
9495 {
|
|
440
|
9496 if (!cmotion_display_lines)
|
|
|
9497 cmotion_display_lines = Dynarr_new (display_line);
|
|
867
|
9498 if (!mode_spec_ibyte_string)
|
|
|
9499 mode_spec_ibyte_string = Dynarr_new (Ibyte);
|
|
440
|
9500 if (!formatted_string_extent_dynarr)
|
|
|
9501 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9502 if (!formatted_string_extent_start_dynarr)
|
|
|
9503 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9504 if (!formatted_string_extent_end_dynarr)
|
|
|
9505 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9506 if (!internal_cache)
|
|
|
9507 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9508 }
|
|
|
9509
|
|
|
9510 /* window system is nil when in -batch mode */
|
|
|
9511 if (!initialized || noninteractive)
|
|
|
9512 return;
|
|
|
9513
|
|
|
9514 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9515 initializing the terminal. This is especially important when the
|
|
|
9516 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9517 using the window system.
|
|
|
9518
|
|
|
9519 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9520 with an error message if that doesn't work. */
|
|
|
9521
|
|
|
9522 #ifdef HAVE_X_WINDOWS
|
|
|
9523 if (!strcmp (display_use, "x"))
|
|
|
9524 {
|
|
|
9525 /* Some stuff checks this way early. */
|
|
|
9526 Vwindow_system = Qx;
|
|
|
9527 Vinitial_window_system = Qx;
|
|
|
9528 return;
|
|
|
9529 }
|
|
|
9530 #endif /* HAVE_X_WINDOWS */
|
|
|
9531
|
|
462
|
9532 #ifdef HAVE_GTK
|
|
|
9533 if (!strcmp (display_use, "gtk"))
|
|
|
9534 {
|
|
|
9535 Vwindow_system = Qgtk;
|
|
|
9536 Vinitial_window_system = Qgtk;
|
|
|
9537 return;
|
|
|
9538 }
|
|
|
9539 #endif
|
|
|
9540
|
|
428
|
9541 #ifdef HAVE_MS_WINDOWS
|
|
|
9542 if (!strcmp (display_use, "mswindows"))
|
|
|
9543 {
|
|
|
9544 /* Some stuff checks this way early. */
|
|
|
9545 Vwindow_system = Qmswindows;
|
|
|
9546 Vinitial_window_system = Qmswindows;
|
|
|
9547 return;
|
|
|
9548 }
|
|
|
9549 #endif /* HAVE_MS_WINDOWS */
|
|
|
9550
|
|
|
9551 #ifdef HAVE_TTY
|
|
|
9552 /* If no window system has been specified, try to use the terminal. */
|
|
|
9553 if (!isatty (0))
|
|
|
9554 {
|
|
|
9555 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9556 exit (1);
|
|
|
9557 }
|
|
|
9558
|
|
|
9559 /* Look at the TERM variable */
|
|
771
|
9560 if (!egetenv ("TERM"))
|
|
428
|
9561 {
|
|
|
9562 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9563 exit (1);
|
|
|
9564 }
|
|
|
9565
|
|
|
9566 Vinitial_window_system = Qtty;
|
|
|
9567 return;
|
|
|
9568 #else /* not HAVE_TTY */
|
|
|
9569 /* No DISPLAY specified, and no TTY support. */
|
|
|
9570 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9571 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9572 exit (1);
|
|
|
9573 #endif
|
|
|
9574 /* Unreached. */
|
|
|
9575 }
|
|
|
9576
|
|
|
9577 void
|
|
|
9578 syms_of_redisplay (void)
|
|
|
9579 {
|
|
563
|
9580 DEFSYMBOL (Qcursor_in_echo_area);
|
|
428
|
9581 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
563
|
9582 DEFSYMBOL (Qpre_redisplay_hook);
|
|
|
9583 DEFSYMBOL (Qpost_redisplay_hook);
|
|
428
|
9584 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
563
|
9585 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9586 DEFSYMBOL (Qbar_cursor);
|
|
|
9587 DEFSYMBOL (Qredisplay_end_trigger_functions);
|
|
|
9588 DEFSYMBOL (Qtop_bottom);
|
|
|
9589 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9590
|
|
|
9591 DEFSUBR (Fredisplay_echo_area);
|
|
|
9592 DEFSUBR (Fredraw_frame);
|
|
|
9593 DEFSUBR (Fredisplay_frame);
|
|
|
9594 DEFSUBR (Fredraw_device);
|
|
|
9595 DEFSUBR (Fredisplay_device);
|
|
|
9596 DEFSUBR (Fredraw_modeline);
|
|
|
9597 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9598 }
|
|
|
9599
|
|
|
9600 void
|
|
|
9601 vars_of_redisplay (void)
|
|
|
9602 {
|
|
|
9603
|
|
|
9604 #if 0
|
|
|
9605 staticpro (&last_arrow_position);
|
|
|
9606 staticpro (&last_arrow_string);
|
|
|
9607 last_arrow_position = Qnil;
|
|
|
9608 last_arrow_string = Qnil;
|
|
|
9609 #endif /* 0 */
|
|
|
9610
|
|
|
9611 /* #### Probably temporary */
|
|
|
9612 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9613 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9614 line start cache.
|
|
|
9615 */ );
|
|
|
9616 cache_adjustment = 2;
|
|
|
9617
|
|
|
9618 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
9619 Minimum pixel height for clipped bottom display line.
|
|
|
9620 A clipped line shorter than this won't be displayed.
|
|
|
9621 */ ,
|
|
|
9622 redisplay_variable_changed);
|
|
|
9623 vertical_clip = 5;
|
|
|
9624
|
|
|
9625 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
9626 Minimum visible area for clipped glyphs at right boundary.
|
|
|
9627 Clipped glyphs shorter than this won't be displayed.
|
|
|
9628 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
9629 */ ,
|
|
|
9630 redisplay_variable_changed);
|
|
|
9631 horizontal_clip = 5;
|
|
|
9632
|
|
|
9633 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
9634 String displayed by modeline-format's "%m" specification.
|
|
|
9635 */ );
|
|
|
9636 Vglobal_mode_string = Qnil;
|
|
|
9637
|
|
|
9638 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
9639 Marker for where to display an arrow on top of the buffer text.
|
|
|
9640 This must be the beginning of a line in order to work.
|
|
|
9641 See also `overlay-arrow-string'.
|
|
|
9642 */ ,
|
|
|
9643 redisplay_variable_changed);
|
|
|
9644 Voverlay_arrow_position = Qnil;
|
|
|
9645
|
|
|
9646 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
9647 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
9648 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
9649 well as a string.)
|
|
428
|
9650 */ ,
|
|
|
9651 redisplay_variable_changed);
|
|
|
9652 Voverlay_arrow_string = Qnil;
|
|
|
9653
|
|
|
9654 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
9655 *The number of lines to try scrolling a window by when point moves out.
|
|
|
9656 If that fails to bring point back on frame, point is centered instead.
|
|
|
9657 If this is zero, point is always centered after it moves off screen.
|
|
|
9658 */ );
|
|
|
9659 scroll_step = 0;
|
|
|
9660
|
|
|
9661 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
9662 *Scroll up to this many lines, to bring point back on screen.
|
|
|
9663 */ );
|
|
|
9664 scroll_conservatively = 0;
|
|
|
9665
|
|
|
9666 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
9667 &truncate_partial_width_windows /*
|
|
|
9668 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
9669 */ ,
|
|
|
9670 redisplay_variable_changed);
|
|
|
9671 truncate_partial_width_windows = 1;
|
|
|
9672
|
|
442
|
9673 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
9674 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
9675
|
|
|
9676 Default behavior is to flash the whole screen. On some platforms,
|
|
|
9677 special effects are available using the following values:
|
|
|
9678
|
|
|
9679 'display Flash the whole screen (ie, the default behavior).
|
|
|
9680 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
9681
|
|
|
9682 When effects are unavailable on a platform, the visual bell is the
|
|
|
9683 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
9684 */ );
|
|
442
|
9685 Vvisible_bell = Qnil;
|
|
428
|
9686
|
|
|
9687 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
9688 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
9689 A non-nil value is useful if the terminal can automatically preserve
|
|
|
9690 Emacs's frame display when you reenter Emacs.
|
|
|
9691 It is up to you to set this variable if your terminal can do that.
|
|
|
9692 */ );
|
|
|
9693 no_redraw_on_reenter = 0;
|
|
|
9694
|
|
|
9695 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
9696 A symbol naming the window-system under which Emacs is running,
|
|
|
9697 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
9698
|
|
|
9699 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
9700 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
9701 instead.
|
|
|
9702 */ );
|
|
|
9703 Vwindow_system = Qnil;
|
|
|
9704
|
|
|
9705 /* #### Temporary shit until window-system is eliminated. */
|
|
|
9706 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
9707 DON'T TOUCH
|
|
|
9708 */ );
|
|
|
9709 Vinitial_window_system = Qnil;
|
|
|
9710
|
|
|
9711 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
9712 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
9713 */ );
|
|
|
9714 cursor_in_echo_area = 0;
|
|
|
9715
|
|
|
9716 /* #### Shouldn't this be generalized as follows:
|
|
|
9717
|
|
|
9718 if nil, use block cursor.
|
|
|
9719 if a number, use a bar cursor of that width.
|
|
|
9720 Otherwise, use a 1-pixel bar cursor.
|
|
|
9721
|
|
|
9722 #### Or better yet, this variable should be trashed entirely
|
|
|
9723 (use a Lisp-magic variable to maintain compatibility)
|
|
|
9724 and a specifier `cursor-shape' added, which allows a block
|
|
|
9725 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
9726 maybe a caret cursor, etc. */
|
|
|
9727
|
|
|
9728 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
9729 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
9730 */ );
|
|
|
9731 Vbar_cursor = Qnil;
|
|
|
9732
|
|
|
9733 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
9734 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
|
|
|
9735 Function or functions to run before every redisplay.
|
|
|
9736 */ );
|
|
|
9737 Vpre_redisplay_hook = Qnil;
|
|
|
9738
|
|
|
9739 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
|
|
|
9740 Function or functions to run after every redisplay.
|
|
|
9741 */ );
|
|
|
9742 Vpost_redisplay_hook = Qnil;
|
|
|
9743 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
9744
|
|
442
|
9745 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
9746 Function or functions to call when a frame's buffer list has changed.
|
|
|
9747 This is called during redisplay, before redisplaying each frame.
|
|
|
9748 Functions on this hook are called with one argument, the frame.
|
|
|
9749 */ );
|
|
|
9750 Vbuffer_list_changed_hook = Qnil;
|
|
|
9751
|
|
428
|
9752 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
9753 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
9754 at next redisplay. You should not normally change this; the function
|
|
|
9755 `display-warning' automatically does this at appropriate times.
|
|
|
9756 */ );
|
|
|
9757 display_warning_tick = 0;
|
|
|
9758
|
|
|
9759 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
9760 Non-nil means inhibit display of warning messages.
|
|
|
9761 You should *bind* this, not set it. Any pending warning messages
|
|
|
9762 will be displayed when the binding no longer applies.
|
|
|
9763 */ );
|
|
|
9764 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
9765 This way, the warnings don't obliterate the splash screen. */
|
|
|
9766 inhibit_warning_display = 1;
|
|
|
9767
|
|
|
9768 DEFVAR_LISP ("window-size-change-functions",
|
|
|
9769 &Vwindow_size_change_functions /*
|
|
|
9770 Not currently implemented.
|
|
|
9771 Functions called before redisplay, if window sizes have changed.
|
|
|
9772 The value should be a list of functions that take one argument.
|
|
|
9773 Just before redisplay, for each frame, if any of its windows have changed
|
|
|
9774 size since the last redisplay, or have been split or deleted,
|
|
|
9775 all the functions in the list are called, with the frame as argument.
|
|
|
9776 */ );
|
|
|
9777 Vwindow_size_change_functions = Qnil;
|
|
|
9778
|
|
|
9779 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
|
|
|
9780 Not currently implemented.
|
|
|
9781 Functions to call before redisplaying a window with scrolling.
|
|
|
9782 Each function is called with two arguments, the window
|
|
|
9783 and its new display-start position. Note that the value of `window-end'
|
|
|
9784 is not valid when these functions are called.
|
|
|
9785 */ );
|
|
|
9786 Vwindow_scroll_functions = Qnil;
|
|
|
9787
|
|
|
9788 DEFVAR_LISP ("redisplay-end-trigger-functions",
|
|
|
9789 &Vredisplay_end_trigger_functions /*
|
|
|
9790 See `set-window-redisplay-end-trigger'.
|
|
|
9791 */ );
|
|
|
9792 Vredisplay_end_trigger_functions = Qnil;
|
|
|
9793
|
|
|
9794 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
9795 *Non-nil means column display number starts at 1.
|
|
|
9796 */ );
|
|
|
9797 column_number_start_at_one = 0;
|
|
|
9798 }
|
|
|
9799
|
|
|
9800 void
|
|
|
9801 specifier_vars_of_redisplay (void)
|
|
|
9802 {
|
|
|
9803 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
9804 *Width of left margin.
|
|
|
9805 This is a specifier; use `set-specifier' to change it.
|
|
|
9806 */ );
|
|
|
9807 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9808 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9809 set_specifier_caching (Vleft_margin_width,
|
|
438
|
9810 offsetof (struct window, left_margin_width),
|
|
428
|
9811 some_window_value_changed,
|
|
438
|
9812 offsetof (struct frame, left_margin_width),
|
|
444
|
9813 margin_width_changed_in_frame, 0);
|
|
428
|
9814
|
|
|
9815 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
9816 *Width of right margin.
|
|
|
9817 This is a specifier; use `set-specifier' to change it.
|
|
|
9818 */ );
|
|
|
9819 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9820 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9821 set_specifier_caching (Vright_margin_width,
|
|
438
|
9822 offsetof (struct window, right_margin_width),
|
|
428
|
9823 some_window_value_changed,
|
|
438
|
9824 offsetof (struct frame, right_margin_width),
|
|
444
|
9825 margin_width_changed_in_frame, 0);
|
|
428
|
9826
|
|
|
9827 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
9828 *Minimum ascent height of lines.
|
|
|
9829 This is a specifier; use `set-specifier' to change it.
|
|
|
9830 */ );
|
|
|
9831 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
9832 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9833 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
9834 offsetof (struct window, minimum_line_ascent),
|
|
428
|
9835 some_window_value_changed,
|
|
444
|
9836 0, 0, 0);
|
|
428
|
9837
|
|
|
9838 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
9839 *Minimum descent height of lines.
|
|
|
9840 This is a specifier; use `set-specifier' to change it.
|
|
|
9841 */ );
|
|
|
9842 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
9843 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9844 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
9845 offsetof (struct window, minimum_line_descent),
|
|
428
|
9846 some_window_value_changed,
|
|
444
|
9847 0, 0, 0);
|
|
428
|
9848
|
|
|
9849 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
9850 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
9851 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9852 This is a specifier; use `set-specifier' to change it.
|
|
|
9853 */ );
|
|
|
9854 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
9855 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9856 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
9857 offsetof (struct window, use_left_overflow),
|
|
428
|
9858 some_window_value_changed,
|
|
444
|
9859 0, 0, 0);
|
|
428
|
9860
|
|
|
9861 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
9862 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
9863 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9864 This is a specifier; use `set-specifier' to change it.
|
|
|
9865 */ );
|
|
|
9866 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
9867 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9868 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
9869 offsetof (struct window, use_right_overflow),
|
|
428
|
9870 some_window_value_changed,
|
|
444
|
9871 0, 0, 0);
|
|
428
|
9872
|
|
|
9873 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
9874 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
9875 This is a specifier; use `set-specifier' to change it.
|
|
|
9876 */ );
|
|
|
9877 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
9878 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
9879 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
9880 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
9881 text_cursor_visible_p_changed,
|
|
444
|
9882 0, 0, 0);
|
|
428
|
9883
|
|
|
9884 }
|
