|
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
|
|
|
36 First: It Is Better To Be Correct Than Fast
|
|
|
37 Second: Thou Shalt Not Run Elisp From Within Redisplay
|
|
|
38 Third: It Is Better To Be Fast Than Not To Be
|
|
|
39 ****************************************************************************/
|
|
|
40
|
|
|
41 #include <config.h>
|
|
|
42 #include "lisp.h"
|
|
|
43
|
|
|
44 #include "buffer.h"
|
|
|
45 #include "commands.h"
|
|
|
46 #include "debug.h"
|
|
|
47 #include "device.h"
|
|
|
48 #include "elhash.h"
|
|
|
49 #include "extents.h"
|
|
|
50 #include "faces.h"
|
|
|
51 #include "frame.h"
|
|
|
52 #include "glyphs.h"
|
|
|
53 #include "gutter.h"
|
|
|
54 #include "insdel.h"
|
|
|
55 #include "menubar.h"
|
|
|
56 #include "objects.h"
|
|
|
57 #include "process.h"
|
|
|
58 #include "redisplay.h"
|
|
|
59 #include "toolbar.h"
|
|
|
60 #include "window.h"
|
|
|
61 #include "line-number.h"
|
|
|
62 #include "file-coding.h"
|
|
|
63
|
|
442
|
64 #include "sysfile.h"
|
|
|
65
|
|
428
|
66 #ifdef HAVE_TTY
|
|
|
67 #include "console-tty.h"
|
|
|
68 #endif /* HAVE_TTY */
|
|
|
69
|
|
|
70 /* Note: We have to be careful throughout this code to properly handle
|
|
665
|
71 and differentiate between Intbytes and Emchars.
|
|
|
72
|
|
|
73 Since strings are generally composed of Intbytes, I've taken the tack
|
|
|
74 that any contiguous set of Intbytes is called a "string", while
|
|
428
|
75 any contiguous set of Emchars is called an "array". */
|
|
|
76
|
|
|
77 /* Return value to indicate a failure by an add_*_rune routine to add
|
|
|
78 a rune, but no propagation information needs to be returned. */
|
|
|
79 #define ADD_FAILED (prop_block_dynarr *) 1
|
|
|
80
|
|
|
81 #define BEGIN_GLYPHS 0
|
|
|
82 #define END_GLYPHS 1
|
|
|
83 #define LEFT_GLYPHS 2
|
|
|
84 #define RIGHT_GLYPHS 3
|
|
|
85
|
|
|
86 #define VERTICAL_CLIP(w, display) \
|
|
442
|
87 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
|
|
428
|
88 ? INT_MAX \
|
|
442
|
89 : vertical_clip)
|
|
428
|
90
|
|
|
91 /* The following structures are completely private to redisplay.c so
|
|
|
92 we put them here instead of in a header file, for modularity. */
|
|
|
93
|
|
826
|
94 /* NOTE: Bytexpos's not Charxpos's in this structure. */
|
|
428
|
95
|
|
|
96 typedef struct position_redisplay_data_type
|
|
|
97 {
|
|
|
98 /* This information is normally filled in by the create_*_block
|
|
|
99 routines and is used by the add_*_rune routines. */
|
|
|
100 Lisp_Object window;
|
|
|
101 /* if we are working with strings rather than buffers we need a
|
|
|
102 handle to the string */
|
|
|
103 Lisp_Object string;
|
|
|
104 struct device *d;
|
|
|
105 struct display_block *db;
|
|
|
106 struct display_line *dl;
|
|
|
107 Emchar ch; /* Character that is to be added. This is
|
|
|
108 used to communicate this information to
|
|
|
109 add_emchar_rune(). */
|
|
|
110 Lisp_Object last_charset; /* The charset of the previous character.
|
|
|
111 Used to optimize some lookups -- we
|
|
|
112 only have to do some things when
|
|
|
113 the charset changes. */
|
|
|
114 face_index last_findex; /* The face index of the previous character.
|
|
|
115 Needed to ensure the validity of the
|
|
|
116 last_charset optimization. */
|
|
|
117
|
|
|
118 int last_char_width; /* The width of the previous character. */
|
|
|
119 int font_is_bogus; /* If true, it means we couldn't instantiate
|
|
|
120 the font for this charset, so we substitute
|
|
|
121 ~'s from the ASCII charset. */
|
|
826
|
122 Bytexpos byte_charpos; /* Position of character we are processing. This
|
|
|
123 is a Bytexpos, meaning it refers to bytes (not
|
|
|
124 chars) and can refer to either buffers (1-based)
|
|
|
125 or strings (0-based). We need to be careful
|
|
|
126 when doing anything that references the text in
|
|
|
127 the buffer or string. */
|
|
|
128 Bytexpos byte_endpos; /* ????? Unknown, under-used. */
|
|
428
|
129 int pixpos;
|
|
|
130 int max_pixpos;
|
|
|
131 int blank_width; /* Width of the blank that is to be added.
|
|
|
132 This is used to communicate this information
|
|
|
133 to add_blank_rune().
|
|
|
134
|
|
|
135 This is also used rather cheesily to
|
|
|
136 communicate the width of the eol-cursor-size
|
|
|
137 blank that exists at the end of the line.
|
|
|
138 add_emchar_rune() is called cheesily with
|
|
|
139 the non-printing char '\n', which is stuck
|
|
|
140 in the output routines with its width being
|
|
|
141 BLANK_WIDTH. */
|
|
826
|
142 Bytexpos byte_cursor_charpos; /* This stores the buffer position of the
|
|
|
143 cursor. */
|
|
428
|
144 unsigned int cursor_type :3;
|
|
|
145 int cursor_x; /* rune block cursor is at */
|
|
|
146 int start_col; /* Number of character columns (each column has
|
|
|
147 a width of the default char width) that still
|
|
|
148 need to be skipped. This is used for horizontal
|
|
|
149 scrolling, where a certain number of columns
|
|
|
150 (those off the left side of the screen) need
|
|
|
151 to be skipped before anything is displayed. */
|
|
826
|
152 Bytexpos byte_start_col_enabled;
|
|
428
|
153 int start_col_xoffset; /* Number of pixels that still need to
|
|
819
|
154 be skipped. This is used for
|
|
|
155 horizontal scrolling of glyphs, where we want
|
|
|
156 to be able to scroll over part of the glyph. */
|
|
428
|
157
|
|
|
158 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
|
|
|
159 glyph differs from space_width (w).
|
|
|
160 0 if no hscroll glyph was used,
|
|
|
161 i.e. the window is not scrolled
|
|
|
162 horizontally. Used in tab
|
|
|
163 calculations. */
|
|
|
164
|
|
|
165 /* Information about the face the text should be displayed in and
|
|
|
166 any begin-glyphs and end-glyphs. */
|
|
|
167 struct extent_fragment *ef;
|
|
|
168 face_index findex;
|
|
|
169
|
|
819
|
170 /* The height of a pixmap may either be predetermined if the user has set a
|
|
|
171 baseline value, or it may be dependent on whatever the line ascent and
|
|
|
172 descent values end up being, based just on font and pixmap-ascent
|
|
|
173 information. In the first case we can immediately update the values, thus
|
|
|
174 their inclusion here. In the last case we cannot determine the actual
|
|
|
175 contribution to the line height until we have finished laying out all text
|
|
|
176 on the line. Thus we propagate the max height of such pixmaps and do a
|
|
|
177 final calculation (in calculate_baseline()) after all text has been added
|
|
|
178 to the line. */
|
|
428
|
179 int new_ascent;
|
|
|
180 int new_descent;
|
|
|
181 int max_pixmap_height;
|
|
819
|
182 int need_baseline_computation;
|
|
|
183 int end_glyph_width; /* Well, it is the kitchen sink after all ... */
|
|
428
|
184
|
|
|
185 Lisp_Object result_str; /* String where we put the result of
|
|
|
186 generating a formatted string in the modeline. */
|
|
|
187 int is_modeline; /* Non-zero if we're generating the modeline. */
|
|
|
188 Charcount modeline_charpos; /* Number of chars used in result_str so far;
|
|
|
189 corresponds to bytepos. */
|
|
|
190 Bytecount bytepos; /* Number of bytes used in result_str so far.
|
|
|
191 We don't actually copy the bytes into result_str
|
|
|
192 until the end because we don't know how big the
|
|
|
193 string is going to be until then. */
|
|
|
194 } pos_data;
|
|
|
195
|
|
|
196 enum prop_type
|
|
|
197 {
|
|
|
198 PROP_STRING,
|
|
|
199 PROP_CHAR,
|
|
|
200 PROP_MINIBUF_PROMPT,
|
|
819
|
201 PROP_BLANK,
|
|
|
202 PROP_GLYPH
|
|
428
|
203 };
|
|
|
204
|
|
|
205 /* Data that should be propagated to the next line. Either a single
|
|
819
|
206 Emchar, a string of Intbyte's or a glyph.
|
|
428
|
207
|
|
|
208 The actual data that is propagated ends up as a Dynarr of these
|
|
|
209 blocks.
|
|
|
210
|
|
819
|
211 prop_blocks are used to indicate that data that was supposed to go
|
|
|
212 on the previous line couldn't actually be displayed. Generally this
|
|
|
213 shouldn't happen if we are clipping the end of lines. If we are
|
|
|
214 wrapping then we need to display the propagation data before moving
|
|
|
215 on. Its questionable whether we should wrap or clip glyphs in this
|
|
|
216 instance. Most e-lisp relies on clipping so we preserve this
|
|
|
217 behavior.
|
|
|
218
|
|
665
|
219 #### It's unclean that both Emchars and Intbytes are here.
|
|
428
|
220 */
|
|
|
221
|
|
|
222 typedef struct prop_block prop_block;
|
|
|
223 struct prop_block
|
|
|
224 {
|
|
|
225 enum prop_type type;
|
|
|
226
|
|
|
227 union data
|
|
|
228 {
|
|
|
229 struct
|
|
|
230 {
|
|
665
|
231 Intbyte *str;
|
|
428
|
232 Bytecount len; /* length of the string. */
|
|
|
233 } p_string;
|
|
|
234
|
|
|
235 struct
|
|
|
236 {
|
|
|
237 Emchar ch;
|
|
826
|
238 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
|
|
428
|
239 unsigned int cursor_type :3;
|
|
|
240 } p_char;
|
|
|
241
|
|
|
242 struct
|
|
|
243 {
|
|
|
244 int width;
|
|
|
245 face_index findex;
|
|
|
246 } p_blank;
|
|
819
|
247
|
|
|
248 struct
|
|
|
249 {
|
|
|
250 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
|
|
|
251 int width;
|
|
|
252 Lisp_Object glyph;
|
|
|
253 } p_glyph;
|
|
|
254
|
|
428
|
255 } data;
|
|
|
256 };
|
|
|
257
|
|
|
258 typedef struct
|
|
|
259 {
|
|
|
260 Dynarr_declare (prop_block);
|
|
|
261 } prop_block_dynarr;
|
|
|
262
|
|
|
263
|
|
|
264 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
|
|
|
265 Charcount pos, Charcount min_pos,
|
|
|
266 Charcount max_pos, Lisp_Object elt,
|
|
|
267 int depth, int max_pixsize,
|
|
438
|
268 face_index findex, int type,
|
|
|
269 Charcount *offset,
|
|
|
270 Lisp_Object cur_ext);
|
|
428
|
271 static prop_block_dynarr *add_glyph_rune (pos_data *data,
|
|
|
272 struct glyph_block *gb,
|
|
|
273 int pos_type, int allow_cursor,
|
|
|
274 struct glyph_cachel *cachel);
|
|
665
|
275 static Bytebpos create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
276 Bytebpos byte_start_pos,
|
|
|
277 prop_block_dynarr **prop,
|
|
|
278 int type);
|
|
428
|
279 static int create_overlay_glyph_block (struct window *w,
|
|
|
280 struct display_line *dl);
|
|
|
281 static void create_left_glyph_block (struct window *w,
|
|
|
282 struct display_line *dl,
|
|
|
283 int overlay_width);
|
|
|
284 static void create_right_glyph_block (struct window *w,
|
|
|
285 struct display_line *dl);
|
|
|
286 static void redisplay_windows (Lisp_Object window, int skip_selected);
|
|
|
287 static void decode_mode_spec (struct window *w, Emchar spec, int type);
|
|
|
288 static void free_display_line (struct display_line *dl);
|
|
826
|
289 static void update_line_start_cache (struct window *w, Charbpos from,
|
|
|
290 Charbpos to, Charbpos point,
|
|
|
291 int no_regen);
|
|
665
|
292 static int point_visible (struct window *w, Charbpos point, int type);
|
|
819
|
293 static void calculate_yoffset (struct display_line *dl,
|
|
|
294 struct display_block *fixup);
|
|
|
295 static void calculate_baseline (pos_data *data);
|
|
428
|
296
|
|
800
|
297 static void sledgehammer_check_redisplay_structs (void);
|
|
|
298
|
|
428
|
299 /* This used to be 10 but 30 seems to give much better performance. */
|
|
|
300 #define INIT_MAX_PREEMPTS 30
|
|
|
301 static int max_preempts;
|
|
|
302
|
|
|
303 #define REDISPLAY_PREEMPTION_CHECK \
|
|
|
304 ((void) \
|
|
|
305 (preempted = \
|
|
|
306 (!disable_preemption && \
|
|
|
307 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
|
|
|
308 (!INTERACTIVE || detect_input_pending ()))))
|
|
|
309
|
|
|
310 /*
|
|
|
311 * Redisplay global variables.
|
|
|
312 */
|
|
|
313
|
|
|
314 /* We need a third set of display structures for the cursor motion
|
|
|
315 routines. We used to just give each window a third set. However,
|
|
|
316 we always fully regenerate the structures when needed so there
|
|
|
317 isn't any reason we need more than a single set. */
|
|
|
318 display_line_dynarr *cmotion_display_lines;
|
|
|
319
|
|
|
320 /* We store the extents that we need to generate in a Dynarr and then
|
|
|
321 frob them all on at the end of generating the string. We do it
|
|
|
322 this way rather than adding them as we generate the string because
|
|
|
323 we don't store the text into the resulting string until we're done
|
|
|
324 (to avoid having to resize the string multiple times), and we don't
|
|
|
325 want to go around adding extents to a string when the extents might
|
|
|
326 stretch off the end of the string. */
|
|
|
327 static EXTENT_dynarr *formatted_string_extent_dynarr;
|
|
|
328 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
|
|
|
329 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
|
|
|
330
|
|
|
331
|
|
|
332 /* #### probably temporary */
|
|
458
|
333 Fixnum cache_adjustment;
|
|
428
|
334
|
|
|
335 /* This holds a string representing the text corresponding to a single
|
|
|
336 modeline % spec. */
|
|
665
|
337 static Intbyte_dynarr *mode_spec_intbyte_string;
|
|
428
|
338
|
|
|
339 int in_display; /* 1 if in redisplay. */
|
|
|
340
|
|
|
341 int disable_preemption; /* Used for debugging redisplay and for
|
|
|
342 force-redisplay. */
|
|
|
343
|
|
|
344 /* We only allow max_preempts preemptions before we force a redisplay. */
|
|
|
345 static int preemption_count;
|
|
|
346
|
|
|
347 /* Minimum pixel height of clipped bottom display line. */
|
|
458
|
348 Fixnum vertical_clip;
|
|
428
|
349
|
|
|
350 /* Minimum visible pixel width of clipped glyphs at right margin. */
|
|
458
|
351 Fixnum horizontal_clip;
|
|
428
|
352
|
|
|
353 /* Nonzero means reading single-character input with prompt
|
|
|
354 so put cursor on minibuffer after the prompt. */
|
|
|
355 int cursor_in_echo_area;
|
|
|
356 Lisp_Object Qcursor_in_echo_area;
|
|
|
357
|
|
|
358 /* Nonzero means truncate lines in all windows less wide than the frame */
|
|
|
359 int truncate_partial_width_windows;
|
|
|
360
|
|
|
361 /* non-nil if a buffer has changed since the last time redisplay completed */
|
|
|
362 int buffers_changed;
|
|
|
363 int buffers_changed_set;
|
|
|
364
|
|
|
365 /* non-nil if hscroll has changed somewhere or a buffer has been
|
|
|
366 narrowed or widened */
|
|
|
367 int clip_changed;
|
|
|
368 int clip_changed_set;
|
|
|
369
|
|
|
370 /* non-nil if any extent has changed since the last time redisplay completed */
|
|
|
371 int extents_changed;
|
|
|
372 int extents_changed_set;
|
|
|
373
|
|
|
374 /* non-nil if any face has changed since the last time redisplay completed */
|
|
|
375 int faces_changed;
|
|
|
376
|
|
|
377 /* Nonzero means some frames have been marked as garbaged */
|
|
|
378 int frame_changed;
|
|
|
379
|
|
|
380 /* non-zero if any of the builtin display glyphs (continuation,
|
|
|
381 hscroll, control-arrow, etc) is in need of updating
|
|
|
382 somewhere. */
|
|
|
383 int glyphs_changed;
|
|
|
384 int glyphs_changed_set;
|
|
|
385
|
|
442
|
386 /* non-zero if any subwindow has been deleted. */
|
|
428
|
387 int subwindows_changed;
|
|
|
388 int subwindows_changed_set;
|
|
|
389
|
|
|
390 /* non-zero if any displayed subwindow is in need of updating
|
|
|
391 somewhere. */
|
|
|
392 int subwindows_state_changed;
|
|
|
393 int subwindows_state_changed_set;
|
|
|
394
|
|
|
395 /* This variable is 1 if the icon has to be updated.
|
|
|
396 It is set to 1 when `frame-icon-glyph' changes. */
|
|
|
397 int icon_changed;
|
|
|
398 int icon_changed_set;
|
|
|
399
|
|
|
400 /* This variable is 1 if the menubar widget has to be updated.
|
|
|
401 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
|
|
|
402 has been updated. */
|
|
|
403 int menubar_changed;
|
|
|
404 int menubar_changed_set;
|
|
|
405
|
|
|
406 /* true iff we should redraw the modelines on the next redisplay */
|
|
|
407 int modeline_changed;
|
|
|
408 int modeline_changed_set;
|
|
|
409
|
|
|
410 /* non-nil if point has changed in some buffer since the last time
|
|
|
411 redisplay completed */
|
|
|
412 int point_changed;
|
|
|
413 int point_changed_set;
|
|
|
414
|
|
|
415 /* non-nil if some frame has changed its size */
|
|
|
416 int size_changed;
|
|
|
417
|
|
|
418 /* non-nil if some device has signaled that it wants to change size */
|
|
|
419 int asynch_device_change_pending;
|
|
|
420
|
|
|
421 /* non-nil if any toolbar has changed */
|
|
|
422 int toolbar_changed;
|
|
|
423 int toolbar_changed_set;
|
|
|
424
|
|
|
425 /* non-nil if any gutter has changed */
|
|
|
426 int gutter_changed;
|
|
|
427 int gutter_changed_set;
|
|
|
428
|
|
|
429 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
430 int windows_changed;
|
|
|
431
|
|
|
432 /* non-nil if any frame's window structure has changed since the last
|
|
|
433 time redisplay completed */
|
|
|
434 int windows_structure_changed;
|
|
|
435
|
|
|
436 /* If non-nil, use vertical bar cursor. */
|
|
|
437 Lisp_Object Vbar_cursor;
|
|
|
438 Lisp_Object Qbar_cursor;
|
|
|
439
|
|
442
|
440 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
|
|
|
441 then the frame will flash instead of
|
|
|
442 beeping when an error occurs */
|
|
428
|
443
|
|
|
444 /* Nonzero means no need to redraw the entire frame on resuming
|
|
|
445 a suspended Emacs. This is useful on terminals with multiple pages,
|
|
|
446 where one page is used for Emacs and another for all else. */
|
|
|
447 int no_redraw_on_reenter;
|
|
|
448
|
|
|
449 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
|
|
|
450 under which emacs is running
|
|
|
451 ('x is the only current possibility) */
|
|
|
452 Lisp_Object Vinitial_window_system;
|
|
|
453
|
|
|
454 Lisp_Object Vglobal_mode_string;
|
|
|
455
|
|
|
456 /* The number of lines scroll a window by when point leaves the window; if
|
|
|
457 it is <=0 then point is centered in the window */
|
|
458
|
458 Fixnum scroll_step;
|
|
428
|
459
|
|
|
460 /* Scroll up to this many lines, to bring point back on screen. */
|
|
458
|
461 Fixnum scroll_conservatively;
|
|
428
|
462
|
|
|
463 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
464 Lisp_Object Voverlay_arrow_position;
|
|
|
465 /* String to display for the arrow. */
|
|
|
466 Lisp_Object Voverlay_arrow_string;
|
|
|
467
|
|
|
468 Lisp_Object Vwindow_size_change_functions;
|
|
|
469 Lisp_Object Vwindow_scroll_functions;
|
|
|
470 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
|
|
|
471
|
|
442
|
472 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
|
|
|
473
|
|
|
474
|
|
428
|
475 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
|
|
|
476 this more. */
|
|
|
477 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
478 /* #### Chuck says: I think this needs more thought.
|
|
|
479 Think about this for 19.14. */
|
|
|
480 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
|
|
|
481 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
|
|
|
482 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
483
|
|
458
|
484 static Fixnum last_display_warning_tick;
|
|
|
485 static Fixnum display_warning_tick;
|
|
428
|
486 Lisp_Object Qdisplay_warning_buffer;
|
|
|
487 int inhibit_warning_display;
|
|
|
488
|
|
|
489 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
490 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
491 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
492 Lisp_Object Vtext_cursor_visible_p;
|
|
|
493
|
|
|
494 int column_number_start_at_one;
|
|
|
495
|
|
442
|
496 Lisp_Object Qtop_bottom;
|
|
|
497
|
|
444
|
498 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
|
|
428
|
499
|
|
|
500
|
|
|
501 /***************************************************************************/
|
|
|
502 /* */
|
|
|
503 /* low-level interfaces onto device routines */
|
|
|
504 /* */
|
|
|
505 /***************************************************************************/
|
|
|
506
|
|
|
507 static int
|
|
|
508 redisplay_text_width_emchar_string (struct window *w, int findex,
|
|
|
509 Emchar *str, Charcount len)
|
|
|
510 {
|
|
|
511 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
512 Lisp_Object window;
|
|
|
513
|
|
|
514 find_charsets_in_emchar_string (charsets, str, len);
|
|
793
|
515 window = wrap_window (w);
|
|
428
|
516 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
517 charsets);
|
|
|
518 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
519 text_width, (XFRAME (WINDOW_FRAME (w)),
|
|
|
520 WINDOW_FACE_CACHEL (w, findex), str, len));
|
|
|
521 }
|
|
|
522
|
|
|
523 static Emchar_dynarr *rtw_emchar_dynarr;
|
|
|
524
|
|
|
525 int
|
|
|
526 redisplay_text_width_string (struct window *w, int findex,
|
|
665
|
527 Intbyte *nonreloc, Lisp_Object reloc,
|
|
428
|
528 Bytecount offset, Bytecount len)
|
|
|
529 {
|
|
|
530 if (!rtw_emchar_dynarr)
|
|
|
531 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
532 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
533
|
|
|
534 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
535 if (STRINGP (reloc))
|
|
|
536 nonreloc = XSTRING_DATA (reloc);
|
|
665
|
537 convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
428
|
538 return redisplay_text_width_emchar_string
|
|
|
539 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
540 Dynarr_length (rtw_emchar_dynarr));
|
|
|
541 }
|
|
|
542
|
|
|
543 int
|
|
|
544 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
665
|
545 Intbyte *nonreloc, Lisp_Object reloc,
|
|
428
|
546 Bytecount offset, Bytecount len)
|
|
|
547 {
|
|
|
548 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
549 Lisp_Object frame;
|
|
|
550 struct face_cachel cachel;
|
|
|
551
|
|
|
552 if (!rtw_emchar_dynarr)
|
|
|
553 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
554 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
555
|
|
|
556 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
557 if (STRINGP (reloc))
|
|
|
558 nonreloc = XSTRING_DATA (reloc);
|
|
665
|
559 convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
|
560 find_charsets_in_intbyte_string (charsets, nonreloc, len);
|
|
428
|
561 reset_face_cachel (&cachel);
|
|
|
562 cachel.face = face;
|
|
793
|
563 frame = wrap_frame (f);
|
|
428
|
564 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
565 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
|
566 text_width, (f, &cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
567 Dynarr_length (rtw_emchar_dynarr)));
|
|
|
568 }
|
|
|
569
|
|
|
570 /* Return the display block from DL of the given TYPE. A display line
|
|
|
571 can have only one display block of each possible type. If DL does
|
|
|
572 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
573
|
|
|
574 struct display_block *
|
|
|
575 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
576 {
|
|
|
577 int elt;
|
|
|
578 struct display_block db;
|
|
|
579
|
|
|
580 /* Check if this display line already has a block of the desired type and
|
|
|
581 if so, return it. */
|
|
|
582 if (dl->display_blocks)
|
|
|
583 {
|
|
|
584 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
585 {
|
|
|
586 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
587 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
588 }
|
|
|
589
|
|
|
590 /* There isn't an active block of the desired type, but there
|
|
|
591 might still be allocated blocks we need to reuse. */
|
|
|
592 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
593 {
|
|
|
594 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
595
|
|
|
596 /* 'add' the block to the list */
|
|
|
597 Dynarr_increment (dl->display_blocks);
|
|
|
598
|
|
|
599 /* initialize and return */
|
|
|
600 dbp->type = type;
|
|
|
601 return dbp;
|
|
|
602 }
|
|
|
603 }
|
|
|
604 else
|
|
|
605 {
|
|
|
606 /* This line doesn't have any display blocks, so initialize the display
|
|
|
607 bock array. */
|
|
|
608 dl->display_blocks = Dynarr_new (display_block);
|
|
|
609 }
|
|
|
610
|
|
|
611 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
612 one and add it to the line. */
|
|
|
613 xzero (db);
|
|
|
614 db.type = type;
|
|
|
615 db.runes = Dynarr_new (rune);
|
|
|
616 Dynarr_add (dl->display_blocks, db);
|
|
|
617
|
|
|
618 /* Return the newly added display block. */
|
|
|
619 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
620
|
|
|
621 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
622 }
|
|
|
623
|
|
|
624 static int
|
|
|
625 tab_char_width (struct window *w)
|
|
|
626 {
|
|
|
627 struct buffer *b = XBUFFER (w->buffer);
|
|
|
628 int char_tab_width = XINT (b->tab_width);
|
|
|
629
|
|
|
630 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
631
|
|
|
632 return char_tab_width;
|
|
|
633 }
|
|
|
634
|
|
|
635 static int
|
|
|
636 space_width (struct window *w)
|
|
|
637 {
|
|
|
638 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
639 fonts the space character tends to give too narrow a value. So
|
|
|
640 we use 'n' instead. Except that we don't. We use the default
|
|
|
641 character width for the default face. If this is actually
|
|
|
642 defined by the font then it is probably the best thing to
|
|
|
643 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
644 already calculated its width. Thus we can avoid a call to
|
|
|
645 XTextWidth on X frames by just querying the default width. */
|
|
|
646 return XFONT_INSTANCE
|
|
|
647 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
648 }
|
|
|
649
|
|
|
650 static int
|
|
|
651 tab_pix_width (struct window *w)
|
|
|
652 {
|
|
|
653 return space_width (w) * tab_char_width (w);
|
|
|
654 }
|
|
|
655
|
|
|
656 /* Given a pixel position in a window, return the pixel location of
|
|
|
657 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
658 terms of spaces displayed in the default face. Formerly the space
|
|
|
659 width was determined using the currently active face. That method
|
|
|
660 leads to tabstops which do not line up. */
|
|
|
661
|
|
|
662 static int
|
|
|
663 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
664 {
|
|
|
665 int n_pos = left_pixpos;
|
|
|
666 int pix_tab_width = tab_pix_width (w);
|
|
|
667
|
|
|
668 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
669 if (WINDOW_SCROLLED (w))
|
|
|
670 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
|
|
|
671
|
|
|
672 while (n_pos <= start_pixpos)
|
|
|
673 n_pos += pix_tab_width;
|
|
|
674
|
|
|
675 return n_pos;
|
|
|
676 }
|
|
|
677
|
|
|
678 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
679 display line. The whitespace boundaries must be calculated by the text
|
|
|
680 layout routines. */
|
|
|
681
|
|
|
682 layout_bounds
|
|
|
683 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
684 {
|
|
|
685 layout_bounds bounds;
|
|
|
686
|
|
|
687 /* Set the outermost boundaries which are the boundaries of the
|
|
|
688 window itself minus the gutters (and minus the scrollbars if this
|
|
|
689 is for the modeline). */
|
|
|
690 if (!modeline)
|
|
|
691 {
|
|
|
692 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
693 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
694 }
|
|
|
695 else
|
|
|
696 {
|
|
|
697 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
698 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
699 }
|
|
|
700
|
|
|
701 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
702 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
703 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
704
|
|
|
705 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
706 depend on the contents of the line being displayed. */
|
|
|
707 bounds.left_white = bounds.left_in;
|
|
|
708 bounds.right_white = bounds.right_in;
|
|
|
709
|
|
|
710 return bounds;
|
|
|
711 }
|
|
|
712
|
|
819
|
713 /* This takes a display_block and its containing line and corrects the yoffset
|
|
|
714 of each glyph in the block to cater for the ascent of the line as a
|
|
|
715 whole. Must be called *after* the line-ascent is known! */
|
|
|
716
|
|
|
717 static void
|
|
|
718 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
|
|
|
719 {
|
|
|
720 int i;
|
|
|
721 for (i=0; i<Dynarr_length (fixup->runes); i++)
|
|
|
722 {
|
|
|
723 struct rune *r = Dynarr_atp (fixup->runes,i);
|
|
|
724 if (r->type == RUNE_DGLYPH)
|
|
|
725 {
|
|
|
726 if (r->object.dglyph.ascent < dl->ascent)
|
|
|
727 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
|
|
|
728 r->object.dglyph.descent;
|
|
|
729 }
|
|
|
730 }
|
|
|
731 }
|
|
|
732
|
|
|
733 /* Calculate the textual baseline (the ascent and descent values for the
|
|
|
734 display_line as a whole).
|
|
|
735
|
|
|
736 If the baseline is completely blank, or contains no manually positioned
|
|
|
737 glyphs, then the textual baseline is simply the baseline of the default font.
|
|
|
738 (The `contains no manually positioned glyphs' part is actually done for
|
|
|
739 us by `add_emchar_rune'.)
|
|
|
740
|
|
|
741 If the baseline contains pixmaps, and they're all manually positioned, then
|
|
|
742 the textual baseline location is constrained that way, and we need do no
|
|
|
743 work.
|
|
|
744
|
|
|
745 If the baseline contains pixmaps, and at least one is automatically
|
|
|
746 positioned, then the textual ascent is the largest ascent on the line, and
|
|
|
747 the textual descent is the largest descent (which is how things are set up at
|
|
|
748 entry to this function anyway): except that if the max_ascent + max_descent
|
|
|
749 is too small for the height of the line (say you've adjusted the baseline of
|
|
|
750 a short glyph, and there's a tall one next to it), then take the ascent and
|
|
|
751 descent for the line individually from the largest of the explicitly set
|
|
|
752 ascent/descent, and the rescaled ascent/descent of the default font, scaled
|
|
|
753 such that the largest glyph will fit.
|
|
|
754
|
|
|
755 This means that if you have a short glyph (but taller than the default
|
|
|
756 font's descent) forced right under the baseline, and a really tall
|
|
|
757 automatically positioned glyph, that the descent for the line is just big
|
|
|
758 enough for the manually positioned short glyph, and the tall one uses as
|
|
|
759 much of that space as the default font would were it as tall as the tall
|
|
|
760 glyph; but that the ascent is big enough for the tall glyph to fit.
|
|
|
761
|
|
|
762 This behaviour means that under no circumstances will changing the baseline
|
|
|
763 of a short glyph cause a tall glyph to move around; nor will it move the
|
|
|
764 textual baseline more than necessary. (Changing a tall glyph's baseline
|
|
|
765 might move the text's baseline arbitrarily, of course.) */
|
|
|
766
|
|
|
767 static void
|
|
|
768 calculate_baseline (pos_data *data)
|
|
|
769 {
|
|
|
770 /* Blank line: baseline is default font's baseline. */
|
|
|
771
|
|
|
772 if (!data->new_ascent && !data->new_descent)
|
|
|
773 {
|
|
|
774 /* We've got a blank line so initialize these values from the default
|
|
|
775 face. */
|
|
|
776 default_face_font_info (data->window, &data->new_ascent,
|
|
|
777 &data->new_descent, 0, 0, 0);
|
|
|
778 }
|
|
|
779
|
|
|
780 /* No automatically positioned glyphs? Return at once. */
|
|
|
781 if (!data->need_baseline_computation)
|
|
|
782 return;
|
|
|
783
|
|
|
784 /* Is the tallest glyph on the line automatically positioned?
|
|
|
785 If it's manually positioned, or it's automatically positioned
|
|
|
786 and there's enough room for it anyway, we need do no more work. */
|
|
|
787 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
788 {
|
|
|
789 int default_font_ascent, default_font_descent, default_font_height;
|
|
|
790 int scaled_default_font_ascent, scaled_default_font_descent;
|
|
|
791
|
|
|
792 default_face_font_info (data->window, &default_font_ascent,
|
|
|
793 &default_font_descent, &default_font_height,
|
|
|
794 0, 0);
|
|
|
795
|
|
|
796 scaled_default_font_ascent = data->max_pixmap_height *
|
|
|
797 default_font_ascent / default_font_height;
|
|
|
798
|
|
|
799 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
|
|
|
800
|
|
|
801 /* The ascent may have expanded now. Do we still need to grow the descent,
|
|
|
802 or are things big enough?
|
|
|
803
|
|
|
804 The +1 caters for the baseline row itself. */
|
|
|
805 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
806 {
|
|
|
807 scaled_default_font_descent = (data->max_pixmap_height *
|
|
|
808 default_font_descent / default_font_height) + 1;
|
|
|
809
|
|
|
810 data->new_descent = max (data->new_descent, scaled_default_font_descent);
|
|
|
811 }
|
|
|
812 }
|
|
|
813 }
|
|
|
814
|
|
428
|
815 /* Given a display line and a starting position, ensure that the
|
|
|
816 contents of the display line accurately represent the visual
|
|
|
817 representation of the buffer contents starting from the given
|
|
|
818 position when displayed in the given window. The display line ends
|
|
|
819 when the contents of the line reach the right boundary of the given
|
|
|
820 window. */
|
|
|
821
|
|
665
|
822 static Charbpos
|
|
428
|
823 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
665
|
824 Charbpos start_pos, prop_block_dynarr **prop,
|
|
428
|
825 int type)
|
|
|
826 {
|
|
826
|
827 Charbpos ret_charpos;
|
|
428
|
828 int overlay_width;
|
|
|
829 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
830
|
|
|
831 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
832 if (!bounds)
|
|
|
833 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
834
|
|
|
835 /* Reset what this line is using. */
|
|
|
836 if (dl->display_blocks)
|
|
|
837 Dynarr_reset (dl->display_blocks);
|
|
|
838 if (dl->left_glyphs)
|
|
|
839 {
|
|
|
840 Dynarr_free (dl->left_glyphs);
|
|
|
841 dl->left_glyphs = 0;
|
|
|
842 }
|
|
|
843 if (dl->right_glyphs)
|
|
|
844 {
|
|
|
845 Dynarr_free (dl->right_glyphs);
|
|
|
846 dl->right_glyphs = 0;
|
|
|
847 }
|
|
|
848
|
|
|
849 /* We aren't generating a modeline at the moment. */
|
|
|
850 dl->modeline = 0;
|
|
|
851
|
|
|
852 /* Create a display block for the text region of the line. */
|
|
|
853 {
|
|
|
854 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
665
|
855 Bytebpos hacked_up_bytebpos =
|
|
|
856 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
|
|
428
|
857 prop, type);
|
|
826
|
858 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
|
|
|
859 ret_charpos = BUF_ZV (b) + 1;
|
|
428
|
860 else
|
|
826
|
861 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
|
|
428
|
862 }
|
|
826
|
863 dl->charpos = start_pos;
|
|
|
864 if (dl->end_charpos < dl->charpos)
|
|
|
865 dl->end_charpos = dl->charpos;
|
|
428
|
866
|
|
|
867 if (MARKERP (Voverlay_arrow_position)
|
|
|
868 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
869 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
870 && (STRINGP (Voverlay_arrow_string)
|
|
|
871 || GLYPHP (Voverlay_arrow_string)))
|
|
|
872 {
|
|
|
873 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
874 }
|
|
|
875 else
|
|
|
876 overlay_width = 0;
|
|
|
877
|
|
|
878 /* If there are left glyphs associated with any character in the
|
|
|
879 text block, then create a display block to handle them. */
|
|
|
880 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
881 create_left_glyph_block (w, dl, overlay_width);
|
|
|
882
|
|
|
883 /* If there are right glyphs associated with any character in the
|
|
|
884 text block, then create a display block to handle them. */
|
|
|
885 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
886 create_right_glyph_block (w, dl);
|
|
|
887
|
|
|
888 /* In the future additional types of display blocks may be generated
|
|
|
889 here. */
|
|
|
890
|
|
826
|
891 w->last_redisplay_pos = ret_charpos;
|
|
|
892
|
|
|
893 return ret_charpos;
|
|
428
|
894 }
|
|
|
895
|
|
|
896 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
897 the block had better be empty.
|
|
|
898
|
|
|
899 Yes, there are multiple places where this function is called but
|
|
|
900 that is the way it has to be. Each calling function has to deal
|
|
826
|
901 with byte_start_col_enabled a little differently depending on the
|
|
428
|
902 object being worked with. */
|
|
|
903
|
|
|
904 static prop_block_dynarr *
|
|
|
905 add_hscroll_rune (pos_data *data)
|
|
|
906 {
|
|
|
907 struct glyph_block gb;
|
|
|
908 prop_block_dynarr *retval;
|
|
826
|
909 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
910 int old_cursor_type = data->cursor_type;
|
|
826
|
911 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
912
|
|
|
913 if (data->cursor_type == CURSOR_ON
|
|
826
|
914 && data->byte_cursor_charpos >= data->byte_start_col_enabled
|
|
|
915 && data->byte_cursor_charpos <= data->byte_charpos)
|
|
|
916 {
|
|
|
917 data->byte_cursor_charpos = data->byte_start_col_enabled;
|
|
428
|
918 }
|
|
|
919 else
|
|
|
920 {
|
|
|
921 data->cursor_type = NO_CURSOR;
|
|
|
922 }
|
|
|
923
|
|
826
|
924 data->byte_endpos = data->byte_charpos;
|
|
|
925 data->byte_charpos = data->byte_start_col_enabled;
|
|
428
|
926
|
|
|
927 gb.extent = Qnil;
|
|
|
928 gb.glyph = Vhscroll_glyph;
|
|
|
929 {
|
|
|
930 int oldpixpos = data->pixpos;
|
|
442
|
931 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
|
|
428
|
932 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
933 HSCROLL_GLYPH_INDEX));
|
|
|
934 data->hscroll_glyph_width_adjust =
|
|
|
935 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
|
|
|
936 }
|
|
826
|
937 data->byte_endpos = 0;
|
|
|
938 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
939 data->cursor_type = old_cursor_type;
|
|
826
|
940 data->byte_charpos = byte_old_charpos;
|
|
|
941
|
|
|
942 data->byte_start_col_enabled = 0;
|
|
428
|
943 return retval;
|
|
|
944 }
|
|
|
945
|
|
793
|
946 /* Adds a character rune to a display block. If there is not enough room
|
|
|
947 to fit the rune on the display block (as determined by the MAX_PIXPOS)
|
|
|
948 then it adds nothing and returns ADD_FAILED. If
|
|
|
949 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
|
|
|
950 to affect the total line height. (See add_intbyte_string_runes()). */
|
|
428
|
951
|
|
|
952 static prop_block_dynarr *
|
|
793
|
953 add_emchar_rune_1 (pos_data *data, int no_contribute_to_line_height)
|
|
428
|
954 {
|
|
|
955 struct rune rb, *crb;
|
|
|
956 int width, local;
|
|
|
957
|
|
|
958 if (data->start_col)
|
|
|
959 {
|
|
|
960 data->start_col--;
|
|
|
961
|
|
|
962 if (data->start_col)
|
|
|
963 return NULL;
|
|
|
964 }
|
|
|
965
|
|
826
|
966 if (data->byte_start_col_enabled)
|
|
428
|
967 {
|
|
|
968 return add_hscroll_rune (data);
|
|
|
969 }
|
|
|
970
|
|
|
971 if (data->ch == '\n')
|
|
|
972 {
|
|
|
973 data->font_is_bogus = 0;
|
|
|
974 /* Cheesy end-of-line pseudo-character. */
|
|
|
975 width = data->blank_width;
|
|
|
976 }
|
|
|
977 else
|
|
|
978 {
|
|
826
|
979 Lisp_Object charset = emchar_charset (data->ch);
|
|
428
|
980 if (!EQ (charset, data->last_charset) ||
|
|
|
981 data->findex != data->last_findex)
|
|
|
982 {
|
|
|
983 /* OK, we need to do things the hard way. */
|
|
|
984 struct window *w = XWINDOW (data->window);
|
|
|
985 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
986 Lisp_Object font_instance =
|
|
|
987 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
988 charset);
|
|
440
|
989 Lisp_Font_Instance *fi;
|
|
428
|
990
|
|
|
991 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
992 {
|
|
|
993 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
994 data->font_is_bogus = 1;
|
|
|
995 }
|
|
|
996 else
|
|
|
997 data->font_is_bogus = 0;
|
|
|
998
|
|
|
999 fi = XFONT_INSTANCE (font_instance);
|
|
771
|
1000 if (!fi->proportional_p || data->font_is_bogus)
|
|
|
1001 {
|
|
|
1002 Emchar ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1003
|
|
|
1004 data->last_char_width =
|
|
|
1005 redisplay_text_width_emchar_string (XWINDOW (data->window),
|
|
|
1006 data->findex, &ch, 1);
|
|
|
1007 }
|
|
428
|
1008 else
|
|
|
1009 data->last_char_width = -1;
|
|
819
|
1010
|
|
793
|
1011 if (!no_contribute_to_line_height)
|
|
|
1012 {
|
|
|
1013 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
|
1014 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
1015 }
|
|
819
|
1016
|
|
428
|
1017 data->last_charset = charset;
|
|
|
1018 data->last_findex = data->findex;
|
|
|
1019 }
|
|
|
1020
|
|
|
1021 width = data->last_char_width;
|
|
771
|
1022 if (width < 0) /* proportional fonts */
|
|
|
1023 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
|
|
|
1024 data->findex,
|
|
|
1025 &data->ch, 1);
|
|
428
|
1026 }
|
|
|
1027
|
|
|
1028 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
1029 {
|
|
|
1030 return ADD_FAILED;
|
|
|
1031 }
|
|
|
1032
|
|
|
1033 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
1034 {
|
|
|
1035 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
1036 local = 0;
|
|
|
1037 }
|
|
|
1038 else
|
|
|
1039 {
|
|
|
1040 crb = &rb;
|
|
|
1041 local = 1;
|
|
|
1042 }
|
|
|
1043
|
|
|
1044 crb->findex = data->findex;
|
|
|
1045 crb->xpos = data->pixpos;
|
|
|
1046 crb->width = width;
|
|
826
|
1047 if (data->byte_charpos)
|
|
428
|
1048 {
|
|
|
1049 if (NILP (data->string))
|
|
826
|
1050 crb->charpos =
|
|
793
|
1051 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
|
|
|
1052 (XWINDOW (data->window))),
|
|
826
|
1053 data->byte_charpos);
|
|
428
|
1054 else
|
|
826
|
1055 crb->charpos =
|
|
|
1056 string_index_byte_to_char (data->string, data->byte_charpos);
|
|
428
|
1057 }
|
|
|
1058 else if (data->is_modeline)
|
|
826
|
1059 crb->charpos = data->modeline_charpos;
|
|
428
|
1060 else
|
|
442
|
1061 /* Text but not in buffer */
|
|
826
|
1062 crb->charpos = 0;
|
|
428
|
1063 crb->type = RUNE_CHAR;
|
|
|
1064 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1065 crb->endpos = 0;
|
|
|
1066
|
|
|
1067 if (data->cursor_type == CURSOR_ON)
|
|
|
1068 {
|
|
826
|
1069 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1070 {
|
|
|
1071 crb->cursor_type = CURSOR_ON;
|
|
|
1072 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1073 }
|
|
|
1074 else
|
|
|
1075 crb->cursor_type = CURSOR_OFF;
|
|
|
1076 }
|
|
|
1077 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1078 {
|
|
|
1079 crb->cursor_type = CURSOR_ON;
|
|
|
1080 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1081 data->cursor_type = NO_CURSOR;
|
|
|
1082 }
|
|
|
1083 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1084 crb->cursor_type = IGNORE_CURSOR;
|
|
|
1085 else
|
|
|
1086 crb->cursor_type = CURSOR_OFF;
|
|
|
1087
|
|
|
1088 if (local)
|
|
|
1089 Dynarr_add (data->db->runes, *crb);
|
|
|
1090 else
|
|
|
1091 Dynarr_increment (data->db->runes);
|
|
|
1092
|
|
|
1093 data->pixpos += width;
|
|
|
1094
|
|
|
1095 return NULL;
|
|
|
1096 }
|
|
|
1097
|
|
793
|
1098 static prop_block_dynarr *
|
|
|
1099 add_emchar_rune (pos_data *data)
|
|
|
1100 {
|
|
|
1101 return add_emchar_rune_1 (data, 0);
|
|
|
1102 }
|
|
|
1103
|
|
|
1104 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune for
|
|
|
1105 each character in the string. Propagate any left-over data unless
|
|
|
1106 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
|
|
|
1107 allow this character to increase the total height of the line. (This is
|
|
|
1108 used when the character is part of a text glyph. In that case, the
|
|
|
1109 glyph code itself adjusts the line height as necessary, depending on
|
|
|
1110 whether glyph-contrib-p is true.) */
|
|
428
|
1111
|
|
|
1112 static prop_block_dynarr *
|
|
665
|
1113 add_intbyte_string_runes (pos_data *data, Intbyte *c_string,
|
|
793
|
1114 Bytecount c_length, int no_prop,
|
|
|
1115 int no_contribute_to_line_height)
|
|
428
|
1116 {
|
|
665
|
1117 Intbyte *pos, *end = c_string + c_length;
|
|
428
|
1118 prop_block_dynarr *prop;
|
|
|
1119
|
|
|
1120 /* #### This function is too simplistic. It needs to do the same
|
|
|
1121 sort of character interpretation (display-table lookup,
|
|
|
1122 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
1123 The functionality to do this in that routine needs to be
|
|
|
1124 modularized. */
|
|
|
1125
|
|
|
1126 for (pos = c_string; pos < end;)
|
|
|
1127 {
|
|
665
|
1128 Intbyte *old_pos = pos;
|
|
464
|
1129
|
|
428
|
1130 data->ch = charptr_emchar (pos);
|
|
|
1131
|
|
793
|
1132 prop = add_emchar_rune_1 (data, no_contribute_to_line_height);
|
|
428
|
1133
|
|
|
1134 if (prop)
|
|
|
1135 {
|
|
|
1136 if (no_prop)
|
|
|
1137 return ADD_FAILED;
|
|
|
1138 else
|
|
|
1139 {
|
|
|
1140 struct prop_block pb;
|
|
|
1141 Bytecount len = end - pos;
|
|
|
1142 prop = Dynarr_new (prop_block);
|
|
|
1143
|
|
|
1144 pb.type = PROP_STRING;
|
|
665
|
1145 pb.data.p_string.str = xnew_array (Intbyte, len);
|
|
428
|
1146 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
1147 pb.data.p_string.len = len;
|
|
|
1148
|
|
|
1149 Dynarr_add (prop, pb);
|
|
|
1150 return prop;
|
|
|
1151 }
|
|
|
1152 }
|
|
|
1153 INC_CHARPTR (pos);
|
|
|
1154 assert (pos <= end);
|
|
464
|
1155 /* #### Duplicate code from add_string_to_fstring_db_runes
|
|
|
1156 should we do more?*/
|
|
|
1157 data->bytepos += pos - old_pos;
|
|
428
|
1158 }
|
|
|
1159
|
|
|
1160 return NULL;
|
|
|
1161 }
|
|
|
1162
|
|
|
1163 /* Add a single rune of the specified width. The area covered by this
|
|
|
1164 rune will be displayed in the foreground color of the associated
|
|
|
1165 face. */
|
|
|
1166
|
|
|
1167 static prop_block_dynarr *
|
|
|
1168 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1169 {
|
|
|
1170 struct rune rb;
|
|
|
1171
|
|
|
1172 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1173 been to add it as a tab. */
|
|
|
1174 if (data->start_col)
|
|
|
1175 {
|
|
|
1176 /* assert (w != NULL) */
|
|
|
1177 prop_block_dynarr *retval;
|
|
|
1178
|
|
|
1179 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1180 the width of this tab and return. */
|
|
|
1181 if (char_tab_width < data->start_col)
|
|
|
1182 {
|
|
|
1183 data->start_col -= char_tab_width;
|
|
|
1184 return NULL;
|
|
|
1185 }
|
|
|
1186 else if (char_tab_width == data->start_col)
|
|
|
1187 data->blank_width = 0;
|
|
|
1188 else
|
|
|
1189 {
|
|
|
1190 int spcwid = space_width (w);
|
|
|
1191
|
|
|
1192 if (spcwid >= data->blank_width)
|
|
|
1193 data->blank_width = 0;
|
|
|
1194 else
|
|
|
1195 data->blank_width -= spcwid;
|
|
|
1196 }
|
|
|
1197
|
|
|
1198 data->start_col = 0;
|
|
|
1199 retval = add_hscroll_rune (data);
|
|
|
1200
|
|
|
1201 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1202 if (retval != NULL || !data->blank_width)
|
|
|
1203 return retval;
|
|
|
1204 }
|
|
|
1205
|
|
|
1206 /* Blank runes are always calculated to fit. */
|
|
|
1207 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1208
|
|
|
1209 rb.findex = data->findex;
|
|
|
1210 rb.xpos = data->pixpos;
|
|
|
1211 rb.width = data->blank_width;
|
|
826
|
1212 if (data->byte_charpos)
|
|
|
1213 rb.charpos =
|
|
665
|
1214 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
|
|
826
|
1215 data->byte_charpos);
|
|
428
|
1216 else
|
|
|
1217 /* #### and this is really correct too? */
|
|
826
|
1218 rb.charpos = 0;
|
|
428
|
1219 rb.endpos = 0;
|
|
|
1220 rb.type = RUNE_BLANK;
|
|
|
1221
|
|
|
1222 if (data->cursor_type == CURSOR_ON)
|
|
|
1223 {
|
|
826
|
1224 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1225 {
|
|
|
1226 rb.cursor_type = CURSOR_ON;
|
|
|
1227 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1228 }
|
|
|
1229 else
|
|
|
1230 rb.cursor_type = CURSOR_OFF;
|
|
|
1231 }
|
|
|
1232 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1233 {
|
|
|
1234 rb.cursor_type = CURSOR_ON;
|
|
|
1235 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1236 data->cursor_type = NO_CURSOR;
|
|
|
1237 }
|
|
|
1238 else
|
|
|
1239 rb.cursor_type = CURSOR_OFF;
|
|
|
1240
|
|
|
1241 Dynarr_add (data->db->runes, rb);
|
|
|
1242 data->pixpos += data->blank_width;
|
|
|
1243
|
|
|
1244 return NULL;
|
|
|
1245 }
|
|
|
1246
|
|
|
1247 /* Add runes representing a character in octal. */
|
|
|
1248
|
|
|
1249 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1250 { \
|
|
|
1251 if (add_failed || (add_failed = add_emchar_rune (data))) \
|
|
|
1252 { \
|
|
|
1253 struct prop_block pb; \
|
|
|
1254 if (!prop) \
|
|
|
1255 prop = Dynarr_new (prop_block); \
|
|
|
1256 \
|
|
|
1257 pb.type = PROP_CHAR; \
|
|
|
1258 pb.data.p_char.ch = data->ch; \
|
|
|
1259 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1260 Dynarr_add (prop, pb); \
|
|
|
1261 } \
|
|
|
1262 } while (0)
|
|
|
1263
|
|
|
1264 static prop_block_dynarr *
|
|
|
1265 add_octal_runes (pos_data *data)
|
|
|
1266 {
|
|
819
|
1267 prop_block_dynarr *add_failed, *prop = 0;
|
|
428
|
1268 Emchar orig_char = data->ch;
|
|
647
|
1269 int orig_cursor_type = data->cursor_type;
|
|
428
|
1270
|
|
|
1271 /* Initialize */
|
|
|
1272 add_failed = NULL;
|
|
|
1273
|
|
|
1274 if (data->start_col)
|
|
|
1275 data->start_col--;
|
|
|
1276
|
|
|
1277 if (!data->start_col)
|
|
|
1278 {
|
|
826
|
1279 if (data->byte_start_col_enabled)
|
|
428
|
1280 {
|
|
|
1281 add_failed = add_hscroll_rune (data);
|
|
|
1282 }
|
|
|
1283 else
|
|
|
1284 {
|
|
|
1285 struct glyph_block gb;
|
|
|
1286 struct window *w = XWINDOW (data->window);
|
|
|
1287
|
|
|
1288 gb.extent = Qnil;
|
|
|
1289 gb.glyph = Voctal_escape_glyph;
|
|
|
1290 add_failed =
|
|
|
1291 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1292 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1293 }
|
|
|
1294 }
|
|
|
1295
|
|
|
1296 /* We only propagate information if the glyph was partially
|
|
|
1297 added. */
|
|
|
1298 if (add_failed)
|
|
|
1299 return add_failed;
|
|
|
1300
|
|
|
1301 data->cursor_type = IGNORE_CURSOR;
|
|
|
1302
|
|
|
1303 if (data->ch >= 0x100)
|
|
|
1304 {
|
|
|
1305 /* If the character is an extended Mule character, it could have
|
|
|
1306 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1307 octal number. This is not that pretty, but whatever. */
|
|
|
1308 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1309 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1310
|
|
|
1311 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1312 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1313
|
|
|
1314 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1315 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1316
|
|
|
1317 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1318 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1319 }
|
|
|
1320
|
|
|
1321 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1322 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1323
|
|
|
1324 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1325 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1326
|
|
|
1327 data->ch = (7 & orig_char) + '0';
|
|
|
1328 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1329
|
|
|
1330 data->cursor_type = orig_cursor_type;
|
|
819
|
1331 return NULL;
|
|
428
|
1332 }
|
|
|
1333
|
|
|
1334 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1335
|
|
|
1336 /* Add runes representing a control character to a display block. */
|
|
|
1337
|
|
|
1338 static prop_block_dynarr *
|
|
|
1339 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1340 {
|
|
|
1341 if (!NILP (b->ctl_arrow))
|
|
|
1342 {
|
|
|
1343 prop_block_dynarr *prop;
|
|
|
1344 Emchar orig_char = data->ch;
|
|
647
|
1345 int old_cursor_type = data->cursor_type;
|
|
428
|
1346
|
|
|
1347 /* Initialize */
|
|
|
1348 prop = NULL;
|
|
|
1349
|
|
|
1350 if (data->start_col)
|
|
|
1351 data->start_col--;
|
|
|
1352
|
|
|
1353 if (!data->start_col)
|
|
|
1354 {
|
|
826
|
1355 if (data->byte_start_col_enabled)
|
|
428
|
1356 {
|
|
|
1357 prop_block_dynarr *retval;
|
|
|
1358
|
|
|
1359 retval = add_hscroll_rune (data);
|
|
|
1360 if (retval)
|
|
|
1361 return retval;
|
|
|
1362 }
|
|
|
1363 else
|
|
|
1364 {
|
|
|
1365 struct glyph_block gb;
|
|
|
1366 struct window *w = XWINDOW (data->window);
|
|
|
1367
|
|
|
1368 gb.extent = Qnil;
|
|
|
1369 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1370
|
|
|
1371 /* We only propagate information if the glyph was partially
|
|
|
1372 added. */
|
|
|
1373 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1374 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1375 return ADD_FAILED;
|
|
|
1376 }
|
|
|
1377 }
|
|
|
1378
|
|
|
1379 if (orig_char == 0177)
|
|
|
1380 data->ch = '?';
|
|
|
1381 else
|
|
|
1382 data->ch = orig_char ^ 0100;
|
|
|
1383 data->cursor_type = IGNORE_CURSOR;
|
|
|
1384
|
|
|
1385 if (add_emchar_rune (data))
|
|
|
1386 {
|
|
|
1387 struct prop_block pb;
|
|
|
1388 if (!prop)
|
|
|
1389 prop = Dynarr_new (prop_block);
|
|
|
1390
|
|
|
1391 pb.type = PROP_CHAR;
|
|
|
1392 pb.data.p_char.ch = data->ch;
|
|
|
1393 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1394 Dynarr_add (prop, pb);
|
|
|
1395 }
|
|
|
1396
|
|
|
1397 data->cursor_type = old_cursor_type;
|
|
|
1398 return prop;
|
|
|
1399 }
|
|
|
1400 else
|
|
|
1401 {
|
|
|
1402 return add_octal_runes (data);
|
|
|
1403 }
|
|
|
1404 }
|
|
|
1405
|
|
|
1406 static prop_block_dynarr *
|
|
|
1407 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
|
|
|
1408 {
|
|
|
1409 prop_block_dynarr *prop = NULL;
|
|
|
1410
|
|
|
1411 if (STRINGP (entry))
|
|
|
1412 {
|
|
665
|
1413 prop = add_intbyte_string_runes (data,
|
|
428
|
1414 XSTRING_DATA (entry),
|
|
|
1415 XSTRING_LENGTH (entry),
|
|
793
|
1416 0, 0);
|
|
428
|
1417 }
|
|
|
1418 else if (GLYPHP (entry))
|
|
|
1419 {
|
|
|
1420 if (data->start_col)
|
|
|
1421 data->start_col--;
|
|
|
1422
|
|
826
|
1423 if (!data->start_col && data->byte_start_col_enabled)
|
|
428
|
1424 {
|
|
|
1425 prop = add_hscroll_rune (data);
|
|
|
1426 }
|
|
|
1427 else
|
|
|
1428 {
|
|
|
1429 struct glyph_block gb;
|
|
|
1430
|
|
|
1431 gb.glyph = entry;
|
|
|
1432 gb.extent = Qnil;
|
|
|
1433 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1434 }
|
|
|
1435 }
|
|
|
1436 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1437 {
|
|
|
1438 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
|
1439 prop = add_emchar_rune (data);
|
|
|
1440 }
|
|
|
1441 else if (CONSP (entry))
|
|
|
1442 {
|
|
|
1443 if (EQ (XCAR (entry), Qformat)
|
|
|
1444 && CONSP (XCDR (entry))
|
|
|
1445 && STRINGP (XCAR (XCDR (entry))))
|
|
|
1446 {
|
|
|
1447 Lisp_Object format = XCAR (XCDR (entry));
|
|
665
|
1448 Bytebpos len = XSTRING_LENGTH (format);
|
|
|
1449 Intbyte *src = XSTRING_DATA (format), *end = src + len;
|
|
|
1450 Intbyte *result = alloca_array (Intbyte, len);
|
|
|
1451 Intbyte *dst = result;
|
|
428
|
1452
|
|
|
1453 while (src < end)
|
|
|
1454 {
|
|
|
1455 Emchar c = charptr_emchar (src);
|
|
|
1456 INC_CHARPTR (src);
|
|
|
1457 if (c != '%' || src == end)
|
|
|
1458 dst += set_charptr_emchar (dst, c);
|
|
|
1459 else
|
|
|
1460 {
|
|
|
1461 c = charptr_emchar (src);
|
|
|
1462 INC_CHARPTR (src);
|
|
|
1463 switch (c)
|
|
|
1464 {
|
|
|
1465 /*case 'x':
|
|
|
1466 dst += long_to_string_base ((char *)dst, data->ch, 16);
|
|
|
1467 break;*/
|
|
|
1468 case '%':
|
|
|
1469 dst += set_charptr_emchar (dst, '%');
|
|
|
1470 break;
|
|
442
|
1471 /* #### unimplemented */
|
|
428
|
1472 }
|
|
|
1473 }
|
|
|
1474 }
|
|
793
|
1475 prop = add_intbyte_string_runes (data, result, dst - result, 0, 0);
|
|
428
|
1476 }
|
|
|
1477 }
|
|
|
1478
|
|
|
1479 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1480 have any safe way of signaling an error. */
|
|
|
1481 return prop;
|
|
|
1482 }
|
|
|
1483
|
|
|
1484 /* Given a display table entry, call the appropriate functions to
|
|
|
1485 display each element of the entry. */
|
|
|
1486
|
|
|
1487 static prop_block_dynarr *
|
|
|
1488 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1489 {
|
|
|
1490 prop_block_dynarr *prop = NULL;
|
|
|
1491 if (VECTORP (entry))
|
|
|
1492 {
|
|
440
|
1493 Lisp_Vector *de = XVECTOR (entry);
|
|
428
|
1494 EMACS_INT len = vector_length (de);
|
|
|
1495 int elt;
|
|
|
1496
|
|
|
1497 for (elt = 0; elt < len; elt++)
|
|
|
1498 {
|
|
|
1499 if (NILP (vector_data (de)[elt]))
|
|
|
1500 continue;
|
|
|
1501 else
|
|
|
1502 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
|
|
|
1503 /* Else blow it off because someone added a bad entry and we
|
|
|
1504 don't have any safe way of signaling an error. Hey, this
|
|
|
1505 comment sounds familiar. */
|
|
|
1506
|
|
|
1507 /* #### Still need to add any remaining elements to the
|
|
|
1508 propagation information. */
|
|
|
1509 if (prop)
|
|
|
1510 return prop;
|
|
|
1511 }
|
|
|
1512 }
|
|
|
1513 else
|
|
|
1514 prop = add_disp_table_entry_runes_1 (data, entry);
|
|
|
1515 return prop;
|
|
|
1516 }
|
|
|
1517
|
|
|
1518 /* Add runes which were propagated from the previous line. */
|
|
|
1519
|
|
|
1520 static prop_block_dynarr *
|
|
|
1521 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1522 {
|
|
|
1523 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1524 this is finished. */
|
|
|
1525 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1526 case of not all the propagation blocks being added was not handled
|
|
|
1527 well. */
|
|
|
1528 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1529 of bogus. A cleaner solution is just to check for
|
|
|
1530 Dynarr_length (prop) > 0. */
|
|
|
1531 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1532 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1533 record? */
|
|
|
1534 int elt;
|
|
|
1535 prop_block_dynarr *add_failed;
|
|
826
|
1536 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
1537 int old_cursor_type = data->cursor_type;
|
|
428
|
1538
|
|
|
1539 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1540 {
|
|
|
1541 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1542
|
|
|
1543 switch (pb->type)
|
|
|
1544 {
|
|
|
1545 case PROP_CHAR:
|
|
|
1546 data->ch = pb->data.p_char.ch;
|
|
826
|
1547 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
|
|
428
|
1548 data->cursor_type = pb->data.p_char.cursor_type;
|
|
|
1549 add_failed = add_emchar_rune (data);
|
|
|
1550
|
|
|
1551 if (add_failed)
|
|
|
1552 goto oops_no_more_space;
|
|
|
1553 break;
|
|
|
1554 case PROP_STRING:
|
|
|
1555 if (pb->data.p_string.str)
|
|
|
1556 xfree (pb->data.p_string.str);
|
|
|
1557 /* #### bogus bogus -- this doesn't do anything!
|
|
665
|
1558 Should probably call add_intbyte_string_runes(),
|
|
428
|
1559 once that function is fixed. */
|
|
|
1560 break;
|
|
|
1561 case PROP_MINIBUF_PROMPT:
|
|
|
1562 {
|
|
|
1563 face_index old_findex = data->findex;
|
|
826
|
1564 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
1565
|
|
|
1566 data->findex = DEFAULT_INDEX;
|
|
826
|
1567 data->byte_charpos = 0;
|
|
428
|
1568 data->cursor_type = NO_CURSOR;
|
|
|
1569
|
|
|
1570 while (pb->data.p_string.len > 0)
|
|
|
1571 {
|
|
|
1572 data->ch = charptr_emchar (pb->data.p_string.str);
|
|
|
1573 add_failed = add_emchar_rune (data);
|
|
|
1574
|
|
|
1575 if (add_failed)
|
|
|
1576 {
|
|
|
1577 data->findex = old_findex;
|
|
826
|
1578 data->byte_charpos = byte_old_charpos;
|
|
428
|
1579 goto oops_no_more_space;
|
|
|
1580 }
|
|
|
1581 else
|
|
|
1582 {
|
|
|
1583 /* Complicated equivalent of ptr++, len-- */
|
|
665
|
1584 Intbyte *oldpos = pb->data.p_string.str;
|
|
428
|
1585 INC_CHARPTR (pb->data.p_string.str);
|
|
|
1586 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1587 }
|
|
|
1588 }
|
|
|
1589
|
|
|
1590 data->findex = old_findex;
|
|
|
1591 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
826
|
1592 this function, data->byte_charpos is automatically incremented.
|
|
428
|
1593 However, we don't want that to happen if we were adding
|
|
|
1594 the minibuffer prompt. */
|
|
|
1595 {
|
|
|
1596 struct buffer *buf =
|
|
|
1597 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1598 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
826
|
1599 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
|
|
|
1600 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
|
|
428
|
1601 else
|
|
|
1602 /* #### is this correct? Does anyone know?
|
|
|
1603 Does anyone care? Is this a cheesy hack or what? */
|
|
826
|
1604 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
|
|
428
|
1605 }
|
|
|
1606 }
|
|
|
1607 break;
|
|
|
1608 case PROP_BLANK:
|
|
|
1609 {
|
|
|
1610 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1611 the blank_width, as it implies that the value carries
|
|
|
1612 over from one rune to the next, which is wrong. */
|
|
|
1613 int old_width = data->blank_width;
|
|
|
1614 face_index old_findex = data->findex;
|
|
|
1615
|
|
|
1616 data->findex = pb->data.p_blank.findex;
|
|
|
1617 data->blank_width = pb->data.p_blank.width;
|
|
826
|
1618 data->byte_cursor_charpos = 0;
|
|
428
|
1619 data->cursor_type = IGNORE_CURSOR;
|
|
|
1620
|
|
|
1621 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1622 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1623
|
|
|
1624 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1625 matter because unless something is really screwed up
|
|
|
1626 this call won't cause that arg to be used. */
|
|
|
1627 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1628
|
|
|
1629 /* This can happen in the case where we have a tab which
|
|
|
1630 is wider than the window. */
|
|
|
1631 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1632 {
|
|
|
1633 pb->data.p_blank.width -= data->blank_width;
|
|
|
1634 add_failed = ADD_FAILED;
|
|
|
1635 }
|
|
|
1636
|
|
|
1637 data->findex = old_findex;
|
|
|
1638 data->blank_width = old_width;
|
|
|
1639
|
|
|
1640 if (add_failed)
|
|
|
1641 goto oops_no_more_space;
|
|
|
1642 }
|
|
|
1643 break;
|
|
|
1644 default:
|
|
|
1645 abort ();
|
|
|
1646 }
|
|
|
1647 }
|
|
|
1648
|
|
|
1649 oops_no_more_space:
|
|
|
1650
|
|
826
|
1651 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
1652 data->cursor_type = old_cursor_type;
|
|
|
1653 if (elt < Dynarr_length (*prop))
|
|
|
1654 {
|
|
|
1655 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1656 return *prop;
|
|
|
1657 }
|
|
|
1658 else
|
|
|
1659 {
|
|
|
1660 Dynarr_free (*prop);
|
|
|
1661 return NULL;
|
|
|
1662 }
|
|
|
1663 }
|
|
|
1664
|
|
|
1665 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1666 the display block, but add all other types to the appropriate list
|
|
|
1667 of the display line. They will be added later by different
|
|
|
1668 routines. */
|
|
|
1669
|
|
|
1670 static prop_block_dynarr *
|
|
|
1671 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1672 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1673 {
|
|
|
1674 struct window *w = XWINDOW (data->window);
|
|
|
1675
|
|
440
|
1676 /* If window faces changed, and glyph instance is text, then
|
|
|
1677 glyph sizes might have changed too */
|
|
|
1678 invalidate_glyph_geometry_maybe (gb->glyph, w);
|
|
|
1679
|
|
442
|
1680 /* This makes sure the glyph is in the cachels.
|
|
|
1681
|
|
|
1682 #### We do this to make sure the glyph is in the glyph cachels,
|
|
|
1683 so that the dirty flag can be reset after redisplay has
|
|
|
1684 finished. We should do this some other way, maybe by iterating
|
|
|
1685 over the window cache of subwindows. */
|
|
|
1686 get_glyph_cachel_index (w, gb->glyph);
|
|
|
1687
|
|
428
|
1688 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1689 if (NILP (gb->extent)
|
|
|
1690 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1691 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1692 || (pos_type == END_GLYPHS &&
|
|
442
|
1693 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1694 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
|
|
428
|
1695 {
|
|
|
1696 struct rune rb;
|
|
|
1697 int width;
|
|
|
1698 int xoffset = 0;
|
|
|
1699 int ascent, descent;
|
|
|
1700 Lisp_Object baseline;
|
|
|
1701 Lisp_Object face;
|
|
442
|
1702 Lisp_Object instance;
|
|
|
1703 face_index findex;
|
|
819
|
1704 prop_block_dynarr *retval = 0;
|
|
428
|
1705
|
|
|
1706 if (cachel)
|
|
|
1707 width = cachel->width;
|
|
|
1708 else
|
|
438
|
1709 width = glyph_width (gb->glyph, data->window);
|
|
428
|
1710
|
|
|
1711 if (!width)
|
|
|
1712 return NULL;
|
|
|
1713
|
|
|
1714 if (data->start_col || data->start_col_xoffset)
|
|
|
1715 {
|
|
|
1716 int glyph_char_width = width / space_width (w);
|
|
|
1717
|
|
|
1718 /* If we still have not fully scrolled horizontally after
|
|
|
1719 taking into account the width of the glyph, subtract its
|
|
|
1720 width and return. */
|
|
|
1721 if (glyph_char_width < data->start_col)
|
|
|
1722 {
|
|
|
1723 data->start_col -= glyph_char_width;
|
|
|
1724 return NULL;
|
|
|
1725 }
|
|
|
1726 else if (glyph_char_width == data->start_col)
|
|
|
1727 width = 0;
|
|
|
1728 else
|
|
|
1729 {
|
|
|
1730 xoffset = space_width (w) * data->start_col;
|
|
|
1731 width -= xoffset;
|
|
|
1732
|
|
|
1733 /* #### Can this happen? */
|
|
|
1734 if (width < 0)
|
|
|
1735 width = 0;
|
|
|
1736 }
|
|
|
1737
|
|
|
1738 data->start_col = 0;
|
|
|
1739 retval = add_hscroll_rune (data);
|
|
|
1740
|
|
|
1741 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1742 if (retval != NULL || !width)
|
|
|
1743 return retval;
|
|
|
1744 }
|
|
|
1745 else
|
|
|
1746 xoffset = 0;
|
|
|
1747
|
|
|
1748 if (data->pixpos + width > data->max_pixpos)
|
|
|
1749 {
|
|
|
1750 /* If this is the first object we are attempting to add to
|
|
819
|
1751 the line then we ignore the horizontal_clip threshold.
|
|
|
1752 Otherwise we will loop until the bottom of the window
|
|
|
1753 continually failing to add this glyph because it is wider
|
|
|
1754 than the window. We could alternatively just completely
|
|
|
1755 ignore the glyph and proceed from there but I think that
|
|
|
1756 this is a better solution.
|
|
|
1757
|
|
|
1758 This does, however, create a different problem in that we
|
|
|
1759 can end up adding the object to every single line, never
|
|
|
1760 getting any further - for instance an extent with a long
|
|
|
1761 start-glyph that covers multitple following
|
|
|
1762 characters. */
|
|
428
|
1763 if (Dynarr_length (data->db->runes)
|
|
|
1764 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1765 return ADD_FAILED;
|
|
819
|
1766 else {
|
|
|
1767 struct prop_block pb;
|
|
|
1768
|
|
|
1769 /* We need to account for the width of the end-of-line
|
|
|
1770 glyph if there is nothing more in the line to display,
|
|
|
1771 since we will not display it in this instance. It seems
|
|
|
1772 kind of gross doing it here, but otherwise we have to
|
|
|
1773 search the runes in create_text_block(). */
|
|
|
1774 if (data->ch == '\n')
|
|
|
1775 data->max_pixpos += data->end_glyph_width;
|
|
428
|
1776 width = data->max_pixpos - data->pixpos;
|
|
819
|
1777 /* Add the glyph we are displaying, but clipping, to the
|
|
|
1778 propagation data so that we don't try and do it
|
|
|
1779 again. */
|
|
|
1780 retval = Dynarr_new (prop_block);
|
|
|
1781 pb.type = PROP_GLYPH;
|
|
|
1782 pb.data.p_glyph.glyph = gb->glyph;
|
|
|
1783 pb.data.p_glyph.width = width;
|
|
|
1784 Dynarr_add (retval, pb);
|
|
|
1785 }
|
|
428
|
1786 }
|
|
|
1787
|
|
|
1788 if (cachel)
|
|
|
1789 {
|
|
|
1790 ascent = cachel->ascent;
|
|
|
1791 descent = cachel->descent;
|
|
|
1792 }
|
|
|
1793 else
|
|
|
1794 {
|
|
438
|
1795 ascent = glyph_ascent (gb->glyph, data->window);
|
|
|
1796 descent = glyph_descent (gb->glyph, data->window);
|
|
428
|
1797 }
|
|
|
1798
|
|
|
1799 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1800
|
|
819
|
1801 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
|
|
|
1802
|
|
428
|
1803 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1804 {
|
|
|
1805 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1806 contribution will be determined later. */
|
|
|
1807 if (NILP (baseline))
|
|
|
1808 {
|
|
|
1809 int height = ascent + descent;
|
|
819
|
1810 data->need_baseline_computation = 1;
|
|
428
|
1811 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1812 }
|
|
|
1813
|
|
|
1814 /* A string so determine contribution normally. */
|
|
|
1815 else if (EQ (baseline, Qt))
|
|
|
1816 {
|
|
|
1817 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1818 data->new_descent = max (data->new_descent, descent);
|
|
|
1819 }
|
|
|
1820
|
|
|
1821 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1822 contribution here. */
|
|
|
1823 else if (INTP (baseline))
|
|
|
1824 {
|
|
|
1825 int height = ascent + descent;
|
|
|
1826 int pix_ascent, pix_descent;
|
|
|
1827
|
|
|
1828 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1829 pix_descent = height - pix_ascent;
|
|
|
1830
|
|
|
1831 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1832 data->new_descent = max (data->new_descent, pix_descent);
|
|
819
|
1833 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1834
|
|
|
1835 rb.object.dglyph.descent = pix_descent;
|
|
428
|
1836 }
|
|
|
1837
|
|
|
1838 /* Otherwise something is screwed up. */
|
|
|
1839 else
|
|
|
1840 abort ();
|
|
|
1841 }
|
|
|
1842
|
|
|
1843 face = glyph_face (gb->glyph, data->window);
|
|
|
1844 if (NILP (face))
|
|
442
|
1845 findex = data->findex;
|
|
428
|
1846 else
|
|
442
|
1847 findex = get_builtin_face_cache_index (w, face);
|
|
|
1848
|
|
|
1849 instance = glyph_image_instance (gb->glyph, data->window,
|
|
793
|
1850 ERROR_ME_DEBUG_WARN, 1);
|
|
442
|
1851 if (TEXT_IMAGE_INSTANCEP (instance))
|
|
|
1852 {
|
|
|
1853 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
|
|
|
1854 face_index orig_findex = data->findex;
|
|
826
|
1855 Bytebpos orig_charpos = data->byte_charpos;
|
|
|
1856 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
|
|
442
|
1857
|
|
|
1858 data->findex = findex;
|
|
826
|
1859 data->byte_start_col_enabled = 0;
|
|
442
|
1860 if (!allow_cursor)
|
|
826
|
1861 data->byte_charpos = 0;
|
|
665
|
1862 add_intbyte_string_runes (data, XSTRING_DATA (string),
|
|
793
|
1863 XSTRING_LENGTH (string), 0, 1);
|
|
442
|
1864 data->findex = orig_findex;
|
|
826
|
1865 data->byte_charpos = orig_charpos;
|
|
|
1866 data->byte_start_col_enabled = orig_start_col_enabled;
|
|
819
|
1867 return retval;
|
|
442
|
1868 }
|
|
|
1869
|
|
|
1870 rb.findex = findex;
|
|
428
|
1871 rb.xpos = data->pixpos;
|
|
|
1872 rb.width = width;
|
|
826
|
1873 rb.charpos = 0; /* glyphs are never "at" anywhere */
|
|
|
1874 if (data->byte_endpos)
|
|
428
|
1875 /* #### is this necessary at all? */
|
|
665
|
1876 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
826
|
1877 data->byte_endpos);
|
|
428
|
1878 else
|
|
|
1879 rb.endpos = 0;
|
|
|
1880 rb.type = RUNE_DGLYPH;
|
|
|
1881 rb.object.dglyph.glyph = gb->glyph;
|
|
|
1882 rb.object.dglyph.extent = gb->extent;
|
|
|
1883 rb.object.dglyph.xoffset = xoffset;
|
|
819
|
1884 rb.object.dglyph.ascent = ascent;
|
|
|
1885 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
|
|
|
1886 a normal (textual) baseline. */
|
|
428
|
1887
|
|
|
1888 if (allow_cursor)
|
|
|
1889 {
|
|
826
|
1890 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
|
1891 data->byte_charpos);
|
|
428
|
1892
|
|
|
1893 if (data->cursor_type == CURSOR_ON)
|
|
|
1894 {
|
|
826
|
1895 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1896 {
|
|
|
1897 rb.cursor_type = CURSOR_ON;
|
|
|
1898 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1899 }
|
|
|
1900 else
|
|
|
1901 rb.cursor_type = CURSOR_OFF;
|
|
|
1902 }
|
|
|
1903 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1904 {
|
|
|
1905 rb.cursor_type = CURSOR_ON;
|
|
|
1906 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1907 data->cursor_type = NO_CURSOR;
|
|
|
1908 }
|
|
|
1909 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1910 rb.cursor_type = IGNORE_CURSOR;
|
|
|
1911 else if (data->cursor_type == NO_CURSOR)
|
|
|
1912 rb.cursor_type = NO_CURSOR;
|
|
|
1913 else
|
|
|
1914 rb.cursor_type = CURSOR_OFF;
|
|
|
1915 }
|
|
|
1916 else
|
|
|
1917 rb.cursor_type = CURSOR_OFF;
|
|
|
1918
|
|
|
1919 Dynarr_add (data->db->runes, rb);
|
|
|
1920 data->pixpos += width;
|
|
|
1921
|
|
819
|
1922 return retval;
|
|
428
|
1923 }
|
|
|
1924 else
|
|
|
1925 {
|
|
|
1926 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
1927 gb->findex =
|
|
|
1928 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
1929 data->window));
|
|
|
1930 else
|
|
|
1931 gb->findex = data->findex;
|
|
|
1932
|
|
|
1933 if (pos_type == BEGIN_GLYPHS)
|
|
|
1934 {
|
|
|
1935 if (!data->dl->left_glyphs)
|
|
|
1936 data->dl->left_glyphs = Dynarr_new (glyph_block);
|
|
|
1937 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
1938 return NULL;
|
|
|
1939 }
|
|
|
1940 else if (pos_type == END_GLYPHS)
|
|
|
1941 {
|
|
|
1942 if (!data->dl->right_glyphs)
|
|
|
1943 data->dl->right_glyphs = Dynarr_new (glyph_block);
|
|
|
1944 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
1945 return NULL;
|
|
|
1946 }
|
|
|
1947 else
|
|
|
1948 abort (); /* there are no unknown types */
|
|
|
1949 }
|
|
|
1950
|
|
819
|
1951 return NULL;
|
|
428
|
1952 }
|
|
|
1953
|
|
|
1954 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
1955 data. */
|
|
|
1956
|
|
|
1957 static prop_block_dynarr *
|
|
|
1958 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
1959 {
|
|
|
1960 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
1961 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
1962 int elt;
|
|
|
1963 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
1964 ? data->ef->begin_glyphs
|
|
|
1965 : data->ef->end_glyphs);
|
|
|
1966 prop_block_dynarr *prop;
|
|
|
1967
|
|
|
1968 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
1969 {
|
|
|
1970 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
1971 0);
|
|
|
1972
|
|
|
1973 if (prop)
|
|
|
1974 {
|
|
|
1975 /* #### Add some propagation information. */
|
|
|
1976 return prop;
|
|
|
1977 }
|
|
|
1978 }
|
|
|
1979
|
|
|
1980 Dynarr_reset (glyph_arr);
|
|
|
1981
|
|
|
1982 return NULL;
|
|
|
1983 }
|
|
|
1984
|
|
|
1985 /* Given a position for a buffer in a window, ensure that the given
|
|
|
1986 display line DL accurately represents the text on a line starting
|
|
|
1987 at the given position.
|
|
|
1988
|
|
826
|
1989 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's.
|
|
428
|
1990 You must do appropriate conversion. */
|
|
|
1991
|
|
665
|
1992 static Bytebpos
|
|
428
|
1993 create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
1994 Bytebpos byte_start_pos, prop_block_dynarr **prop,
|
|
428
|
1995 int type)
|
|
|
1996 {
|
|
|
1997 struct frame *f = XFRAME (w->frame);
|
|
|
1998 struct buffer *b = XBUFFER (w->buffer);
|
|
|
1999 struct device *d = XDEVICE (f->device);
|
|
|
2000
|
|
|
2001 pos_data data;
|
|
|
2002
|
|
|
2003 /* Don't display anything in the minibuffer if this window is not on
|
|
|
2004 a selected frame. We consider all other windows to be active
|
|
|
2005 minibuffers as it simplifies the coding. */
|
|
|
2006 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
2007 (f == device_selected_frame (d)) ||
|
|
|
2008 is_surrogate_for_selected_frame (f));
|
|
|
2009
|
|
|
2010 int truncate_win = window_truncation_on (w);
|
|
|
2011
|
|
|
2012 /* If the buffer's value of selective_display is an integer then
|
|
|
2013 only lines that start with less than selective_display columns of
|
|
|
2014 space will be displayed. If selective_display is t then all text
|
|
|
2015 after a ^M is invisible. */
|
|
|
2016 int selective = (INTP (b->selective_display)
|
|
|
2017 ? XINT (b->selective_display)
|
|
434
|
2018 : (!NILP (b->selective_display) ? -1 : 0));
|
|
428
|
2019
|
|
|
2020 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
2021 can actually be displayed and which octal should be used for.
|
|
|
2022 #### This variable should probably have some rethought done to
|
|
|
2023 it.
|
|
|
2024
|
|
|
2025 #### It would also be really nice if you could specify that
|
|
|
2026 the characters come out in hex instead of in octal. Mule
|
|
|
2027 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
2028 but that's bogus -- we need a more general solution. I
|
|
|
2029 think you need to extend the concept of display tables
|
|
|
2030 into a more general conversion mechanism. Ideally you
|
|
|
2031 could specify a Lisp function that converts characters,
|
|
|
2032 but this violates the Second Golden Rule and besides would
|
|
|
2033 make things way way way way slow.
|
|
|
2034
|
|
|
2035 So instead, we extend the display-table concept, which was
|
|
|
2036 historically limited to 256-byte vectors, to one of the
|
|
|
2037 following:
|
|
|
2038
|
|
|
2039 a) A 256-entry vector, for backward compatibility;
|
|
|
2040 b) char-table, mapping characters to values;
|
|
|
2041 c) range-table, mapping ranges of characters to values;
|
|
|
2042 d) a list of the above.
|
|
|
2043
|
|
|
2044 The (d) option allows you to specify multiple display tables
|
|
|
2045 instead of just one. Each display table can specify conversions
|
|
|
2046 for some characters and leave others unchanged. The way the
|
|
|
2047 character gets displayed is determined by the first display table
|
|
|
2048 with a binding for that character. This way, you could call a
|
|
|
2049 function `enable-hex-display' that adds a hex display-table to
|
|
|
2050 the list of display tables for the current buffer.
|
|
|
2051
|
|
|
2052 #### ...not yet implemented... Also, we extend the concept of
|
|
|
2053 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
2054 extended characters show up as hex with a display table like
|
|
|
2055 this:
|
|
|
2056
|
|
|
2057 #s(range-table data ((256 524288) (format "%x")))
|
|
|
2058
|
|
|
2059 Since more than one display table is possible, you have
|
|
|
2060 great flexibility in mapping ranges of characters. */
|
|
|
2061 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
|
2062 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2063 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2064 ? 255 : 160));
|
|
|
2065
|
|
|
2066 Lisp_Object face_dt, window_dt;
|
|
|
2067
|
|
|
2068 /* The text display block for this display line. */
|
|
|
2069 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2070
|
|
|
2071 /* The first time through the main loop we need to force the glyph
|
|
|
2072 data to be updated. */
|
|
|
2073 int initial = 1;
|
|
|
2074
|
|
|
2075 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2076 equal to the position passed in if there are no more runs to be
|
|
|
2077 displayed. */
|
|
|
2078 int no_more_frags = 0;
|
|
|
2079
|
|
|
2080 Lisp_Object synch_minibuffers_value =
|
|
|
2081 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2082
|
|
|
2083 dl->used_prop_data = 0;
|
|
|
2084 dl->num_chars = 0;
|
|
442
|
2085 dl->line_continuation = 0;
|
|
428
|
2086
|
|
|
2087 xzero (data);
|
|
|
2088 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2089
|
|
|
2090 /* These values are used by all of the rune addition routines. We add
|
|
|
2091 them to this structure for ease of passing. */
|
|
|
2092 data.d = d;
|
|
793
|
2093 data.window = wrap_window (w);
|
|
428
|
2094 data.string = Qnil;
|
|
|
2095 data.db = db;
|
|
|
2096 data.dl = dl;
|
|
|
2097
|
|
826
|
2098 data.byte_charpos = byte_start_pos;
|
|
428
|
2099 data.pixpos = dl->bounds.left_in;
|
|
|
2100 data.last_charset = Qunbound;
|
|
|
2101 data.last_findex = DEFAULT_INDEX;
|
|
|
2102 data.result_str = Qnil;
|
|
|
2103
|
|
|
2104 /* Set the right boundary adjusting it to take into account any end
|
|
|
2105 glyph. Save the width of the end glyph for later use. */
|
|
|
2106 data.max_pixpos = dl->bounds.right_in;
|
|
|
2107 if (truncate_win)
|
|
819
|
2108 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2109 else
|
|
819
|
2110 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2111 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2112
|
|
|
2113 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2114 {
|
|
826
|
2115 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2116 data.cursor_type = CURSOR_ON;
|
|
|
2117 }
|
|
|
2118 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2119 data.cursor_type = NO_CURSOR;
|
|
|
2120 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2121 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2122 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2123 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2124 {
|
|
826
|
2125 data.byte_cursor_charpos = BYTE_BUF_PT (b);
|
|
428
|
2126 data.cursor_type = CURSOR_ON;
|
|
|
2127 }
|
|
|
2128 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2129 {
|
|
826
|
2130 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
|
|
428
|
2131 data.cursor_type = CURSOR_ON;
|
|
|
2132 }
|
|
|
2133 else
|
|
|
2134 data.cursor_type = NO_CURSOR;
|
|
|
2135 data.cursor_x = -1;
|
|
|
2136
|
|
|
2137 data.start_col = w->hscroll;
|
|
|
2138 data.start_col_xoffset = w->left_xoffset;
|
|
826
|
2139 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
2140 data.hscroll_glyph_width_adjust = 0;
|
|
|
2141
|
|
|
2142 /* We regenerate the line from the very beginning. */
|
|
|
2143 Dynarr_reset (db->runes);
|
|
|
2144
|
|
|
2145 /* Why is this less than or equal and not just less than? If the
|
|
|
2146 starting position is already equal to the maximum we can't add
|
|
|
2147 anything else, right? Wrong. We might still have a newline to
|
|
|
2148 add. A newline can use the room allocated for an end glyph since
|
|
|
2149 if we add it we know we aren't going to be adding any end
|
|
|
2150 glyph. */
|
|
|
2151
|
|
|
2152 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2153 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2154 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2155 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2156 that the loop terminates only when either (a) there is
|
|
|
2157 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2158
|
|
|
2159 #### Also I think you need to ensure that the operation
|
|
|
2160 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2161 can't get interrupted in the middle. If you run off the end
|
|
|
2162 of the line during that operation, then you keep accumulating
|
|
|
2163 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2164 there's a begin glyph at a particular position and attempting
|
|
|
2165 to display that glyph results in window-end being hit and
|
|
|
2166 propagation data being generated, then the character at that
|
|
|
2167 position won't be displayed.
|
|
|
2168
|
|
|
2169 #### See also the comment after the end of this loop, below.
|
|
|
2170 */
|
|
|
2171 while (data.pixpos <= data.max_pixpos
|
|
|
2172 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2173 {
|
|
|
2174 /* #### This check probably should not be necessary. */
|
|
826
|
2175 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
428
|
2176 {
|
|
|
2177 /* #### urk! More of this lossage! */
|
|
826
|
2178 data.byte_charpos--;
|
|
428
|
2179 goto done;
|
|
|
2180 }
|
|
|
2181
|
|
|
2182 /* If selective display was an integer and we aren't working on
|
|
|
2183 a continuation line then find the next line we are actually
|
|
|
2184 supposed to display. */
|
|
|
2185 if (selective > 0
|
|
826
|
2186 && (data.byte_charpos == BYTE_BUF_BEGV (b)
|
|
|
2187 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
|
|
|
2188 {
|
|
|
2189 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2190 {
|
|
826
|
2191 data.byte_charpos =
|
|
|
2192 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2193 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2194 {
|
|
826
|
2195 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2196 goto done;
|
|
|
2197 }
|
|
|
2198 }
|
|
|
2199 }
|
|
|
2200
|
|
|
2201 /* Check for face changes. */
|
|
826
|
2202 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
2203 {
|
|
819
|
2204 Lisp_Object last_glyph = Qnil;
|
|
|
2205
|
|
|
2206 /* Deal with glyphs that we have already displayed. The
|
|
|
2207 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2208 propagation data then we are clipping the glyph and there
|
|
|
2209 can be no propagation data before that point. The theory
|
|
|
2210 works because we always recalculate the extent-fragments
|
|
|
2211 for propagated data, we never actually propagate the
|
|
|
2212 fragments that still need to be displayed. */
|
|
|
2213 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2214 {
|
|
|
2215 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2216 Dynarr_free (*prop);
|
|
|
2217 *prop = 0;
|
|
|
2218 }
|
|
428
|
2219 /* Now compute the face and begin/end-glyph information. */
|
|
|
2220 data.findex =
|
|
665
|
2221 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
826
|
2222 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
2223
|
|
|
2224 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2225
|
|
826
|
2226 if (data.byte_charpos == data.ef->end)
|
|
428
|
2227 no_more_frags = 1;
|
|
|
2228 }
|
|
|
2229 initial = 0;
|
|
|
2230
|
|
|
2231 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2232 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2233 display then we determine what to do based on the character at the
|
|
|
2234 current buffer position. */
|
|
|
2235
|
|
|
2236 /* If the current position is covered by an invisible extent, do
|
|
|
2237 nothing (except maybe add some ellipses).
|
|
|
2238
|
|
|
2239 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2240 invisible extent should be investigated further. This is
|
|
|
2241 fairly low priority though. */
|
|
|
2242 if (data.ef->invisible)
|
|
|
2243 {
|
|
|
2244 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2245 really know what I'm doing. */
|
|
|
2246 if (*prop)
|
|
|
2247 {
|
|
|
2248 Dynarr_free (*prop);
|
|
|
2249 *prop = 0;
|
|
|
2250 }
|
|
|
2251
|
|
|
2252 /* The extent fragment code only sets this when we should
|
|
|
2253 really display the ellipses. It makes sure the ellipses
|
|
|
2254 don't get displayed more than once in a row. */
|
|
|
2255 if (data.ef->invisible_ellipses)
|
|
|
2256 {
|
|
|
2257 struct glyph_block gb;
|
|
|
2258
|
|
|
2259 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2260 data.ef->invisible_ellipses = 0;
|
|
|
2261 gb.extent = Qnil;
|
|
|
2262 gb.glyph = Vinvisible_text_glyph;
|
|
|
2263 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2264 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2265 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2266 is to display a newline (for compatibility with
|
|
|
2267 selective-display-ellipses)? Maybe that's too
|
|
|
2268 abstruse. */
|
|
|
2269 if (*prop)
|
|
|
2270 goto done;
|
|
|
2271 }
|
|
|
2272
|
|
|
2273 /* If point is in an invisible region we place it on the
|
|
|
2274 next visible character. */
|
|
|
2275 if (data.cursor_type == CURSOR_ON
|
|
826
|
2276 && data.byte_charpos == data.byte_cursor_charpos)
|
|
428
|
2277 {
|
|
|
2278 data.cursor_type = NEXT_CURSOR;
|
|
|
2279 }
|
|
|
2280
|
|
|
2281 /* #### What if we we're dealing with a display table? */
|
|
|
2282 if (data.start_col)
|
|
|
2283 data.start_col--;
|
|
|
2284
|
|
826
|
2285 if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2286 goto done;
|
|
|
2287 else
|
|
826
|
2288 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2289 }
|
|
|
2290
|
|
|
2291 /* If there is propagation data, then it represents the current
|
|
819
|
2292 buffer position being displayed. Add them and advance the
|
|
|
2293 position counter. This might also add the minibuffer
|
|
|
2294 prompt. */
|
|
428
|
2295 else if (*prop)
|
|
|
2296 {
|
|
|
2297 dl->used_prop_data = 1;
|
|
|
2298 *prop = add_propagation_runes (prop, &data);
|
|
|
2299
|
|
|
2300 if (*prop)
|
|
|
2301 goto done; /* gee, a really narrow window */
|
|
826
|
2302 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2303 goto done;
|
|
826
|
2304 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
|
|
428
|
2305 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
2306 data.byte_charpos = BYTE_BUF_BEGV (b);
|
|
428
|
2307 else
|
|
826
|
2308 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2309 }
|
|
|
2310
|
|
|
2311 /* If there are end glyphs, add them to the line. These are
|
|
|
2312 the end glyphs for the previous run of text. We add them
|
|
|
2313 here rather than doing them at the end of handling the
|
|
|
2314 previous run so that glyphs at the beginning and end of
|
|
|
2315 a line are handled correctly. */
|
|
819
|
2316 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2317 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2318 {
|
|
|
2319 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2320 /* #### I think this is safe, but could be wrong. */
|
|
826
|
2321 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
819
|
2322
|
|
|
2323 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2324 {
|
|
|
2325 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2326 tmpglyphs = data.ef->end_glyphs;
|
|
|
2327 }
|
|
|
2328
|
|
|
2329 /* If there are begin glyphs, add them to the line. */
|
|
|
2330 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2331 {
|
|
|
2332 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2333 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2334 }
|
|
|
2335
|
|
|
2336 if (*prop)
|
|
|
2337 {
|
|
|
2338 /* If we just clipped a glyph and we are at the end of a
|
|
|
2339 line and there are more glyphs to display then do
|
|
|
2340 appropriate processing to not get a continuation
|
|
|
2341 glyph. */
|
|
|
2342 if (*prop != ADD_FAILED
|
|
|
2343 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2344 && data.ch == '\n')
|
|
|
2345 {
|
|
|
2346 /* If there are no more glyphs then do the normal
|
|
|
2347 processing.
|
|
|
2348
|
|
|
2349 #### This doesn't actually work if the same glyph is
|
|
|
2350 present more than once in the block. To solve
|
|
|
2351 this we would have to carry the index around
|
|
|
2352 which might be problematic since the fragment is
|
|
|
2353 recalculated for each line. */
|
|
|
2354 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2355 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2356 {
|
|
|
2357 Dynarr_free (*prop);
|
|
|
2358 *prop = 0;
|
|
|
2359 }
|
|
|
2360 else {
|
|
|
2361 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2362 add_emchar_rune (&data); /* discard prop data. */
|
|
|
2363 goto done;
|
|
|
2364 }
|
|
|
2365 }
|
|
|
2366 else
|
|
|
2367 goto done;
|
|
|
2368 }
|
|
428
|
2369 }
|
|
|
2370
|
|
|
2371 /* If at end-of-buffer, we've already processed begin and
|
|
|
2372 end-glyphs at this point and there's no text to process,
|
|
|
2373 so we're done. */
|
|
826
|
2374 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2375 goto done;
|
|
|
2376
|
|
|
2377 else
|
|
|
2378 {
|
|
|
2379 Lisp_Object entry = Qnil;
|
|
|
2380 /* Get the character at the current buffer position. */
|
|
826
|
2381 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2382 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2383 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2384
|
|
|
2385 /* If there is a display table entry for it, hand it off to
|
|
|
2386 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2387 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2388 {
|
|
|
2389 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2390
|
|
|
2391 if (*prop)
|
|
|
2392 goto done;
|
|
|
2393 }
|
|
|
2394
|
|
|
2395 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2396 to the line and end this loop. */
|
|
|
2397 else if (data.ch == '\n')
|
|
|
2398 {
|
|
|
2399 /* We aren't going to be adding an end glyph so give its
|
|
|
2400 space back in order to make sure that the cursor can
|
|
|
2401 fit. */
|
|
819
|
2402 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2403
|
|
|
2404 if (selective > 0
|
|
826
|
2405 && (byte_spaces_at_point
|
|
|
2406 (b, next_bytebpos (b, data.byte_charpos))
|
|
428
|
2407 >= selective))
|
|
|
2408 {
|
|
|
2409 if (!NILP (b->selective_display_ellipses))
|
|
|
2410 {
|
|
|
2411 struct glyph_block gb;
|
|
|
2412
|
|
|
2413 gb.extent = Qnil;
|
|
|
2414 gb.glyph = Vinvisible_text_glyph;
|
|
|
2415 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2416 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2417 }
|
|
|
2418 else
|
|
|
2419 {
|
|
|
2420 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2421 line with a special "character rune" whose width
|
|
|
2422 is the EOL cursor width and whose character is
|
|
|
2423 the non-printing character '\n'. */
|
|
|
2424 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2425 *prop = add_emchar_rune (&data);
|
|
|
2426 }
|
|
|
2427
|
|
826
|
2428 /* We need to set data.byte_charpos to the start of the
|
|
428
|
2429 next visible region in order to make this line
|
|
|
2430 appear to contain all of the invisible area.
|
|
|
2431 Otherwise, the line cache won't work
|
|
|
2432 correctly. */
|
|
826
|
2433 INC_BYTEBPOS (b, data.byte_charpos);
|
|
|
2434 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2435 {
|
|
826
|
2436 data.byte_charpos =
|
|
|
2437 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2438 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2439 {
|
|
826
|
2440 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2441 break;
|
|
|
2442 }
|
|
|
2443 }
|
|
826
|
2444 if (BYTE_BUF_FETCH_CHAR
|
|
|
2445 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
|
|
|
2446 DEC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2447 }
|
|
|
2448 else
|
|
|
2449 {
|
|
|
2450 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2451 *prop = add_emchar_rune (&data);
|
|
|
2452 }
|
|
|
2453
|
|
|
2454 goto done;
|
|
|
2455 }
|
|
|
2456
|
|
|
2457 /* If the current character is ^M, and selective display is
|
|
|
2458 enabled, then add the invisible-text-glyph if
|
|
|
2459 selective-display-ellipses is set. In any case, this
|
|
|
2460 line is done. */
|
|
|
2461 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2462 {
|
|
826
|
2463 Bytebpos byte_next_charpos;
|
|
428
|
2464
|
|
|
2465 /* Find the buffer position at the end of the line. */
|
|
826
|
2466 byte_next_charpos =
|
|
|
2467 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2468 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
|
|
428
|
2469 == '\n')
|
|
826
|
2470 DEC_BYTEBPOS (b, byte_next_charpos);
|
|
428
|
2471
|
|
|
2472 /* If the cursor is somewhere in the elided text make
|
|
|
2473 sure that the cursor gets drawn appropriately. */
|
|
|
2474 if (data.cursor_type == CURSOR_ON
|
|
826
|
2475 && (data.byte_cursor_charpos >= data.byte_charpos &&
|
|
|
2476 data.byte_cursor_charpos < byte_next_charpos))
|
|
428
|
2477 {
|
|
|
2478 data.cursor_type = NEXT_CURSOR;
|
|
|
2479 }
|
|
|
2480
|
|
|
2481 /* We won't be adding a truncation or continuation glyph
|
|
|
2482 so give up the room allocated for them. */
|
|
819
|
2483 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2484
|
|
|
2485 if (!NILP (b->selective_display_ellipses))
|
|
|
2486 {
|
|
|
2487 /* We don't propagate anything from the invisible
|
|
|
2488 text glyph if it fails to fit. This is
|
|
|
2489 intentional. */
|
|
|
2490 struct glyph_block gb;
|
|
|
2491
|
|
|
2492 gb.extent = Qnil;
|
|
|
2493 gb.glyph = Vinvisible_text_glyph;
|
|
|
2494 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2495 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2496 }
|
|
|
2497
|
|
|
2498 /* Set the buffer position to the end of the line. We
|
|
|
2499 need to do this before potentially adding a newline
|
|
|
2500 so that the cursor flag will get set correctly (if
|
|
|
2501 needed). */
|
|
826
|
2502 data.byte_charpos = byte_next_charpos;
|
|
428
|
2503
|
|
|
2504 if (NILP (b->selective_display_ellipses)
|
|
826
|
2505 || data.byte_cursor_charpos == byte_next_charpos)
|
|
428
|
2506 {
|
|
|
2507 /* We have to at least add a newline character so
|
|
|
2508 that the cursor shows up properly. */
|
|
|
2509 data.ch = '\n';
|
|
|
2510 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2511 data.findex = DEFAULT_INDEX;
|
|
|
2512 data.start_col = 0;
|
|
|
2513 data.start_col_xoffset = 0;
|
|
826
|
2514 data.byte_start_col_enabled = 0;
|
|
428
|
2515
|
|
|
2516 add_emchar_rune (&data);
|
|
|
2517 }
|
|
|
2518
|
|
|
2519 /* This had better be a newline but doing it this way
|
|
|
2520 we'll see obvious incorrect results if it isn't. No
|
|
|
2521 need to abort here. */
|
|
826
|
2522 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2523
|
|
|
2524 goto done;
|
|
|
2525 }
|
|
|
2526
|
|
|
2527 /* If the current character is considered to be printable, then
|
|
|
2528 just add it. */
|
|
|
2529 else if (data.ch >= printable_min)
|
|
|
2530 {
|
|
|
2531 *prop = add_emchar_rune (&data);
|
|
|
2532 if (*prop)
|
|
|
2533 goto done;
|
|
|
2534 }
|
|
|
2535
|
|
|
2536 /* If the current character is a tab, determine the next tab
|
|
|
2537 starting position and add a blank rune which extends from the
|
|
|
2538 current pixel position to that starting position. */
|
|
|
2539 else if (data.ch == '\t')
|
|
|
2540 {
|
|
|
2541 int tab_start_pixpos = data.pixpos;
|
|
|
2542 int next_tab_start;
|
|
|
2543 int char_tab_width;
|
|
|
2544 int prop_width = 0;
|
|
|
2545
|
|
|
2546 if (data.start_col > 1)
|
|
434
|
2547 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2548 + data.start_col_xoffset;
|
|
|
2549
|
|
|
2550 next_tab_start =
|
|
|
2551 next_tab_position (w, tab_start_pixpos,
|
|
|
2552 dl->bounds.left_in +
|
|
|
2553 data.hscroll_glyph_width_adjust);
|
|
|
2554 if (next_tab_start > data.max_pixpos)
|
|
|
2555 {
|
|
|
2556 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2557 next_tab_start = data.max_pixpos;
|
|
|
2558 }
|
|
|
2559 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2560 char_tab_width =
|
|
|
2561 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2562
|
|
|
2563 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2564
|
|
|
2565 /* add_blank_rune is only supposed to be called with
|
|
|
2566 sizes guaranteed to fit in the available space. */
|
|
|
2567 assert (!(*prop));
|
|
|
2568
|
|
|
2569 if (prop_width)
|
|
|
2570 {
|
|
|
2571 struct prop_block pb;
|
|
|
2572 *prop = Dynarr_new (prop_block);
|
|
|
2573
|
|
|
2574 pb.type = PROP_BLANK;
|
|
|
2575 pb.data.p_blank.width = prop_width;
|
|
|
2576 pb.data.p_blank.findex = data.findex;
|
|
|
2577 Dynarr_add (*prop, pb);
|
|
|
2578
|
|
|
2579 goto done;
|
|
|
2580 }
|
|
|
2581 }
|
|
|
2582
|
|
|
2583 /* If character is a control character, pass it off to
|
|
|
2584 add_control_char_runes.
|
|
|
2585
|
|
|
2586 The is_*() routines have undefined results on
|
|
|
2587 arguments outside of the range [-1, 255]. (This
|
|
|
2588 often bites people who carelessly use `char' instead
|
|
|
2589 of `unsigned char'.)
|
|
|
2590 */
|
|
665
|
2591 else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
|
|
428
|
2592 {
|
|
|
2593 *prop = add_control_char_runes (&data, b);
|
|
|
2594
|
|
|
2595 if (*prop)
|
|
|
2596 goto done;
|
|
|
2597 }
|
|
|
2598
|
|
|
2599 /* If the character is above the ASCII range and we have not
|
|
|
2600 already handled it, then print it as an octal number. */
|
|
|
2601 else if (data.ch >= 0200)
|
|
|
2602 {
|
|
|
2603 *prop = add_octal_runes (&data);
|
|
|
2604
|
|
|
2605 if (*prop)
|
|
|
2606 goto done;
|
|
|
2607 }
|
|
|
2608
|
|
|
2609 /* Assume the current character is considered to be printable,
|
|
|
2610 then just add it. */
|
|
|
2611 else
|
|
|
2612 {
|
|
|
2613 *prop = add_emchar_rune (&data);
|
|
|
2614 if (*prop)
|
|
|
2615 goto done;
|
|
|
2616 }
|
|
|
2617
|
|
826
|
2618 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2619 }
|
|
|
2620 }
|
|
|
2621
|
|
|
2622 done:
|
|
|
2623
|
|
|
2624 /* Determine the starting point of the next line if we did not hit the
|
|
|
2625 end of the buffer. */
|
|
826
|
2626 if (data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2627 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2628 {
|
|
|
2629 /* #### This check is not correct. If the line terminated
|
|
|
2630 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
2631 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
2632 you make the two changes mentioned at the top of this loop,
|
|
|
2633 you should be able to say '(if (*prop))'. That should also
|
|
826
|
2634 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2635 check. */
|
|
|
2636
|
|
|
2637 /* The common case is that the line ended because we hit a newline.
|
|
|
2638 In that case, the next character is just the next buffer
|
|
|
2639 position. */
|
|
|
2640 if (data.ch == '\n')
|
|
|
2641 {
|
|
|
2642 /* If data.start_col_enabled is still true, then the window is
|
|
|
2643 scrolled far enough so that nothing on this line is visible.
|
|
|
2644 We need to stick a truncation glyph at the beginning of the
|
|
|
2645 line in that case unless the line is completely blank. */
|
|
826
|
2646 if (data.byte_start_col_enabled)
|
|
428
|
2647 {
|
|
|
2648 if (data.cursor_type == CURSOR_ON)
|
|
|
2649 {
|
|
826
|
2650 if (data.byte_cursor_charpos >= byte_start_pos
|
|
|
2651 && data.byte_cursor_charpos <= data.byte_charpos)
|
|
|
2652 data.byte_cursor_charpos = data.byte_charpos;
|
|
428
|
2653 }
|
|
|
2654 data.findex = DEFAULT_INDEX;
|
|
|
2655 data.start_col = 0;
|
|
826
|
2656 data.byte_start_col_enabled = 0;
|
|
|
2657
|
|
|
2658 if (data.byte_charpos != byte_start_pos)
|
|
428
|
2659 {
|
|
|
2660 struct glyph_block gb;
|
|
|
2661
|
|
|
2662 gb.extent = Qnil;
|
|
|
2663 gb.glyph = Vhscroll_glyph;
|
|
|
2664 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2665 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2666 }
|
|
|
2667 else
|
|
|
2668 {
|
|
|
2669 /* This duplicates code down below to add a newline to
|
|
|
2670 the end of an otherwise empty line.*/
|
|
|
2671 data.ch = '\n';
|
|
|
2672 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2673
|
|
|
2674 add_emchar_rune (&data);
|
|
|
2675 }
|
|
|
2676 }
|
|
|
2677
|
|
826
|
2678 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2679 }
|
|
|
2680
|
|
|
2681 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2682 line. */
|
|
|
2683 else
|
|
|
2684 {
|
|
|
2685 struct glyph_block gb;
|
|
|
2686 struct glyph_cachel *cachel;
|
|
|
2687
|
|
|
2688 /* If the line is to be truncated then we actually have to look
|
|
|
2689 for the next newline. We also add the end-of-line glyph which
|
|
|
2690 we know will fit because we adjusted the right border before
|
|
|
2691 we starting laying out the line. */
|
|
819
|
2692 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2693 data.findex = DEFAULT_INDEX;
|
|
|
2694 gb.extent = Qnil;
|
|
|
2695
|
|
|
2696 if (truncate_win)
|
|
|
2697 {
|
|
826
|
2698 Bytebpos byte_pos;
|
|
428
|
2699
|
|
|
2700 /* Now find the start of the next line. */
|
|
826
|
2701 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
428
|
2702
|
|
|
2703 /* If the cursor is past the truncation line then we
|
|
|
2704 make it appear on the truncation glyph. If we've hit
|
|
|
2705 the end of the buffer then we also make the cursor
|
|
|
2706 appear unless eob is immediately preceded by a
|
|
|
2707 newline. In that case the cursor should actually
|
|
|
2708 appear on the next line. */
|
|
|
2709 if (data.cursor_type == CURSOR_ON
|
|
826
|
2710 && data.byte_cursor_charpos >= data.byte_charpos
|
|
|
2711 && (data.byte_cursor_charpos < byte_pos ||
|
|
|
2712 (byte_pos == BYTE_BUF_ZV (b)
|
|
|
2713 && (byte_pos == BYTE_BUF_BEGV (b)
|
|
|
2714 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
|
|
428
|
2715 != '\n')))))
|
|
826
|
2716 data.byte_cursor_charpos = byte_pos;
|
|
428
|
2717 else
|
|
|
2718 data.cursor_type = NO_CURSOR;
|
|
|
2719
|
|
826
|
2720 data.byte_charpos = byte_pos;
|
|
428
|
2721 gb.glyph = Vtruncation_glyph;
|
|
|
2722 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2723 }
|
|
|
2724 else
|
|
|
2725 {
|
|
|
2726 /* The cursor can never be on the continuation glyph. */
|
|
|
2727 data.cursor_type = NO_CURSOR;
|
|
|
2728
|
|
826
|
2729 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
2730
|
|
442
|
2731 dl->line_continuation = 1;
|
|
428
|
2732 gb.glyph = Vcontinuation_glyph;
|
|
|
2733 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2734 }
|
|
|
2735
|
|
442
|
2736 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2737
|
|
826
|
2738 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
|
|
|
2739 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
|
|
428
|
2740 /* #### Damn this losing shit. */
|
|
826
|
2741 data.byte_charpos++;
|
|
428
|
2742 }
|
|
|
2743 }
|
|
|
2744 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
826
|
2745 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
|
|
428
|
2746 {
|
|
|
2747 /* We need to add a marker to the end of the line since there is no
|
|
|
2748 newline character in order for the cursor to get drawn. We label
|
|
|
2749 it as a newline so that it gets handled correctly by the
|
|
|
2750 whitespace routines below. */
|
|
|
2751
|
|
|
2752 data.ch = '\n';
|
|
|
2753 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2754 data.findex = DEFAULT_INDEX;
|
|
|
2755 data.start_col = 0;
|
|
|
2756 data.start_col_xoffset = 0;
|
|
826
|
2757 data.byte_start_col_enabled = 0;
|
|
428
|
2758
|
|
|
2759 data.max_pixpos += data.blank_width;
|
|
|
2760 add_emchar_rune (&data);
|
|
|
2761 data.max_pixpos -= data.blank_width;
|
|
|
2762
|
|
|
2763 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2764 manipulating invalid positions is guaranteed to result in
|
|
|
2765 trouble sooner or later. */
|
|
826
|
2766 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
|
|
428
|
2767 }
|
|
|
2768
|
|
|
2769 /* Calculate left whitespace boundary. */
|
|
|
2770 {
|
|
|
2771 int elt = 0;
|
|
|
2772
|
|
|
2773 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2774 while (elt < Dynarr_length (db->runes))
|
|
|
2775 {
|
|
|
2776 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2777
|
|
|
2778 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2779 || rb->type == RUNE_BLANK)
|
|
|
2780 {
|
|
|
2781 dl->bounds.left_white += rb->width;
|
|
|
2782 elt++;
|
|
|
2783 }
|
|
|
2784 else
|
|
|
2785 elt = Dynarr_length (db->runes);
|
|
|
2786 }
|
|
|
2787 }
|
|
|
2788
|
|
|
2789 /* Calculate right whitespace boundary. */
|
|
|
2790 {
|
|
|
2791 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2792 int done = 0;
|
|
|
2793
|
|
|
2794 while (!done && elt >= 0)
|
|
|
2795 {
|
|
|
2796 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2797
|
|
|
2798 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2799 && isspace (rb->object.chr.ch))
|
|
|
2800 && !rb->type == RUNE_BLANK)
|
|
|
2801 {
|
|
|
2802 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2803 done = 1;
|
|
|
2804 }
|
|
|
2805
|
|
|
2806 elt--;
|
|
|
2807
|
|
|
2808 }
|
|
|
2809
|
|
|
2810 /* The line is blank so everything is considered to be right
|
|
|
2811 whitespace. */
|
|
|
2812 if (!done)
|
|
|
2813 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2814 }
|
|
|
2815
|
|
|
2816 /* Set the display blocks bounds. */
|
|
|
2817 db->start_pos = dl->bounds.left_in;
|
|
|
2818 if (Dynarr_length (db->runes))
|
|
|
2819 {
|
|
|
2820 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2821
|
|
|
2822 db->end_pos = rb->xpos + rb->width;
|
|
|
2823 }
|
|
|
2824 else
|
|
|
2825 db->end_pos = dl->bounds.right_white;
|
|
|
2826
|
|
819
|
2827 calculate_baseline (&data);
|
|
428
|
2828
|
|
|
2829 dl->ascent = data.new_ascent;
|
|
|
2830 dl->descent = data.new_descent;
|
|
|
2831
|
|
|
2832 {
|
|
|
2833 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2834
|
|
|
2835 if (dl->ascent < ascent)
|
|
|
2836 dl->ascent = ascent;
|
|
|
2837 }
|
|
|
2838 {
|
|
|
2839 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2840
|
|
|
2841 if (dl->descent < descent)
|
|
|
2842 dl->descent = descent;
|
|
|
2843 }
|
|
|
2844
|
|
819
|
2845 calculate_yoffset (dl, db);
|
|
|
2846
|
|
428
|
2847 dl->cursor_elt = data.cursor_x;
|
|
|
2848 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
2849 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
|
2850 dl->end_charpos = BUF_ZV (b);
|
|
428
|
2851 else
|
|
826
|
2852 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
|
|
428
|
2853 if (truncate_win)
|
|
826
|
2854 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
|
|
428
|
2855 else
|
|
|
2856 /* This doesn't correctly take into account tabs and control
|
|
|
2857 characters but if the window isn't being truncated then this
|
|
|
2858 value isn't going to end up being used anyhow. */
|
|
826
|
2859 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
2860
|
|
|
2861 /* #### handle horizontally scrolled line with text none of which
|
|
|
2862 was actually laid out. */
|
|
|
2863
|
|
|
2864 /* #### handle any remainder of overlay arrow */
|
|
|
2865
|
|
|
2866 if (*prop == ADD_FAILED)
|
|
|
2867 *prop = NULL;
|
|
|
2868
|
|
|
2869 if (truncate_win && *prop)
|
|
|
2870 {
|
|
|
2871 Dynarr_free (*prop);
|
|
|
2872 *prop = NULL;
|
|
|
2873 }
|
|
|
2874
|
|
|
2875 extent_fragment_delete (data.ef);
|
|
|
2876
|
|
|
2877 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2878 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2879 The main loop should get fixed so that it isn't necessary to call
|
|
|
2880 this function if we are already at EOB. */
|
|
|
2881
|
|
826
|
2882 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
|
|
|
2883 return data.byte_charpos + 1; /* Yuck! */
|
|
428
|
2884 else
|
|
826
|
2885 return data.byte_charpos;
|
|
428
|
2886 }
|
|
|
2887
|
|
|
2888 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2889
|
|
|
2890 static int
|
|
|
2891 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2892 {
|
|
|
2893 struct frame *f = XFRAME (w->frame);
|
|
|
2894 struct device *d = XDEVICE (f->device);
|
|
|
2895 pos_data data;
|
|
|
2896
|
|
|
2897 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2898 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2899 return 0;
|
|
|
2900
|
|
|
2901 xzero (data);
|
|
|
2902 data.ef = NULL;
|
|
|
2903 data.d = d;
|
|
793
|
2904 data.window = wrap_window (w);
|
|
428
|
2905 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2906 data.dl = dl;
|
|
|
2907 data.pixpos = dl->bounds.left_in;
|
|
|
2908 data.max_pixpos = dl->bounds.right_in;
|
|
|
2909 data.cursor_type = NO_CURSOR;
|
|
|
2910 data.cursor_x = -1;
|
|
|
2911 data.findex = DEFAULT_INDEX;
|
|
|
2912 data.last_charset = Qunbound;
|
|
|
2913 data.last_findex = DEFAULT_INDEX;
|
|
|
2914 data.result_str = Qnil;
|
|
|
2915 data.string = Qnil;
|
|
|
2916
|
|
|
2917 Dynarr_reset (data.db->runes);
|
|
|
2918
|
|
|
2919 if (STRINGP (Voverlay_arrow_string))
|
|
|
2920 {
|
|
665
|
2921 add_intbyte_string_runes
|
|
428
|
2922 (&data,
|
|
|
2923 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
2924 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
2925 1, 0);
|
|
428
|
2926 }
|
|
|
2927 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
2928 {
|
|
|
2929 struct glyph_block gb;
|
|
|
2930
|
|
|
2931 gb.glyph = Voverlay_arrow_string;
|
|
|
2932 gb.extent = Qnil;
|
|
|
2933 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
2934 }
|
|
819
|
2935
|
|
428
|
2936 if (data.max_pixmap_height)
|
|
|
2937 {
|
|
|
2938 int height = data.new_ascent + data.new_descent;
|
|
|
2939 int pix_ascent, pix_descent;
|
|
819
|
2940
|
|
428
|
2941 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2942 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
2943 calculate_baseline (&data);
|
|
428
|
2944
|
|
|
2945 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2946 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2947 }
|
|
|
2948
|
|
|
2949 dl->ascent = data.new_ascent;
|
|
|
2950 dl->descent = data.new_descent;
|
|
|
2951
|
|
|
2952 data.db->start_pos = dl->bounds.left_in;
|
|
|
2953 data.db->end_pos = data.pixpos;
|
|
|
2954
|
|
819
|
2955 calculate_yoffset (dl, data.db);
|
|
|
2956
|
|
428
|
2957 return data.pixpos - dl->bounds.left_in;
|
|
|
2958 }
|
|
|
2959
|
|
|
2960 /* Add a type of glyph to a margin display block. */
|
|
|
2961
|
|
|
2962 static int
|
|
|
2963 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
2964 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
2965 {
|
|
|
2966 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
2967 ? dl->left_glyphs
|
|
|
2968 : dl->right_glyphs);
|
|
|
2969 int elt, end;
|
|
|
2970 int reverse;
|
|
442
|
2971 struct window *w = XWINDOW (window);
|
|
|
2972 struct frame *f = XFRAME (w->frame);
|
|
|
2973 struct device *d = XDEVICE (f->device);
|
|
|
2974 pos_data data;
|
|
|
2975
|
|
|
2976 xzero (data);
|
|
|
2977 data.d = d;
|
|
|
2978 data.window = window;
|
|
|
2979 data.db = db;
|
|
|
2980 data.dl = dl;
|
|
|
2981 data.pixpos = start;
|
|
|
2982 data.cursor_type = NO_CURSOR;
|
|
|
2983 data.cursor_x = -1;
|
|
|
2984 data.last_charset = Qunbound;
|
|
|
2985 data.last_findex = DEFAULT_INDEX;
|
|
|
2986 data.result_str = Qnil;
|
|
|
2987 data.string = Qnil;
|
|
|
2988 data.new_ascent = dl->ascent;
|
|
|
2989 data.new_descent = dl->descent;
|
|
428
|
2990
|
|
|
2991 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
2992 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
2993 {
|
|
|
2994 reverse = 1;
|
|
|
2995 elt = Dynarr_length (gbd) - 1;
|
|
|
2996 end = 0;
|
|
|
2997 }
|
|
|
2998 else
|
|
|
2999 {
|
|
|
3000 reverse = 0;
|
|
|
3001 elt = 0;
|
|
|
3002 end = Dynarr_length (gbd);
|
|
|
3003 }
|
|
|
3004
|
|
|
3005 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
3006 {
|
|
|
3007 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3008
|
|
|
3009 if (NILP (gb->extent))
|
|
|
3010 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3011
|
|
|
3012 if (gb->active &&
|
|
|
3013 ((side == LEFT_GLYPHS &&
|
|
|
3014 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3015 || (side == RIGHT_GLYPHS &&
|
|
|
3016 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3017 {
|
|
442
|
3018 data.findex = gb->findex;
|
|
|
3019 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3020 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3021 count--;
|
|
|
3022 gb->active = 0;
|
|
|
3023 }
|
|
|
3024
|
|
|
3025 (reverse ? elt-- : elt++);
|
|
|
3026 }
|
|
|
3027
|
|
819
|
3028 calculate_baseline (&data);
|
|
442
|
3029
|
|
|
3030 dl->ascent = data.new_ascent;
|
|
|
3031 dl->descent = data.new_descent;
|
|
|
3032
|
|
819
|
3033 calculate_yoffset (dl, data.db);
|
|
|
3034
|
|
442
|
3035 return data.pixpos;
|
|
428
|
3036 }
|
|
|
3037
|
|
|
3038 /* Add a blank to a margin display block. */
|
|
|
3039
|
|
|
3040 static void
|
|
|
3041 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
3042 struct window *w, int xpos, int width, int side)
|
|
|
3043 {
|
|
|
3044 struct rune rb;
|
|
|
3045
|
|
|
3046 rb.findex = (side == LEFT_GLYPHS
|
|
|
3047 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3048 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3049 rb.xpos = xpos;
|
|
|
3050 rb.width = width;
|
|
826
|
3051 rb.charpos = -1;
|
|
428
|
3052 rb.endpos = 0;
|
|
|
3053 rb.type = RUNE_BLANK;
|
|
|
3054 rb.cursor_type = CURSOR_OFF;
|
|
|
3055
|
|
|
3056 Dynarr_add (db->runes, rb);
|
|
|
3057 }
|
|
|
3058
|
|
|
3059 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3060 left whitespace area. */
|
|
|
3061
|
|
|
3062 static void
|
|
|
3063 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3064 int overlay_width)
|
|
|
3065 {
|
|
|
3066 Lisp_Object window;
|
|
|
3067
|
|
|
3068 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3069 int elt, end_xpos;
|
|
|
3070 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3071 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3072 int left_in_start = dl->bounds.left_in;
|
|
|
3073 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3074
|
|
|
3075 struct display_block *odb, *idb;
|
|
|
3076
|
|
793
|
3077 window = wrap_window (w);
|
|
428
|
3078
|
|
|
3079 /* We have to add the glyphs to the line in the order outside,
|
|
|
3080 inside, whitespace. However the precedence dictates that we
|
|
|
3081 determine how many will fit in the reverse order. */
|
|
|
3082
|
|
|
3083 /* Determine how many whitespace glyphs we can display and where
|
|
|
3084 they should start. */
|
|
|
3085 white_in_start = dl->bounds.left_white;
|
|
|
3086 white_out_start = left_in_start;
|
|
|
3087 white_out_cnt = white_in_cnt = 0;
|
|
|
3088 elt = 0;
|
|
|
3089
|
|
|
3090 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3091 {
|
|
|
3092 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3093
|
|
|
3094 if (NILP (gb->extent))
|
|
|
3095 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3096
|
|
|
3097 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3098 {
|
|
|
3099 int width;
|
|
|
3100
|
|
438
|
3101 width = glyph_width (gb->glyph, window);
|
|
428
|
3102
|
|
|
3103 if (white_in_start - width >= left_in_end)
|
|
|
3104 {
|
|
|
3105 white_in_cnt++;
|
|
|
3106 white_in_start -= width;
|
|
|
3107 gb->width = width;
|
|
|
3108 gb->active = 1;
|
|
|
3109 }
|
|
|
3110 else if (use_overflow
|
|
|
3111 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3112 {
|
|
|
3113 white_out_cnt++;
|
|
|
3114 white_out_start -= width;
|
|
|
3115 gb->width = width;
|
|
|
3116 gb->active = 1;
|
|
|
3117 }
|
|
|
3118 else
|
|
|
3119 gb->active = 0;
|
|
|
3120 }
|
|
|
3121
|
|
|
3122 elt++;
|
|
|
3123 }
|
|
|
3124
|
|
|
3125 /* Determine how many inside margin glyphs we can display and where
|
|
|
3126 they should start. The inside margin glyphs get whatever space
|
|
|
3127 is left after the whitespace glyphs have been displayed. These
|
|
|
3128 are tricky to calculate since if we decide to use the overflow
|
|
|
3129 area we basically have to start over. So for these we build up a
|
|
|
3130 list of just the inside margin glyphs and manipulate it to
|
|
|
3131 determine the needed info. */
|
|
|
3132 {
|
|
|
3133 glyph_block_dynarr *ib;
|
|
|
3134 int avail_in, avail_out;
|
|
|
3135 int done = 0;
|
|
|
3136 int marker = 0;
|
|
|
3137 int used_in, used_out;
|
|
|
3138
|
|
|
3139 elt = 0;
|
|
|
3140 used_in = used_out = 0;
|
|
|
3141 ib = Dynarr_new (glyph_block);
|
|
|
3142 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3143 {
|
|
|
3144 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3145
|
|
|
3146 if (NILP (gb->extent))
|
|
|
3147 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3148
|
|
|
3149 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3150 GL_INSIDE_MARGIN)
|
|
|
3151 {
|
|
438
|
3152 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3153 used_in += gb->width;
|
|
|
3154 Dynarr_add (ib, *gb);
|
|
|
3155 }
|
|
|
3156
|
|
|
3157 elt++;
|
|
|
3158 }
|
|
|
3159
|
|
|
3160 if (white_out_cnt)
|
|
|
3161 avail_in = 0;
|
|
|
3162 else
|
|
|
3163 {
|
|
|
3164 avail_in = white_in_start - left_in_end;
|
|
|
3165 if (avail_in < 0)
|
|
|
3166 avail_in = 0;
|
|
|
3167 }
|
|
|
3168
|
|
|
3169 if (!use_overflow)
|
|
|
3170 avail_out = 0;
|
|
|
3171 else
|
|
|
3172 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3173
|
|
|
3174 marker = 0;
|
|
|
3175 while (!done && marker < Dynarr_length (ib))
|
|
|
3176 {
|
|
|
3177 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3178
|
|
|
3179 /* If everything now fits in the available inside margin
|
|
|
3180 space, we're done. */
|
|
|
3181 if (used_in <= avail_in)
|
|
|
3182 done = 1;
|
|
|
3183 else
|
|
|
3184 {
|
|
|
3185 /* Otherwise see if we have room to move a glyph to the
|
|
|
3186 outside. */
|
|
|
3187 if (used_out + width <= avail_out)
|
|
|
3188 {
|
|
|
3189 used_out += width;
|
|
|
3190 used_in -= width;
|
|
|
3191 }
|
|
|
3192 else
|
|
|
3193 done = 1;
|
|
|
3194 }
|
|
|
3195
|
|
|
3196 if (!done)
|
|
|
3197 marker++;
|
|
|
3198 }
|
|
|
3199
|
|
|
3200 /* At this point we now know that everything from marker on goes in
|
|
|
3201 the inside margin and everything before it goes in the outside
|
|
|
3202 margin. The stuff going into the outside margin is guaranteed
|
|
|
3203 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3204
|
|
|
3205 in_in_end = left_in_end;
|
|
|
3206 in_out_start = white_out_start;
|
|
|
3207 in_out_cnt = in_in_cnt = 0;
|
|
|
3208
|
|
|
3209 Dynarr_free (ib);
|
|
|
3210 elt = 0;
|
|
|
3211 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3212 {
|
|
|
3213 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3214
|
|
|
3215 if (NILP (gb->extent))
|
|
|
3216 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3217
|
|
|
3218 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3219 GL_INSIDE_MARGIN)
|
|
|
3220 {
|
|
438
|
3221 int width = glyph_width (gb->glyph, window);
|
|
428
|
3222
|
|
|
3223 if (used_out)
|
|
|
3224 {
|
|
|
3225 in_out_cnt++;
|
|
|
3226 in_out_start -= width;
|
|
|
3227 gb->width = width;
|
|
|
3228 gb->active = 1;
|
|
|
3229 used_out -= width;
|
|
|
3230 }
|
|
|
3231 else if (in_in_end + width < white_in_start)
|
|
|
3232 {
|
|
|
3233 in_in_cnt++;
|
|
|
3234 in_in_end += width;
|
|
|
3235 gb->width = width;
|
|
|
3236 gb->active = 1;
|
|
|
3237 }
|
|
|
3238 else
|
|
|
3239 gb->active = 0;
|
|
|
3240 }
|
|
|
3241
|
|
|
3242 elt++;
|
|
|
3243 }
|
|
|
3244 }
|
|
|
3245
|
|
|
3246 /* Determine how many outside margin glyphs we can display. They
|
|
|
3247 always start at the left outside margin and can only use the
|
|
|
3248 outside margin space. */
|
|
|
3249 out_end = dl->bounds.left_out;
|
|
|
3250 out_cnt = 0;
|
|
|
3251 elt = 0;
|
|
|
3252
|
|
|
3253 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3254 {
|
|
|
3255 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3256
|
|
|
3257 if (NILP (gb->extent))
|
|
|
3258 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3259
|
|
|
3260 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3261 GL_OUTSIDE_MARGIN)
|
|
|
3262 {
|
|
438
|
3263 int width = glyph_width (gb->glyph, window);
|
|
428
|
3264
|
|
|
3265 if (out_end + width <= in_out_start)
|
|
|
3266 {
|
|
|
3267 out_cnt++;
|
|
|
3268 out_end += width;
|
|
|
3269 gb->width = width;
|
|
|
3270 gb->active = 1;
|
|
|
3271 }
|
|
|
3272 else
|
|
|
3273 gb->active = 0;
|
|
|
3274 }
|
|
|
3275
|
|
|
3276 elt++;
|
|
|
3277 }
|
|
|
3278
|
|
|
3279 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3280 runes to the appropriate display blocks. */
|
|
|
3281 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3282 {
|
|
|
3283 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3284 odb->start_pos = dl->bounds.left_out;
|
|
|
3285 /* #### We should stop adding a blank to account for the space
|
|
|
3286 between the end of the glyphs and the margin and instead set
|
|
|
3287 this accordingly. */
|
|
|
3288 odb->end_pos = dl->bounds.left_in;
|
|
|
3289 Dynarr_reset (odb->runes);
|
|
|
3290 }
|
|
|
3291 else
|
|
|
3292 odb = 0;
|
|
|
3293
|
|
|
3294 if (in_in_cnt || white_in_cnt)
|
|
|
3295 {
|
|
|
3296 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3297 idb->start_pos = dl->bounds.left_in;
|
|
|
3298 /* #### See above comment for odb->end_pos */
|
|
|
3299 idb->end_pos = dl->bounds.left_white;
|
|
|
3300 Dynarr_reset (idb->runes);
|
|
|
3301 }
|
|
|
3302 else
|
|
|
3303 idb = 0;
|
|
|
3304
|
|
|
3305 /* First add the outside margin glyphs. */
|
|
|
3306 if (out_cnt)
|
|
|
3307 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3308 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3309 else
|
|
|
3310 end_xpos = dl->bounds.left_out;
|
|
|
3311
|
|
|
3312 /* There may be blank space between the outside margin glyphs and
|
|
|
3313 the inside margin glyphs. If so, add a blank. */
|
|
|
3314 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3315 {
|
|
|
3316 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3317 LEFT_GLYPHS);
|
|
|
3318 }
|
|
|
3319
|
|
|
3320 /* Next add the inside margin glyphs which are actually in the
|
|
|
3321 outside margin. */
|
|
|
3322 if (in_out_cnt)
|
|
|
3323 {
|
|
|
3324 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3325 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3326 }
|
|
|
3327
|
|
|
3328 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3329 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3330 here. */
|
|
|
3331 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3332 {
|
|
|
3333 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3334 LEFT_GLYPHS);
|
|
|
3335 }
|
|
|
3336
|
|
|
3337 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3338 outside margin. */
|
|
|
3339 if (white_out_cnt)
|
|
|
3340 {
|
|
|
3341 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3342 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3343 }
|
|
|
3344
|
|
|
3345 /* We take care of clearing between the end of the glyphs and the
|
|
|
3346 start of the inside margin for lines which have glyphs. */
|
|
|
3347 if (odb && (left_in_start - end_xpos))
|
|
|
3348 {
|
|
|
3349 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3350 LEFT_GLYPHS);
|
|
|
3351 }
|
|
|
3352
|
|
|
3353 /* Next add the inside margin glyphs which are actually in the
|
|
|
3354 inside margin. */
|
|
|
3355 if (in_in_cnt)
|
|
|
3356 {
|
|
|
3357 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3358 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3359 }
|
|
|
3360 else
|
|
|
3361 end_xpos = left_in_end;
|
|
|
3362
|
|
|
3363 /* Make sure that the area between the end of the inside margin
|
|
|
3364 glyphs and the whitespace glyphs is cleared. */
|
|
|
3365 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3366 {
|
|
|
3367 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3368 LEFT_GLYPHS);
|
|
|
3369 }
|
|
|
3370
|
|
|
3371 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3372 inside margin. */
|
|
|
3373 if (white_in_cnt)
|
|
|
3374 {
|
|
|
3375 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3376 LEFT_GLYPHS, window);
|
|
|
3377 }
|
|
|
3378
|
|
|
3379 /* Whitespace glyphs always end right next to the text block so
|
|
|
3380 there is nothing we have to make sure is cleared after them. */
|
|
|
3381 }
|
|
|
3382
|
|
|
3383 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3384 right whitespace area. */
|
|
|
3385
|
|
|
3386 static void
|
|
|
3387 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3388 {
|
|
|
3389 Lisp_Object window;
|
|
|
3390
|
|
|
3391 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3392 int elt, end_xpos;
|
|
|
3393 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3394 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3395
|
|
|
3396 struct display_block *odb, *idb;
|
|
|
3397
|
|
793
|
3398 window = wrap_window (w);
|
|
428
|
3399
|
|
|
3400 /* We have to add the glyphs to the line in the order outside,
|
|
|
3401 inside, whitespace. However the precedence dictates that we
|
|
|
3402 determine how many will fit in the reverse order. */
|
|
|
3403
|
|
|
3404 /* Determine how many whitespace glyphs we can display and where
|
|
|
3405 they should start. */
|
|
|
3406 white_in_end = dl->bounds.right_white;
|
|
|
3407 white_out_end = dl->bounds.right_in;
|
|
|
3408 white_out_cnt = white_in_cnt = 0;
|
|
|
3409 elt = 0;
|
|
|
3410
|
|
|
3411 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3412 {
|
|
|
3413 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3414
|
|
|
3415 if (NILP (gb->extent))
|
|
|
3416 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3417
|
|
|
3418 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3419 {
|
|
438
|
3420 int width = glyph_width (gb->glyph, window);
|
|
428
|
3421
|
|
|
3422 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3423 {
|
|
|
3424 white_in_cnt++;
|
|
|
3425 white_in_end += width;
|
|
|
3426 gb->width = width;
|
|
|
3427 gb->active = 1;
|
|
|
3428 }
|
|
|
3429 else if (use_overflow
|
|
|
3430 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3431 {
|
|
|
3432 white_out_cnt++;
|
|
|
3433 white_out_end += width;
|
|
|
3434 gb->width = width;
|
|
|
3435 gb->active = 1;
|
|
|
3436 }
|
|
|
3437 else
|
|
|
3438 gb->active = 0;
|
|
|
3439 }
|
|
|
3440
|
|
|
3441 elt++;
|
|
|
3442 }
|
|
|
3443
|
|
|
3444 /* Determine how many inside margin glyphs we can display and where
|
|
|
3445 they should start. The inside margin glyphs get whatever space
|
|
|
3446 is left after the whitespace glyphs have been displayed. These
|
|
|
3447 are tricky to calculate since if we decide to use the overflow
|
|
|
3448 area we basically have to start over. So for these we build up a
|
|
|
3449 list of just the inside margin glyphs and manipulate it to
|
|
|
3450 determine the needed info. */
|
|
|
3451 {
|
|
|
3452 glyph_block_dynarr *ib;
|
|
|
3453 int avail_in, avail_out;
|
|
|
3454 int done = 0;
|
|
|
3455 int marker = 0;
|
|
|
3456 int used_in, used_out;
|
|
|
3457
|
|
|
3458 elt = 0;
|
|
|
3459 used_in = used_out = 0;
|
|
|
3460 ib = Dynarr_new (glyph_block);
|
|
|
3461 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3462 {
|
|
|
3463 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3464
|
|
|
3465 if (NILP (gb->extent))
|
|
|
3466 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3467
|
|
|
3468 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3469 {
|
|
438
|
3470 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3471 used_in += gb->width;
|
|
|
3472 Dynarr_add (ib, *gb);
|
|
|
3473 }
|
|
|
3474
|
|
|
3475 elt++;
|
|
|
3476 }
|
|
|
3477
|
|
|
3478 if (white_out_cnt)
|
|
|
3479 avail_in = 0;
|
|
|
3480 else
|
|
|
3481 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3482
|
|
|
3483 if (!use_overflow)
|
|
|
3484 avail_out = 0;
|
|
|
3485 else
|
|
|
3486 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3487
|
|
|
3488 marker = 0;
|
|
|
3489 while (!done && marker < Dynarr_length (ib))
|
|
|
3490 {
|
|
|
3491 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3492
|
|
|
3493 /* If everything now fits in the available inside margin
|
|
|
3494 space, we're done. */
|
|
|
3495 if (used_in <= avail_in)
|
|
|
3496 done = 1;
|
|
|
3497 else
|
|
|
3498 {
|
|
|
3499 /* Otherwise see if we have room to move a glyph to the
|
|
|
3500 outside. */
|
|
|
3501 if (used_out + width <= avail_out)
|
|
|
3502 {
|
|
|
3503 used_out += width;
|
|
|
3504 used_in -= width;
|
|
|
3505 }
|
|
|
3506 else
|
|
|
3507 done = 1;
|
|
|
3508 }
|
|
|
3509
|
|
|
3510 if (!done)
|
|
|
3511 marker++;
|
|
|
3512 }
|
|
|
3513
|
|
|
3514 /* At this point we now know that everything from marker on goes in
|
|
|
3515 the inside margin and everything before it goes in the outside
|
|
|
3516 margin. The stuff going into the outside margin is guaranteed
|
|
|
3517 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3518
|
|
|
3519 in_in_start = dl->bounds.right_in;
|
|
|
3520 in_out_end = dl->bounds.right_in;
|
|
|
3521 in_out_cnt = in_in_cnt = 0;
|
|
|
3522
|
|
|
3523 Dynarr_free (ib);
|
|
|
3524 elt = 0;
|
|
|
3525 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3526 {
|
|
|
3527 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3528
|
|
|
3529 if (NILP (gb->extent))
|
|
|
3530 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3531
|
|
|
3532 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3533 {
|
|
438
|
3534 int width = glyph_width (gb->glyph, window);
|
|
428
|
3535
|
|
|
3536 if (used_out)
|
|
|
3537 {
|
|
|
3538 in_out_cnt++;
|
|
|
3539 in_out_end += width;
|
|
|
3540 gb->width = width;
|
|
|
3541 gb->active = 1;
|
|
|
3542 used_out -= width;
|
|
|
3543 }
|
|
|
3544 else if (in_in_start - width >= white_in_end)
|
|
|
3545 {
|
|
|
3546 in_in_cnt++;
|
|
|
3547 in_in_start -= width;
|
|
|
3548 gb->width = width;
|
|
|
3549 gb->active = 1;
|
|
|
3550 }
|
|
|
3551 else
|
|
|
3552 gb->active = 0;
|
|
|
3553 }
|
|
|
3554
|
|
|
3555 elt++;
|
|
|
3556 }
|
|
|
3557 }
|
|
|
3558
|
|
|
3559 /* Determine how many outside margin glyphs we can display. They
|
|
|
3560 always start at the right outside margin and can only use the
|
|
|
3561 outside margin space. */
|
|
|
3562 out_start = dl->bounds.right_out;
|
|
|
3563 out_cnt = 0;
|
|
|
3564 elt = 0;
|
|
|
3565
|
|
|
3566 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3567 {
|
|
|
3568 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3569
|
|
|
3570 if (NILP (gb->extent))
|
|
|
3571 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3572
|
|
|
3573 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3574 {
|
|
438
|
3575 int width = glyph_width (gb->glyph, window);
|
|
428
|
3576
|
|
|
3577 if (out_start - width >= in_out_end)
|
|
|
3578 {
|
|
|
3579 out_cnt++;
|
|
|
3580 out_start -= width;
|
|
|
3581 gb->width = width;
|
|
|
3582 gb->active = 1;
|
|
|
3583 }
|
|
|
3584 else
|
|
|
3585 gb->active = 0;
|
|
|
3586 }
|
|
|
3587
|
|
|
3588 elt++;
|
|
|
3589 }
|
|
|
3590
|
|
|
3591 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3592 to the appropriate display blocks. */
|
|
|
3593 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3594 {
|
|
|
3595 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3596 /* #### See comments before odb->start_pos init in
|
|
|
3597 create_left_glyph_block */
|
|
|
3598 odb->start_pos = dl->bounds.right_in;
|
|
|
3599 odb->end_pos = dl->bounds.right_out;
|
|
|
3600 Dynarr_reset (odb->runes);
|
|
|
3601 }
|
|
|
3602 else
|
|
|
3603 odb = 0;
|
|
|
3604
|
|
|
3605 if (in_in_cnt || white_in_cnt)
|
|
|
3606 {
|
|
|
3607 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3608 idb->start_pos = dl->bounds.right_white;
|
|
|
3609 /* #### See comments before odb->start_pos init in
|
|
|
3610 create_left_glyph_block */
|
|
|
3611 idb->end_pos = dl->bounds.right_in;
|
|
|
3612 Dynarr_reset (idb->runes);
|
|
|
3613 }
|
|
|
3614 else
|
|
|
3615 idb = 0;
|
|
|
3616
|
|
|
3617 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3618 inside margin. */
|
|
|
3619 if (white_in_cnt)
|
|
|
3620 {
|
|
|
3621 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3622 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3623 window);
|
|
|
3624 }
|
|
|
3625 else
|
|
|
3626 end_xpos = dl->bounds.right_white;
|
|
|
3627
|
|
|
3628 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3629 and the inside margin glyphs is cleared. */
|
|
|
3630 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3631 {
|
|
|
3632 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3633 RIGHT_GLYPHS);
|
|
|
3634 }
|
|
|
3635
|
|
|
3636 /* Next add the inside margin glyphs which are actually in the
|
|
|
3637 inside margin. */
|
|
|
3638 if (in_in_cnt)
|
|
|
3639 {
|
|
|
3640 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3641 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3642 }
|
|
|
3643
|
|
|
3644 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3645 of the inside margin area gets cleared. */
|
|
|
3646 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3647 {
|
|
|
3648 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3649 RIGHT_GLYPHS);
|
|
|
3650 }
|
|
|
3651
|
|
|
3652 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3653 if (white_out_cnt)
|
|
|
3654 {
|
|
|
3655 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3656 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3657 }
|
|
|
3658 else
|
|
|
3659 end_xpos = dl->bounds.right_in;
|
|
|
3660
|
|
|
3661 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3662 if (in_out_cnt)
|
|
|
3663 {
|
|
|
3664 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3665 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3666 }
|
|
|
3667
|
|
|
3668 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3669 in the outside margin and the actual outside margin glyphs. */
|
|
|
3670 if (odb && (out_start - end_xpos))
|
|
|
3671 {
|
|
|
3672 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3673 RIGHT_GLYPHS);
|
|
|
3674 }
|
|
|
3675
|
|
|
3676 /* Finally, add the outside margin glyphs. */
|
|
|
3677 if (out_cnt)
|
|
|
3678 {
|
|
|
3679 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3680 RIGHT_GLYPHS, window);
|
|
|
3681 }
|
|
|
3682 }
|
|
|
3683
|
|
|
3684
|
|
|
3685 /***************************************************************************/
|
|
|
3686 /* */
|
|
|
3687 /* modeline routines */
|
|
|
3688 /* */
|
|
|
3689 /***************************************************************************/
|
|
|
3690
|
|
438
|
3691 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3692 void
|
|
|
3693 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3694 struct window *w, struct display_line *dl,
|
|
|
3695 struct display_block *db, face_index findex,
|
|
|
3696 int min_pixpos, int max_pixpos, int type)
|
|
|
3697 {
|
|
|
3698 struct frame *f = XFRAME (w->frame);
|
|
|
3699 struct device *d = XDEVICE (f->device);
|
|
|
3700
|
|
|
3701 pos_data data;
|
|
|
3702 int c_pixpos;
|
|
|
3703 Charcount offset = 0;
|
|
|
3704
|
|
|
3705 xzero (data);
|
|
|
3706 data.d = d;
|
|
|
3707 data.db = db;
|
|
|
3708 data.dl = dl;
|
|
|
3709 data.findex = findex;
|
|
|
3710 data.pixpos = min_pixpos;
|
|
|
3711 data.max_pixpos = max_pixpos;
|
|
|
3712 data.cursor_type = NO_CURSOR;
|
|
|
3713 data.last_charset = Qunbound;
|
|
|
3714 data.last_findex = DEFAULT_INDEX;
|
|
|
3715 data.result_str = result_str;
|
|
|
3716 data.is_modeline = 1;
|
|
|
3717 data.string = Qnil;
|
|
793
|
3718 data.window = wrap_window (w);
|
|
438
|
3719
|
|
|
3720 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3721 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3722 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3723
|
|
|
3724 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3725 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3726 horizontal scrolling amount */
|
|
438
|
3727 if (! NILP (result_str))
|
|
|
3728 offset = w->modeline_hscroll;
|
|
|
3729 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3730 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3731 Qnil);
|
|
|
3732
|
|
|
3733 if (Dynarr_length (db->runes))
|
|
|
3734 {
|
|
|
3735 struct rune *rb =
|
|
|
3736 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3737 c_pixpos = rb->xpos + rb->width;
|
|
|
3738 }
|
|
|
3739 else
|
|
|
3740 c_pixpos = min_pixpos;
|
|
|
3741
|
|
|
3742 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3743 to make up the difference. This usually only occurs if the
|
|
|
3744 modeline face is using a proportional width font or a fixed width
|
|
|
3745 font of a different size from the default face font. */
|
|
|
3746
|
|
|
3747 if (c_pixpos < max_pixpos)
|
|
|
3748 {
|
|
|
3749 data.pixpos = c_pixpos;
|
|
|
3750 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3751
|
|
|
3752 add_blank_rune (&data, NULL, 0);
|
|
|
3753 }
|
|
|
3754
|
|
|
3755 /* Now create the result string and frob the extents into it. */
|
|
|
3756 if (!NILP (result_str))
|
|
|
3757 {
|
|
|
3758 int elt;
|
|
|
3759 Bytecount len;
|
|
665
|
3760 Intbyte *strdata;
|
|
438
|
3761 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3762
|
|
442
|
3763 in_modeline_generation = 1;
|
|
|
3764
|
|
771
|
3765 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3766 detach_all_extents (result_str);
|
|
793
|
3767 resize_string (result_str, -1,
|
|
438
|
3768 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3769
|
|
|
3770 strdata = XSTRING_DATA (result_str);
|
|
|
3771
|
|
|
3772 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3773 {
|
|
|
3774 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3775 {
|
|
|
3776 len += (set_charptr_emchar
|
|
|
3777 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3778 elt)->object.chr.ch));
|
|
|
3779 }
|
|
|
3780 }
|
|
|
3781
|
|
771
|
3782 init_string_ascii_begin (result_str);
|
|
|
3783 bump_string_modiff (result_str);
|
|
|
3784 sledgehammer_check_ascii_begin (result_str);
|
|
|
3785
|
|
438
|
3786 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3787 elt++)
|
|
|
3788 {
|
|
|
3789 Lisp_Object extent = Qnil;
|
|
|
3790 Lisp_Object child;
|
|
|
3791
|
|
793
|
3792 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3793 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3794 if (NILP (child))
|
|
|
3795 {
|
|
|
3796 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3797 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3798 }
|
|
|
3799 Fset_extent_parent (child, extent);
|
|
|
3800 set_extent_endpoints
|
|
|
3801 (XEXTENT (child),
|
|
|
3802 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3803 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3804 result_str);
|
|
|
3805 }
|
|
442
|
3806
|
|
|
3807 in_modeline_generation = 0;
|
|
438
|
3808 }
|
|
|
3809 }
|
|
|
3810
|
|
428
|
3811 /* Ensure that the given display line DL accurately represents the
|
|
|
3812 modeline for the given window. */
|
|
|
3813 static void
|
|
|
3814 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3815 {
|
|
|
3816 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3817 struct frame *f = XFRAME (w->frame);
|
|
|
3818 struct device *d = XDEVICE (f->device);
|
|
|
3819
|
|
|
3820 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3821 our feet. */
|
|
|
3822 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3823 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3824 Lisp_Object font_inst;
|
|
|
3825
|
|
|
3826 /* This will actually determine incorrect inside boundaries for the
|
|
|
3827 modeline since it ignores the margins. However being aware of this fact
|
|
|
3828 we never use those values anywhere so it doesn't matter. */
|
|
|
3829 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3830
|
|
|
3831 /* We are generating a modeline. */
|
|
|
3832 dl->modeline = 1;
|
|
|
3833 dl->cursor_elt = -1;
|
|
|
3834
|
|
|
3835 /* Reset the runes on the modeline. */
|
|
|
3836 Dynarr_reset (db->runes);
|
|
|
3837
|
|
|
3838 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3839 {
|
|
|
3840 struct rune rb;
|
|
|
3841
|
|
|
3842 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3843 if (window_scrollbar_height (w))
|
|
|
3844 return;
|
|
|
3845
|
|
|
3846 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3847 dl->descent = 0;
|
|
|
3848 /* The modeline is at the bottom of the gutters. */
|
|
|
3849 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3850
|
|
|
3851 rb.findex = MODELINE_INDEX;
|
|
|
3852 rb.xpos = dl->bounds.left_out;
|
|
|
3853 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
826
|
3854 rb.charpos = 0;
|
|
428
|
3855 rb.endpos = 0;
|
|
|
3856 rb.type = RUNE_HLINE;
|
|
|
3857 rb.object.hline.thickness = 1;
|
|
|
3858 rb.object.hline.yoffset = 0;
|
|
|
3859 rb.cursor_type = NO_CURSOR;
|
|
|
3860
|
|
|
3861 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3862 && FRAME_WIN_P (f))
|
|
|
3863 {
|
|
|
3864 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3865
|
|
|
3866 dl->ypos -= shadow_thickness;
|
|
|
3867 rb.xpos += shadow_thickness;
|
|
|
3868 rb.width -= 2 * shadow_thickness;
|
|
|
3869 }
|
|
|
3870
|
|
|
3871 Dynarr_add (db->runes, rb);
|
|
|
3872 return;
|
|
|
3873 }
|
|
|
3874
|
|
|
3875 /* !!#### not right; needs to compute the max height of
|
|
|
3876 all the charsets */
|
|
|
3877 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3878
|
|
|
3879 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3880 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3881
|
|
|
3882 min_pixpos = dl->bounds.left_out;
|
|
|
3883 max_pixpos = dl->bounds.right_out;
|
|
|
3884
|
|
|
3885 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3886 {
|
|
|
3887 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3888
|
|
|
3889 ypos_adj = shadow_thickness;
|
|
|
3890 min_pixpos += shadow_thickness;
|
|
|
3891 max_pixpos -= shadow_thickness;
|
|
|
3892 }
|
|
|
3893 else
|
|
|
3894 ypos_adj = 0;
|
|
|
3895
|
|
|
3896 generate_formatted_string_db (b->modeline_format,
|
|
|
3897 b->generated_modeline_string, w, dl, db,
|
|
|
3898 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3899
|
|
|
3900 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3901 set this until we've generated the modeline in order to account
|
|
|
3902 for any embedded faces. */
|
|
|
3903 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3904 }
|
|
|
3905
|
|
|
3906 static Charcount
|
|
665
|
3907 add_string_to_fstring_db_runes (pos_data *data, const Intbyte *str,
|
|
771
|
3908 Charcount pos, Charcount min_pos,
|
|
|
3909 Charcount max_pos)
|
|
428
|
3910 {
|
|
|
3911 /* This function has been Mule-ized. */
|
|
|
3912 Charcount end;
|
|
665
|
3913 const Intbyte *cur_pos = str;
|
|
428
|
3914 struct display_block *db = data->db;
|
|
|
3915
|
|
|
3916 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3917 while (Dynarr_length (db->runes) < pos)
|
|
|
3918 add_blank_rune (data, NULL, 0);
|
|
|
3919
|
|
|
3920 end = (Dynarr_length (db->runes) +
|
|
442
|
3921 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
3922 if (max_pos != -1)
|
|
|
3923 end = min (max_pos, end);
|
|
|
3924
|
|
|
3925 while (pos < end && *cur_pos)
|
|
|
3926 {
|
|
665
|
3927 const Intbyte *old_cur_pos = cur_pos;
|
|
428
|
3928 int succeeded;
|
|
|
3929
|
|
|
3930 data->ch = charptr_emchar (cur_pos);
|
|
|
3931 succeeded = (add_emchar_rune (data) != ADD_FAILED);
|
|
|
3932 INC_CHARPTR (cur_pos);
|
|
|
3933 if (succeeded)
|
|
|
3934 {
|
|
|
3935 pos++;
|
|
|
3936 data->modeline_charpos++;
|
|
|
3937 data->bytepos += cur_pos - old_cur_pos;
|
|
|
3938 }
|
|
|
3939 }
|
|
|
3940
|
|
|
3941 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
3942 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3943 add_blank_rune (data, NULL, 0);
|
|
|
3944
|
|
|
3945 return Dynarr_length (db->runes);
|
|
|
3946 }
|
|
|
3947
|
|
|
3948 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
3949 modeline extents. */
|
|
|
3950 static Charcount
|
|
|
3951 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
438
|
3952 Charcount pos, Charcount min_pos,
|
|
|
3953 Charcount max_pos, Lisp_Object extent)
|
|
428
|
3954 {
|
|
|
3955 /* This function has been Mule-ized. */
|
|
|
3956 Charcount end;
|
|
|
3957 struct display_block *db = data->db;
|
|
|
3958 struct glyph_block gb;
|
|
|
3959
|
|
|
3960 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3961 while (Dynarr_length (db->runes) < pos)
|
|
|
3962 add_blank_rune (data, NULL, 0);
|
|
|
3963
|
|
|
3964 end = Dynarr_length (db->runes) + 1;
|
|
|
3965 if (max_pos != -1)
|
|
|
3966 end = min (max_pos, end);
|
|
|
3967
|
|
|
3968 gb.glyph = glyph;
|
|
438
|
3969 gb.extent = extent;
|
|
428
|
3970 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3971 pos++;
|
|
|
3972
|
|
|
3973 while (Dynarr_length (db->runes) < pos &&
|
|
|
3974 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3975 add_blank_rune (data, NULL, 0);
|
|
|
3976
|
|
|
3977 return Dynarr_length (db->runes);
|
|
|
3978 }
|
|
|
3979
|
|
|
3980 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
3981 true of max_pixsize. */
|
|
|
3982 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
3983 if (Dynarr_length (data->db->runes)) \
|
|
|
3984 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
3985 else \
|
|
|
3986 cur_pixsize = 0;
|
|
|
3987
|
|
|
3988 /* Note that this function does "positions" in terms of characters and
|
|
|
3989 not in terms of columns. This is necessary to make the formatting
|
|
|
3990 work correctly when proportional width fonts are used in the
|
|
|
3991 modeline. */
|
|
|
3992 static Charcount
|
|
|
3993 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
3994 Charcount min_pos, Charcount max_pos,
|
|
|
3995 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
3996 face_index findex, int type, Charcount *offset,
|
|
|
3997 Lisp_Object cur_ext)
|
|
428
|
3998 {
|
|
|
3999 /* This function has been Mule-ized. */
|
|
|
4000 /* #### The other losing things in this function are:
|
|
|
4001
|
|
|
4002 -- C zero-terminated-string lossage.
|
|
|
4003 -- Non-printable characters should be converted into something
|
|
|
4004 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
4005 */
|
|
|
4006
|
|
|
4007 tail_recurse:
|
|
|
4008 if (depth > 10)
|
|
|
4009 goto invalid;
|
|
|
4010
|
|
|
4011 depth++;
|
|
|
4012
|
|
|
4013 if (STRINGP (elt))
|
|
|
4014 {
|
|
|
4015 /* A string. Add to the display line and check for %-constructs
|
|
|
4016 within it. */
|
|
|
4017
|
|
665
|
4018 Intbyte *this = XSTRING_DATA (elt);
|
|
428
|
4019
|
|
|
4020 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4021 {
|
|
665
|
4022 Intbyte *last = this;
|
|
428
|
4023
|
|
|
4024 while (*this && *this != '%')
|
|
|
4025 this++;
|
|
|
4026
|
|
|
4027 if (this != last)
|
|
|
4028 {
|
|
438
|
4029 /* No %-construct */
|
|
428
|
4030 Charcount size =
|
|
438
|
4031 bytecount_to_charcount (last, this - last);
|
|
|
4032
|
|
|
4033 if (size <= *offset)
|
|
|
4034 *offset -= size;
|
|
|
4035 else
|
|
|
4036 {
|
|
|
4037 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4038 min (pos + size - *offset, max_pos));
|
|
665
|
4039 const Intbyte *tmp_last = charptr_n_addr (last, *offset);
|
|
438
|
4040
|
|
|
4041 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4042 pos, pos, tmp_max);
|
|
|
4043 *offset = 0;
|
|
|
4044 }
|
|
428
|
4045 }
|
|
|
4046 else /* *this == '%' */
|
|
|
4047 {
|
|
|
4048 Charcount spec_width = 0;
|
|
|
4049
|
|
|
4050 this++; /* skip over '%' */
|
|
|
4051
|
|
|
4052 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4053 * Argument specifies minwidth but not maxwidth
|
|
|
4054 * (maxwidth can be specified by
|
|
|
4055 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4056 */
|
|
|
4057 while (isdigit (*this))
|
|
|
4058 {
|
|
|
4059 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4060 this++;
|
|
|
4061 }
|
|
|
4062 spec_width += pos;
|
|
|
4063
|
|
|
4064 if (*this == 'M')
|
|
|
4065 {
|
|
|
4066 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4067 max_pos, Vglobal_mode_string,
|
|
|
4068 depth, max_pixsize, findex,
|
|
438
|
4069 type, offset, cur_ext);
|
|
428
|
4070 }
|
|
|
4071 else if (*this == '-')
|
|
|
4072 {
|
|
|
4073 Charcount num_to_add;
|
|
|
4074
|
|
|
4075 if (max_pixsize < 0)
|
|
|
4076 num_to_add = 0;
|
|
|
4077 else if (max_pos != -1)
|
|
|
4078 num_to_add = max_pos - pos;
|
|
|
4079 else
|
|
|
4080 {
|
|
|
4081 int cur_pixsize;
|
|
|
4082 int dash_pixsize;
|
|
665
|
4083 Intbyte ch = '-';
|
|
428
|
4084 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4085
|
|
|
4086 dash_pixsize =
|
|
|
4087 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4088 1);
|
|
|
4089
|
|
|
4090 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4091 num_to_add++;
|
|
|
4092 }
|
|
|
4093
|
|
|
4094 while (num_to_add--)
|
|
|
4095 pos = add_string_to_fstring_db_runes
|
|
665
|
4096 (data, (const Intbyte *) "-", pos, pos, max_pos);
|
|
428
|
4097 }
|
|
|
4098 else if (*this != 0)
|
|
|
4099 {
|
|
438
|
4100 Emchar ch = charptr_emchar (this);
|
|
665
|
4101 Intbyte *str;
|
|
438
|
4102 Charcount size;
|
|
|
4103
|
|
428
|
4104 decode_mode_spec (w, ch, type);
|
|
|
4105
|
|
665
|
4106 str = Dynarr_atp (mode_spec_intbyte_string, 0);
|
|
438
|
4107 size = bytecount_to_charcount
|
|
|
4108 /* Skip the null character added by `decode_mode_spec' */
|
|
665
|
4109 (str, Dynarr_length (mode_spec_intbyte_string)) - 1;
|
|
438
|
4110
|
|
|
4111 if (size <= *offset)
|
|
|
4112 *offset -= size;
|
|
|
4113 else
|
|
|
4114 {
|
|
665
|
4115 const Intbyte *tmp_str = charptr_n_addr (str, *offset);
|
|
438
|
4116
|
|
440
|
4117 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4118 computed and used here as in the plain string case
|
|
|
4119 above. -- dv */
|
|
|
4120 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4121 pos, pos,
|
|
|
4122 max_pos);
|
|
|
4123 *offset = 0;
|
|
|
4124 }
|
|
428
|
4125 }
|
|
|
4126
|
|
|
4127 /* NOT this++. There could be any sort of character at
|
|
|
4128 the current position. */
|
|
|
4129 INC_CHARPTR (this);
|
|
|
4130 }
|
|
|
4131
|
|
|
4132 if (max_pixsize > 0)
|
|
|
4133 {
|
|
|
4134 int cur_pixsize;
|
|
|
4135 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4136
|
|
|
4137 if (cur_pixsize >= max_pixsize)
|
|
|
4138 break;
|
|
|
4139 }
|
|
|
4140 }
|
|
|
4141 }
|
|
|
4142 else if (SYMBOLP (elt))
|
|
|
4143 {
|
|
|
4144 /* A symbol: process the value of the symbol recursively
|
|
|
4145 as if it appeared here directly. */
|
|
|
4146 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4147
|
|
|
4148 if (!UNBOUNDP (tem))
|
|
|
4149 {
|
|
438
|
4150 /* If value is a string, output that string literally:
|
|
428
|
4151 don't check for % within it. */
|
|
|
4152 if (STRINGP (tem))
|
|
|
4153 {
|
|
665
|
4154 Intbyte *str = XSTRING_DATA (tem);
|
|
826
|
4155 Charcount size = string_char_length (tem);
|
|
438
|
4156
|
|
|
4157 if (size <= *offset)
|
|
|
4158 *offset -= size;
|
|
|
4159 else
|
|
|
4160 {
|
|
665
|
4161 const Intbyte *tmp_str = charptr_n_addr (str, *offset);
|
|
438
|
4162
|
|
440
|
4163 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4164 computed and used here as in the plain string case
|
|
|
4165 above. -- dv */
|
|
|
4166 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4167 min_pos, max_pos);
|
|
|
4168 *offset = 0;
|
|
|
4169 }
|
|
428
|
4170 }
|
|
|
4171 /* Give up right away for nil or t. */
|
|
|
4172 else if (!EQ (tem, elt))
|
|
|
4173 {
|
|
|
4174 elt = tem;
|
|
|
4175 goto tail_recurse;
|
|
|
4176 }
|
|
|
4177 }
|
|
|
4178 }
|
|
|
4179 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4180 {
|
|
|
4181 Lisp_Object window, tem;
|
|
793
|
4182 window = wrap_window (w);
|
|
428
|
4183 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4184 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4185 if (!UNBOUNDP (tem))
|
|
|
4186 {
|
|
|
4187 elt = tem;
|
|
|
4188 goto tail_recurse;
|
|
|
4189 }
|
|
|
4190 }
|
|
|
4191 else if (CONSP (elt))
|
|
|
4192 {
|
|
|
4193 /* A cons cell: four distinct cases.
|
|
438
|
4194 * - If first element is a string or a cons, process all the elements
|
|
|
4195 * and effectively concatenate them.
|
|
|
4196 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4197 * at most that many characters. If positive, pad (with spaces)
|
|
|
4198 * to at least that many characters.
|
|
771
|
4199 * - If first element is another symbol or a boolean specifier, process
|
|
|
4200 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4201 * value or specifier's instance is non-nil or nil.
|
|
|
4202 * - If first element is , process the cadr or caddr
|
|
|
4203 * recursively according to whether the instance of the specifier in
|
|
|
4204 * the modeline's window is non-nil or nil.
|
|
442
|
4205 * - If first element is an extent, process the cdr recursively
|
|
|
4206 * and handle the extent's face.
|
|
428
|
4207 */
|
|
438
|
4208
|
|
428
|
4209 Lisp_Object car, tem;
|
|
|
4210
|
|
|
4211 car = XCAR (elt);
|
|
771
|
4212 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4213 {
|
|
|
4214 elt = XCDR (elt);
|
|
|
4215 if (!CONSP (elt))
|
|
|
4216 goto invalid;
|
|
|
4217
|
|
771
|
4218 if (SYMBOLP (car))
|
|
|
4219 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4220 else
|
|
|
4221 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4222 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4223 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4224 Use its car if CAR has a non-nil value. */
|
|
771
|
4225 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4226 {
|
|
771
|
4227 elt = XCAR (elt);
|
|
|
4228 goto tail_recurse;
|
|
438
|
4229 }
|
|
771
|
4230 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4231 * Get the cddr of the original list
|
|
|
4232 * and if possible find the caddr and use that.
|
|
|
4233 */
|
|
|
4234 elt = XCDR (elt);
|
|
|
4235 if (NILP (elt))
|
|
|
4236 ;
|
|
|
4237 else if (!CONSP (elt))
|
|
|
4238 goto invalid;
|
|
|
4239 else
|
|
|
4240 {
|
|
|
4241 elt = XCAR (elt);
|
|
|
4242 goto tail_recurse;
|
|
|
4243 }
|
|
|
4244 }
|
|
428
|
4245 else if (INTP (car))
|
|
|
4246 {
|
|
|
4247 Charcount lim = XINT (car);
|
|
|
4248
|
|
|
4249 elt = XCDR (elt);
|
|
|
4250
|
|
|
4251 if (lim < 0)
|
|
|
4252 {
|
|
|
4253 /* Negative int means reduce maximum width.
|
|
|
4254 * DO NOT change MIN_PIXPOS here!
|
|
|
4255 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4256 * and then pad to 20.
|
|
|
4257 */
|
|
|
4258 if (max_pos == -1)
|
|
|
4259 max_pos = pos - lim;
|
|
|
4260 else
|
|
|
4261 max_pos = min (max_pos, pos - lim);
|
|
|
4262 }
|
|
|
4263 else if (lim > 0)
|
|
|
4264 {
|
|
|
4265 /* Padding specified. Don't let it be more than
|
|
|
4266 * current maximum.
|
|
|
4267 */
|
|
|
4268 lim += pos;
|
|
|
4269 if (max_pos != -1 && lim > max_pos)
|
|
|
4270 lim = max_pos;
|
|
|
4271 /* If that's more padding than already wanted, queue it.
|
|
|
4272 * But don't reduce padding already specified even if
|
|
|
4273 * that is beyond the current truncation point.
|
|
|
4274 */
|
|
|
4275 if (lim > min_pos)
|
|
|
4276 min_pos = lim;
|
|
|
4277 }
|
|
|
4278 goto tail_recurse;
|
|
|
4279 }
|
|
|
4280 else if (STRINGP (car) || CONSP (car))
|
|
|
4281 {
|
|
|
4282 int limit = 50;
|
|
438
|
4283
|
|
428
|
4284 /* LIMIT is to protect against circular lists. */
|
|
|
4285 while (CONSP (elt) && --limit > 0
|
|
|
4286 && (pos < max_pos || max_pos == -1))
|
|
|
4287 {
|
|
|
4288 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4289 XCAR (elt), depth, max_pixsize,
|
|
|
4290 findex, type, offset, cur_ext);
|
|
428
|
4291 elt = XCDR (elt);
|
|
|
4292 }
|
|
|
4293 }
|
|
|
4294 else if (EXTENTP (car))
|
|
|
4295 {
|
|
|
4296 struct extent *ext = XEXTENT (car);
|
|
|
4297
|
|
|
4298 if (EXTENT_LIVE_P (ext))
|
|
|
4299 {
|
|
|
4300 face_index old_findex = data->findex;
|
|
|
4301 Lisp_Object face;
|
|
|
4302 Lisp_Object font_inst;
|
|
|
4303 face_index new_findex;
|
|
|
4304 Bytecount start = data->bytepos;
|
|
|
4305
|
|
|
4306 face = extent_face (ext);
|
|
|
4307 if (FACEP (face))
|
|
|
4308 {
|
|
|
4309 /* #### needs to merge faces, sigh */
|
|
|
4310 /* #### needs to handle list of faces */
|
|
|
4311 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4312 /* !!#### not right; needs to compute the max height of
|
|
|
4313 all the charsets */
|
|
|
4314 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4315 Vcharset_ascii);
|
|
|
4316
|
|
|
4317 data->dl->ascent = max (data->dl->ascent,
|
|
|
4318 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4319 data->dl->descent = max (data->dl->descent,
|
|
|
4320 XFONT_INSTANCE (font_inst)->
|
|
|
4321 descent);
|
|
|
4322 }
|
|
|
4323 else
|
|
|
4324 new_findex = old_findex;
|
|
|
4325
|
|
|
4326 data->findex = new_findex;
|
|
|
4327 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4328 XCDR (elt), depth - 1,
|
|
438
|
4329 max_pixsize, new_findex, type,
|
|
|
4330 offset, car);
|
|
428
|
4331 data->findex = old_findex;
|
|
|
4332 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4333 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4334 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4335 }
|
|
|
4336 }
|
|
|
4337 }
|
|
|
4338 else if (GLYPHP (elt))
|
|
|
4339 {
|
|
438
|
4340 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4341 horizontal scrolling facility. -- dv */
|
|
|
4342 if (*offset > 0)
|
|
|
4343 *offset -= 1;
|
|
|
4344 else
|
|
|
4345 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4346 cur_ext);
|
|
428
|
4347 }
|
|
|
4348 else
|
|
|
4349 {
|
|
|
4350 invalid:
|
|
438
|
4351 {
|
|
|
4352 char *str = GETTEXT ("*invalid*");
|
|
|
4353 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4354
|
|
|
4355 if (size <= *offset)
|
|
|
4356 *offset -= size;
|
|
|
4357 else
|
|
|
4358 {
|
|
665
|
4359 const Intbyte *tmp_str =
|
|
|
4360 charptr_n_addr ((const Intbyte *) str, *offset);
|
|
438
|
4361
|
|
440
|
4362 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4363 used here as in the plain string case above. -- dv */
|
|
|
4364 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4365 min_pos, max_pos);
|
|
|
4366 *offset = 0;
|
|
|
4367 }
|
|
|
4368 }
|
|
428
|
4369 }
|
|
|
4370
|
|
|
4371 if (min_pos > pos)
|
|
|
4372 {
|
|
665
|
4373 add_string_to_fstring_db_runes (data, (const Intbyte *) "", pos,
|
|
438
|
4374 min_pos, -1);
|
|
428
|
4375 }
|
|
|
4376
|
|
|
4377 return pos;
|
|
|
4378 }
|
|
|
4379
|
|
|
4380 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4381 they do not have a modeline block, it does nothing. */
|
|
|
4382 static void
|
|
|
4383 regenerate_modeline (struct window *w)
|
|
|
4384 {
|
|
|
4385 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4386
|
|
|
4387 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4388 return;
|
|
|
4389 else
|
|
|
4390 {
|
|
|
4391 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4392 redisplay_update_line (w, 0, 0, 0);
|
|
|
4393 }
|
|
|
4394 }
|
|
|
4395
|
|
|
4396 /* Make sure that modeline display line is present in the given
|
|
|
4397 display structs if the window has a modeline and update that
|
|
|
4398 line. Returns true if a modeline was needed. */
|
|
|
4399 static int
|
|
|
4400 ensure_modeline_generated (struct window *w, int type)
|
|
|
4401 {
|
|
|
4402 int need_modeline;
|
|
|
4403
|
|
|
4404 /* minibuffer windows don't have modelines */
|
|
|
4405 if (MINI_WINDOW_P (w))
|
|
|
4406 need_modeline = 0;
|
|
|
4407 /* windows which haven't had it turned off do */
|
|
|
4408 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4409 need_modeline = 1;
|
|
|
4410 /* windows which have it turned off don't have a divider if there is
|
|
|
4411 a horizontal scrollbar */
|
|
|
4412 else if (window_scrollbar_height (w))
|
|
|
4413 need_modeline = 0;
|
|
|
4414 /* and in this case there is none */
|
|
|
4415 else
|
|
|
4416 need_modeline = 1;
|
|
|
4417
|
|
|
4418 if (need_modeline)
|
|
|
4419 {
|
|
|
4420 display_line_dynarr *dla;
|
|
|
4421
|
|
|
4422 dla = window_display_lines (w, type);
|
|
|
4423
|
|
|
4424 /* We don't care if there is a display line which is not
|
|
|
4425 currently a modeline because it is definitely going to become
|
|
|
4426 one if we have gotten to this point. */
|
|
|
4427 if (Dynarr_length (dla) == 0)
|
|
|
4428 {
|
|
|
4429 if (Dynarr_largest (dla) > 0)
|
|
800
|
4430 Dynarr_increment (dla);
|
|
428
|
4431 else
|
|
|
4432 {
|
|
|
4433 struct display_line modeline;
|
|
|
4434 xzero (modeline);
|
|
|
4435 Dynarr_add (dla, modeline);
|
|
|
4436 }
|
|
|
4437 }
|
|
|
4438
|
|
|
4439 /* If we're adding a new place marker go ahead and generate the
|
|
|
4440 modeline so that it is available for use by
|
|
|
4441 window_modeline_height. */
|
|
|
4442 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4443 }
|
|
|
4444
|
|
|
4445 return need_modeline;
|
|
|
4446 }
|
|
|
4447
|
|
|
4448 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4449 int
|
|
|
4450 real_current_modeline_height (struct window *w)
|
|
|
4451 {
|
|
|
4452 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4453 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4454
|
|
|
4455 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4456 {
|
|
|
4457 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4458
|
|
|
4459 if (Dynarr_length (dla))
|
|
|
4460 {
|
|
|
4461 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4462 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4463 Dynarr_atp (dla, 0)->descent);
|
|
|
4464 }
|
|
|
4465 }
|
|
|
4466 return 0;
|
|
|
4467 }
|
|
|
4468
|
|
|
4469
|
|
|
4470 /***************************************************************************/
|
|
819
|
4471 /* */
|
|
826
|
4472 /* displayable string routines */
|
|
819
|
4473 /* */
|
|
428
|
4474 /***************************************************************************/
|
|
|
4475
|
|
|
4476 /* Given a position for a string in a window, ensure that the given
|
|
|
4477 display line DL accurately represents the text on a line starting
|
|
|
4478 at the given position.
|
|
|
4479
|
|
|
4480 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4481 looked just too hard to change create_text_block to handle strings
|
|
|
4482 *and* buffers. We already make a distinction between the two
|
|
|
4483 elsewhere in the code so I think unifying them would require a
|
|
|
4484 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4485 functions cover text that the user *cannot edit* so we can remove
|
|
|
4486 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4487 modeline routines should be modified to use this code as it copes
|
|
|
4488 with many more types of display situation. */
|
|
|
4489
|
|
665
|
4490 static Charbpos
|
|
428
|
4491 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4492 struct display_line *dl,
|
|
826
|
4493 Charcount start_pos,
|
|
428
|
4494 prop_block_dynarr **prop,
|
|
|
4495 face_index default_face)
|
|
|
4496 {
|
|
|
4497 struct frame *f = XFRAME (w->frame);
|
|
|
4498 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4499 because you might well want to make use of it (selective display
|
|
|
4500 etc), its just the buffer text that we do not use. However, it
|
|
|
4501 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4502 against this case. */
|
|
|
4503 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4504 struct device *d = XDEVICE (f->device);
|
|
|
4505
|
|
|
4506 /* we're working with these a lot so precalculate them */
|
|
|
4507 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
826
|
4508 Bytecount byte_string_zv = slen;
|
|
|
4509 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4510
|
|
|
4511 pos_data data;
|
|
|
4512
|
|
|
4513 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4514
|
|
442
|
4515 /* We're going to ditch selective display for static text, it's an
|
|
|
4516 FSF thing and invisible extents are the way to go here.
|
|
|
4517 Implementing it also relies on a number of buffer-specific
|
|
428
|
4518 functions that we don't have the luxury of being able to use
|
|
|
4519 here. */
|
|
|
4520
|
|
|
4521 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4522 can actually be displayed and which octal should be used for.
|
|
|
4523 #### This variable should probably have some rethought done to
|
|
|
4524 it.
|
|
|
4525
|
|
|
4526 #### It would also be really nice if you could specify that
|
|
|
4527 the characters come out in hex instead of in octal. Mule
|
|
|
4528 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4529 but that's bogus -- we need a more general solution. I
|
|
|
4530 think you need to extend the concept of display tables
|
|
|
4531 into a more general conversion mechanism. Ideally you
|
|
|
4532 could specify a Lisp function that converts characters,
|
|
|
4533 but this violates the Second Golden Rule and besides would
|
|
|
4534 make things way way way way slow.
|
|
|
4535
|
|
|
4536 So instead, we extend the display-table concept, which was
|
|
|
4537 historically limited to 256-byte vectors, to one of the
|
|
|
4538 following:
|
|
|
4539
|
|
|
4540 a) A 256-entry vector, for backward compatibility;
|
|
|
4541 b) char-table, mapping characters to values;
|
|
|
4542 c) range-table, mapping ranges of characters to values;
|
|
|
4543 d) a list of the above.
|
|
|
4544
|
|
|
4545 The (d) option allows you to specify multiple display tables
|
|
|
4546 instead of just one. Each display table can specify conversions
|
|
|
4547 for some characters and leave others unchanged. The way the
|
|
|
4548 character gets displayed is determined by the first display table
|
|
|
4549 with a binding for that character. This way, you could call a
|
|
|
4550 function `enable-hex-display' that adds a hex display-table to
|
|
|
4551 the list of display tables for the current buffer.
|
|
|
4552
|
|
|
4553 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4554 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4555 extended characters show up as hex with a display table like
|
|
|
4556 this:
|
|
|
4557
|
|
|
4558 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4559
|
|
|
4560 Since more than one display table is possible, you have
|
|
|
4561 great flexibility in mapping ranges of characters. */
|
|
|
4562 Emchar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
|
4563 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4564 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4565 ? 255 : 160)) : 255;
|
|
|
4566
|
|
|
4567 Lisp_Object face_dt, window_dt;
|
|
|
4568
|
|
|
4569 /* The text display block for this display line. */
|
|
|
4570 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4571
|
|
|
4572 /* The first time through the main loop we need to force the glyph
|
|
|
4573 data to be updated. */
|
|
|
4574 int initial = 1;
|
|
|
4575
|
|
|
4576 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4577 equal to the position passed in if there are no more runs to be
|
|
|
4578 displayed. */
|
|
|
4579 int no_more_frags = 0;
|
|
|
4580
|
|
|
4581 dl->used_prop_data = 0;
|
|
|
4582 dl->num_chars = 0;
|
|
442
|
4583 dl->line_continuation = 0;
|
|
428
|
4584
|
|
|
4585 /* set up faces to use for clearing areas, used by
|
|
|
4586 output_display_line */
|
|
|
4587 dl->default_findex = default_face;
|
|
|
4588 if (default_face)
|
|
|
4589 {
|
|
|
4590 dl->left_margin_findex = default_face;
|
|
|
4591 dl->right_margin_findex = default_face;
|
|
|
4592 }
|
|
|
4593 else
|
|
|
4594 {
|
|
434
|
4595 dl->left_margin_findex =
|
|
428
|
4596 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4597 dl->right_margin_findex =
|
|
428
|
4598 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4599 }
|
|
|
4600
|
|
|
4601 xzero (data);
|
|
|
4602 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4603
|
|
|
4604 /* These values are used by all of the rune addition routines. We add
|
|
|
4605 them to this structure for ease of passing. */
|
|
|
4606 data.d = d;
|
|
793
|
4607 data.window = wrap_window (w);
|
|
428
|
4608 data.db = db;
|
|
|
4609 data.dl = dl;
|
|
|
4610
|
|
826
|
4611 data.byte_charpos = byte_start_pos;
|
|
428
|
4612 data.pixpos = dl->bounds.left_in;
|
|
|
4613 data.last_charset = Qunbound;
|
|
|
4614 data.last_findex = default_face;
|
|
|
4615 data.result_str = Qnil;
|
|
|
4616 data.string = disp_string;
|
|
|
4617
|
|
|
4618 /* Set the right boundary adjusting it to take into account any end
|
|
|
4619 glyph. Save the width of the end glyph for later use. */
|
|
|
4620 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4621 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4622
|
|
|
4623 data.cursor_type = NO_CURSOR;
|
|
|
4624 data.cursor_x = -1;
|
|
|
4625
|
|
|
4626 data.start_col = 0;
|
|
|
4627 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4628 the window
|
|
428
|
4629 data.start_col = w->hscroll;
|
|
826
|
4630 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
4631 */
|
|
826
|
4632 data.byte_start_col_enabled = 0;
|
|
428
|
4633 data.hscroll_glyph_width_adjust = 0;
|
|
|
4634
|
|
|
4635 /* We regenerate the line from the very beginning. */
|
|
|
4636 Dynarr_reset (db->runes);
|
|
|
4637
|
|
|
4638 /* Why is this less than or equal and not just less than? If the
|
|
|
4639 starting position is already equal to the maximum we can't add
|
|
|
4640 anything else, right? Wrong. We might still have a newline to
|
|
|
4641 add. A newline can use the room allocated for an end glyph since
|
|
|
4642 if we add it we know we aren't going to be adding any end
|
|
|
4643 glyph. */
|
|
|
4644
|
|
|
4645 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4646 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4647 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4648 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4649 that the loop terminates only when either (a) there is
|
|
|
4650 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4651
|
|
|
4652 #### Also I think you need to ensure that the operation
|
|
|
4653 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4654 can't get interrupted in the middle. If you run off the end
|
|
|
4655 of the line during that operation, then you keep accumulating
|
|
|
4656 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4657 there's a begin glyph at a particular position and attempting
|
|
|
4658 to display that glyph results in window-end being hit and
|
|
|
4659 propagation data being generated, then the character at that
|
|
|
4660 position won't be displayed.
|
|
|
4661
|
|
|
4662 #### See also the comment after the end of this loop, below.
|
|
|
4663 */
|
|
|
4664 while (data.pixpos <= data.max_pixpos)
|
|
|
4665 {
|
|
|
4666 /* #### This check probably should not be necessary. */
|
|
826
|
4667 if (data.byte_charpos > byte_string_zv)
|
|
428
|
4668 {
|
|
|
4669 /* #### urk! More of this lossage! */
|
|
826
|
4670 data.byte_charpos--;
|
|
428
|
4671 goto done;
|
|
|
4672 }
|
|
|
4673
|
|
|
4674 /* Check for face changes. */
|
|
826
|
4675 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
4676 {
|
|
819
|
4677 Lisp_Object last_glyph = Qnil;
|
|
|
4678 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4679 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4680 {
|
|
|
4681 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4682 Dynarr_free (*prop);
|
|
|
4683 *prop = 0;
|
|
|
4684 }
|
|
428
|
4685 /* Now compute the face and begin/end-glyph information. */
|
|
|
4686 data.findex =
|
|
793
|
4687 /* Remember that the extent-fragment routines deal in
|
|
826
|
4688 Bytexpos's. */
|
|
|
4689 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
4690 /* This is somewhat cheesy but the alternative is to
|
|
|
4691 propagate default_face into extent_fragment_update. */
|
|
|
4692 if (data.findex == DEFAULT_INDEX)
|
|
|
4693 data.findex = default_face;
|
|
|
4694
|
|
|
4695 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4696
|
|
826
|
4697 if (data.byte_charpos == data.ef->end)
|
|
428
|
4698 no_more_frags = 1;
|
|
|
4699 }
|
|
|
4700 initial = 0;
|
|
|
4701
|
|
|
4702 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4703 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4704 display then we determine what to do based on the character at the
|
|
|
4705 current buffer position. */
|
|
|
4706
|
|
|
4707 /* If the current position is covered by an invisible extent, do
|
|
|
4708 nothing (except maybe add some ellipses).
|
|
|
4709
|
|
|
4710 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4711 invisible extent should be investigated further. This is
|
|
|
4712 fairly low priority though. */
|
|
|
4713 if (data.ef->invisible)
|
|
|
4714 {
|
|
|
4715 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4716 really know what I'm doing. */
|
|
|
4717 if (*prop)
|
|
|
4718 {
|
|
|
4719 Dynarr_free (*prop);
|
|
|
4720 *prop = 0;
|
|
|
4721 }
|
|
|
4722
|
|
|
4723 /* The extent fragment code only sets this when we should
|
|
|
4724 really display the ellipses. It makes sure the ellipses
|
|
|
4725 don't get displayed more than once in a row. */
|
|
|
4726 if (data.ef->invisible_ellipses)
|
|
|
4727 {
|
|
|
4728 struct glyph_block gb;
|
|
|
4729
|
|
|
4730 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4731 data.ef->invisible_ellipses = 0;
|
|
|
4732 gb.extent = Qnil;
|
|
|
4733 gb.glyph = Vinvisible_text_glyph;
|
|
|
4734 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4735 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4736 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4737 is to display a newline (for compatibility with
|
|
|
4738 selective-display-ellipses)? Maybe that's too
|
|
|
4739 abstruse. */
|
|
|
4740 if (*prop)
|
|
|
4741 goto done;
|
|
|
4742 }
|
|
|
4743
|
|
638
|
4744 /* #### What if we're dealing with a display table? */
|
|
428
|
4745 if (data.start_col)
|
|
|
4746 data.start_col--;
|
|
|
4747
|
|
826
|
4748 if (data.byte_charpos == byte_string_zv)
|
|
428
|
4749 goto done;
|
|
|
4750 else
|
|
826
|
4751 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4752 }
|
|
|
4753
|
|
|
4754 /* If there is propagation data, then it represents the current
|
|
|
4755 buffer position being displayed. Add them and advance the
|
|
|
4756 position counter. This might also add the minibuffer
|
|
|
4757 prompt. */
|
|
|
4758 else if (*prop)
|
|
|
4759 {
|
|
|
4760 dl->used_prop_data = 1;
|
|
|
4761 *prop = add_propagation_runes (prop, &data);
|
|
|
4762
|
|
|
4763 if (*prop)
|
|
|
4764 goto done; /* gee, a really narrow window */
|
|
826
|
4765 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4766 goto done;
|
|
826
|
4767 else if (data.byte_charpos < 0)
|
|
428
|
4768 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
4769 data.byte_charpos = 0;
|
|
428
|
4770 else
|
|
826
|
4771 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4772 }
|
|
|
4773
|
|
|
4774 /* If there are end glyphs, add them to the line. These are
|
|
|
4775 the end glyphs for the previous run of text. We add them
|
|
|
4776 here rather than doing them at the end of handling the
|
|
|
4777 previous run so that glyphs at the beginning and end of
|
|
|
4778 a line are handled correctly. */
|
|
|
4779 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4780 {
|
|
826
|
4781 data.ch = string_emchar (disp_string, data.byte_charpos);
|
|
428
|
4782 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4783
|
|
|
4784 if (*prop) {
|
|
428
|
4785 goto done;
|
|
819
|
4786 }
|
|
428
|
4787 }
|
|
|
4788
|
|
|
4789 /* If there are begin glyphs, add them to the line. */
|
|
|
4790 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4791 {
|
|
826
|
4792 data.ch = string_emchar (disp_string, data.byte_charpos);
|
|
428
|
4793 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4794
|
|
|
4795 if (*prop) {
|
|
428
|
4796 goto done;
|
|
819
|
4797 }
|
|
428
|
4798 }
|
|
|
4799
|
|
|
4800 /* If at end-of-buffer, we've already processed begin and
|
|
|
4801 end-glyphs at this point and there's no text to process,
|
|
|
4802 so we're done. */
|
|
826
|
4803 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4804 goto done;
|
|
|
4805
|
|
|
4806 else
|
|
|
4807 {
|
|
|
4808 Lisp_Object entry = Qnil;
|
|
|
4809 /* Get the character at the current buffer position. */
|
|
826
|
4810 data.ch = string_emchar (disp_string, data.byte_charpos);
|
|
428
|
4811 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4812 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4813
|
|
|
4814 /* If there is a display table entry for it, hand it off to
|
|
|
4815 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4816 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4817 {
|
|
|
4818 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4819
|
|
|
4820 if (*prop)
|
|
|
4821 goto done;
|
|
|
4822 }
|
|
|
4823
|
|
|
4824 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4825 to the line and end this loop. */
|
|
|
4826 else if (data.ch == '\n')
|
|
|
4827 {
|
|
|
4828 /* We aren't going to be adding an end glyph so give its
|
|
|
4829 space back in order to make sure that the cursor can
|
|
|
4830 fit. */
|
|
819
|
4831 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4832 goto done;
|
|
|
4833 }
|
|
|
4834
|
|
|
4835 /* If the current character is considered to be printable, then
|
|
|
4836 just add it. */
|
|
|
4837 else if (data.ch >= printable_min)
|
|
|
4838 {
|
|
|
4839 *prop = add_emchar_rune (&data);
|
|
|
4840 if (*prop)
|
|
|
4841 goto done;
|
|
|
4842 }
|
|
|
4843
|
|
|
4844 /* If the current character is a tab, determine the next tab
|
|
|
4845 starting position and add a blank rune which extends from the
|
|
|
4846 current pixel position to that starting position. */
|
|
|
4847 else if (data.ch == '\t')
|
|
|
4848 {
|
|
|
4849 int tab_start_pixpos = data.pixpos;
|
|
|
4850 int next_tab_start;
|
|
|
4851 int char_tab_width;
|
|
|
4852 int prop_width = 0;
|
|
|
4853
|
|
|
4854 if (data.start_col > 1)
|
|
|
4855 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4856
|
|
|
4857 next_tab_start =
|
|
|
4858 next_tab_position (w, tab_start_pixpos,
|
|
|
4859 dl->bounds.left_in +
|
|
|
4860 data.hscroll_glyph_width_adjust);
|
|
|
4861 if (next_tab_start > data.max_pixpos)
|
|
|
4862 {
|
|
|
4863 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4864 next_tab_start = data.max_pixpos;
|
|
|
4865 }
|
|
|
4866 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4867 char_tab_width =
|
|
|
4868 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4869
|
|
|
4870 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4871
|
|
|
4872 /* add_blank_rune is only supposed to be called with
|
|
819
|
4873 sizes guaranteed to fit in the available space. */
|
|
428
|
4874 assert (!(*prop));
|
|
|
4875
|
|
|
4876 if (prop_width)
|
|
|
4877 {
|
|
|
4878 struct prop_block pb;
|
|
|
4879 *prop = Dynarr_new (prop_block);
|
|
|
4880
|
|
|
4881 pb.type = PROP_BLANK;
|
|
|
4882 pb.data.p_blank.width = prop_width;
|
|
|
4883 pb.data.p_blank.findex = data.findex;
|
|
|
4884 Dynarr_add (*prop, pb);
|
|
|
4885
|
|
|
4886 goto done;
|
|
|
4887 }
|
|
|
4888 }
|
|
|
4889
|
|
|
4890 /* If character is a control character, pass it off to
|
|
|
4891 add_control_char_runes.
|
|
|
4892
|
|
|
4893 The is_*() routines have undefined results on
|
|
|
4894 arguments outside of the range [-1, 255]. (This
|
|
|
4895 often bites people who carelessly use `char' instead
|
|
|
4896 of `unsigned char'.)
|
|
|
4897 */
|
|
665
|
4898 else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
|
|
428
|
4899 {
|
|
|
4900 *prop = add_control_char_runes (&data, b);
|
|
|
4901
|
|
|
4902 if (*prop)
|
|
|
4903 goto done;
|
|
|
4904 }
|
|
|
4905
|
|
|
4906 /* If the character is above the ASCII range and we have not
|
|
|
4907 already handled it, then print it as an octal number. */
|
|
|
4908 else if (data.ch >= 0200)
|
|
|
4909 {
|
|
|
4910 *prop = add_octal_runes (&data);
|
|
|
4911
|
|
|
4912 if (*prop)
|
|
|
4913 goto done;
|
|
|
4914 }
|
|
|
4915
|
|
|
4916 /* Assume the current character is considered to be printable,
|
|
|
4917 then just add it. */
|
|
|
4918 else
|
|
|
4919 {
|
|
|
4920 *prop = add_emchar_rune (&data);
|
|
|
4921 if (*prop)
|
|
|
4922 goto done;
|
|
|
4923 }
|
|
|
4924
|
|
826
|
4925 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4926 }
|
|
|
4927 }
|
|
|
4928
|
|
819
|
4929 done:
|
|
428
|
4930
|
|
|
4931 /* Determine the starting point of the next line if we did not hit the
|
|
|
4932 end of the buffer. */
|
|
826
|
4933 if (data.byte_charpos < byte_string_zv)
|
|
428
|
4934 {
|
|
|
4935 /* #### This check is not correct. If the line terminated
|
|
|
4936 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
4937 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
4938 you make the two changes mentioned at the top of this loop,
|
|
|
4939 you should be able to say '(if (*prop))'. That should also
|
|
826
|
4940 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
4941 check. */
|
|
|
4942
|
|
|
4943 /* The common case is that the line ended because we hit a newline.
|
|
|
4944 In that case, the next character is just the next buffer
|
|
|
4945 position. */
|
|
|
4946 if (data.ch == '\n')
|
|
|
4947 {
|
|
826
|
4948 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4949 }
|
|
|
4950
|
|
|
4951 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
4952 line. */
|
|
|
4953 else
|
|
|
4954 {
|
|
|
4955 struct glyph_block gb;
|
|
|
4956 struct glyph_cachel *cachel;
|
|
|
4957
|
|
|
4958 /* If the line is to be truncated then we actually have to look
|
|
|
4959 for the next newline. We also add the end-of-line glyph which
|
|
|
4960 we know will fit because we adjusted the right border before
|
|
|
4961 we starting laying out the line. */
|
|
819
|
4962 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4963 data.findex = default_face;
|
|
|
4964 gb.extent = Qnil;
|
|
|
4965
|
|
|
4966 if (truncate_win)
|
|
|
4967 {
|
|
826
|
4968 Bytecount byte_pos;
|
|
428
|
4969
|
|
|
4970 /* Now find the start of the next line. */
|
|
826
|
4971 byte_pos = byte_find_next_emchar_in_string (disp_string, '\n',
|
|
|
4972 data.byte_charpos, 1);
|
|
428
|
4973
|
|
|
4974 data.cursor_type = NO_CURSOR;
|
|
826
|
4975 data.byte_charpos = byte_pos;
|
|
428
|
4976 gb.glyph = Vtruncation_glyph;
|
|
|
4977 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
4978 }
|
|
|
4979 else
|
|
|
4980 {
|
|
|
4981 /* The cursor can never be on the continuation glyph. */
|
|
|
4982 data.cursor_type = NO_CURSOR;
|
|
|
4983
|
|
826
|
4984 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
4985
|
|
442
|
4986 dl->line_continuation = 1;
|
|
428
|
4987 gb.glyph = Vcontinuation_glyph;
|
|
|
4988 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
4989 }
|
|
|
4990
|
|
819
|
4991 if (data.end_glyph_width)
|
|
428
|
4992 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
4993
|
|
826
|
4994 if (truncate_win && data.byte_charpos == byte_string_zv)
|
|
428
|
4995 {
|
|
793
|
4996 const Intbyte *endb = charptr_n_addr (XSTRING_DATA (disp_string),
|
|
826
|
4997 byte_string_zv);
|
|
428
|
4998 DEC_CHARPTR (endb);
|
|
|
4999 if (charptr_emchar (endb) != '\n')
|
|
|
5000 {
|
|
|
5001 /* #### Damn this losing shit. */
|
|
826
|
5002 data.byte_charpos++;
|
|
428
|
5003 }
|
|
|
5004 }
|
|
|
5005 }
|
|
|
5006 }
|
|
826
|
5007 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
5008 {
|
|
|
5009 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5010 up subwindow display. Since we never have a cursor in the
|
|
|
5011 gutter we can safely ignore it. */
|
|
|
5012 }
|
|
|
5013 /* Calculate left whitespace boundary. */
|
|
|
5014 {
|
|
|
5015 int elt = 0;
|
|
|
5016
|
|
|
5017 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5018 while (elt < Dynarr_length (db->runes))
|
|
|
5019 {
|
|
|
5020 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5021
|
|
|
5022 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5023 || rb->type == RUNE_BLANK)
|
|
|
5024 {
|
|
|
5025 dl->bounds.left_white += rb->width;
|
|
|
5026 elt++;
|
|
|
5027 }
|
|
|
5028 else
|
|
|
5029 elt = Dynarr_length (db->runes);
|
|
|
5030 }
|
|
|
5031 }
|
|
|
5032
|
|
|
5033 /* Calculate right whitespace boundary. */
|
|
|
5034 {
|
|
|
5035 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5036 int done = 0;
|
|
|
5037
|
|
|
5038 while (!done && elt >= 0)
|
|
|
5039 {
|
|
|
5040 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5041
|
|
|
5042 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5043 && isspace (rb->object.chr.ch))
|
|
|
5044 && !rb->type == RUNE_BLANK)
|
|
|
5045 {
|
|
|
5046 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5047 done = 1;
|
|
|
5048 }
|
|
|
5049
|
|
|
5050 elt--;
|
|
|
5051
|
|
|
5052 }
|
|
|
5053
|
|
|
5054 /* The line is blank so everything is considered to be right
|
|
|
5055 whitespace. */
|
|
|
5056 if (!done)
|
|
|
5057 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5058 }
|
|
|
5059
|
|
|
5060 /* Set the display blocks bounds. */
|
|
|
5061 db->start_pos = dl->bounds.left_in;
|
|
|
5062 if (Dynarr_length (db->runes))
|
|
|
5063 {
|
|
|
5064 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5065
|
|
|
5066 db->end_pos = rb->xpos + rb->width;
|
|
|
5067 }
|
|
|
5068 else
|
|
|
5069 db->end_pos = dl->bounds.right_white;
|
|
|
5070
|
|
819
|
5071 calculate_baseline (&data);
|
|
428
|
5072
|
|
|
5073 dl->ascent = data.new_ascent;
|
|
|
5074 dl->descent = data.new_descent;
|
|
|
5075
|
|
|
5076 {
|
|
|
5077 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5078
|
|
|
5079 if (dl->ascent < ascent)
|
|
|
5080 dl->ascent = ascent;
|
|
|
5081 }
|
|
|
5082 {
|
|
|
5083 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5084
|
|
|
5085 if (dl->descent < descent)
|
|
|
5086 dl->descent = descent;
|
|
|
5087 }
|
|
|
5088
|
|
819
|
5089 calculate_yoffset (dl, db);
|
|
|
5090
|
|
428
|
5091 dl->cursor_elt = data.cursor_x;
|
|
|
5092 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
5093 if (data.byte_charpos > byte_string_zv)
|
|
|
5094 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5095 byte_string_zv);
|
|
428
|
5096 else
|
|
826
|
5097 dl->end_charpos =
|
|
|
5098 buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5099 data.byte_charpos) - 1;
|
|
428
|
5100 if (truncate_win)
|
|
434
|
5101 data.dl->num_chars =
|
|
826
|
5102 string_column_at_point (disp_string, dl->end_charpos,
|
|
793
|
5103 b ? XINT (b->tab_width) : 8);
|
|
428
|
5104 else
|
|
|
5105 /* This doesn't correctly take into account tabs and control
|
|
|
5106 characters but if the window isn't being truncated then this
|
|
|
5107 value isn't going to end up being used anyhow. */
|
|
826
|
5108 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
5109
|
|
|
5110 /* #### handle horizontally scrolled line with text none of which
|
|
|
5111 was actually laid out. */
|
|
|
5112
|
|
|
5113 /* #### handle any remainder of overlay arrow */
|
|
|
5114
|
|
|
5115 if (*prop == ADD_FAILED)
|
|
|
5116 *prop = NULL;
|
|
|
5117
|
|
|
5118 if (truncate_win && *prop)
|
|
|
5119 {
|
|
|
5120 Dynarr_free (*prop);
|
|
|
5121 *prop = NULL;
|
|
|
5122 }
|
|
|
5123
|
|
|
5124 extent_fragment_delete (data.ef);
|
|
|
5125
|
|
|
5126 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5127 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5128 The main loop should get fixed so that it isn't necessary to call
|
|
|
5129 this function if we are already at EOB. */
|
|
|
5130
|
|
826
|
5131 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
|
|
793
|
5132 return string_index_byte_to_char (disp_string,
|
|
826
|
5133 data.byte_charpos) + 1; /* Yuck! */
|
|
428
|
5134 else
|
|
826
|
5135 return string_index_byte_to_char (disp_string, data.byte_charpos);
|
|
428
|
5136 }
|
|
|
5137
|
|
|
5138 /* Given a display line and a starting position, ensure that the
|
|
|
5139 contents of the display line accurately represent the visual
|
|
|
5140 representation of the buffer contents starting from the given
|
|
|
5141 position when displayed in the given window. The display line ends
|
|
|
5142 when the contents of the line reach the right boundary of the given
|
|
434
|
5143 window.
|
|
|
5144
|
|
428
|
5145 This is very similar to generate_display_line but with the same
|
|
|
5146 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5147 of fixing the bytebpos stuff though.*/
|
|
|
5148
|
|
|
5149 static Charbpos
|
|
428
|
5150 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5151 struct display_line *dl,
|
|
826
|
5152 Charcount start_pos,
|
|
428
|
5153 prop_block_dynarr **prop,
|
|
|
5154 face_index default_face)
|
|
|
5155 {
|
|
826
|
5156 Charcount ret_charcount;
|
|
428
|
5157
|
|
|
5158 /* you must set bounds before calling this. */
|
|
434
|
5159
|
|
428
|
5160 /* Reset what this line is using. */
|
|
|
5161 if (dl->display_blocks)
|
|
|
5162 Dynarr_reset (dl->display_blocks);
|
|
|
5163 if (dl->left_glyphs)
|
|
|
5164 {
|
|
|
5165 Dynarr_free (dl->left_glyphs);
|
|
|
5166 dl->left_glyphs = 0;
|
|
|
5167 }
|
|
|
5168 if (dl->right_glyphs)
|
|
|
5169 {
|
|
|
5170 Dynarr_free (dl->right_glyphs);
|
|
|
5171 dl->right_glyphs = 0;
|
|
|
5172 }
|
|
|
5173
|
|
|
5174 /* We aren't generating a modeline at the moment. */
|
|
|
5175 dl->modeline = 0;
|
|
|
5176
|
|
|
5177 /* Create a display block for the text region of the line. */
|
|
826
|
5178 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
|
|
|
5179 prop, default_face);
|
|
|
5180 dl->charpos = start_pos;
|
|
|
5181 if (dl->end_charpos < dl->charpos)
|
|
|
5182 dl->end_charpos = dl->charpos;
|
|
428
|
5183
|
|
|
5184 /* If there are left glyphs associated with any character in the
|
|
|
5185 text block, then create a display block to handle them. */
|
|
|
5186 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5187 create_left_glyph_block (w, dl, 0);
|
|
|
5188
|
|
|
5189 /* If there are right glyphs associated with any character in the
|
|
|
5190 text block, then create a display block to handle them. */
|
|
|
5191 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5192 create_right_glyph_block (w, dl);
|
|
|
5193
|
|
826
|
5194 return ret_charcount;
|
|
428
|
5195 }
|
|
|
5196
|
|
|
5197 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5198 loop through elements in the string creating display lines until we
|
|
|
5199 have covered the provided area. Simple really. */
|
|
|
5200 void
|
|
|
5201 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5202 int xpos, int ypos, int width, int height,
|
|
|
5203 display_line_dynarr* dla,
|
|
826
|
5204 Charcount start_pos,
|
|
428
|
5205 face_index default_face)
|
|
|
5206 {
|
|
|
5207 int yend = ypos + height;
|
|
|
5208 Charcount s_zv;
|
|
|
5209
|
|
|
5210 prop_block_dynarr *prop = 0;
|
|
|
5211 layout_bounds bounds;
|
|
|
5212 assert (dla);
|
|
|
5213
|
|
|
5214 Dynarr_reset (dla);
|
|
|
5215 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5216 there is something to do. */
|
|
|
5217 if (NILP (disp_string))
|
|
|
5218 return;
|
|
|
5219
|
|
826
|
5220 s_zv = string_char_length (disp_string);
|
|
428
|
5221
|
|
|
5222 bounds.left_out = xpos;
|
|
|
5223 bounds.right_out = xpos + width;
|
|
|
5224 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5225 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5226 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5227 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5228 depend on the contents of the line being displayed. */
|
|
|
5229 bounds.left_white = bounds.left_in;
|
|
|
5230 bounds.right_white = bounds.right_in;
|
|
|
5231
|
|
|
5232 while (ypos < yend)
|
|
|
5233 {
|
|
|
5234 struct display_line dl;
|
|
|
5235 struct display_line *dlp;
|
|
826
|
5236 Charcount next_pos;
|
|
428
|
5237 int local;
|
|
851
|
5238 int pos_of_dlp = -1;
|
|
428
|
5239
|
|
|
5240 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5241 {
|
|
851
|
5242 pos_of_dlp = Dynarr_length (dla);
|
|
|
5243 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5244 local = 0;
|
|
|
5245 }
|
|
|
5246 else
|
|
|
5247 {
|
|
|
5248
|
|
|
5249 xzero (dl);
|
|
|
5250 dlp = &dl;
|
|
|
5251 local = 1;
|
|
|
5252 }
|
|
|
5253
|
|
|
5254 dlp->bounds = bounds;
|
|
|
5255 dlp->offset = 0;
|
|
|
5256 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5257 &prop, default_face);
|
|
|
5258 /* we need to make sure that we continue along the line if there
|
|
|
5259 is more left to display otherwise we just end up redisplaying
|
|
|
5260 the same chunk over and over again. */
|
|
|
5261 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5262 start_pos++;
|
|
|
5263 else
|
|
|
5264 start_pos = next_pos;
|
|
|
5265
|
|
|
5266 dlp->ypos = ypos + dlp->ascent;
|
|
|
5267 ypos = dlp->ypos + dlp->descent;
|
|
|
5268
|
|
|
5269 if (ypos > yend)
|
|
|
5270 {
|
|
|
5271 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5272
|
|
|
5273 dlp->clip = (ypos - yend);
|
|
|
5274 visible_height -= dlp->clip;
|
|
|
5275
|
|
|
5276 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5277 {
|
|
|
5278 if (local)
|
|
|
5279 free_display_line (dlp);
|
|
|
5280 break;
|
|
|
5281 }
|
|
|
5282 }
|
|
|
5283 else
|
|
|
5284 dlp->clip = 0;
|
|
|
5285
|
|
851
|
5286 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5287 Dynarr_add (dla, *dlp);
|
|
|
5288
|
|
|
5289 /* #### This type of check needs to be done down in the
|
|
|
5290 generate_display_line call. */
|
|
|
5291 if (start_pos >= s_zv)
|
|
|
5292 break;
|
|
|
5293 }
|
|
|
5294
|
|
|
5295 if (prop)
|
|
|
5296 Dynarr_free (prop);
|
|
|
5297 }
|
|
|
5298
|
|
|
5299
|
|
|
5300 /***************************************************************************/
|
|
|
5301 /* */
|
|
|
5302 /* window-regeneration routines */
|
|
|
5303 /* */
|
|
|
5304 /***************************************************************************/
|
|
|
5305
|
|
|
5306 /* For a given window and starting position in the buffer it contains,
|
|
|
5307 ensure that the TYPE display lines accurately represent the
|
|
|
5308 presentation of the window. We pass the buffer instead of getting
|
|
|
5309 it from the window since redisplay_window may have temporarily
|
|
|
5310 changed it to the echo area buffer. */
|
|
|
5311
|
|
|
5312 static void
|
|
665
|
5313 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5314 {
|
|
|
5315 struct frame *f = XFRAME (w->frame);
|
|
|
5316 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5317 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5318 int yend; /* set farther down */
|
|
|
5319 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5320 int force;
|
|
428
|
5321
|
|
|
5322 prop_block_dynarr *prop;
|
|
|
5323 layout_bounds bounds;
|
|
|
5324 display_line_dynarr *dla;
|
|
|
5325 int need_modeline;
|
|
|
5326
|
|
|
5327 /* The lines had better exist by this point. */
|
|
|
5328 if (!(dla = window_display_lines (w, type)))
|
|
|
5329 abort ();
|
|
|
5330 Dynarr_reset (dla);
|
|
|
5331 w->max_line_len = 0;
|
|
|
5332
|
|
|
5333 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5334 for this function to get called from some other points where that
|
|
|
5335 update may not have occurred. This acts as a safety check. */
|
|
|
5336 if (!Dynarr_length (w->face_cachels))
|
|
|
5337 reset_face_cachels (w);
|
|
|
5338 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5339 reset_glyph_cachels (w);
|
|
|
5340
|
|
|
5341 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5342 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5343 w->last_point_x[type] = -1;
|
|
|
5344 w->last_point_y[type] = -1;
|
|
|
5345
|
|
|
5346 /* Make sure a modeline is in the structs if needed. */
|
|
|
5347 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5348
|
|
|
5349 /* Wait until here to set this so that the structs have a modeline
|
|
|
5350 generated in the case where one didn't exist. */
|
|
|
5351 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5352
|
|
|
5353 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5354
|
|
|
5355 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5356 if (MINI_WINDOW_P (w)
|
|
|
5357 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5358 && !echo_area_active (f)
|
|
|
5359 && start_pos == BUF_BEGV (b))
|
|
|
5360 {
|
|
|
5361 struct prop_block pb;
|
|
|
5362 Lisp_Object string;
|
|
|
5363 prop = Dynarr_new (prop_block);
|
|
|
5364
|
|
|
5365 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5366 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5367 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5368 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5369 Dynarr_add (prop, pb);
|
|
|
5370 }
|
|
|
5371 else
|
|
|
5372 prop = 0;
|
|
|
5373
|
|
442
|
5374 /* When we are computing things for scrolling purposes, make
|
|
|
5375 sure at least one line is always generated */
|
|
|
5376 force = (type == CMOTION_DISP);
|
|
|
5377
|
|
|
5378 /* Make sure this is set always */
|
|
|
5379 /* Note the conversion at end */
|
|
|
5380 w->window_end_pos[type] = start_pos;
|
|
|
5381 while (ypos < yend || force)
|
|
428
|
5382 {
|
|
|
5383 struct display_line dl;
|
|
|
5384 struct display_line *dlp;
|
|
|
5385 int local;
|
|
851
|
5386 int pos_of_dlp = -1;
|
|
428
|
5387
|
|
|
5388 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5389 {
|
|
851
|
5390 pos_of_dlp = Dynarr_length (dla);
|
|
|
5391 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5392 local = 0;
|
|
|
5393 }
|
|
|
5394 else
|
|
|
5395 {
|
|
|
5396
|
|
|
5397 xzero (dl);
|
|
|
5398 dlp = &dl;
|
|
|
5399 local = 1;
|
|
|
5400 }
|
|
|
5401
|
|
|
5402 dlp->bounds = bounds;
|
|
|
5403 dlp->offset = 0;
|
|
|
5404 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
|
5405
|
|
|
5406 if (yclip > dlp->ascent)
|
|
|
5407 {
|
|
|
5408 /* this should never happen, but if it does just display the
|
|
|
5409 whole line */
|
|
|
5410 yclip = 0;
|
|
|
5411 }
|
|
|
5412
|
|
|
5413 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5414 ypos = dlp->ypos + dlp->descent;
|
|
|
5415
|
|
|
5416 /* See if we've been asked to start midway through a line, for
|
|
|
5417 partial display line scrolling. */
|
|
434
|
5418 if (yclip)
|
|
428
|
5419 {
|
|
|
5420 dlp->top_clip = yclip;
|
|
|
5421 yclip = 0;
|
|
|
5422 }
|
|
|
5423 else
|
|
|
5424 dlp->top_clip = 0;
|
|
|
5425
|
|
|
5426 if (ypos > yend)
|
|
|
5427 {
|
|
|
5428 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5429
|
|
|
5430 dlp->clip = (ypos - yend);
|
|
|
5431 /* Although this seems strange we could have a single very
|
|
|
5432 tall line visible for which we need to account for both
|
|
|
5433 the top clip and the bottom clip. */
|
|
|
5434 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5435
|
|
442
|
5436 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5437 {
|
|
|
5438 if (local)
|
|
|
5439 free_display_line (dlp);
|
|
|
5440 break;
|
|
|
5441 }
|
|
|
5442 }
|
|
|
5443 else
|
|
|
5444 dlp->clip = 0;
|
|
|
5445
|
|
|
5446 if (dlp->cursor_elt != -1)
|
|
|
5447 {
|
|
|
5448 /* #### This check is steaming crap. Have to get things
|
|
|
5449 fixed so when create_text_block hits EOB, we're done,
|
|
|
5450 period. */
|
|
|
5451 if (w->last_point_x[type] == -1)
|
|
|
5452 {
|
|
|
5453 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5454 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5455 }
|
|
|
5456 else
|
|
|
5457 {
|
|
|
5458 /* #### This means that we've added a cursor at EOB
|
|
|
5459 twice. Yuck oh yuck. */
|
|
|
5460 struct display_block *db =
|
|
|
5461 get_display_block_from_line (dlp, TEXT);
|
|
|
5462
|
|
|
5463 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5464 dlp->cursor_elt = -1;
|
|
|
5465 }
|
|
|
5466 }
|
|
|
5467
|
|
|
5468 if (dlp->num_chars > w->max_line_len)
|
|
|
5469 w->max_line_len = dlp->num_chars;
|
|
|
5470
|
|
851
|
5471 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5472 Dynarr_add (dla, *dlp);
|
|
|
5473
|
|
|
5474 /* #### This isn't right, but it is close enough for now. */
|
|
|
5475 w->window_end_pos[type] = start_pos;
|
|
|
5476
|
|
|
5477 /* #### This type of check needs to be done down in the
|
|
|
5478 generate_display_line call. */
|
|
|
5479 if (start_pos > BUF_ZV (b))
|
|
|
5480 break;
|
|
442
|
5481
|
|
|
5482 force = 0;
|
|
428
|
5483 }
|
|
|
5484
|
|
|
5485 if (prop)
|
|
|
5486 Dynarr_free (prop);
|
|
|
5487
|
|
|
5488 /* #### More not quite right, but close enough. */
|
|
442
|
5489 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5490 as the number of characters between the window end and the
|
|
|
5491 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5492 the justification for this?
|
|
|
5493
|
|
|
5494 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5495 that can change. This representation allows initalizing with 0.
|
|
|
5496 */
|
|
428
|
5497 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5498
|
|
|
5499 if (need_modeline)
|
|
|
5500 {
|
|
|
5501 /* We know that this is the right thing to use because we put it
|
|
|
5502 there when we first started working in this function. */
|
|
|
5503 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5504 }
|
|
|
5505 }
|
|
|
5506
|
|
826
|
5507 #define REGEN_INC_FIND_START_END \
|
|
|
5508 do { \
|
|
|
5509 /* Determine start and end of lines. */ \
|
|
|
5510 if (!Dynarr_length (cdla)) \
|
|
|
5511 return 0; \
|
|
|
5512 else \
|
|
|
5513 { \
|
|
428
|
5514 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
826
|
5515 { \
|
|
|
5516 dla_start = 1; \
|
|
|
5517 } \
|
|
|
5518 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5519 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5520 { \
|
|
|
5521 dla_start = 0; \
|
|
|
5522 } \
|
|
|
5523 else \
|
|
|
5524 abort (); /* structs differ */ \
|
|
|
5525 \
|
|
|
5526 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5527 } \
|
|
|
5528 \
|
|
|
5529 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
|
|
|
5530 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5531 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5532 full regen. */ \
|
|
|
5533 if (startp != start_pos) \
|
|
|
5534 return 0; \
|
|
|
5535 \
|
|
|
5536 /* Point is outside the visible region so give up. */ \
|
|
|
5537 if (pointm < start_pos) \
|
|
|
5538 return 0; \
|
|
|
5539 \
|
|
428
|
5540 } while (0)
|
|
|
5541
|
|
|
5542 /* This attempts to incrementally update the display structures. It
|
|
|
5543 returns a boolean indicating success or failure. This function is
|
|
|
5544 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5545 called from that function. However, because of the nature of the
|
|
|
5546 changes it deals with it sometimes makes different assumptions
|
|
|
5547 which can lead to success which are much more difficult to make
|
|
|
5548 when dealing with buffer changes. */
|
|
|
5549
|
|
|
5550 static int
|
|
665
|
5551 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5552 Charbpos pointm,
|
|
428
|
5553 Charcount beg_unchanged,
|
|
|
5554 Charcount end_unchanged)
|
|
|
5555 {
|
|
|
5556 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5557 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5558 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5559
|
|
|
5560 int dla_start = 0;
|
|
|
5561 int dla_end, line;
|
|
|
5562 int first_line, last_line;
|
|
665
|
5563 Charbpos start_pos;
|
|
428
|
5564 /* Don't define this in the loop where it is used because we
|
|
|
5565 definitely want its value to survive between passes. */
|
|
|
5566 prop_block_dynarr *prop = NULL;
|
|
|
5567
|
|
|
5568 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5569 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5570 under which this can happen, but I believe that it is probably a
|
|
|
5571 reasonable happening. */
|
|
|
5572 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5573 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5574 return 0;
|
|
|
5575
|
|
|
5576 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5577 go ahead and proceed with the optimization attempt. */
|
|
|
5578 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5579 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5580 {
|
|
|
5581 struct frame *f = XFRAME (w->frame);
|
|
|
5582 struct device *d = XDEVICE (f->device);
|
|
|
5583 struct frame *sel_f = device_selected_frame (d);
|
|
|
5584 int success = 0;
|
|
|
5585
|
|
|
5586 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5587 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5588 {
|
|
|
5589
|
|
|
5590 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5591 {
|
|
|
5592 /* Always regenerate the modeline in case it is
|
|
|
5593 displaying the current line or column. */
|
|
|
5594 regenerate_modeline (w);
|
|
|
5595 success = 1;
|
|
|
5596 }
|
|
|
5597 }
|
|
|
5598 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5599 {
|
|
|
5600 if (f->modeline_changed)
|
|
|
5601 regenerate_modeline (w);
|
|
|
5602 success = 1;
|
|
|
5603 }
|
|
|
5604
|
|
|
5605 if (!success)
|
|
|
5606 return 0;
|
|
|
5607 }
|
|
|
5608
|
|
|
5609 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5610 return 1;
|
|
|
5611
|
|
|
5612 /* assert: There are no buffer modifications or they are all below the
|
|
|
5613 visible region. We assume that regenerate_window_incrementally has
|
|
|
5614 not called us unless this is true. */
|
|
|
5615
|
|
|
5616 REGEN_INC_FIND_START_END;
|
|
|
5617
|
|
|
5618 /* If the changed are starts before the visible area, give up. */
|
|
|
5619 if (beg_unchanged < startp)
|
|
|
5620 return 0;
|
|
|
5621
|
|
|
5622 /* Find what display line the extent changes first affect. */
|
|
|
5623 line = dla_start;
|
|
|
5624 while (line <= dla_end)
|
|
|
5625 {
|
|
|
5626 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5627 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5628 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5629
|
|
|
5630 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5631 break;
|
|
|
5632
|
|
|
5633 line++;
|
|
|
5634 }
|
|
|
5635
|
|
|
5636 /* If the changes are below the visible area then if point hasn't
|
|
|
5637 moved return success otherwise fail in order to be safe. */
|
|
|
5638 if (line > dla_end)
|
|
|
5639 {
|
|
|
5640 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5641 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5642 return 1;
|
|
|
5643 else
|
|
|
5644 return 0;
|
|
|
5645 }
|
|
|
5646
|
|
|
5647 /* At this point we know what line the changes first affect. We now
|
|
|
5648 begin redrawing lines as long as we are still in the affected
|
|
|
5649 region and the line's size and positioning don't change.
|
|
|
5650 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5651 structs which could lead to an assertion failure. However, if we
|
|
|
5652 fail the next thing that is going to happen is a full regen so we
|
|
|
5653 will actually end up being safe. */
|
|
|
5654 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5655 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5656 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5657 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5658
|
|
|
5659 first_line = last_line = line;
|
|
|
5660 while (line <= dla_end)
|
|
|
5661 {
|
|
665
|
5662 Charbpos old_start, old_end, new_start;
|
|
428
|
5663 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5664 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5665 struct display_block *db;
|
|
|
5666 int initial_size;
|
|
|
5667
|
|
826
|
5668 assert (cdl->charpos == ddl->charpos);
|
|
|
5669 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5670 assert (cdl->offset == ddl->offset);
|
|
|
5671
|
|
|
5672 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5673 initial_size = Dynarr_length (db->runes);
|
|
826
|
5674 old_start = ddl->charpos + ddl->offset;
|
|
|
5675 old_end = ddl->end_charpos + ddl->offset;
|
|
428
|
5676
|
|
|
5677 /* If this is the first line being updated and it used
|
|
|
5678 propagation data, fail. Otherwise we'll be okay because
|
|
|
5679 we'll have the necessary propagation data. */
|
|
|
5680 if (line == first_line && ddl->used_prop_data)
|
|
|
5681 return 0;
|
|
|
5682
|
|
826
|
5683 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5684 &prop, DESIRED_DISP);
|
|
|
5685 ddl->offset = 0;
|
|
|
5686
|
|
|
5687 /* #### If there is propagated stuff the fail. We could
|
|
|
5688 probably actually deal with this if the line had propagated
|
|
|
5689 information when originally created by a full
|
|
|
5690 regeneration. */
|
|
|
5691 if (prop)
|
|
|
5692 {
|
|
|
5693 Dynarr_free (prop);
|
|
|
5694 return 0;
|
|
|
5695 }
|
|
|
5696
|
|
|
5697 /* If any line position parameters have changed or a
|
|
|
5698 cursor has disappeared or disappeared, fail. */
|
|
|
5699 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5700 if (cdl->ypos != ddl->ypos
|
|
|
5701 || cdl->ascent != ddl->ascent
|
|
|
5702 || cdl->descent != ddl->descent
|
|
|
5703 || cdl->top_clip != ddl->top_clip
|
|
|
5704 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5705 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
826
|
5706 || old_start != ddl->charpos
|
|
|
5707 || old_end != ddl->end_charpos
|
|
428
|
5708 || initial_size != Dynarr_length (db->runes))
|
|
|
5709 {
|
|
|
5710 return 0;
|
|
|
5711 }
|
|
|
5712
|
|
|
5713 if (ddl->cursor_elt != -1)
|
|
|
5714 {
|
|
|
5715 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5716 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5717 }
|
|
|
5718
|
|
|
5719 last_line = line;
|
|
|
5720
|
|
|
5721 /* If the extent changes end on the line we just updated then
|
|
|
5722 we're done. Otherwise go on to the next line. */
|
|
826
|
5723 if (end_unchanged <= ddl->end_charpos)
|
|
428
|
5724 break;
|
|
|
5725 else
|
|
|
5726 line++;
|
|
|
5727 }
|
|
|
5728
|
|
|
5729 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5730 return 1;
|
|
|
5731 }
|
|
|
5732
|
|
|
5733 /* Attempt to update the display data structures based on knowledge of
|
|
|
5734 the changed region in the buffer. Returns a boolean indicating
|
|
|
5735 success or failure. If this function returns a failure then a
|
|
|
5736 regenerate_window _must_ be performed next in order to maintain
|
|
|
5737 invariants located here. */
|
|
|
5738
|
|
|
5739 static int
|
|
665
|
5740 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5741 Charbpos pointm)
|
|
428
|
5742 {
|
|
|
5743 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5744 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5745 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5746 Charcount beg_unchanged, end_unchanged;
|
|
|
5747 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5748
|
|
|
5749 int dla_start = 0;
|
|
|
5750 int dla_end, line;
|
|
665
|
5751 Charbpos start_pos;
|
|
428
|
5752
|
|
|
5753 /* If this function is called, the current and desired structures
|
|
|
5754 had better be identical. If they are not, then that is a bug. */
|
|
|
5755 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5756
|
|
|
5757 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5758 screws us up. */
|
|
|
5759 if (MINI_WINDOW_P (w))
|
|
|
5760 return 0;
|
|
|
5761
|
|
|
5762 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
5763 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
5764 ? -1
|
|
|
5765 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
5766
|
|
|
5767 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
5768 and succeed. */
|
|
|
5769 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
5770 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5771 extent_beg_unchanged,
|
|
|
5772 extent_end_unchanged);
|
|
|
5773
|
|
|
5774 /* We can't deal with deleted newlines. */
|
|
|
5775 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
5776 return 0;
|
|
|
5777
|
|
|
5778 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
5779 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
5780 ? -1
|
|
|
5781 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
5782
|
|
|
5783 REGEN_INC_FIND_START_END;
|
|
|
5784
|
|
|
5785 /* If the changed area starts before the visible area, give up. */
|
|
|
5786 if (beg_unchanged < startp)
|
|
|
5787 return 0;
|
|
|
5788
|
|
|
5789 /* Find what display line the buffer changes first affect. */
|
|
|
5790 line = dla_start;
|
|
|
5791 while (line <= dla_end)
|
|
|
5792 {
|
|
|
5793 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5794 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5795 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5796
|
|
|
5797 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5798 break;
|
|
|
5799
|
|
|
5800 line++;
|
|
|
5801 }
|
|
|
5802
|
|
|
5803 /* If the changes are below the visible area then if point hasn't
|
|
|
5804 moved return success otherwise fail in order to be safe. */
|
|
|
5805 if (line > dla_end)
|
|
|
5806 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5807 extent_beg_unchanged,
|
|
|
5808 extent_end_unchanged);
|
|
|
5809 else
|
|
|
5810 /* At this point we know what line the changes first affect. We
|
|
|
5811 now redraw that line. If the changes are contained within it
|
|
|
5812 we are going to succeed and can update just that one line.
|
|
|
5813 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5814 structs which could lead to an assertion failure. However, if
|
|
|
5815 we fail the next thing that is going to happen is a full regen
|
|
|
5816 so we will actually end up being safe. */
|
|
|
5817 {
|
|
665
|
5818 Charbpos new_start;
|
|
428
|
5819 prop_block_dynarr *prop = NULL;
|
|
|
5820 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5821 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5822
|
|
826
|
5823 assert (cdl->charpos == ddl->charpos);
|
|
|
5824 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5825 assert (cdl->offset == ddl->offset);
|
|
|
5826
|
|
442
|
5827 /* If the line continues to next display line, fail. */
|
|
|
5828 if (ddl->line_continuation)
|
|
|
5829 return 0;
|
|
428
|
5830
|
|
|
5831 /* If the line was generated using propagation data, fail. */
|
|
|
5832 if (ddl->used_prop_data)
|
|
|
5833 return 0;
|
|
|
5834
|
|
826
|
5835 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5836 &prop, DESIRED_DISP);
|
|
|
5837 ddl->offset = 0;
|
|
|
5838
|
|
|
5839 /* If there is propagated stuff then it is pretty much a
|
|
|
5840 guarantee that more than just the one line is affected. */
|
|
|
5841 if (prop)
|
|
|
5842 {
|
|
|
5843 Dynarr_free (prop);
|
|
|
5844 return 0;
|
|
|
5845 }
|
|
|
5846
|
|
442
|
5847 /* If the line continues to next display line, fail. */
|
|
|
5848 if (ddl->line_continuation)
|
|
|
5849 return 0;
|
|
428
|
5850
|
|
|
5851 /* If any line position parameters have changed or a
|
|
|
5852 cursor has disappeared or disappeared, fail. */
|
|
|
5853 if (cdl->ypos != ddl->ypos
|
|
|
5854 || cdl->ascent != ddl->ascent
|
|
|
5855 || cdl->descent != ddl->descent
|
|
|
5856 || cdl->top_clip != ddl->top_clip
|
|
|
5857 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5858 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
5859 {
|
|
|
5860 return 0;
|
|
|
5861 }
|
|
|
5862
|
|
|
5863 /* If the changed area also ends on this line, then we may be in
|
|
|
5864 business. Update everything and return success. */
|
|
826
|
5865 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
|
|
428
|
5866 {
|
|
|
5867 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5868 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5869 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
5870 w->buffer);
|
|
|
5871 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
5872 w->buffer);
|
|
|
5873
|
|
|
5874 if (ddl->cursor_elt != -1)
|
|
|
5875 {
|
|
|
5876 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5877 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5878 }
|
|
|
5879
|
|
|
5880 redisplay_update_line (w, line, line, 1);
|
|
|
5881 regenerate_modeline (w);
|
|
|
5882
|
|
|
5883 /* #### For now we just flush the cache until this has been
|
|
|
5884 tested. After that is done, this should correct the
|
|
|
5885 cache directly. */
|
|
|
5886 Dynarr_reset (w->line_start_cache);
|
|
|
5887
|
|
|
5888 /* Adjust the extent changed boundaries to remove any
|
|
|
5889 overlap with the buffer changes since we've just
|
|
|
5890 successfully updated that area. */
|
|
|
5891 if (extent_beg_unchanged != -1
|
|
|
5892 && extent_beg_unchanged >= beg_unchanged
|
|
|
5893 && extent_beg_unchanged < end_unchanged)
|
|
|
5894 extent_beg_unchanged = end_unchanged;
|
|
|
5895
|
|
|
5896 if (extent_end_unchanged != -1
|
|
|
5897 && extent_end_unchanged >= beg_unchanged
|
|
|
5898 && extent_end_unchanged < end_unchanged)
|
|
|
5899 extent_end_unchanged = beg_unchanged - 1;
|
|
|
5900
|
|
|
5901 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
5902 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
5903
|
|
|
5904 /* This could lead to odd results if it fails, but since the
|
|
|
5905 buffer changes update succeeded this probably will to.
|
|
|
5906 We already know that the extent changes start at or after
|
|
|
5907 the line because we checked before entering the loop. */
|
|
|
5908 if (extent_beg_unchanged != -1
|
|
|
5909 && extent_end_unchanged != -1
|
|
826
|
5910 && ((extent_beg_unchanged < ddl->charpos)
|
|
|
5911 || (extent_end_unchanged > ddl->end_charpos)))
|
|
428
|
5912 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5913 extent_beg_unchanged,
|
|
|
5914 extent_end_unchanged);
|
|
|
5915 else
|
|
|
5916 return 1;
|
|
|
5917 }
|
|
|
5918 }
|
|
|
5919
|
|
|
5920 /* Oh, well. */
|
|
|
5921 return 0;
|
|
|
5922 }
|
|
|
5923
|
|
|
5924 /* Given a window and a point, update the given display lines such
|
|
|
5925 that point is displayed in the middle of the window.
|
|
|
5926 Return the window's new start position. */
|
|
|
5927
|
|
665
|
5928 static Charbpos
|
|
|
5929 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
5930 {
|
|
665
|
5931 Charbpos startp;
|
|
428
|
5932
|
|
|
5933 /* We need to make sure that the modeline is generated so that the
|
|
|
5934 window height can be calculated correctly. */
|
|
|
5935 ensure_modeline_generated (w, type);
|
|
|
5936
|
|
|
5937 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
5938 regenerate_window (w, startp, point, type);
|
|
|
5939 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
5940
|
|
|
5941 return startp;
|
|
|
5942 }
|
|
|
5943
|
|
|
5944 /* Given a window and a set of display lines, return a boolean
|
|
|
5945 indicating whether the given point is contained within. */
|
|
|
5946
|
|
|
5947 static int
|
|
665
|
5948 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
5949 {
|
|
|
5950 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5951 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
5952 int first_line;
|
|
|
5953
|
|
|
5954 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
5955 first_line = 1;
|
|
|
5956 else
|
|
|
5957 first_line = 0;
|
|
|
5958
|
|
|
5959 if (Dynarr_length (dla) > first_line)
|
|
|
5960 {
|
|
665
|
5961 Charbpos start, end;
|
|
428
|
5962 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
5963
|
|
826
|
5964 start = dl->charpos;
|
|
428
|
5965 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
5966
|
|
|
5967 if (point >= start && point <= end)
|
|
|
5968 {
|
|
|
5969 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
5970 {
|
|
|
5971 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
5972
|
|
826
|
5973 if (point >= (dl->charpos + dl->offset)
|
|
|
5974 && point <= (dl->end_charpos + dl->offset))
|
|
428
|
5975 return !dl->clip;
|
|
|
5976 else
|
|
|
5977 return 1;
|
|
|
5978 }
|
|
|
5979 else
|
|
|
5980 return 1;
|
|
|
5981 }
|
|
|
5982 else
|
|
|
5983 return 0;
|
|
|
5984 }
|
|
|
5985 else
|
|
|
5986 return 0;
|
|
|
5987 }
|
|
|
5988
|
|
|
5989 /* Return pixel position the middle of the window, not including the
|
|
|
5990 modeline and any potential horizontal scrollbar. */
|
|
|
5991
|
|
|
5992 int
|
|
|
5993 window_half_pixpos (struct window *w)
|
|
|
5994 {
|
|
|
5995 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
5996 }
|
|
|
5997
|
|
|
5998 /* Return the display line which is currently in the middle of the
|
|
|
5999 window W for display lines TYPE. */
|
|
|
6000
|
|
|
6001 int
|
|
665
|
6002 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6003 {
|
|
|
6004 display_line_dynarr *dla;
|
|
|
6005 int half;
|
|
|
6006 int elt;
|
|
|
6007 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
6008
|
|
|
6009 if (type == CMOTION_DISP)
|
|
|
6010 regenerate_window (w, start, point, type);
|
|
|
6011
|
|
|
6012 dla = window_display_lines (w, type);
|
|
|
6013 half = window_half_pixpos (w);
|
|
|
6014
|
|
|
6015 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6016 {
|
|
|
6017 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6018 int line_bot = dl->ypos + dl->descent;
|
|
|
6019
|
|
|
6020 if (line_bot > half)
|
|
|
6021 return elt;
|
|
|
6022 }
|
|
|
6023
|
|
|
6024 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6025 being displayed. */
|
|
|
6026 return -1;
|
|
|
6027 }
|
|
|
6028
|
|
|
6029 /* Return a value for point that would place it at the beginning of
|
|
|
6030 the line which is in the middle of the window. */
|
|
|
6031
|
|
665
|
6032 Charbpos
|
|
|
6033 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6034 {
|
|
|
6035 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6036 int line = line_at_center (w, type, start, point);
|
|
|
6037
|
|
|
6038 if (line == -1)
|
|
|
6039 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6040 else
|
|
|
6041 {
|
|
|
6042 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6043 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6044
|
|
826
|
6045 return dl->charpos;
|
|
428
|
6046 }
|
|
|
6047 }
|
|
|
6048
|
|
|
6049 /* For a given window, ensure that the current visual representation
|
|
|
6050 is accurate. */
|
|
|
6051
|
|
|
6052 static void
|
|
|
6053 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6054 {
|
|
|
6055 struct window *w = XWINDOW (window);
|
|
|
6056 struct frame *f = XFRAME (w->frame);
|
|
|
6057 struct device *d = XDEVICE (f->device);
|
|
|
6058 Lisp_Object old_buffer = w->buffer;
|
|
|
6059 Lisp_Object the_buffer = w->buffer;
|
|
|
6060 struct buffer *b;
|
|
|
6061 int echo_active = 0;
|
|
|
6062 int startp = 1;
|
|
|
6063 int pointm;
|
|
|
6064 int old_startp = 1;
|
|
|
6065 int old_pointm = 1;
|
|
|
6066 int selected_in_its_frame;
|
|
|
6067 int selected_globally;
|
|
|
6068 int skip_output = 0;
|
|
|
6069 int truncation_changed;
|
|
|
6070 int inactive_minibuffer =
|
|
|
6071 (MINI_WINDOW_P (w) &&
|
|
|
6072 (f != device_selected_frame (d)) &&
|
|
|
6073 !is_surrogate_for_selected_frame (f));
|
|
|
6074
|
|
|
6075 /* #### In the new world this function actually does a bunch of
|
|
|
6076 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6077 implemented yet. */
|
|
|
6078
|
|
|
6079 /* If this is a combination window, do its children; that's all.
|
|
|
6080 The selected window is always a leaf so we don't check for
|
|
|
6081 skip_selected here. */
|
|
|
6082 if (!NILP (w->vchild))
|
|
|
6083 {
|
|
|
6084 redisplay_windows (w->vchild, skip_selected);
|
|
|
6085 return;
|
|
|
6086 }
|
|
|
6087 if (!NILP (w->hchild))
|
|
|
6088 {
|
|
|
6089 redisplay_windows (w->hchild, skip_selected);
|
|
|
6090 return;
|
|
|
6091 }
|
|
|
6092
|
|
|
6093 /* Is this window the selected window on its frame? */
|
|
|
6094 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6095 selected_globally =
|
|
|
6096 selected_in_its_frame &&
|
|
|
6097 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6098 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6099 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6100 if (skip_selected && selected_in_its_frame)
|
|
|
6101 return;
|
|
|
6102
|
|
|
6103 /* It is possible that the window is not fully initialized yet. */
|
|
|
6104 if (NILP (w->buffer))
|
|
|
6105 return;
|
|
|
6106
|
|
|
6107 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6108 {
|
|
|
6109 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6110 echo_active = 1;
|
|
|
6111 }
|
|
|
6112
|
|
|
6113 b = XBUFFER (w->buffer);
|
|
|
6114
|
|
|
6115 if (echo_active)
|
|
|
6116 {
|
|
|
6117 old_pointm = selected_globally
|
|
|
6118 ? BUF_PT (b)
|
|
|
6119 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6120 pointm = 1;
|
|
|
6121 }
|
|
|
6122 else
|
|
|
6123 {
|
|
|
6124 if (selected_globally)
|
|
|
6125 {
|
|
|
6126 pointm = BUF_PT (b);
|
|
|
6127 }
|
|
|
6128 else
|
|
|
6129 {
|
|
|
6130 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6131
|
|
|
6132 if (pointm < BUF_BEGV (b))
|
|
|
6133 pointm = BUF_BEGV (b);
|
|
|
6134 else if (pointm > BUF_ZV (b))
|
|
|
6135 pointm = BUF_ZV (b);
|
|
|
6136 }
|
|
|
6137 }
|
|
|
6138 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6139
|
|
|
6140 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6141 cache elements. */
|
|
|
6142 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6143 || !Dynarr_length (w->face_cachels)
|
|
|
6144 || f->faces_changed)
|
|
|
6145 reset_face_cachels (w);
|
|
|
6146 else
|
|
|
6147 mark_face_cachels_as_not_updated (w);
|
|
|
6148
|
|
|
6149 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6150 the cache purely because glyphs have changed - this is now
|
|
|
6151 handled by the dirty flag.*/
|
|
|
6152 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6153 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6154 reset_glyph_cachels (w);
|
|
|
6155 else
|
|
|
6156 mark_glyph_cachels_as_not_updated (w);
|
|
|
6157
|
|
|
6158 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6159 to find a new starting position. */
|
|
|
6160 if (!MINI_WINDOW_P (w)
|
|
|
6161 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6162 {
|
|
|
6163 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6164
|
|
|
6165 goto regeneration_done;
|
|
|
6166 }
|
|
|
6167
|
|
|
6168 if (echo_active)
|
|
|
6169 {
|
|
|
6170 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6171 startp = 1;
|
|
|
6172 }
|
|
|
6173 else
|
|
|
6174 {
|
|
|
6175 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6176 if (startp < BUF_BEGV (b))
|
|
|
6177 startp = BUF_BEGV (b);
|
|
|
6178 else if (startp > BUF_ZV (b))
|
|
|
6179 startp = BUF_ZV (b);
|
|
|
6180 }
|
|
|
6181 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6182
|
|
|
6183 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6184 (unsigned int) window_truncation_on (w));
|
|
428
|
6185
|
|
|
6186 /* If w->force_start is set, then some function set w->start and we
|
|
|
6187 should display from there and change point, if necessary, to
|
|
|
6188 ensure that it is visible. */
|
|
|
6189 if (w->force_start || inactive_minibuffer)
|
|
|
6190 {
|
|
|
6191 w->force_start = 0;
|
|
|
6192 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6193 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6194
|
|
|
6195 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6196
|
|
|
6197 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6198 {
|
|
|
6199 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6200
|
|
|
6201 if (selected_globally)
|
|
|
6202 BUF_SET_PT (b, pointm);
|
|
|
6203
|
|
|
6204 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6205 the_buffer);
|
|
|
6206
|
|
|
6207 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6208 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6209 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6210 }
|
|
|
6211
|
|
|
6212 goto regeneration_done;
|
|
|
6213 }
|
|
|
6214
|
|
|
6215 /* If nothing has changed since the last redisplay, then we just
|
|
|
6216 need to make sure that point is still visible. */
|
|
|
6217 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6218 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6219 && pointm >= startp
|
|
|
6220 /* This check is to make sure we restore the minibuffer after a
|
|
|
6221 temporary change to the echo area. */
|
|
|
6222 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6223 && !f->frame_changed
|
|
|
6224 && !truncation_changed
|
|
442
|
6225 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6226 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6227 )
|
|
|
6228 {
|
|
|
6229 /* Check if the cursor has actually moved. */
|
|
|
6230 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6231 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6232 && selected_globally
|
|
|
6233 && !w->windows_changed
|
|
|
6234 && !f->clip_changed
|
|
|
6235 && !f->extents_changed
|
|
|
6236 && !f->faces_changed
|
|
|
6237 && !f->glyphs_changed
|
|
|
6238 && !f->subwindows_changed
|
|
442
|
6239 /* && !f->subwindows_state_changed*/
|
|
428
|
6240 && !f->point_changed
|
|
|
6241 && !f->windows_structure_changed)
|
|
|
6242 {
|
|
|
6243 /* If not, we're done. */
|
|
|
6244 if (f->modeline_changed)
|
|
|
6245 regenerate_modeline (w);
|
|
|
6246
|
|
|
6247 skip_output = 1;
|
|
|
6248 goto regeneration_done;
|
|
|
6249 }
|
|
|
6250 else
|
|
|
6251 {
|
|
|
6252 /* If the new point is visible in the redisplay structures,
|
|
|
6253 then let the output update routines handle it, otherwise
|
|
|
6254 do things the hard way. */
|
|
|
6255 if (!w->windows_changed
|
|
|
6256 && !f->clip_changed
|
|
|
6257 && !f->extents_changed
|
|
|
6258 && !f->faces_changed
|
|
|
6259 && !f->glyphs_changed
|
|
|
6260 && !f->subwindows_changed
|
|
442
|
6261 /* && !f->subwindows_state_changed*/
|
|
428
|
6262 && !f->windows_structure_changed)
|
|
|
6263 {
|
|
|
6264 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6265 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6266 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6267 {
|
|
|
6268 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6269 {
|
|
|
6270 /* Always regenerate in case it is displaying
|
|
|
6271 the current line or column. */
|
|
|
6272 regenerate_modeline (w);
|
|
|
6273
|
|
|
6274 skip_output = 1;
|
|
|
6275 goto regeneration_done;
|
|
|
6276 }
|
|
|
6277 }
|
|
|
6278 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6279 {
|
|
|
6280 if (f->modeline_changed)
|
|
|
6281 regenerate_modeline (w);
|
|
|
6282
|
|
|
6283 skip_output = 1;
|
|
|
6284 goto regeneration_done;
|
|
|
6285 }
|
|
|
6286 }
|
|
|
6287
|
|
|
6288 /* If we weren't able to take the shortcut method, then use
|
|
|
6289 the brute force method. */
|
|
|
6290 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6291
|
|
|
6292 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6293 goto regeneration_done;
|
|
|
6294 }
|
|
|
6295 }
|
|
|
6296
|
|
|
6297 /* Check if the starting point is no longer at the beginning of a
|
|
|
6298 line, in which case find a new starting point. We also recenter
|
|
|
6299 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6300 up with a blank window. */
|
|
|
6301 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6302 && !(startp == BUF_BEGV (b)
|
|
|
6303 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6304 || (pointm == startp &&
|
|
|
6305 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6306 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6307 || (startp == BUF_ZV (b)))
|
|
|
6308 {
|
|
|
6309 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6310
|
|
|
6311 goto regeneration_done;
|
|
|
6312 }
|
|
|
6313 /* See if we can update the data structures locally based on
|
|
|
6314 knowledge of what changed in the buffer. */
|
|
|
6315 else if (!w->windows_changed
|
|
|
6316 && !f->clip_changed
|
|
|
6317 && !f->faces_changed
|
|
|
6318 && !f->glyphs_changed
|
|
|
6319 && !f->subwindows_changed
|
|
442
|
6320 /* && !f->subwindows_state_changed*/
|
|
428
|
6321 && !f->windows_structure_changed
|
|
|
6322 && !f->frame_changed
|
|
|
6323 && !truncation_changed
|
|
|
6324 && pointm >= startp
|
|
|
6325 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6326 {
|
|
|
6327 if (f->modeline_changed
|
|
|
6328 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6329 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6330 regenerate_modeline (w);
|
|
|
6331
|
|
|
6332 skip_output = 1;
|
|
|
6333 goto regeneration_done;
|
|
|
6334 }
|
|
|
6335 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6336 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6337 else
|
|
|
6338 {
|
|
|
6339 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6340
|
|
|
6341 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6342 goto regeneration_done;
|
|
|
6343 }
|
|
|
6344
|
|
|
6345 /* We still haven't gotten the window regenerated with point
|
|
|
6346 visible. Next we try scrolling a little and see if point comes
|
|
|
6347 back onto the screen. */
|
|
|
6348 if (scroll_step > 0)
|
|
|
6349 {
|
|
|
6350 int scrolled = scroll_conservatively;
|
|
|
6351 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6352 {
|
|
|
6353 startp = vmotion (w, startp,
|
|
|
6354 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6355 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6356
|
|
|
6357 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6358 goto regeneration_done;
|
|
|
6359 }
|
|
|
6360 }
|
|
|
6361
|
|
|
6362 /* We still haven't managed to get the screen drawn with point on
|
|
|
6363 the screen, so just center it and be done with it. */
|
|
|
6364 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6365
|
|
|
6366
|
|
|
6367 regeneration_done:
|
|
|
6368
|
|
|
6369 /* If the window's frame is changed then reset the current display
|
|
|
6370 lines in order to force a full repaint. */
|
|
|
6371 if (f->frame_changed)
|
|
|
6372 {
|
|
|
6373 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6374
|
|
|
6375 Dynarr_reset (cla);
|
|
|
6376 }
|
|
|
6377
|
|
|
6378 /* Must do this before calling redisplay_output_window because it
|
|
|
6379 sets some markers on the window. */
|
|
|
6380 if (echo_active)
|
|
|
6381 {
|
|
|
6382 w->buffer = old_buffer;
|
|
|
6383 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6384 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6385 }
|
|
|
6386
|
|
|
6387 /* These also have to be set before calling redisplay_output_window
|
|
|
6388 since it sets the CURRENT_DISP values based on them. */
|
|
|
6389 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6390 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6391 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6392 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6393
|
|
|
6394 if (!skip_output)
|
|
|
6395 {
|
|
665
|
6396 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6397 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6398 ? BUF_ZV (b)
|
|
|
6399 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6400 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6401 if (w->start_at_line_beg)
|
|
|
6402 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6403 redisplay_output_window (w);
|
|
|
6404 /*
|
|
|
6405 * If we just displayed the echo area, the line start cache is
|
|
|
6406 * no longer valid, because the minibuffer window is associated
|
|
|
6407 * with the window now.
|
|
|
6408 */
|
|
|
6409 if (echo_active)
|
|
|
6410 w->line_cache_last_updated = make_int (-1);
|
|
|
6411 }
|
|
|
6412
|
|
|
6413 /* #### This should be dependent on face changes and will need to be
|
|
|
6414 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6415 mark_face_cachels_as_clean (w);
|
|
|
6416
|
|
438
|
6417 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6418 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6419 flag since everything must be up-to-date. */
|
|
428
|
6420 if (glyphs_changed)
|
|
|
6421 mark_glyph_cachels_as_clean (w);
|
|
|
6422
|
|
|
6423 w->windows_changed = 0;
|
|
|
6424 }
|
|
|
6425
|
|
|
6426 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6427 currently visible in all frames on all devices. #### There has to
|
|
|
6428 be a better way to do this. */
|
|
|
6429
|
|
|
6430 static int
|
|
|
6431 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
6432 {
|
|
|
6433 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6434 return 0;
|
|
|
6435 }
|
|
|
6436
|
|
|
6437 static void
|
|
|
6438 reset_buffer_changes (void)
|
|
|
6439 {
|
|
|
6440 Lisp_Object frmcons, devcons, concons;
|
|
|
6441
|
|
|
6442 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6443 {
|
|
|
6444 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6445
|
|
|
6446 if (FRAME_REPAINT_P (f))
|
|
|
6447 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6448 }
|
|
|
6449 }
|
|
|
6450
|
|
|
6451 /* Ensure that all windows underneath the given window in the window
|
|
|
6452 hierarchy are correctly displayed. */
|
|
|
6453
|
|
|
6454 static void
|
|
|
6455 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6456 {
|
|
|
6457 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6458 {
|
|
|
6459 redisplay_window (window, skip_selected);
|
|
|
6460 }
|
|
|
6461 }
|
|
|
6462
|
|
|
6463 static int
|
|
|
6464 call_redisplay_end_triggers (struct window *w, void *closure)
|
|
|
6465 {
|
|
665
|
6466 Charbpos lrpos = w->last_redisplay_pos;
|
|
428
|
6467 w->last_redisplay_pos = 0;
|
|
|
6468 if (!NILP (w->buffer)
|
|
|
6469 && !NILP (w->redisplay_end_trigger)
|
|
|
6470 && lrpos > 0)
|
|
|
6471 {
|
|
665
|
6472 Charbpos pos;
|
|
428
|
6473
|
|
|
6474 if (MARKERP (w->redisplay_end_trigger)
|
|
|
6475 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
|
|
|
6476 pos = marker_position (w->redisplay_end_trigger);
|
|
|
6477 else if (INTP (w->redisplay_end_trigger))
|
|
|
6478 pos = XINT (w->redisplay_end_trigger);
|
|
|
6479 else
|
|
|
6480 {
|
|
|
6481 w->redisplay_end_trigger = Qnil;
|
|
|
6482 return 0;
|
|
|
6483 }
|
|
|
6484
|
|
|
6485 if (lrpos >= pos)
|
|
|
6486 {
|
|
793
|
6487 Lisp_Object window = wrap_window (w);
|
|
|
6488
|
|
428
|
6489 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
|
|
|
6490 Qredisplay_end_trigger_functions,
|
|
|
6491 2, window,
|
|
|
6492 w->redisplay_end_trigger);
|
|
|
6493 w->redisplay_end_trigger = Qnil;
|
|
|
6494 }
|
|
|
6495 }
|
|
|
6496
|
|
|
6497 return 0;
|
|
|
6498 }
|
|
|
6499
|
|
|
6500 /* Ensure that all windows on the given frame are correctly displayed. */
|
|
|
6501
|
|
442
|
6502 int
|
|
428
|
6503 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6504 {
|
|
|
6505 struct device *d = XDEVICE (f->device);
|
|
|
6506
|
|
545
|
6507 if (preemption_check
|
|
|
6508 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6509 {
|
|
|
6510 /* The preemption check itself takes a lot of time,
|
|
|
6511 so normally don't do it here. We do it if called
|
|
|
6512 from Lisp, though (`redisplay-frame'). */
|
|
|
6513 int preempted;
|
|
|
6514
|
|
|
6515 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6516 if (preempted)
|
|
|
6517 return 1;
|
|
|
6518 }
|
|
|
6519
|
|
442
|
6520 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6521 {
|
|
|
6522 Lisp_Object frame;
|
|
|
6523
|
|
|
6524 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6525 f->buffer_alist);
|
|
793
|
6526 frame = wrap_frame (f);
|
|
442
|
6527 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6528 }
|
|
|
6529
|
|
428
|
6530 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6531 any which are already pending. */
|
|
|
6532 if (f->size_change_pending)
|
|
|
6533 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6534
|
|
|
6535 /* If frame size might need to be changed, due to changed size
|
|
|
6536 of toolbars, scrollbars etc, change it now */
|
|
|
6537 if (f->size_slipped)
|
|
|
6538 {
|
|
|
6539 adjust_frame_size (f);
|
|
|
6540 assert (!f->size_slipped);
|
|
|
6541 }
|
|
|
6542
|
|
|
6543 /* The menubar, toolbar, and icon updates must be done before
|
|
|
6544 hold_frame_size_changes is called and we are officially
|
|
|
6545 'in_display'. They may eval lisp code which may call Fsignal.
|
|
|
6546 If in_display is set Fsignal will abort. */
|
|
|
6547
|
|
|
6548 #ifdef HAVE_MENUBARS
|
|
|
6549 /* Update the menubar. It is done first since it could change
|
|
|
6550 the menubar's visibility. This way we avoid having flashing
|
|
|
6551 caused by an Expose event generated by the visibility change
|
|
|
6552 being handled. */
|
|
|
6553 update_frame_menubars (f);
|
|
|
6554 #endif /* HAVE_MENUBARS */
|
|
|
6555 #ifdef HAVE_TOOLBARS
|
|
|
6556 /* Update the toolbars. */
|
|
|
6557 update_frame_toolbars (f);
|
|
|
6558 #endif /* HAVE_TOOLBARS */
|
|
442
|
6559 /* Gutter update proper has to be done inside display when no frame
|
|
|
6560 size changes can occur, thus we separately update the gutter
|
|
|
6561 geometry here if it needs it. */
|
|
|
6562 update_frame_gutter_geometry (f);
|
|
428
|
6563
|
|
|
6564 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
6565 if (f->clear)
|
|
|
6566 f->frame_changed = 1;
|
|
|
6567
|
|
442
|
6568 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
6569 to cause subwindows to get instantiated. This is because
|
|
428
|
6570 subwindows_state_changed is less strict - dealing with things
|
|
|
6571 like the clicked state of button. We have to do this before
|
|
|
6572 redisplaying the gutters as subwindows get unmapped in the
|
|
|
6573 process.*/
|
|
442
|
6574 if (f->frame_changed)
|
|
|
6575 reset_frame_subwindow_instance_cache (f);
|
|
|
6576
|
|
|
6577 if (f->frame_changed || f->subwindows_changed)
|
|
|
6578 {
|
|
428
|
6579 /* we have to do this so the gutter gets regenerated. */
|
|
|
6580 reset_gutter_display_lines (f);
|
|
|
6581 }
|
|
|
6582
|
|
|
6583 hold_frame_size_changes ();
|
|
|
6584
|
|
|
6585 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6586 /* Within this section, we are defenseless and assume that the
|
|
|
6587 following cannot happen:
|
|
|
6588
|
|
|
6589 1) garbage collection
|
|
|
6590 2) Lisp code evaluation
|
|
|
6591 3) frame size changes
|
|
|
6592
|
|
|
6593 We ensure (3) by calling hold_frame_size_changes(), which
|
|
|
6594 will cause any pending frame size changes to get put on hold
|
|
|
6595 till after the end of the critical section. (1) follows
|
|
|
6596 automatically if (2) is met. #### Unfortunately, there are
|
|
|
6597 some places where Lisp code can be called within this section.
|
|
|
6598 We need to remove them.
|
|
|
6599
|
|
|
6600 If Fsignal() is called during this critical section, we
|
|
|
6601 will abort().
|
|
|
6602
|
|
|
6603 If garbage collection is called during this critical section,
|
|
|
6604 we simply return. #### We should abort instead.
|
|
|
6605
|
|
|
6606 #### If a frame-size change does occur we should probably
|
|
|
6607 actually be preempting redisplay. */
|
|
|
6608
|
|
442
|
6609 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
6610
|
|
|
6611 /* We can now update the gutters, safe in the knowledge that our
|
|
|
6612 efforts won't get undone. */
|
|
|
6613
|
|
|
6614 /* This can call lisp, but redisplay is protected by binding
|
|
|
6615 inhibit_quit. More importantly the code involving display lines
|
|
|
6616 *assumes* that GC will not happen and so does not GCPRO
|
|
|
6617 anything. Since we use this code the whole time with the gutters
|
|
|
6618 we cannot allow GC to happen when manipulating the gutters. */
|
|
|
6619 update_frame_gutters (f);
|
|
|
6620
|
|
428
|
6621 /* Erase the frame before outputting its contents. */
|
|
|
6622 if (f->clear)
|
|
|
6623 {
|
|
442
|
6624 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
6625 }
|
|
|
6626
|
|
|
6627 /* Do the selected window first. */
|
|
|
6628 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
6629
|
|
|
6630 /* Then do the rest. */
|
|
|
6631 redisplay_windows (f->root_window, 1);
|
|
|
6632
|
|
442
|
6633 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
6634
|
|
|
6635 update_frame_title (f);
|
|
|
6636
|
|
|
6637 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
6638 f->window_face_cache_reset = 0;
|
|
|
6639 f->echo_area_garbaged = 0;
|
|
|
6640 f->clear = 0;
|
|
|
6641
|
|
|
6642 if (!f->size_change_pending)
|
|
|
6643 f->size_changed = 0;
|
|
|
6644
|
|
|
6645 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6646
|
|
|
6647 /* Allow frame size changes to occur again.
|
|
|
6648
|
|
|
6649 #### what happens if changes to other frames happen? */
|
|
|
6650 unhold_one_frame_size_changes (f);
|
|
|
6651
|
|
|
6652 map_windows (f, call_redisplay_end_triggers, 0);
|
|
|
6653 return 0;
|
|
|
6654 }
|
|
|
6655
|
|
440
|
6656 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
6657 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
6658 no automatic redisplay, as printers do, then the device is not
|
|
|
6659 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
6660 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
6661 when called from "lazy" redisplay();
|
|
|
6662 */
|
|
428
|
6663
|
|
|
6664 static int
|
|
440
|
6665 redisplay_device (struct device *d, int automatic)
|
|
428
|
6666 {
|
|
|
6667 Lisp_Object frame, frmcons;
|
|
|
6668 int size_change_failed = 0;
|
|
|
6669 struct frame *f;
|
|
|
6670
|
|
545
|
6671 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
6672 return 0;
|
|
|
6673
|
|
428
|
6674 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
6675 return 0;
|
|
|
6676
|
|
|
6677 /* It is possible that redisplay has been called before the
|
|
545
|
6678 device is fully initialized, or that the console implementation
|
|
|
6679 allows frameless devices. If so then continue with the next
|
|
|
6680 device. */
|
|
428
|
6681 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
6682 return 0;
|
|
|
6683
|
|
545
|
6684 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
6685 {
|
|
|
6686 int preempted;
|
|
|
6687 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6688 if (preempted)
|
|
|
6689 return 1;
|
|
|
6690 }
|
|
428
|
6691
|
|
|
6692 /* Always do the selected frame first. */
|
|
|
6693 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
6694
|
|
|
6695 f = XFRAME (frame);
|
|
|
6696
|
|
|
6697 if (f->icon_changed || f->windows_changed)
|
|
|
6698 update_frame_icon (f);
|
|
|
6699
|
|
|
6700 if (FRAME_REPAINT_P (f))
|
|
|
6701 {
|
|
|
6702 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
6703 {
|
|
588
|
6704 int preempted = redisplay_frame (f, 1);
|
|
545
|
6705 if (preempted)
|
|
|
6706 return 1;
|
|
|
6707 }
|
|
428
|
6708
|
|
|
6709 /* If the frame redisplay did not get preempted, then this flag
|
|
|
6710 should have gotten set to 0. It might be possible for that
|
|
|
6711 not to happen if a size change event were to occur at an odd
|
|
|
6712 time. To make sure we don't miss anything we simply don't
|
|
|
6713 reset the top level flags until the condition ends up being
|
|
|
6714 in the right state. */
|
|
|
6715 if (f->size_changed)
|
|
|
6716 size_change_failed = 1;
|
|
|
6717 }
|
|
|
6718
|
|
|
6719 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
6720 {
|
|
|
6721 f = XFRAME (XCAR (frmcons));
|
|
|
6722
|
|
|
6723 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
6724 continue;
|
|
|
6725
|
|
|
6726 if (f->icon_changed || f->windows_changed)
|
|
|
6727 update_frame_icon (f);
|
|
|
6728
|
|
|
6729 if (FRAME_REPAINT_P (f))
|
|
|
6730 {
|
|
430
|
6731 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
6732 {
|
|
588
|
6733 int preempted = redisplay_frame (f, 1);
|
|
545
|
6734 if (preempted)
|
|
|
6735 return 1;
|
|
428
|
6736 }
|
|
|
6737
|
|
|
6738 if (f->size_change_pending)
|
|
|
6739 size_change_failed = 1;
|
|
|
6740 }
|
|
|
6741 }
|
|
|
6742
|
|
|
6743 /* If we get here then we redisplayed all of our frames without
|
|
|
6744 getting preempted so mark ourselves as clean. */
|
|
|
6745 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
6746
|
|
|
6747 if (!size_change_failed)
|
|
|
6748 d->size_changed = 0;
|
|
|
6749
|
|
|
6750 return 0;
|
|
|
6751 }
|
|
|
6752
|
|
|
6753 static Lisp_Object
|
|
|
6754 restore_profiling_redisplay_flag (Lisp_Object val)
|
|
|
6755 {
|
|
|
6756 profiling_redisplay_flag = XINT (val);
|
|
|
6757 return Qnil;
|
|
|
6758 }
|
|
|
6759
|
|
|
6760 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
6761 the current contents of their respective buffers. */
|
|
|
6762
|
|
|
6763 static void
|
|
|
6764 redisplay_without_hooks (void)
|
|
|
6765 {
|
|
|
6766 Lisp_Object devcons, concons;
|
|
|
6767 int size_change_failed = 0;
|
|
|
6768 int count = specpdl_depth ();
|
|
|
6769
|
|
|
6770 if (profiling_active)
|
|
|
6771 {
|
|
|
6772 record_unwind_protect (restore_profiling_redisplay_flag,
|
|
|
6773 make_int (profiling_redisplay_flag));
|
|
|
6774 profiling_redisplay_flag = 1;
|
|
|
6775 }
|
|
|
6776
|
|
|
6777 if (asynch_device_change_pending)
|
|
|
6778 handle_asynch_device_change ();
|
|
|
6779
|
|
|
6780 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
6781 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
6782 goto done;
|
|
|
6783
|
|
|
6784 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
6785 {
|
|
|
6786 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
6787 int preempted;
|
|
|
6788
|
|
430
|
6789 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
6790 {
|
|
440
|
6791 preempted = redisplay_device (d, 1);
|
|
428
|
6792
|
|
|
6793 if (preempted)
|
|
|
6794 {
|
|
|
6795 preemption_count++;
|
|
|
6796 RESET_CHANGED_SET_FLAGS;
|
|
|
6797 goto done;
|
|
|
6798 }
|
|
|
6799
|
|
|
6800 /* See comment in redisplay_device. */
|
|
|
6801 if (d->size_changed)
|
|
|
6802 size_change_failed = 1;
|
|
|
6803 }
|
|
|
6804 }
|
|
|
6805 preemption_count = 0;
|
|
|
6806
|
|
|
6807 /* Mark redisplay as accurate */
|
|
|
6808 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
6809 RESET_CHANGED_SET_FLAGS;
|
|
|
6810
|
|
|
6811 if (faces_changed)
|
|
|
6812 {
|
|
|
6813 mark_all_faces_as_clean ();
|
|
|
6814 faces_changed = 0;
|
|
|
6815 }
|
|
|
6816
|
|
|
6817 if (!size_change_failed)
|
|
|
6818 size_changed = 0;
|
|
|
6819
|
|
|
6820 reset_buffer_changes ();
|
|
|
6821
|
|
|
6822 done:
|
|
771
|
6823 unbind_to (count);
|
|
800
|
6824 #ifdef ERROR_CHECK_DISPLAY
|
|
|
6825 sledgehammer_check_redisplay_structs ();
|
|
|
6826 #endif /* ERROR_CHECK_DISPLAY */
|
|
428
|
6827 }
|
|
|
6828
|
|
|
6829 void
|
|
|
6830 redisplay (void)
|
|
|
6831 {
|
|
|
6832 if (last_display_warning_tick != display_warning_tick &&
|
|
|
6833 !inhibit_warning_display)
|
|
|
6834 {
|
|
|
6835 /* If an error occurs during this function, oh well.
|
|
|
6836 If we report another warning, we could get stuck in an
|
|
|
6837 infinite loop reporting warnings. */
|
|
|
6838 call0_trapping_errors (0, Qdisplay_warning_buffer);
|
|
|
6839 last_display_warning_tick = display_warning_tick;
|
|
|
6840 }
|
|
|
6841 /* The run_hook_trapping_errors functions are smart enough not
|
|
|
6842 to do any evalling if the hook function is empty, so there
|
|
|
6843 should not be any significant time loss. All places in the
|
|
|
6844 C code that call redisplay() are prepared to handle GCing,
|
|
|
6845 so we should be OK. */
|
|
|
6846 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
6847 run_hook_trapping_errors ("Error in pre-redisplay-hook",
|
|
|
6848 Qpre_redisplay_hook);
|
|
|
6849 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6850
|
|
|
6851 redisplay_without_hooks ();
|
|
|
6852
|
|
|
6853 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
6854 run_hook_trapping_errors ("Error in post-redisplay-hook",
|
|
|
6855 Qpost_redisplay_hook);
|
|
|
6856 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6857 }
|
|
|
6858
|
|
|
6859
|
|
|
6860 /* Efficiently determine the window line number, and return a pointer
|
|
|
6861 to its printed representation. Do this regardless of whether
|
|
|
6862 line-number-mode is on. The first line in the buffer is counted as
|
|
|
6863 1. If narrowing is in effect, the lines are counted from the
|
|
|
6864 beginning of the visible portion of the buffer. */
|
|
|
6865 static char *
|
|
|
6866 window_line_number (struct window *w, int type)
|
|
|
6867 {
|
|
|
6868 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
6869 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6870 /* Be careful in the order of these tests. The first clause will
|
|
|
6871 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
6872 This can occur when the frame title is computed really early */
|
|
665
|
6873 Charbpos pos =
|
|
428
|
6874 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
6875 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
6876 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6877 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
6878 ? BUF_PT (b)
|
|
|
6879 : marker_position (w->pointm[type]));
|
|
|
6880 EMACS_INT line;
|
|
|
6881
|
|
|
6882 line = buffer_line_number (b, pos, 1);
|
|
|
6883
|
|
603
|
6884 {
|
|
|
6885 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
6886
|
|
|
6887 long_to_string (window_line_number_buf, line + 1);
|
|
|
6888
|
|
|
6889 return window_line_number_buf;
|
|
|
6890 }
|
|
428
|
6891 }
|
|
|
6892
|
|
|
6893
|
|
|
6894 /* Given a character representing an object in a modeline
|
|
|
6895 specification, return a string (stored into the global array
|
|
665
|
6896 `mode_spec_intbyte_string') with the information that object
|
|
428
|
6897 represents.
|
|
|
6898
|
|
|
6899 This function is largely unchanged from previous versions of the
|
|
|
6900 redisplay engine.
|
|
|
6901
|
|
|
6902 Warning! This code is also used for frame titles and can be called
|
|
|
6903 very early in the device/frame update process! JV
|
|
|
6904 */
|
|
|
6905
|
|
|
6906 static void
|
|
|
6907 decode_mode_spec (struct window *w, Emchar spec, int type)
|
|
|
6908 {
|
|
|
6909 Lisp_Object obj = Qnil;
|
|
442
|
6910 const char *str = NULL;
|
|
428
|
6911 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6912
|
|
665
|
6913 Dynarr_reset (mode_spec_intbyte_string);
|
|
428
|
6914
|
|
|
6915 switch (spec)
|
|
|
6916 {
|
|
|
6917 /* print buffer name */
|
|
|
6918 case 'b':
|
|
|
6919 obj = b->name;
|
|
|
6920 break;
|
|
|
6921
|
|
|
6922 /* print visited file name */
|
|
|
6923 case 'f':
|
|
|
6924 obj = b->filename;
|
|
|
6925 break;
|
|
|
6926
|
|
|
6927 /* print the current column */
|
|
|
6928 case 'c':
|
|
|
6929 {
|
|
665
|
6930 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
6931 ? BUF_PT (b)
|
|
|
6932 : marker_position (w->pointm[type]);
|
|
|
6933 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
6934 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
6935
|
|
|
6936 long_to_string (buf, col);
|
|
|
6937
|
|
665
|
6938 Dynarr_add_many (mode_spec_intbyte_string,
|
|
|
6939 (const Intbyte *) buf, strlen (buf));
|
|
428
|
6940
|
|
|
6941 goto decode_mode_spec_done;
|
|
|
6942 }
|
|
|
6943 /* print the file coding system */
|
|
|
6944 case 'C':
|
|
|
6945 {
|
|
|
6946 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
6947 /* Be very careful here not to get an error. */
|
|
|
6948 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
6949 {
|
|
771
|
6950 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
6951 if (CODING_SYSTEMP (codesys))
|
|
|
6952 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
6953 }
|
|
|
6954 }
|
|
|
6955 break;
|
|
|
6956
|
|
|
6957 /* print the current line number */
|
|
|
6958 case 'l':
|
|
|
6959 str = window_line_number (w, type);
|
|
|
6960 break;
|
|
|
6961
|
|
|
6962 /* print value of mode-name (obsolete) */
|
|
|
6963 case 'm':
|
|
|
6964 obj = b->mode_name;
|
|
|
6965 break;
|
|
|
6966
|
|
|
6967 /* print hyphen and frame number, if != 1 */
|
|
|
6968 case 'N':
|
|
|
6969 #ifdef HAVE_TTY
|
|
|
6970 {
|
|
|
6971 struct frame *f = XFRAME (w->frame);
|
|
|
6972 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
6973 {
|
|
|
6974 /* Naughty, naughty */
|
|
|
6975 char * writable_str = alloca_array (char, 10);
|
|
|
6976 sprintf (writable_str, "-%d", f->order_count);
|
|
|
6977 str = writable_str;
|
|
|
6978 }
|
|
|
6979 }
|
|
|
6980 #endif /* HAVE_TTY */
|
|
|
6981 break;
|
|
|
6982
|
|
|
6983 /* print Narrow if appropriate */
|
|
|
6984 case 'n':
|
|
|
6985 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
6986 || BUF_ZV (b) < BUF_Z (b))
|
|
|
6987 str = " Narrow";
|
|
|
6988 break;
|
|
|
6989
|
|
|
6990 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
6991 case '*':
|
|
|
6992 str = (!NILP (b->read_only)
|
|
|
6993 ? "%"
|
|
|
6994 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
6995 ? "*"
|
|
|
6996 : "-"));
|
|
|
6997 break;
|
|
|
6998
|
|
|
6999 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
7000 read-only but still indicate whether it is modified. */
|
|
|
7001 case '+':
|
|
|
7002 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7003 ? "*"
|
|
|
7004 : (!NILP (b->read_only)
|
|
|
7005 ? "%"
|
|
|
7006 : "-"));
|
|
|
7007 break;
|
|
|
7008
|
|
|
7009 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
7010 modeline-format doc string. */
|
|
|
7011 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
7012 case '&':
|
|
|
7013 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7014 ? "*"
|
|
|
7015 : "-");
|
|
|
7016 break;
|
|
|
7017
|
|
|
7018 /* print process status */
|
|
|
7019 case 's':
|
|
|
7020 obj = Fget_buffer_process (w->buffer);
|
|
|
7021 if (NILP (obj))
|
|
|
7022 str = GETTEXT ("no process");
|
|
|
7023 else
|
|
|
7024 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7025 break;
|
|
|
7026
|
|
|
7027 /* Print name of selected frame. */
|
|
|
7028 case 'S':
|
|
|
7029 obj = XFRAME (w->frame)->name;
|
|
|
7030 break;
|
|
|
7031
|
|
|
7032 /* indicate TEXT or BINARY */
|
|
|
7033 case 't':
|
|
|
7034 /* #### NT does not use this any more. Now what? */
|
|
|
7035 str = "T";
|
|
|
7036 break;
|
|
|
7037
|
|
|
7038 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7039 case 'p':
|
|
|
7040 {
|
|
665
|
7041 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7042
|
|
|
7043 /* This had better be while the desired lines are being done. */
|
|
|
7044 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7045 {
|
|
|
7046 if (pos <= BUF_BEGV (b))
|
|
|
7047 str = "All";
|
|
|
7048 else
|
|
|
7049 str = "Bottom";
|
|
|
7050 }
|
|
|
7051 else if (pos <= BUF_BEGV (b))
|
|
|
7052 str = "Top";
|
|
|
7053 else
|
|
|
7054 {
|
|
|
7055 /* This hard limit is ok since the string it will hold has a
|
|
|
7056 fixed maximum length of 3. But just to be safe... */
|
|
|
7057 char buf[10];
|
|
|
7058 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7059 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7060
|
|
|
7061 /* Avoid overflow on big buffers */
|
|
|
7062 int percent = total > LONG_MAX/200 ?
|
|
|
7063 (chars + total/200) / (total / 100) :
|
|
|
7064 (chars * 100 + total/2) / total;
|
|
|
7065
|
|
|
7066 /* We can't normally display a 3-digit number, so get us a
|
|
|
7067 2-digit number that is close. */
|
|
|
7068 if (percent == 100)
|
|
|
7069 percent = 99;
|
|
|
7070
|
|
|
7071 sprintf (buf, "%d%%", percent);
|
|
665
|
7072 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
|
|
428
|
7073 strlen (buf));
|
|
|
7074
|
|
|
7075 goto decode_mode_spec_done;
|
|
|
7076 }
|
|
|
7077 break;
|
|
|
7078 }
|
|
|
7079
|
|
|
7080 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7081 Top, or print Bottom or All */
|
|
|
7082 case 'P':
|
|
|
7083 {
|
|
665
|
7084 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7085 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7086
|
|
|
7087 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7088 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7089 botpos may be negative. */
|
|
|
7090 if (botpos < toppos)
|
|
|
7091 botpos = toppos;
|
|
|
7092
|
|
|
7093 if (botpos >= BUF_ZV (b))
|
|
|
7094 {
|
|
|
7095 if (toppos <= BUF_BEGV (b))
|
|
|
7096 str = "All";
|
|
|
7097 else
|
|
|
7098 str = "Bottom";
|
|
|
7099 }
|
|
|
7100 else
|
|
|
7101 {
|
|
|
7102 /* This hard limit is ok since the string it will hold has a
|
|
|
7103 fixed maximum length of around 6. But just to be safe... */
|
|
|
7104 char buf[10];
|
|
|
7105 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7106 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7107
|
|
|
7108 /* Avoid overflow on big buffers */
|
|
|
7109 int percent = total > LONG_MAX/200 ?
|
|
|
7110 (chars + total/200) / (total / 100) :
|
|
|
7111 (chars * 100 + total/2) / max (total, 1);
|
|
|
7112
|
|
|
7113 /* We can't normally display a 3-digit number, so get us a
|
|
|
7114 2-digit number that is close. */
|
|
|
7115 if (percent == 100)
|
|
|
7116 percent = 99;
|
|
|
7117
|
|
|
7118 if (toppos <= BUF_BEGV (b))
|
|
|
7119 sprintf (buf, "Top%d%%", percent);
|
|
|
7120 else
|
|
|
7121 sprintf (buf, "%d%%", percent);
|
|
|
7122
|
|
665
|
7123 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
|
|
428
|
7124 strlen (buf));
|
|
|
7125
|
|
|
7126 goto decode_mode_spec_done;
|
|
|
7127 }
|
|
|
7128 break;
|
|
|
7129 }
|
|
|
7130
|
|
|
7131 /* print % */
|
|
|
7132 case '%':
|
|
|
7133 str = "%";
|
|
|
7134 break;
|
|
|
7135
|
|
|
7136 /* print one [ for each recursive editing level. */
|
|
|
7137 case '[':
|
|
|
7138 {
|
|
|
7139 int i;
|
|
|
7140
|
|
|
7141 if (command_loop_level > 5)
|
|
|
7142 {
|
|
|
7143 str = "[[[... ";
|
|
|
7144 break;
|
|
|
7145 }
|
|
|
7146
|
|
|
7147 for (i = 0; i < command_loop_level; i++)
|
|
665
|
7148 Dynarr_add (mode_spec_intbyte_string, '[');
|
|
428
|
7149
|
|
|
7150 goto decode_mode_spec_done;
|
|
|
7151 }
|
|
|
7152
|
|
|
7153 /* print one ] for each recursive editing level. */
|
|
|
7154 case ']':
|
|
|
7155 {
|
|
|
7156 int i;
|
|
|
7157
|
|
|
7158 if (command_loop_level > 5)
|
|
|
7159 {
|
|
|
7160 str = "...]]]";
|
|
|
7161 break;
|
|
|
7162 }
|
|
|
7163
|
|
|
7164 for (i = 0; i < command_loop_level; i++)
|
|
665
|
7165 Dynarr_add (mode_spec_intbyte_string, ']');
|
|
428
|
7166
|
|
|
7167 goto decode_mode_spec_done;
|
|
|
7168 }
|
|
|
7169
|
|
|
7170 /* print infinitely many dashes -- handle at top level now */
|
|
|
7171 case '-':
|
|
|
7172 break;
|
|
|
7173
|
|
|
7174 }
|
|
|
7175
|
|
|
7176 if (STRINGP (obj))
|
|
665
|
7177 Dynarr_add_many (mode_spec_intbyte_string,
|
|
428
|
7178 XSTRING_DATA (obj),
|
|
|
7179 XSTRING_LENGTH (obj));
|
|
|
7180 else if (str)
|
|
665
|
7181 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) str, strlen (str));
|
|
428
|
7182
|
|
|
7183 decode_mode_spec_done:
|
|
665
|
7184 Dynarr_add (mode_spec_intbyte_string, '\0');
|
|
428
|
7185 }
|
|
|
7186
|
|
|
7187 /* Given a display line, free all of its data structures. */
|
|
|
7188
|
|
|
7189 static void
|
|
|
7190 free_display_line (struct display_line *dl)
|
|
|
7191 {
|
|
|
7192 int block;
|
|
|
7193
|
|
|
7194 if (dl->display_blocks)
|
|
|
7195 {
|
|
|
7196 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
|
7197 {
|
|
|
7198 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7199
|
|
|
7200 Dynarr_free (db->runes);
|
|
|
7201 }
|
|
|
7202
|
|
|
7203 Dynarr_free (dl->display_blocks);
|
|
|
7204 dl->display_blocks = NULL;
|
|
|
7205 }
|
|
|
7206
|
|
|
7207 if (dl->left_glyphs)
|
|
|
7208 {
|
|
|
7209 Dynarr_free (dl->left_glyphs);
|
|
|
7210 dl->left_glyphs = NULL;
|
|
|
7211 }
|
|
|
7212
|
|
|
7213 if (dl->right_glyphs)
|
|
|
7214 {
|
|
|
7215 Dynarr_free (dl->right_glyphs);
|
|
|
7216 dl->right_glyphs = NULL;
|
|
|
7217 }
|
|
|
7218 }
|
|
|
7219
|
|
|
7220
|
|
|
7221 /* Given an array of display lines, free them and all data structures
|
|
|
7222 contained within them. */
|
|
|
7223
|
|
|
7224 void
|
|
|
7225 free_display_lines (display_line_dynarr *dla)
|
|
|
7226 {
|
|
|
7227 int line;
|
|
|
7228
|
|
|
7229 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7230 {
|
|
|
7231 free_display_line (Dynarr_atp (dla, line));
|
|
|
7232 }
|
|
|
7233
|
|
|
7234 Dynarr_free (dla);
|
|
|
7235 }
|
|
|
7236
|
|
|
7237 /* Call internal free routine for each set of display lines. */
|
|
|
7238
|
|
|
7239 void
|
|
|
7240 free_display_structs (struct window_mirror *mir)
|
|
|
7241 {
|
|
|
7242 if (mir->current_display_lines)
|
|
|
7243 {
|
|
|
7244 free_display_lines (mir->current_display_lines);
|
|
|
7245 mir->current_display_lines = 0;
|
|
|
7246 }
|
|
|
7247
|
|
|
7248 if (mir->desired_display_lines)
|
|
|
7249 {
|
|
|
7250 free_display_lines (mir->desired_display_lines);
|
|
|
7251 mir->desired_display_lines = 0;
|
|
|
7252 }
|
|
|
7253 }
|
|
|
7254
|
|
|
7255
|
|
|
7256 static void
|
|
|
7257 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7258 {
|
|
|
7259 if (gba)
|
|
|
7260 {
|
|
|
7261 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7262 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7263
|
|
|
7264 for (; gb < gb_last; gb++)
|
|
|
7265 {
|
|
|
7266 if (!NILP (gb->glyph))
|
|
|
7267 mark_object (gb->glyph);
|
|
|
7268 if (!NILP (gb->extent))
|
|
|
7269 mark_object (gb->extent);
|
|
|
7270 }
|
|
|
7271 }
|
|
|
7272 }
|
|
|
7273
|
|
442
|
7274 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7275 the glyph will also mark the image_instance. */
|
|
|
7276 void
|
|
428
|
7277 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7278 {
|
|
|
7279 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7280 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7281
|
|
|
7282 for (; dl < dl_last; dl++)
|
|
|
7283 {
|
|
|
7284 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7285 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7286 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7287
|
|
|
7288 for (; db < db_last; db++)
|
|
|
7289 {
|
|
|
7290 rune_dynarr *ra = db->runes;
|
|
|
7291 rune *r = Dynarr_atp (ra, 0);
|
|
|
7292 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7293
|
|
|
7294 for (; r < r_last; r++)
|
|
|
7295 {
|
|
|
7296 if (r->type == RUNE_DGLYPH)
|
|
|
7297 {
|
|
|
7298 if (!NILP (r->object.dglyph.glyph))
|
|
|
7299 mark_object (r->object.dglyph.glyph);
|
|
|
7300 if (!NILP (r->object.dglyph.extent))
|
|
|
7301 mark_object (r->object.dglyph.extent);
|
|
|
7302 }
|
|
|
7303 }
|
|
|
7304 }
|
|
|
7305
|
|
|
7306 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7307 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7308 }
|
|
|
7309 }
|
|
|
7310
|
|
|
7311
|
|
|
7312 /*****************************************************************************
|
|
|
7313 Line Start Cache Description and Rationale
|
|
|
7314
|
|
|
7315 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
7316 It depends on the key assumption that the number of lines that can be
|
|
|
7317 displayed at any given time is fixed. This led to a complete separation
|
|
|
7318 of the scrolling code from the redisplay code. In order to fully support
|
|
|
7319 variable height lines, the scrolling code must actually be tightly
|
|
|
7320 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
7321 will be displayed on a screen for any given starting point.
|
|
|
7322
|
|
|
7323 What is ideally wanted is a complete list of the starting buffer position
|
|
|
7324 for every possible display line of a buffer along with the height of that
|
|
|
7325 display line. Maintaining such a full list would be very expensive. We
|
|
|
7326 settle for having it include information for all areas which we happen to
|
|
|
7327 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
7328 areas we need to work with.
|
|
|
7329
|
|
|
7330 In order to ensure that the cache accurately represents what redisplay
|
|
|
7331 would actually show, it is necessary to invalidate it in many situations.
|
|
|
7332 If the buffer changes, the starting positions may no longer be correct.
|
|
|
7333 If a face or an extent has changed then the line heights may have altered.
|
|
|
7334 These events happen frequently enough that the cache can end up being
|
|
|
7335 constantly disabled. With this potentially constant invalidation when is
|
|
|
7336 the cache ever useful?
|
|
|
7337
|
|
|
7338 Even if the cache is invalidated before every single usage, it is
|
|
|
7339 necessary. Scrolling often requires knowledge about display lines which
|
|
|
7340 are actually above or below the visible region. The cache provides a
|
|
|
7341 convenient light-weight method of storing this information for multiple
|
|
|
7342 display regions. This knowledge is necessary for the scrolling code to
|
|
|
7343 always obey the First Golden Rule of Redisplay.
|
|
|
7344
|
|
|
7345 If the cache already contains all of the information that the scrolling
|
|
|
7346 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
7347 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
7348 do to help out the cache is to always add the displayed region. This
|
|
|
7349 region had to be generated anyway, so the cache ends up getting the
|
|
|
7350 information basically for free. In those cases where a user is simply
|
|
|
7351 scrolling around viewing a buffer there is a high probability that this is
|
|
|
7352 sufficient to always provide the needed information. The second thing we
|
|
|
7353 can do is be smart about invalidating the cache.
|
|
|
7354
|
|
|
7355 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
7356
|
|
|
7357 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
7358 starting positions of any display lines. These types of buffer
|
|
|
7359 modifications should not invalidate the cache. This is actually a large
|
|
|
7360 optimization for redisplay speed as well.
|
|
|
7361
|
|
|
7362 + Buffer modifications frequently only affect the display of lines at and
|
|
|
7363 below where they occur. In these situations we should only invalidate
|
|
|
7364 the part of the cache starting at where the modification occurs.
|
|
|
7365
|
|
|
7366 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
7367 applicable.
|
|
|
7368 ****************************************************************************/
|
|
|
7369
|
|
|
7370 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7371 allocating and freeing it. */
|
|
|
7372 static line_start_cache_dynarr *internal_cache;
|
|
|
7373
|
|
|
7374 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7375 the TYPE display structs. */
|
|
|
7376
|
|
|
7377 static void
|
|
|
7378 update_internal_cache_list (struct window *w, int type)
|
|
|
7379 {
|
|
|
7380 int line;
|
|
|
7381 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7382
|
|
|
7383 Dynarr_reset (internal_cache);
|
|
|
7384 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7385 {
|
|
|
7386 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7387
|
|
|
7388 if (dl->modeline)
|
|
|
7389 continue;
|
|
|
7390 else
|
|
|
7391 {
|
|
|
7392 struct line_start_cache lsc;
|
|
434
|
7393
|
|
826
|
7394 lsc.start = dl->charpos;
|
|
|
7395 lsc.end = dl->end_charpos;
|
|
428
|
7396 lsc.height = dl->ascent + dl->descent;
|
|
|
7397
|
|
|
7398 Dynarr_add (internal_cache, lsc);
|
|
|
7399 }
|
|
|
7400 }
|
|
|
7401 }
|
|
|
7402
|
|
|
7403 /* Reset the line cache if necessary. This should be run at the
|
|
|
7404 beginning of any function which access the cache. */
|
|
|
7405
|
|
|
7406 static void
|
|
|
7407 validate_line_start_cache (struct window *w)
|
|
|
7408 {
|
|
|
7409 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7410 struct frame *f = XFRAME (w->frame);
|
|
|
7411
|
|
|
7412 if (!w->line_cache_validation_override)
|
|
|
7413 {
|
|
|
7414 /* f->extents_changed used to be in here because extent face and
|
|
|
7415 size changes can cause text shifting. However, the extent
|
|
|
7416 covering the region is constantly having its face set and
|
|
|
7417 priority altered by the mouse code. This means that the line
|
|
|
7418 start cache is constantly being invalidated. This is bad
|
|
|
7419 since the mouse code also triggers heavy usage of the cache.
|
|
|
7420 Since it is an unlikely that f->extents being changed
|
|
|
7421 indicates that the cache really needs to be updated and if it
|
|
|
7422 does redisplay will catch it pretty quickly we no longer
|
|
|
7423 invalidate the cache if it is set. This greatly speeds up
|
|
|
7424 dragging out regions with the mouse. */
|
|
|
7425 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7426 || f->faces_changed
|
|
|
7427 || f->clip_changed)
|
|
|
7428 {
|
|
|
7429 Dynarr_reset (w->line_start_cache);
|
|
|
7430 }
|
|
|
7431 }
|
|
|
7432 }
|
|
|
7433
|
|
|
7434 /* Return the very first buffer position contained in the given
|
|
|
7435 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7436 cache is valid. */
|
|
|
7437
|
|
665
|
7438 static Charbpos
|
|
428
|
7439 line_start_cache_start (struct window *w)
|
|
|
7440 {
|
|
|
7441 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7442
|
|
|
7443 if (!Dynarr_length (cache))
|
|
|
7444 return -1;
|
|
|
7445 else
|
|
|
7446 return Dynarr_atp (cache, 0)->start;
|
|
|
7447 }
|
|
|
7448
|
|
|
7449 /* Return the very last buffer position contained in the given
|
|
|
7450 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7451 cache is valid. */
|
|
|
7452
|
|
665
|
7453 static Charbpos
|
|
428
|
7454 line_start_cache_end (struct window *w)
|
|
|
7455 {
|
|
|
7456 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7457
|
|
|
7458 if (!Dynarr_length (cache))
|
|
|
7459 return -1;
|
|
|
7460 else
|
|
|
7461 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7462 }
|
|
|
7463
|
|
|
7464 /* Return the index of the line POINT is contained within in window
|
|
|
7465 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7466 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7467 a guarantee of the number of entries in the cache present on either
|
|
|
7468 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7469 then it will be treated as 0, but the cache window will not be
|
|
|
7470 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7471 for any reason. */
|
|
|
7472
|
|
|
7473 int
|
|
665
|
7474 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7475 {
|
|
|
7476 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7477 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7478 int top, bottom, pos;
|
|
428
|
7479
|
|
|
7480 validate_line_start_cache (w);
|
|
|
7481 w->line_cache_validation_override++;
|
|
|
7482
|
|
|
7483 /* Let functions pass in negative values, but we still treat -1
|
|
|
7484 specially. */
|
|
|
7485 /* #### bogosity alert */
|
|
|
7486 if (min_past < 0 && min_past != -1)
|
|
|
7487 min_past = -min_past;
|
|
|
7488
|
|
|
7489 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7490 || line_start_cache_end (w) < point)
|
|
|
7491 {
|
|
|
7492 int loop;
|
|
|
7493 int win_char_height = window_char_height (w, 1);
|
|
|
7494
|
|
|
7495 /* Occasionally we get here with a 0 height
|
|
|
7496 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7497 count of 0 so handle that case. */
|
|
|
7498 if (!win_char_height)
|
|
|
7499 win_char_height = 1;
|
|
|
7500
|
|
|
7501 if (!Dynarr_length (cache))
|
|
|
7502 {
|
|
665
|
7503 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7504 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7505
|
|
|
7506 update_line_start_cache (w, from, to, point, 0);
|
|
|
7507
|
|
|
7508 if (!Dynarr_length (cache))
|
|
|
7509 {
|
|
|
7510 w->line_cache_validation_override--;
|
|
|
7511 return -1;
|
|
|
7512 }
|
|
|
7513 }
|
|
|
7514
|
|
|
7515 assert (Dynarr_length (cache));
|
|
|
7516
|
|
|
7517 loop = 0;
|
|
|
7518 while (line_start_cache_start (w) > point
|
|
|
7519 && (loop < cache_adjustment || min_past == -1))
|
|
|
7520 {
|
|
665
|
7521 Charbpos from, to;
|
|
428
|
7522
|
|
|
7523 from = line_start_cache_start (w);
|
|
|
7524 if (from <= BUF_BEGV (b))
|
|
|
7525 break;
|
|
|
7526
|
|
|
7527 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7528 to = line_start_cache_end (w);
|
|
|
7529
|
|
|
7530 update_line_start_cache (w, from, to, point, 0);
|
|
|
7531 loop++;
|
|
|
7532 }
|
|
|
7533
|
|
|
7534 if (line_start_cache_start (w) > point)
|
|
|
7535 {
|
|
665
|
7536 Charbpos from, to;
|
|
428
|
7537
|
|
|
7538 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7539 if (from >= BUF_ZV (b))
|
|
|
7540 {
|
|
|
7541 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7542 from = to;
|
|
|
7543 to = BUF_ZV (b);
|
|
|
7544 }
|
|
|
7545 else
|
|
|
7546 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7547
|
|
|
7548 update_line_start_cache (w, from, to, point, 0);
|
|
|
7549 }
|
|
|
7550
|
|
|
7551 loop = 0;
|
|
|
7552 while (line_start_cache_end (w) < point
|
|
|
7553 && (loop < cache_adjustment || min_past == -1))
|
|
|
7554 {
|
|
665
|
7555 Charbpos from, to;
|
|
428
|
7556
|
|
|
7557 to = line_start_cache_end (w);
|
|
|
7558 if (to >= BUF_ZV (b))
|
|
|
7559 break;
|
|
|
7560
|
|
|
7561 from = line_start_cache_end (w);
|
|
|
7562 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7563
|
|
|
7564 update_line_start_cache (w, from, to, point, 0);
|
|
|
7565 loop++;
|
|
|
7566 }
|
|
|
7567
|
|
|
7568 if (line_start_cache_end (w) < point)
|
|
|
7569 {
|
|
665
|
7570 Charbpos from, to;
|
|
428
|
7571
|
|
|
7572 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7573 if (from >= BUF_ZV (b))
|
|
|
7574 {
|
|
|
7575 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7576 from = to;
|
|
|
7577 to = BUF_ZV (b);
|
|
|
7578 }
|
|
|
7579 else
|
|
|
7580 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7581
|
|
|
7582 update_line_start_cache (w, from, to, point, 0);
|
|
|
7583 }
|
|
|
7584 }
|
|
|
7585
|
|
|
7586 assert (Dynarr_length (cache));
|
|
|
7587
|
|
|
7588 if (min_past == -1)
|
|
|
7589 min_past = 0;
|
|
|
7590
|
|
|
7591 /* This could happen if the buffer is narrowed. */
|
|
|
7592 if (line_start_cache_start (w) > point
|
|
|
7593 || line_start_cache_end (w) < point)
|
|
|
7594 {
|
|
|
7595 w->line_cache_validation_override--;
|
|
|
7596 return -1;
|
|
|
7597 }
|
|
|
7598
|
|
|
7599 find_point_loop:
|
|
|
7600
|
|
|
7601 top = Dynarr_length (cache) - 1;
|
|
|
7602 bottom = 0;
|
|
|
7603
|
|
|
7604 while (1)
|
|
|
7605 {
|
|
647
|
7606 int new_pos;
|
|
665
|
7607 Charbpos start, end;
|
|
428
|
7608
|
|
|
7609 pos = (bottom + top + 1) >> 1;
|
|
|
7610 start = Dynarr_atp (cache, pos)->start;
|
|
|
7611 end = Dynarr_atp (cache, pos)->end;
|
|
|
7612
|
|
|
7613 if (point >= start && point <= end)
|
|
|
7614 {
|
|
|
7615 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
7616 {
|
|
665
|
7617 Charbpos from =
|
|
428
|
7618 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
7619 -min_past - 1);
|
|
665
|
7620 Charbpos to = line_start_cache_end (w);
|
|
428
|
7621
|
|
|
7622 update_line_start_cache (w, from, to, point, 0);
|
|
|
7623 goto find_point_loop;
|
|
|
7624 }
|
|
|
7625 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
7626 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
7627 {
|
|
665
|
7628 Charbpos from = line_start_cache_end (w);
|
|
|
7629 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7630 (min_past
|
|
|
7631 ? min_past
|
|
|
7632 : 1));
|
|
|
7633
|
|
|
7634 update_line_start_cache (w, from, to, point, 0);
|
|
|
7635 goto find_point_loop;
|
|
|
7636 }
|
|
|
7637 else
|
|
|
7638 {
|
|
|
7639 w->line_cache_validation_override--;
|
|
|
7640 return pos;
|
|
|
7641 }
|
|
|
7642 }
|
|
|
7643 else if (point > end)
|
|
|
7644 bottom = pos + 1;
|
|
|
7645 else if (point < start)
|
|
|
7646 top = pos - 1;
|
|
|
7647 else
|
|
|
7648 abort ();
|
|
|
7649
|
|
|
7650 new_pos = (bottom + top + 1) >> 1;
|
|
|
7651 if (pos == new_pos)
|
|
|
7652 {
|
|
|
7653 w->line_cache_validation_override--;
|
|
|
7654 return -1;
|
|
|
7655 }
|
|
|
7656 }
|
|
|
7657 }
|
|
|
7658
|
|
|
7659 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
7660 if display of the window was to begin at STARTP. */
|
|
|
7661
|
|
|
7662 int
|
|
665
|
7663 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
|
|
428
|
7664 {
|
|
|
7665 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
7666 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
7667 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
7668 int start_elt;
|
|
|
7669
|
|
|
7670 /* If point is before the intended start it obviously can't be visible. */
|
|
|
7671 if (point < startp)
|
|
|
7672 return 0;
|
|
|
7673
|
|
|
7674 /* If point or start are not in the accessible buffer range, then
|
|
|
7675 fail. */
|
|
|
7676 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
7677 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
7678 return 0;
|
|
|
7679
|
|
|
7680 validate_line_start_cache (w);
|
|
|
7681 w->line_cache_validation_override++;
|
|
|
7682
|
|
|
7683 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
7684 if (start_elt == -1)
|
|
|
7685 {
|
|
|
7686 w->line_cache_validation_override--;
|
|
|
7687 return 0;
|
|
|
7688 }
|
|
|
7689
|
|
|
7690 assert (line_start_cache_start (w) <= startp
|
|
|
7691 && line_start_cache_end (w) >= startp);
|
|
|
7692
|
|
|
7693 while (1)
|
|
|
7694 {
|
|
|
7695 int height;
|
|
|
7696
|
|
|
7697 /* Expand the cache if necessary. */
|
|
|
7698 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7699 {
|
|
665
|
7700 Charbpos old_startp =
|
|
428
|
7701 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
7702
|
|
|
7703 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
7704 window_char_height (w, 0));
|
|
|
7705
|
|
|
7706 /* We've already actually processed old_startp, so increment
|
|
|
7707 immediately. */
|
|
|
7708 start_elt++;
|
|
|
7709
|
|
|
7710 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
7711 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7712 {
|
|
|
7713 w->line_cache_validation_override--;
|
|
|
7714 return 0;
|
|
|
7715 }
|
|
|
7716 }
|
|
|
7717
|
|
|
7718 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
7719
|
|
|
7720 if (pixpos + height > bottom)
|
|
|
7721 {
|
|
|
7722 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7723 {
|
|
|
7724 w->line_cache_validation_override--;
|
|
|
7725 return 0;
|
|
|
7726 }
|
|
|
7727 }
|
|
|
7728
|
|
|
7729 pixpos += height;
|
|
|
7730 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
7731 {
|
|
|
7732 w->line_cache_validation_override--;
|
|
|
7733 return 1;
|
|
|
7734 }
|
|
|
7735
|
|
|
7736 start_elt++;
|
|
|
7737 }
|
|
|
7738 }
|
|
|
7739
|
|
|
7740 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7741 the buffer position at the beginning or end of the last line
|
|
|
7742 displayed. The end of the last line is also know as the window end
|
|
|
7743 position.
|
|
|
7744
|
|
442
|
7745 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
7746 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
7747 does occur in the following situation: A mouse event has come in and we
|
|
|
7748 need to compute its location in a window. That code (in
|
|
|
7749 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
7750
|
|
428
|
7751 #### With a little work this could probably be reworked as just a
|
|
|
7752 call to start_with_line_at_pixpos. */
|
|
|
7753
|
|
665
|
7754 static Charbpos
|
|
|
7755 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
7756 int may_error)
|
|
428
|
7757 {
|
|
|
7758 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7759 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7760 int pixpos = 0;
|
|
|
7761 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
7762 Charbpos cur_start;
|
|
428
|
7763 int start_elt;
|
|
|
7764
|
|
|
7765 validate_line_start_cache (w);
|
|
|
7766 w->line_cache_validation_override++;
|
|
|
7767
|
|
|
7768 if (startp < BUF_BEGV (b))
|
|
|
7769 startp = BUF_BEGV (b);
|
|
|
7770 else if (startp > BUF_ZV (b))
|
|
|
7771 startp = BUF_ZV (b);
|
|
|
7772 cur_start = startp;
|
|
|
7773
|
|
|
7774 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
7775 if (start_elt == -1)
|
|
442
|
7776 return may_error ? 0 : startp;
|
|
428
|
7777
|
|
|
7778 while (1)
|
|
|
7779 {
|
|
|
7780 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
7781
|
|
|
7782 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
7783
|
|
|
7784 if (pixpos + height > bottom)
|
|
|
7785 {
|
|
|
7786 /* Adjust for any possible clip. */
|
|
|
7787 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7788 start_elt--;
|
|
|
7789
|
|
|
7790 if (start_elt < 0)
|
|
|
7791 {
|
|
|
7792 w->line_cache_validation_override--;
|
|
|
7793 if (end)
|
|
|
7794 return BUF_ZV (b);
|
|
|
7795 else
|
|
|
7796 return BUF_BEGV (b);
|
|
|
7797 }
|
|
|
7798 else
|
|
|
7799 {
|
|
|
7800 w->line_cache_validation_override--;
|
|
|
7801 if (end)
|
|
|
7802 return Dynarr_atp (cache, start_elt)->end;
|
|
|
7803 else
|
|
|
7804 return Dynarr_atp (cache, start_elt)->start;
|
|
|
7805 }
|
|
|
7806 }
|
|
|
7807
|
|
|
7808 pixpos += height;
|
|
|
7809 start_elt++;
|
|
|
7810 if (start_elt == Dynarr_length (cache))
|
|
|
7811 {
|
|
665
|
7812 Charbpos from = line_start_cache_end (w);
|
|
428
|
7813 int win_char_height = window_char_height (w, 0);
|
|
665
|
7814 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7815 (win_char_height
|
|
|
7816 ? win_char_height
|
|
|
7817 : 1));
|
|
|
7818
|
|
|
7819 /* We've hit the end of the bottom so that's what it is. */
|
|
|
7820 if (from >= BUF_ZV (b))
|
|
|
7821 {
|
|
|
7822 w->line_cache_validation_override--;
|
|
|
7823 return BUF_ZV (b);
|
|
|
7824 }
|
|
|
7825
|
|
|
7826 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
7827
|
|
|
7828 /* Updating the cache invalidates any current indexes. */
|
|
|
7829 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
7830 }
|
|
|
7831 }
|
|
|
7832 }
|
|
|
7833
|
|
|
7834 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7835 the buffer position at the beginning of the last line displayed. */
|
|
|
7836
|
|
665
|
7837 Charbpos
|
|
|
7838 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7839 {
|
|
442
|
7840 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
7841 }
|
|
|
7842
|
|
|
7843 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7844 the buffer position at the end of the last line displayed. This is
|
|
|
7845 also know as the window end position. */
|
|
|
7846
|
|
665
|
7847 Charbpos
|
|
|
7848 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7849 {
|
|
442
|
7850 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
7851 }
|
|
|
7852
|
|
665
|
7853 static Charbpos
|
|
|
7854 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
7855 {
|
|
|
7856 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
7857 }
|
|
|
7858
|
|
|
7859
|
|
428
|
7860 /* For window W, what does the starting position have to be so that
|
|
|
7861 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
7862
|
|
665
|
7863 Charbpos
|
|
|
7864 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
7865 {
|
|
|
7866 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7867 int cur_elt;
|
|
665
|
7868 Charbpos cur_pos, prev_pos = point;
|
|
428
|
7869 int point_line_height;
|
|
|
7870 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
7871
|
|
|
7872 validate_line_start_cache (w);
|
|
|
7873 w->line_cache_validation_override++;
|
|
|
7874
|
|
|
7875 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
7876 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
7877 if (cur_elt < 0)
|
|
|
7878 {
|
|
|
7879 w->line_cache_validation_override--;
|
|
|
7880 return point;
|
|
|
7881 }
|
|
|
7882
|
|
|
7883 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7884
|
|
|
7885 while (1)
|
|
|
7886 {
|
|
|
7887 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7888
|
|
|
7889 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7890
|
|
|
7891 /* Do not take into account the value of vertical_clip here.
|
|
|
7892 That is the responsibility of the calling functions. */
|
|
|
7893 if (pixheight < 0)
|
|
|
7894 {
|
|
|
7895 w->line_cache_validation_override--;
|
|
|
7896 if (-pixheight > point_line_height)
|
|
|
7897 /* We can't make the target line cover pixpos, so put it
|
|
|
7898 above pixpos. That way it will at least be visible. */
|
|
|
7899 return prev_pos;
|
|
|
7900 else
|
|
|
7901 return cur_pos;
|
|
|
7902 }
|
|
|
7903
|
|
|
7904 cur_elt--;
|
|
|
7905 while (cur_elt < 0)
|
|
|
7906 {
|
|
665
|
7907 Charbpos from, to;
|
|
428
|
7908 int win_char_height;
|
|
|
7909
|
|
|
7910 if (cur_pos <= BUF_BEGV (b))
|
|
|
7911 {
|
|
|
7912 w->line_cache_validation_override--;
|
|
|
7913 return BUF_BEGV (b);
|
|
|
7914 }
|
|
|
7915
|
|
|
7916 win_char_height = window_char_height (w, 0);
|
|
|
7917 if (!win_char_height)
|
|
|
7918 win_char_height = 1;
|
|
|
7919
|
|
|
7920 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
7921 to = line_start_cache_end (w);
|
|
|
7922 update_line_start_cache (w, from, to, point, 0);
|
|
|
7923
|
|
|
7924 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
7925 assert (cur_elt >= -1);
|
|
|
7926 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
7927 point is in the top line and not at BUF_BEGV, then
|
|
434
|
7928 setting the window_start to a newline before the start of
|
|
428
|
7929 the first line will always cause scrolling.
|
|
|
7930
|
|
|
7931 However in my (jv) opinion this is wrong. That new line
|
|
|
7932 can be hidden in various ways: invisible extents, an
|
|
|
7933 explicit window-start not at a newline character etc.
|
|
|
7934 The existence of those are indeed known to create crashes
|
|
|
7935 on that assert. So we have no option but to continue the
|
|
|
7936 search if we found point at the top of the line_start_cache
|
|
|
7937 again. */
|
|
434
|
7938 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
7939 }
|
|
|
7940 prev_pos = cur_pos;
|
|
|
7941 }
|
|
|
7942 }
|
|
|
7943
|
|
|
7944 /* For window W, what does the starting position have to be so that
|
|
|
7945 the line containing point is on display line LINE. If LINE is
|
|
|
7946 positive it is considered to be the number of lines from the top of
|
|
|
7947 the window (0 is the top line). If it is negative the number is
|
|
|
7948 considered to be the number of lines from the bottom (-1 is the
|
|
|
7949 bottom line). */
|
|
|
7950
|
|
665
|
7951 Charbpos
|
|
|
7952 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
7953 {
|
|
|
7954 validate_line_start_cache (w);
|
|
|
7955 w->line_cache_validation_override++;
|
|
|
7956
|
|
|
7957 if (line >= 0)
|
|
|
7958 {
|
|
|
7959 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
7960
|
|
|
7961 if (cur_elt - line < 0)
|
|
|
7962 cur_elt = 0; /* Hit the top */
|
|
|
7963 else
|
|
|
7964 cur_elt -= line;
|
|
|
7965
|
|
|
7966 w->line_cache_validation_override--;
|
|
|
7967 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7968 }
|
|
|
7969 else
|
|
|
7970 {
|
|
|
7971 /* The calculated value of pixpos is correct for the bottom line
|
|
|
7972 or what we want when line is -1. Therefore we subtract one
|
|
|
7973 because we have already handled one line. */
|
|
|
7974 int new_line = -line - 1;
|
|
|
7975 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
7976 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
7977 Charbpos retval, search_point;
|
|
428
|
7978
|
|
|
7979 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
7980 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
7981 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
7982 line, so back up from the bottom by the height of the line
|
|
|
7983 containing point. */
|
|
|
7984 if (scroll_on_clipped_lines)
|
|
|
7985 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7986 else
|
|
|
7987 pixpos -= 1;
|
|
|
7988
|
|
|
7989 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
7990 {
|
|
|
7991 /* Hit the bottom of the buffer. */
|
|
|
7992 int adjustment =
|
|
|
7993 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
7994 Lisp_Object window;
|
|
|
7995 int defheight;
|
|
|
7996
|
|
793
|
7997 window = wrap_window (w);
|
|
428
|
7998 default_face_height_and_width (window, &defheight, 0);
|
|
|
7999
|
|
|
8000 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
8001
|
|
|
8002 pixpos -= (adjustment * defheight);
|
|
|
8003 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
8004 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
8005 }
|
|
|
8006 else
|
|
|
8007 cur_elt = cur_elt + new_line;
|
|
|
8008
|
|
|
8009 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8010
|
|
|
8011 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
8012 w->line_cache_validation_override--;
|
|
|
8013 return retval;
|
|
|
8014 }
|
|
|
8015 }
|
|
|
8016
|
|
|
8017 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8018 buffer starting positions for display lines. This allows the
|
|
|
8019 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8020 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8021 display structs which are in the given range.
|
|
|
8022
|
|
|
8023 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8024 that this function will actually add information outside of the
|
|
|
8025 lines containing those positions. This can't hurt but it could
|
|
|
8026 possibly help.
|
|
|
8027
|
|
|
8028 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8029 It might help to make the cache a dynarr of caches so that we can
|
|
|
8030 cover more areas. This might, however, turn out to be a lot of
|
|
|
8031 overhead for too little gain. */
|
|
|
8032
|
|
|
8033 static void
|
|
665
|
8034 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8035 Charbpos point, int no_regen)
|
|
428
|
8036 {
|
|
|
8037 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8038 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8039 Charbpos low_bound, high_bound;
|
|
428
|
8040
|
|
|
8041 validate_line_start_cache (w);
|
|
|
8042 w->line_cache_validation_override++;
|
|
|
8043
|
|
|
8044 if (from < BUF_BEGV (b))
|
|
|
8045 from = BUF_BEGV (b);
|
|
|
8046 if (to > BUF_ZV (b))
|
|
|
8047 to = BUF_ZV (b);
|
|
|
8048
|
|
|
8049 if (from > to)
|
|
|
8050 {
|
|
|
8051 w->line_cache_validation_override--;
|
|
|
8052 return;
|
|
|
8053 }
|
|
|
8054
|
|
|
8055 if (Dynarr_length (cache))
|
|
|
8056 {
|
|
|
8057 low_bound = line_start_cache_start (w);
|
|
|
8058 high_bound = line_start_cache_end (w);
|
|
|
8059
|
|
|
8060 /* Check to see if the desired range is already in the cache. */
|
|
|
8061 if (from >= low_bound && to <= high_bound)
|
|
|
8062 {
|
|
|
8063 w->line_cache_validation_override--;
|
|
|
8064 return;
|
|
|
8065 }
|
|
|
8066
|
|
|
8067 /* Check to make sure that the desired range is adjacent to the
|
|
|
8068 current cache. If not, invalidate the cache. */
|
|
|
8069 if (to < low_bound || from > high_bound)
|
|
|
8070 {
|
|
|
8071 Dynarr_reset (cache);
|
|
|
8072 low_bound = high_bound = -1;
|
|
|
8073 }
|
|
|
8074 }
|
|
|
8075 else
|
|
|
8076 {
|
|
|
8077 low_bound = high_bound = -1;
|
|
|
8078 }
|
|
|
8079
|
|
|
8080 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8081
|
|
|
8082 /* This could be integrated into the next two sections, but it is easier
|
|
|
8083 to follow what's going on by having it separate. */
|
|
|
8084 if (no_regen)
|
|
|
8085 {
|
|
665
|
8086 Charbpos start, end;
|
|
428
|
8087
|
|
|
8088 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8089 if (!Dynarr_length (internal_cache))
|
|
|
8090 {
|
|
|
8091 w->line_cache_validation_override--;
|
|
|
8092 return;
|
|
|
8093 }
|
|
|
8094
|
|
|
8095 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8096 end =
|
|
|
8097 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8098
|
|
|
8099 /* We aren't allowed to generate additional information to fill in
|
|
|
8100 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8101 cache. */
|
|
|
8102 if (Dynarr_length (cache))
|
|
|
8103 {
|
|
|
8104 if (end < low_bound || start > high_bound)
|
|
|
8105 Dynarr_reset (cache);
|
|
|
8106
|
|
|
8107 /* #### What should really happen if what we are doing is
|
|
|
8108 extending a line (the last line)? */
|
|
|
8109 if (Dynarr_length (cache) == 1
|
|
|
8110 && Dynarr_length (internal_cache) == 1)
|
|
|
8111 Dynarr_reset (cache);
|
|
|
8112 }
|
|
|
8113
|
|
|
8114 if (!Dynarr_length (cache))
|
|
|
8115 {
|
|
|
8116 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8117 Dynarr_length (internal_cache));
|
|
|
8118 w->line_cache_validation_override--;
|
|
|
8119 return;
|
|
|
8120 }
|
|
|
8121
|
|
|
8122 /* An extra check just in case the calling function didn't pass in
|
|
|
8123 the bounds of the DESIRED structs in the first place. */
|
|
|
8124 if (start >= low_bound && end <= high_bound)
|
|
|
8125 {
|
|
|
8126 w->line_cache_validation_override--;
|
|
|
8127 return;
|
|
|
8128 }
|
|
|
8129
|
|
|
8130 /* At this point we know that the internal cache partially overlaps
|
|
|
8131 the main cache. */
|
|
|
8132 if (start < low_bound)
|
|
|
8133 {
|
|
|
8134 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8135 while (ic_elt >= 0)
|
|
|
8136 {
|
|
|
8137 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8138 break;
|
|
|
8139 else
|
|
|
8140 ic_elt--;
|
|
|
8141 }
|
|
|
8142
|
|
|
8143 if (!(ic_elt >= 0))
|
|
|
8144 {
|
|
|
8145 Dynarr_reset (cache);
|
|
|
8146 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8147 Dynarr_length (internal_cache));
|
|
|
8148 w->line_cache_validation_override--;
|
|
|
8149 return;
|
|
|
8150 }
|
|
|
8151
|
|
|
8152 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8153 ic_elt + 1);
|
|
|
8154 }
|
|
|
8155
|
|
|
8156 if (end > high_bound)
|
|
|
8157 {
|
|
|
8158 int ic_elt = 0;
|
|
|
8159
|
|
|
8160 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8161 {
|
|
|
8162 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8163 break;
|
|
|
8164 else
|
|
|
8165 ic_elt++;
|
|
|
8166 }
|
|
|
8167
|
|
|
8168 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8169 {
|
|
|
8170 Dynarr_reset (cache);
|
|
|
8171 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8172 Dynarr_length (internal_cache));
|
|
|
8173 w->line_cache_validation_override--;
|
|
|
8174 return;
|
|
|
8175 }
|
|
|
8176
|
|
|
8177 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8178 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8179 }
|
|
|
8180
|
|
|
8181 w->line_cache_validation_override--;
|
|
|
8182 return;
|
|
|
8183 }
|
|
|
8184
|
|
|
8185 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8186 {
|
|
665
|
8187 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8188 int marker = 0;
|
|
|
8189 int old_lb = low_bound;
|
|
|
8190
|
|
|
8191 while (startp < old_lb || low_bound == -1)
|
|
|
8192 {
|
|
|
8193 int ic_elt;
|
|
665
|
8194 Charbpos new_startp;
|
|
428
|
8195
|
|
|
8196 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8197 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8198
|
|
|
8199 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8200 to layout a single line. This is not possible since we
|
|
|
8201 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8202 assert (Dynarr_length (internal_cache));
|
|
428
|
8203 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8204
|
|
|
8205 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8206 if (low_bound != -1)
|
|
|
8207 {
|
|
|
8208 while (ic_elt >= 0)
|
|
|
8209 {
|
|
|
8210 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8211 break;
|
|
|
8212 else
|
|
|
8213 ic_elt--;
|
|
|
8214 }
|
|
|
8215 }
|
|
|
8216 assert (ic_elt >= 0);
|
|
|
8217
|
|
|
8218 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8219
|
|
|
8220 /*
|
|
|
8221 * Handle invisible text properly:
|
|
|
8222 * If the last line we're inserting has the same end as the
|
|
|
8223 * line before which it will be added, merge the two lines.
|
|
|
8224 */
|
|
|
8225 if (Dynarr_length (cache) &&
|
|
|
8226 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8227 Dynarr_atp (cache, marker)->end)
|
|
|
8228 {
|
|
|
8229 Dynarr_atp (cache, marker)->start
|
|
|
8230 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8231 Dynarr_atp (cache, marker)->height
|
|
|
8232 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8233 ic_elt--;
|
|
|
8234 }
|
|
|
8235
|
|
|
8236 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8237 {
|
|
|
8238 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8239 ic_elt + 1, marker);
|
|
|
8240 marker += (ic_elt + 1);
|
|
|
8241 }
|
|
|
8242
|
|
|
8243 if (startp < low_bound || low_bound == -1)
|
|
|
8244 low_bound = startp;
|
|
|
8245 startp = new_startp;
|
|
|
8246 if (startp > BUF_ZV (b))
|
|
|
8247 {
|
|
|
8248 w->line_cache_validation_override--;
|
|
|
8249 return;
|
|
|
8250 }
|
|
|
8251 }
|
|
|
8252 }
|
|
|
8253
|
|
|
8254 assert (Dynarr_length (cache));
|
|
|
8255 assert (from >= low_bound);
|
|
|
8256
|
|
|
8257 /* Readjust the high_bound to account for any changes made while
|
|
|
8258 correcting the low_bound. */
|
|
|
8259 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8260
|
|
|
8261 if (to > high_bound)
|
|
|
8262 {
|
|
665
|
8263 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8264
|
|
|
8265 do
|
|
|
8266 {
|
|
|
8267 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8268 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8269
|
|
|
8270 /* See comment above about regenerate_window failing. */
|
|
|
8271 assert (Dynarr_length (internal_cache));
|
|
|
8272
|
|
|
8273 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8274 Dynarr_length (internal_cache));
|
|
|
8275 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8276 startp = high_bound + 1;
|
|
|
8277 }
|
|
|
8278 while (to > high_bound);
|
|
|
8279 }
|
|
|
8280
|
|
|
8281 w->line_cache_validation_override--;
|
|
|
8282 assert (to <= high_bound);
|
|
|
8283 }
|
|
|
8284
|
|
|
8285
|
|
|
8286 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8287 return the pixel location corresponding to those coordinates. The
|
|
|
8288 pixel location returned is the center of the given character
|
|
|
8289 position. The pixel values are generated relative to the window,
|
|
|
8290 not the frame.
|
|
|
8291
|
|
|
8292 The modeline is considered to be part of the window. */
|
|
|
8293
|
|
|
8294 void
|
|
|
8295 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8296 int *pix_x, int *pix_y)
|
|
|
8297 {
|
|
|
8298 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8299 int num_disp_lines, modeline;
|
|
|
8300 Lisp_Object window;
|
|
|
8301 int defheight, defwidth;
|
|
|
8302
|
|
793
|
8303 window = wrap_window (w);
|
|
428
|
8304 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8305
|
|
|
8306 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8307 the window, use the first window line or character position
|
|
|
8308 instead. */
|
|
|
8309 if (char_y < 0)
|
|
|
8310 char_y = 0;
|
|
|
8311 if (char_x < 0)
|
|
|
8312 char_x = 0;
|
|
|
8313
|
|
|
8314 num_disp_lines = Dynarr_length (dla);
|
|
|
8315 modeline = 0;
|
|
|
8316 if (num_disp_lines)
|
|
|
8317 {
|
|
|
8318 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8319 {
|
|
|
8320 num_disp_lines--;
|
|
|
8321 modeline = 1;
|
|
|
8322 }
|
|
|
8323 }
|
|
|
8324
|
|
|
8325 /* First check if the y position intersects the display lines. */
|
|
|
8326 if (char_y < num_disp_lines)
|
|
|
8327 {
|
|
|
8328 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8329 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8330
|
|
|
8331 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8332 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8333
|
|
|
8334 if (char_x < Dynarr_length (db->runes))
|
|
|
8335 {
|
|
|
8336 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8337
|
|
|
8338 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8339 }
|
|
|
8340 else
|
|
|
8341 {
|
|
|
8342 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8343 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8344
|
|
|
8345 char_x -= last_rune;
|
|
|
8346
|
|
|
8347 *pix_x = rb->xpos + rb->width;
|
|
|
8348 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8349 *pix_x += (defwidth >> 1);
|
|
|
8350 }
|
|
|
8351 }
|
|
|
8352 else
|
|
|
8353 {
|
|
|
8354 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8355 modeline in this since we don't have true character positions in
|
|
|
8356 it. */
|
|
|
8357
|
|
|
8358 if (!Dynarr_length (w->face_cachels))
|
|
|
8359 reset_face_cachels (w);
|
|
|
8360
|
|
|
8361 char_y -= num_disp_lines;
|
|
|
8362
|
|
|
8363 if (Dynarr_length (dla))
|
|
|
8364 {
|
|
|
8365 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8366 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8367 }
|
|
|
8368 else
|
|
|
8369 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8370
|
|
|
8371 *pix_y += (char_y * defheight);
|
|
|
8372 *pix_y += (defheight >> 1);
|
|
|
8373
|
|
|
8374 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8375 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8376 *pix_x += (char_x * defwidth);
|
|
|
8377 *pix_x += (defwidth >> 1);
|
|
|
8378 }
|
|
|
8379
|
|
|
8380 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8381 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8382 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8383 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8384
|
|
|
8385 *pix_x -= w->pixel_left;
|
|
|
8386 *pix_y -= w->pixel_top;
|
|
|
8387 }
|
|
|
8388
|
|
|
8389 /* Given a display line and a position, determine if there is a glyph
|
|
|
8390 there and return information about it if there is. */
|
|
|
8391
|
|
|
8392 static void
|
|
|
8393 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8394 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8395 int *high_x_coord)
|
|
|
8396 {
|
|
|
8397 struct display_block *db;
|
|
|
8398 int elt;
|
|
|
8399 int block =
|
|
|
8400 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8401
|
|
|
8402 /* We use get_next_display_block to get the actual display block
|
|
|
8403 that would be displayed at x_coord. */
|
|
|
8404
|
|
|
8405 if (block == NO_BLOCK)
|
|
|
8406 return;
|
|
|
8407 else
|
|
|
8408 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8409
|
|
|
8410 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8411 {
|
|
|
8412 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8413
|
|
|
8414 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8415 {
|
|
|
8416 if (rb->type == RUNE_DGLYPH)
|
|
|
8417 {
|
|
|
8418 *obj1 = rb->object.dglyph.glyph;
|
|
|
8419 *obj2 = rb->object.dglyph.extent;
|
|
|
8420 }
|
|
|
8421 else
|
|
|
8422 {
|
|
|
8423 *obj1 = Qnil;
|
|
|
8424 *obj2 = Qnil;
|
|
|
8425 }
|
|
|
8426
|
|
|
8427 if (low_x_coord)
|
|
|
8428 *low_x_coord = rb->xpos;
|
|
|
8429 if (high_x_coord)
|
|
|
8430 *high_x_coord = rb->xpos + rb->width;
|
|
|
8431
|
|
|
8432 return;
|
|
|
8433 }
|
|
|
8434 }
|
|
|
8435 }
|
|
|
8436
|
|
|
8437 #define UPDATE_CACHE_RETURN \
|
|
|
8438 do { \
|
|
|
8439 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8440 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8441 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8442 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8443 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8444 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8445 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8446 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8447 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8448 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8449 d->pixel_to_glyph_cache.w = *w; \
|
|
826
|
8450 d->pixel_to_glyph_cache.charpos = *charpos; \
|
|
428
|
8451 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8452 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8453 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8454 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8455 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8456 RETURN_SANS_WARNINGS position; \
|
|
|
8457 } while (0)
|
|
|
8458
|
|
|
8459 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8460 information about what is located under those coordinates.
|
|
|
8461
|
|
|
8462 The return value will be one of:
|
|
|
8463
|
|
|
8464 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8465 OVER_MODELINE: over a modeline
|
|
|
8466 OVER_BORDER: over an internal border
|
|
|
8467 OVER_NOTHING: over the text area, but not over text
|
|
|
8468 OVER_OUTSIDE: outside of the frame border
|
|
|
8469 OVER_TEXT: over text in the text area
|
|
|
8470
|
|
|
8471 OBJ1 is one of
|
|
|
8472
|
|
|
8473 -- a toolbar button
|
|
|
8474 -- a glyph
|
|
|
8475 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8476
|
|
|
8477 OBJ2 is one of
|
|
|
8478
|
|
|
8479 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8480 -- nil otherwise.
|
|
|
8481
|
|
|
8482 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8483 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8484
|
|
|
8485 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8486 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8487
|
|
|
8488 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8489 */
|
|
|
8490
|
|
|
8491 int
|
|
|
8492 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8493 int *col, int *row, int *obj_x, int *obj_y,
|
|
826
|
8494 struct window **w, Charbpos *charpos,
|
|
665
|
8495 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8496 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8497 {
|
|
|
8498 struct device *d;
|
|
|
8499 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8500 Lisp_Object window;
|
|
|
8501 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8502 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8503 int position = OVER_NOTHING;
|
|
|
8504 int device_check_failed = 0;
|
|
|
8505 display_line_dynarr *dla;
|
|
|
8506
|
|
|
8507 /* This is a safety valve in case this got called with a frame in
|
|
|
8508 the middle of being deleted. */
|
|
|
8509 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8510 {
|
|
|
8511 device_check_failed = 1;
|
|
|
8512 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8513 }
|
|
|
8514 else
|
|
|
8515 {
|
|
|
8516 d = XDEVICE (f->device);
|
|
|
8517 cache = &d->pixel_to_glyph_cache;
|
|
|
8518 }
|
|
|
8519
|
|
|
8520 if (!device_check_failed
|
|
|
8521 && cache->valid
|
|
|
8522 && cache->frame == f
|
|
|
8523 && cache->low_x_coord <= x_coord
|
|
|
8524 && cache->high_x_coord > x_coord
|
|
|
8525 && cache->low_y_coord <= y_coord
|
|
|
8526 && cache->high_y_coord > y_coord)
|
|
|
8527 {
|
|
|
8528 *col = cache->col;
|
|
|
8529 *row = cache->row;
|
|
|
8530 *obj_x = cache->obj_x;
|
|
|
8531 *obj_y = cache->obj_y;
|
|
|
8532 *w = cache->w;
|
|
826
|
8533 *charpos = cache->charpos;
|
|
428
|
8534 *closest = cache->closest;
|
|
|
8535 *modeline_closest = cache->modeline_closest;
|
|
|
8536 *obj1 = cache->obj1;
|
|
|
8537 *obj2 = cache->obj2;
|
|
|
8538
|
|
|
8539 return cache->retval;
|
|
|
8540 }
|
|
|
8541 else
|
|
|
8542 {
|
|
|
8543 *col = 0;
|
|
|
8544 *row = 0;
|
|
|
8545 *obj_x = 0;
|
|
|
8546 *obj_y = 0;
|
|
|
8547 *w = 0;
|
|
826
|
8548 *charpos = 0;
|
|
428
|
8549 *closest = 0;
|
|
|
8550 *modeline_closest = -1;
|
|
|
8551 *obj1 = Qnil;
|
|
|
8552 *obj2 = Qnil;
|
|
|
8553
|
|
|
8554 low_x_coord = x_coord;
|
|
|
8555 high_x_coord = x_coord + 1;
|
|
|
8556 low_y_coord = y_coord;
|
|
|
8557 high_y_coord = y_coord + 1;
|
|
|
8558 }
|
|
|
8559
|
|
|
8560 if (device_check_failed)
|
|
|
8561 return OVER_NOTHING;
|
|
|
8562
|
|
|
8563 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8564 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8565 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8566 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8567
|
|
|
8568 /* Check if the mouse is outside of the text area actually used by
|
|
|
8569 redisplay. */
|
|
|
8570 if (y_coord < frm_top)
|
|
|
8571 {
|
|
|
8572 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8573 {
|
|
|
8574 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8575 high_y_coord = frm_top;
|
|
|
8576 position = OVER_BORDER;
|
|
|
8577 }
|
|
|
8578 else if (y_coord >= 0)
|
|
|
8579 {
|
|
|
8580 low_y_coord = 0;
|
|
|
8581 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8582 position = OVER_TOOLBAR;
|
|
|
8583 }
|
|
|
8584 else
|
|
|
8585 {
|
|
|
8586 low_y_coord = y_coord;
|
|
|
8587 high_y_coord = 0;
|
|
|
8588 position = OVER_OUTSIDE;
|
|
|
8589 }
|
|
|
8590 }
|
|
|
8591 else if (y_coord >= frm_bottom)
|
|
|
8592 {
|
|
|
8593 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
8594 {
|
|
|
8595 low_y_coord = frm_bottom;
|
|
|
8596 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8597 position = OVER_BORDER;
|
|
|
8598 }
|
|
|
8599 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
8600 {
|
|
|
8601 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8602 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8603 position = OVER_TOOLBAR;
|
|
|
8604 }
|
|
|
8605 else
|
|
|
8606 {
|
|
|
8607 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8608 high_y_coord = y_coord;
|
|
|
8609 position = OVER_OUTSIDE;
|
|
|
8610 }
|
|
|
8611 }
|
|
|
8612
|
|
|
8613 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
8614 {
|
|
|
8615 if (x_coord < frm_left)
|
|
|
8616 {
|
|
|
8617 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
8618 {
|
|
|
8619 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8620 high_x_coord = frm_left;
|
|
|
8621 position = OVER_BORDER;
|
|
|
8622 }
|
|
|
8623 else if (x_coord >= 0)
|
|
|
8624 {
|
|
|
8625 low_x_coord = 0;
|
|
|
8626 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8627 position = OVER_TOOLBAR;
|
|
|
8628 }
|
|
|
8629 else
|
|
|
8630 {
|
|
|
8631 low_x_coord = x_coord;
|
|
|
8632 high_x_coord = 0;
|
|
|
8633 position = OVER_OUTSIDE;
|
|
|
8634 }
|
|
|
8635 }
|
|
|
8636 else if (x_coord >= frm_right)
|
|
|
8637 {
|
|
|
8638 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
8639 {
|
|
|
8640 low_x_coord = frm_right;
|
|
|
8641 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8642 position = OVER_BORDER;
|
|
|
8643 }
|
|
|
8644 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
8645 {
|
|
|
8646 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8647 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8648 position = OVER_TOOLBAR;
|
|
|
8649 }
|
|
|
8650 else
|
|
|
8651 {
|
|
|
8652 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8653 high_x_coord = x_coord;
|
|
|
8654 position = OVER_OUTSIDE;
|
|
|
8655 }
|
|
|
8656 }
|
|
|
8657 }
|
|
|
8658
|
|
|
8659 #ifdef HAVE_TOOLBARS
|
|
|
8660 if (position == OVER_TOOLBAR)
|
|
|
8661 {
|
|
|
8662 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
8663 *obj2 = Qnil;
|
|
|
8664 *w = 0;
|
|
|
8665 UPDATE_CACHE_RETURN;
|
|
|
8666 }
|
|
|
8667 #endif /* HAVE_TOOLBARS */
|
|
|
8668
|
|
|
8669 /* We still have to return the window the pointer is next to and its
|
|
|
8670 relative y position even if it is outside the x boundary. */
|
|
|
8671 if (x_coord < frm_left)
|
|
|
8672 x_coord = frm_left;
|
|
|
8673 else if (x_coord > frm_right)
|
|
|
8674 x_coord = frm_right;
|
|
|
8675
|
|
|
8676 /* Same in reverse. */
|
|
|
8677 if (y_coord < frm_top)
|
|
|
8678 y_coord = frm_top;
|
|
|
8679 else if (y_coord > frm_bottom)
|
|
|
8680 y_coord = frm_bottom;
|
|
|
8681
|
|
|
8682 /* Find what window the given coordinates are actually in. */
|
|
|
8683 window = f->root_window;
|
|
|
8684 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
8685
|
|
|
8686 /* If we didn't find a window, we're done. */
|
|
|
8687 if (!*w)
|
|
|
8688 {
|
|
|
8689 UPDATE_CACHE_RETURN;
|
|
|
8690 }
|
|
|
8691 else if (position != OVER_NOTHING)
|
|
|
8692 {
|
|
|
8693 *closest = 0;
|
|
|
8694 *modeline_closest = -1;
|
|
|
8695
|
|
|
8696 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
8697 {
|
|
|
8698 *w = 0;
|
|
|
8699 UPDATE_CACHE_RETURN;
|
|
|
8700 }
|
|
|
8701 }
|
|
|
8702
|
|
|
8703 /* Check if the window is a minibuffer but isn't active. */
|
|
|
8704 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
8705 {
|
|
|
8706 /* Must reset the window value since some callers will ignore
|
|
|
8707 the return value if it is set. */
|
|
|
8708 *w = 0;
|
|
|
8709 UPDATE_CACHE_RETURN;
|
|
|
8710 }
|
|
|
8711
|
|
|
8712 /* See if the point is over window vertical divider */
|
|
|
8713 if (window_needs_vertical_divider (*w))
|
|
|
8714 {
|
|
|
8715 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
8716 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
8717 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
8718 int div_y_low = WINDOW_TOP (*w);
|
|
|
8719
|
|
|
8720 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
8721 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
8722 {
|
|
|
8723 low_x_coord = div_x_low;
|
|
|
8724 high_x_coord = div_x_high;
|
|
|
8725 low_y_coord = div_y_low;
|
|
|
8726 high_y_coord = div_y_high;
|
|
|
8727 position = OVER_V_DIVIDER;
|
|
|
8728 UPDATE_CACHE_RETURN;
|
|
|
8729 }
|
|
|
8730 }
|
|
|
8731
|
|
|
8732 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
8733
|
|
|
8734 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
8735 {
|
|
|
8736 int really_over_nothing = 0;
|
|
|
8737 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
8738
|
|
|
8739 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
8740 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
8741 {
|
|
|
8742 int check_margin_glyphs = 0;
|
|
|
8743 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8744 struct rune *rb = 0;
|
|
|
8745
|
|
|
8746 if (x_coord < dl->bounds.left_white
|
|
|
8747 || x_coord >= dl->bounds.right_white)
|
|
|
8748 check_margin_glyphs = 1;
|
|
|
8749
|
|
|
8750 low_y_coord = dl->ypos - dl->ascent;
|
|
|
8751 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
8752
|
|
|
8753 if (position == OVER_BORDER
|
|
|
8754 || position == OVER_OUTSIDE
|
|
|
8755 || check_margin_glyphs)
|
|
|
8756 {
|
|
|
8757 int x_check, left_bound;
|
|
|
8758
|
|
|
8759 if (check_margin_glyphs)
|
|
|
8760 {
|
|
|
8761 x_check = x_coord;
|
|
|
8762 left_bound = dl->bounds.left_white;
|
|
|
8763 }
|
|
|
8764 else
|
|
|
8765 {
|
|
|
8766 x_check = high_x_coord;
|
|
|
8767 left_bound = frm_left;
|
|
|
8768 }
|
|
|
8769
|
|
|
8770 if (Dynarr_length (db->runes))
|
|
|
8771 {
|
|
|
8772 if (x_check <= left_bound)
|
|
|
8773 {
|
|
|
8774 if (dl->modeline)
|
|
826
|
8775 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8776 else
|
|
826
|
8777 *closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
8778 }
|
|
|
8779 else
|
|
|
8780 {
|
|
|
8781 if (dl->modeline)
|
|
|
8782 *modeline_closest =
|
|
|
8783 Dynarr_atp (db->runes,
|
|
826
|
8784 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8785 else
|
|
|
8786 *closest =
|
|
|
8787 Dynarr_atp (db->runes,
|
|
826
|
8788 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
8789 }
|
|
|
8790
|
|
|
8791 if (dl->modeline)
|
|
|
8792 *modeline_closest += dl->offset;
|
|
|
8793 else
|
|
|
8794 *closest += dl->offset;
|
|
|
8795 }
|
|
|
8796 else
|
|
|
8797 {
|
|
|
8798 /* #### What should be here. */
|
|
|
8799 if (dl->modeline)
|
|
|
8800 *modeline_closest = 0;
|
|
|
8801 else
|
|
|
8802 *closest = 0;
|
|
|
8803 }
|
|
|
8804
|
|
|
8805 if (check_margin_glyphs)
|
|
|
8806 {
|
|
|
8807 if (x_coord < dl->bounds.left_in
|
|
|
8808 || x_coord >= dl->bounds.right_in)
|
|
|
8809 {
|
|
|
8810 /* If we are over the outside margins then we
|
|
|
8811 know the loop over the text block isn't going
|
|
|
8812 to accomplish anything. So we go ahead and
|
|
|
8813 set what information we can right here and
|
|
|
8814 return. */
|
|
|
8815 (*row)--;
|
|
|
8816 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8817 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8818 &low_x_coord, &high_x_coord);
|
|
|
8819
|
|
|
8820 UPDATE_CACHE_RETURN;
|
|
|
8821 }
|
|
|
8822 }
|
|
|
8823 else
|
|
|
8824 UPDATE_CACHE_RETURN;
|
|
|
8825 }
|
|
|
8826
|
|
|
8827 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
8828 {
|
|
|
8829 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
8830
|
|
|
8831 if (!past_end)
|
|
|
8832 rb = Dynarr_atp (db->runes, *col);
|
|
|
8833
|
|
|
8834 if (past_end ||
|
|
|
8835 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
8836 {
|
|
|
8837 if (past_end)
|
|
|
8838 {
|
|
|
8839 (*col)--;
|
|
|
8840 rb = Dynarr_atp (db->runes, *col);
|
|
|
8841 }
|
|
|
8842
|
|
826
|
8843 *charpos = rb->charpos + dl->offset;
|
|
428
|
8844 low_x_coord = rb->xpos;
|
|
|
8845 high_x_coord = rb->xpos + rb->width;
|
|
|
8846
|
|
|
8847 if (rb->type == RUNE_DGLYPH)
|
|
|
8848 {
|
|
|
8849 int elt = *col + 1;
|
|
|
8850
|
|
|
8851 /* Find the first character after the glyph. */
|
|
|
8852 while (elt < Dynarr_length (db->runes))
|
|
|
8853 {
|
|
|
8854 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
8855 {
|
|
|
8856 if (dl->modeline)
|
|
|
8857 *modeline_closest =
|
|
826
|
8858 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8859 dl->offset);
|
|
|
8860 else
|
|
|
8861 *closest =
|
|
826
|
8862 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
8863 dl->offset);
|
|
|
8864 break;
|
|
|
8865 }
|
|
|
8866
|
|
|
8867 elt++;
|
|
|
8868 }
|
|
|
8869
|
|
|
8870 /* In this case we failed to find a non-glyph
|
|
|
8871 character so we return the last position
|
|
|
8872 displayed on the line. */
|
|
|
8873 if (elt == Dynarr_length (db->runes))
|
|
|
8874 {
|
|
|
8875 if (dl->modeline)
|
|
826
|
8876 *modeline_closest = dl->end_charpos + dl->offset;
|
|
428
|
8877 else
|
|
826
|
8878 *closest = dl->end_charpos + dl->offset;
|
|
428
|
8879 really_over_nothing = 1;
|
|
|
8880 }
|
|
|
8881 }
|
|
|
8882 else
|
|
|
8883 {
|
|
|
8884 if (dl->modeline)
|
|
826
|
8885 *modeline_closest = rb->charpos + dl->offset;
|
|
428
|
8886 else
|
|
826
|
8887 *closest = rb->charpos + dl->offset;
|
|
428
|
8888 }
|
|
|
8889
|
|
|
8890 if (dl->modeline)
|
|
|
8891 {
|
|
|
8892 *row = window_displayed_height (*w);
|
|
|
8893
|
|
|
8894 if (position == OVER_NOTHING)
|
|
|
8895 position = OVER_MODELINE;
|
|
|
8896
|
|
|
8897 if (rb->type == RUNE_DGLYPH)
|
|
|
8898 {
|
|
|
8899 *obj1 = rb->object.dglyph.glyph;
|
|
|
8900 *obj2 = rb->object.dglyph.extent;
|
|
|
8901 }
|
|
|
8902 else if (rb->type == RUNE_CHAR)
|
|
|
8903 {
|
|
|
8904 *obj1 = Qnil;
|
|
|
8905 *obj2 = Qnil;
|
|
|
8906 }
|
|
|
8907 else
|
|
|
8908 {
|
|
|
8909 *obj1 = Qnil;
|
|
|
8910 *obj2 = Qnil;
|
|
|
8911 }
|
|
|
8912
|
|
|
8913 UPDATE_CACHE_RETURN;
|
|
|
8914 }
|
|
|
8915 else if (past_end
|
|
|
8916 || (rb->type == RUNE_CHAR
|
|
|
8917 && rb->object.chr.ch == '\n'))
|
|
|
8918 {
|
|
|
8919 (*row)--;
|
|
|
8920 /* At this point we may have glyphs in the right
|
|
|
8921 inside margin. */
|
|
|
8922 if (check_margin_glyphs)
|
|
|
8923 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8924 &low_x_coord, &high_x_coord);
|
|
|
8925 UPDATE_CACHE_RETURN;
|
|
|
8926 }
|
|
|
8927 else
|
|
|
8928 {
|
|
|
8929 (*row)--;
|
|
|
8930 if (rb->type == RUNE_DGLYPH)
|
|
|
8931 {
|
|
|
8932 *obj1 = rb->object.dglyph.glyph;
|
|
|
8933 *obj2 = rb->object.dglyph.extent;
|
|
|
8934 }
|
|
|
8935 else if (rb->type == RUNE_CHAR)
|
|
|
8936 {
|
|
|
8937 *obj1 = Qnil;
|
|
|
8938 *obj2 = Qnil;
|
|
|
8939 }
|
|
|
8940 else
|
|
|
8941 {
|
|
|
8942 *obj1 = Qnil;
|
|
|
8943 *obj2 = Qnil;
|
|
|
8944 }
|
|
|
8945
|
|
|
8946 *obj_x = x_coord - rb->xpos;
|
|
|
8947 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8948
|
|
|
8949 /* At this point we may have glyphs in the left
|
|
|
8950 inside margin. */
|
|
|
8951 if (check_margin_glyphs)
|
|
|
8952 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
8953
|
|
|
8954 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
8955 position = OVER_TEXT;
|
|
|
8956
|
|
|
8957 UPDATE_CACHE_RETURN;
|
|
|
8958 }
|
|
|
8959 }
|
|
|
8960 }
|
|
|
8961 }
|
|
|
8962 }
|
|
|
8963
|
|
|
8964 *row = Dynarr_length (dla) - 1;
|
|
|
8965 if (FRAME_WIN_P (f))
|
|
|
8966 {
|
|
|
8967 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
8968
|
|
|
8969 if (bot_elt >= 0)
|
|
|
8970 {
|
|
|
8971 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
8972 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
8973 Lisp_Object lwin;
|
|
|
8974 int defheight;
|
|
|
8975
|
|
793
|
8976 lwin = wrap_window (*w);
|
|
428
|
8977 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
8978
|
|
|
8979 *row += (adj_area / defheight);
|
|
|
8980 }
|
|
|
8981 }
|
|
|
8982
|
|
|
8983 /* #### This should be checked out some more to determine what
|
|
|
8984 should really be going on. */
|
|
|
8985 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
8986 *closest = 0;
|
|
|
8987 else
|
|
442
|
8988 *closest = end_of_last_line_may_error (*w,
|
|
428
|
8989 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
8990 *col = 0;
|
|
|
8991 UPDATE_CACHE_RETURN;
|
|
|
8992 }
|
|
|
8993 #undef UPDATE_CACHE_RETURN
|
|
|
8994
|
|
|
8995
|
|
|
8996 /***************************************************************************/
|
|
|
8997 /* */
|
|
|
8998 /* Lisp functions */
|
|
|
8999 /* */
|
|
|
9000 /***************************************************************************/
|
|
|
9001
|
|
|
9002 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
9003 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
9004 */
|
|
|
9005 ())
|
|
|
9006 {
|
|
|
9007 Lisp_Object devcons, concons;
|
|
|
9008
|
|
|
9009 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
9010 {
|
|
|
9011 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
9012 Lisp_Object frmcons;
|
|
|
9013
|
|
|
9014 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9015 {
|
|
|
9016 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
9017
|
|
|
9018 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9019 {
|
|
|
9020 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9021
|
|
|
9022 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9023
|
|
428
|
9024 /*
|
|
|
9025 * If the frame size has changed, there may be random
|
|
|
9026 * chud on the screen left from previous messages
|
|
|
9027 * because redisplay_frame hasn't been called yet.
|
|
|
9028 * Clear the screen to get rid of the potential mess.
|
|
|
9029 */
|
|
|
9030 if (f->echo_area_garbaged)
|
|
|
9031 {
|
|
442
|
9032 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9033 f->echo_area_garbaged = 0;
|
|
|
9034 }
|
|
|
9035 redisplay_window (window, 0);
|
|
442
|
9036 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
|
9037
|
|
428
|
9038 call_redisplay_end_triggers (XWINDOW (window), 0);
|
|
|
9039 }
|
|
|
9040 }
|
|
|
9041 }
|
|
|
9042
|
|
|
9043 return Qnil;
|
|
|
9044 }
|
|
|
9045
|
|
|
9046 static Lisp_Object
|
|
|
9047 restore_disable_preemption_value (Lisp_Object value)
|
|
|
9048 {
|
|
|
9049 disable_preemption = XINT (value);
|
|
|
9050 return Qnil;
|
|
|
9051 }
|
|
|
9052
|
|
|
9053 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9054 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9055 FRAME defaults to the selected frame if omitted.
|
|
|
9056 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9057 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9058 input and is guaranteed to proceed to completion.
|
|
|
9059 */
|
|
|
9060 (frame, no_preempt))
|
|
|
9061 {
|
|
|
9062 struct frame *f = decode_frame (frame);
|
|
|
9063 int count = specpdl_depth ();
|
|
|
9064
|
|
|
9065 if (!NILP (no_preempt))
|
|
|
9066 {
|
|
|
9067 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9068 make_int (disable_preemption));
|
|
|
9069 disable_preemption++;
|
|
|
9070 }
|
|
|
9071
|
|
|
9072 f->clear = 1;
|
|
|
9073 redisplay_frame (f, 1);
|
|
|
9074
|
|
442
|
9075 /* See the comment in Fredisplay_frame. */
|
|
|
9076 RESET_CHANGED_SET_FLAGS;
|
|
|
9077
|
|
771
|
9078 return unbind_to (count);
|
|
428
|
9079 }
|
|
|
9080
|
|
|
9081 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9082 Ensure that FRAME's contents are correctly displayed.
|
|
|
9083 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9084 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9085 the frame.
|
|
|
9086 FRAME defaults to the selected frame if omitted.
|
|
|
9087 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9088 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9089 input and is guaranteed to proceed to completion.
|
|
|
9090 */
|
|
|
9091 (frame, no_preempt))
|
|
|
9092 {
|
|
|
9093 struct frame *f = decode_frame (frame);
|
|
|
9094 int count = specpdl_depth ();
|
|
|
9095
|
|
|
9096 if (!NILP (no_preempt))
|
|
|
9097 {
|
|
|
9098 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9099 make_int (disable_preemption));
|
|
|
9100 disable_preemption++;
|
|
|
9101 }
|
|
|
9102
|
|
|
9103 redisplay_frame (f, 1);
|
|
|
9104
|
|
442
|
9105 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9106 changes to the display will not get registered by redisplay
|
|
|
9107 because it thinks it already has registered changes. If you
|
|
|
9108 really knew what you were doing you could confuse redisplay by
|
|
|
9109 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9110 that if you know what you are doing you will not be that
|
|
|
9111 stupid. */
|
|
|
9112 RESET_CHANGED_SET_FLAGS;
|
|
|
9113
|
|
771
|
9114 return unbind_to (count);
|
|
428
|
9115 }
|
|
|
9116
|
|
|
9117 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9118 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9119 DEVICE defaults to the selected device if omitted.
|
|
|
9120 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9121 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9122 input and is guaranteed to proceed to completion.
|
|
|
9123 */
|
|
|
9124 (device, no_preempt))
|
|
|
9125 {
|
|
|
9126 struct device *d = decode_device (device);
|
|
|
9127 Lisp_Object frmcons;
|
|
|
9128 int count = specpdl_depth ();
|
|
|
9129
|
|
|
9130 if (!NILP (no_preempt))
|
|
|
9131 {
|
|
|
9132 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9133 make_int (disable_preemption));
|
|
|
9134 disable_preemption++;
|
|
|
9135 }
|
|
|
9136
|
|
|
9137 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9138 {
|
|
|
9139 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9140 }
|
|
440
|
9141 redisplay_device (d, 0);
|
|
428
|
9142
|
|
442
|
9143 /* See the comment in Fredisplay_frame. */
|
|
|
9144 RESET_CHANGED_SET_FLAGS;
|
|
|
9145
|
|
771
|
9146 return unbind_to (count);
|
|
428
|
9147 }
|
|
|
9148
|
|
|
9149 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9150 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9151 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9152 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9153 the device.
|
|
|
9154 DEVICE defaults to the selected device if omitted.
|
|
|
9155 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9156 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9157 input and is guaranteed to proceed to completion.
|
|
|
9158 */
|
|
|
9159 (device, no_preempt))
|
|
|
9160 {
|
|
|
9161 struct device *d = decode_device (device);
|
|
|
9162 int count = specpdl_depth ();
|
|
|
9163
|
|
|
9164 if (!NILP (no_preempt))
|
|
|
9165 {
|
|
|
9166 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9167 make_int (disable_preemption));
|
|
|
9168 disable_preemption++;
|
|
|
9169 }
|
|
|
9170
|
|
440
|
9171 redisplay_device (d, 0);
|
|
428
|
9172
|
|
442
|
9173 /* See the comment in Fredisplay_frame. */
|
|
|
9174 RESET_CHANGED_SET_FLAGS;
|
|
|
9175
|
|
771
|
9176 return unbind_to (count);
|
|
428
|
9177 }
|
|
|
9178
|
|
|
9179 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9180 regardless if the all flag is set or not. It remains in existence
|
|
|
9181 solely for backwards compatibility. */
|
|
|
9182 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9183 Force the modeline of the current buffer to be redisplayed.
|
|
|
9184 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9185 */
|
|
|
9186 (all))
|
|
|
9187 {
|
|
|
9188 MARK_MODELINE_CHANGED;
|
|
|
9189 return Qnil;
|
|
|
9190 }
|
|
|
9191
|
|
|
9192 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9193 Force an immediate update of the cursor on FRAME.
|
|
|
9194 FRAME defaults to the selected frame if omitted.
|
|
|
9195 */
|
|
|
9196 (frame))
|
|
|
9197 {
|
|
|
9198 redisplay_redraw_cursor (decode_frame (frame), 1);
|
|
|
9199 return Qnil;
|
|
|
9200 }
|
|
|
9201
|
|
|
9202
|
|
|
9203 /***************************************************************************/
|
|
|
9204 /* */
|
|
|
9205 /* Lisp-variable change triggers */
|
|
|
9206 /* */
|
|
|
9207 /***************************************************************************/
|
|
|
9208
|
|
|
9209 static void
|
|
|
9210 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
9211 Lisp_Object oldval)
|
|
|
9212 {
|
|
|
9213 /* Nothing to be done? */
|
|
|
9214 }
|
|
|
9215
|
|
|
9216 int
|
|
|
9217 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
9218 Lisp_Object in_object, int flags)
|
|
|
9219 {
|
|
|
9220 /* #### clip_changed should really be renamed something like
|
|
|
9221 global_redisplay_change. */
|
|
|
9222 MARK_CLIP_CHANGED;
|
|
|
9223 return 0;
|
|
|
9224 }
|
|
|
9225
|
|
|
9226 /* This is called if the built-in glyphs have their properties
|
|
|
9227 changed. */
|
|
|
9228 void
|
|
|
9229 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
9230 Lisp_Object locale)
|
|
|
9231 {
|
|
|
9232 if (WINDOWP (locale))
|
|
|
9233 {
|
|
|
9234 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9235 }
|
|
|
9236 else if (FRAMEP (locale))
|
|
|
9237 {
|
|
|
9238 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9239 }
|
|
|
9240 else if (DEVICEP (locale))
|
|
|
9241 {
|
|
|
9242 Lisp_Object frmcons;
|
|
|
9243 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9244 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9245 }
|
|
|
9246 else if (CONSOLEP (locale))
|
|
|
9247 {
|
|
|
9248 Lisp_Object frmcons, devcons;
|
|
|
9249 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9250 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9251 }
|
|
|
9252 else /* global or buffer */
|
|
|
9253 {
|
|
|
9254 Lisp_Object frmcons, devcons, concons;
|
|
|
9255 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9256 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9257 }
|
|
|
9258 }
|
|
|
9259
|
|
|
9260 static void
|
|
|
9261 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
9262 Lisp_Object oldval)
|
|
|
9263 {
|
|
|
9264 if (XFRAME (w->frame)->init_finished)
|
|
|
9265 Fforce_cursor_redisplay (w->frame);
|
|
|
9266 }
|
|
|
9267
|
|
|
9268 #ifdef MEMORY_USAGE_STATS
|
|
|
9269
|
|
|
9270
|
|
|
9271 /***************************************************************************/
|
|
|
9272 /* */
|
|
|
9273 /* memory usage computation */
|
|
|
9274 /* */
|
|
|
9275 /***************************************************************************/
|
|
|
9276
|
|
|
9277 static int
|
|
|
9278 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9279 {
|
|
|
9280 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9281 }
|
|
|
9282
|
|
|
9283 static int
|
|
|
9284 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9285 struct overhead_stats *ovstats)
|
|
|
9286 {
|
|
|
9287 int total, i;
|
|
|
9288
|
|
|
9289 if (!dyn)
|
|
|
9290 return 0;
|
|
|
9291
|
|
|
9292 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9293 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9294 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9295
|
|
|
9296 return total;
|
|
|
9297 }
|
|
|
9298
|
|
|
9299 static int
|
|
|
9300 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9301 struct overhead_stats *ovstats)
|
|
|
9302 {
|
|
|
9303 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9304 }
|
|
|
9305
|
|
|
9306 int
|
|
|
9307 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9308 struct overhead_stats *ovstats)
|
|
|
9309 {
|
|
|
9310 int total, i;
|
|
|
9311
|
|
|
9312 if (!dyn)
|
|
|
9313 return 0;
|
|
|
9314
|
|
|
9315 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9316 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9317 {
|
|
|
9318 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9319 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9320 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9321 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9322 }
|
|
|
9323
|
|
|
9324 return total;
|
|
|
9325 }
|
|
|
9326
|
|
|
9327 int
|
|
|
9328 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9329 struct overhead_stats *ovstats)
|
|
|
9330 {
|
|
|
9331 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9332 }
|
|
|
9333
|
|
|
9334 #endif /* MEMORY_USAGE_STATS */
|
|
|
9335
|
|
800
|
9336 static int
|
|
|
9337 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
|
|
|
9338 {
|
|
|
9339 int i, j;
|
|
|
9340 display_line_dynarr *dl;
|
|
|
9341
|
|
|
9342 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9343
|
|
|
9344 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9345 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9346 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9347 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9348
|
|
|
9349 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9350
|
|
|
9351 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9352 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9353 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9354 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9355
|
|
|
9356 return 0;
|
|
|
9357 }
|
|
|
9358
|
|
|
9359 static void
|
|
|
9360 sledgehammer_check_redisplay_structs (void)
|
|
|
9361 {
|
|
|
9362 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9363 }
|
|
|
9364
|
|
428
|
9365
|
|
|
9366 /***************************************************************************/
|
|
|
9367 /* */
|
|
|
9368 /* initialization */
|
|
|
9369 /* */
|
|
|
9370 /***************************************************************************/
|
|
|
9371
|
|
|
9372 void
|
|
|
9373 init_redisplay (void)
|
|
|
9374 {
|
|
|
9375 disable_preemption = 0;
|
|
|
9376 preemption_count = 0;
|
|
|
9377 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
9378
|
|
|
9379 #ifndef PDUMP
|
|
|
9380 if (!initialized)
|
|
|
9381 #endif
|
|
|
9382 {
|
|
440
|
9383 if (!cmotion_display_lines)
|
|
|
9384 cmotion_display_lines = Dynarr_new (display_line);
|
|
665
|
9385 if (!mode_spec_intbyte_string)
|
|
|
9386 mode_spec_intbyte_string = Dynarr_new (Intbyte);
|
|
440
|
9387 if (!formatted_string_extent_dynarr)
|
|
|
9388 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9389 if (!formatted_string_extent_start_dynarr)
|
|
|
9390 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9391 if (!formatted_string_extent_end_dynarr)
|
|
|
9392 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9393 if (!internal_cache)
|
|
|
9394 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9395 }
|
|
|
9396
|
|
|
9397 /* window system is nil when in -batch mode */
|
|
|
9398 if (!initialized || noninteractive)
|
|
|
9399 return;
|
|
|
9400
|
|
|
9401 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9402 initializing the terminal. This is especially important when the
|
|
|
9403 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9404 using the window system.
|
|
|
9405
|
|
|
9406 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9407 with an error message if that doesn't work. */
|
|
|
9408
|
|
|
9409 #ifdef HAVE_X_WINDOWS
|
|
|
9410 if (!strcmp (display_use, "x"))
|
|
|
9411 {
|
|
|
9412 /* Some stuff checks this way early. */
|
|
|
9413 Vwindow_system = Qx;
|
|
|
9414 Vinitial_window_system = Qx;
|
|
|
9415 return;
|
|
|
9416 }
|
|
|
9417 #endif /* HAVE_X_WINDOWS */
|
|
|
9418
|
|
462
|
9419 #ifdef HAVE_GTK
|
|
|
9420 if (!strcmp (display_use, "gtk"))
|
|
|
9421 {
|
|
|
9422 Vwindow_system = Qgtk;
|
|
|
9423 Vinitial_window_system = Qgtk;
|
|
|
9424 return;
|
|
|
9425 }
|
|
|
9426 #endif
|
|
|
9427
|
|
428
|
9428 #ifdef HAVE_MS_WINDOWS
|
|
|
9429 if (!strcmp (display_use, "mswindows"))
|
|
|
9430 {
|
|
|
9431 /* Some stuff checks this way early. */
|
|
|
9432 Vwindow_system = Qmswindows;
|
|
|
9433 Vinitial_window_system = Qmswindows;
|
|
|
9434 return;
|
|
|
9435 }
|
|
|
9436 #endif /* HAVE_MS_WINDOWS */
|
|
|
9437
|
|
|
9438 #ifdef HAVE_TTY
|
|
|
9439 /* If no window system has been specified, try to use the terminal. */
|
|
|
9440 if (!isatty (0))
|
|
|
9441 {
|
|
|
9442 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9443 exit (1);
|
|
|
9444 }
|
|
|
9445
|
|
|
9446 /* Look at the TERM variable */
|
|
771
|
9447 if (!egetenv ("TERM"))
|
|
428
|
9448 {
|
|
|
9449 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9450 exit (1);
|
|
|
9451 }
|
|
|
9452
|
|
|
9453 Vinitial_window_system = Qtty;
|
|
|
9454 return;
|
|
|
9455 #else /* not HAVE_TTY */
|
|
|
9456 /* No DISPLAY specified, and no TTY support. */
|
|
|
9457 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9458 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9459 exit (1);
|
|
|
9460 #endif
|
|
|
9461 /* Unreached. */
|
|
|
9462 }
|
|
|
9463
|
|
|
9464 void
|
|
|
9465 syms_of_redisplay (void)
|
|
|
9466 {
|
|
563
|
9467 DEFSYMBOL (Qcursor_in_echo_area);
|
|
428
|
9468 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
563
|
9469 DEFSYMBOL (Qpre_redisplay_hook);
|
|
|
9470 DEFSYMBOL (Qpost_redisplay_hook);
|
|
428
|
9471 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
563
|
9472 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9473 DEFSYMBOL (Qbar_cursor);
|
|
|
9474 DEFSYMBOL (Qredisplay_end_trigger_functions);
|
|
|
9475 DEFSYMBOL (Qtop_bottom);
|
|
|
9476 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9477
|
|
|
9478 DEFSUBR (Fredisplay_echo_area);
|
|
|
9479 DEFSUBR (Fredraw_frame);
|
|
|
9480 DEFSUBR (Fredisplay_frame);
|
|
|
9481 DEFSUBR (Fredraw_device);
|
|
|
9482 DEFSUBR (Fredisplay_device);
|
|
|
9483 DEFSUBR (Fredraw_modeline);
|
|
|
9484 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9485 }
|
|
|
9486
|
|
|
9487 void
|
|
|
9488 vars_of_redisplay (void)
|
|
|
9489 {
|
|
|
9490
|
|
|
9491 #if 0
|
|
|
9492 staticpro (&last_arrow_position);
|
|
|
9493 staticpro (&last_arrow_string);
|
|
|
9494 last_arrow_position = Qnil;
|
|
|
9495 last_arrow_string = Qnil;
|
|
|
9496 #endif /* 0 */
|
|
|
9497
|
|
|
9498 /* #### Probably temporary */
|
|
|
9499 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9500 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9501 line start cache.
|
|
|
9502 */ );
|
|
|
9503 cache_adjustment = 2;
|
|
|
9504
|
|
|
9505 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
9506 Minimum pixel height for clipped bottom display line.
|
|
|
9507 A clipped line shorter than this won't be displayed.
|
|
|
9508 */ ,
|
|
|
9509 redisplay_variable_changed);
|
|
|
9510 vertical_clip = 5;
|
|
|
9511
|
|
|
9512 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
9513 Minimum visible area for clipped glyphs at right boundary.
|
|
|
9514 Clipped glyphs shorter than this won't be displayed.
|
|
|
9515 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
9516 */ ,
|
|
|
9517 redisplay_variable_changed);
|
|
|
9518 horizontal_clip = 5;
|
|
|
9519
|
|
|
9520 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
9521 String displayed by modeline-format's "%m" specification.
|
|
|
9522 */ );
|
|
|
9523 Vglobal_mode_string = Qnil;
|
|
|
9524
|
|
|
9525 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
9526 Marker for where to display an arrow on top of the buffer text.
|
|
|
9527 This must be the beginning of a line in order to work.
|
|
|
9528 See also `overlay-arrow-string'.
|
|
|
9529 */ ,
|
|
|
9530 redisplay_variable_changed);
|
|
|
9531 Voverlay_arrow_position = Qnil;
|
|
|
9532
|
|
|
9533 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
9534 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
9535 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
9536 well as a string.)
|
|
428
|
9537 */ ,
|
|
|
9538 redisplay_variable_changed);
|
|
|
9539 Voverlay_arrow_string = Qnil;
|
|
|
9540
|
|
|
9541 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
9542 *The number of lines to try scrolling a window by when point moves out.
|
|
|
9543 If that fails to bring point back on frame, point is centered instead.
|
|
|
9544 If this is zero, point is always centered after it moves off screen.
|
|
|
9545 */ );
|
|
|
9546 scroll_step = 0;
|
|
|
9547
|
|
|
9548 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
9549 *Scroll up to this many lines, to bring point back on screen.
|
|
|
9550 */ );
|
|
|
9551 scroll_conservatively = 0;
|
|
|
9552
|
|
|
9553 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
9554 &truncate_partial_width_windows /*
|
|
|
9555 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
9556 */ ,
|
|
|
9557 redisplay_variable_changed);
|
|
|
9558 truncate_partial_width_windows = 1;
|
|
|
9559
|
|
442
|
9560 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
9561 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
9562
|
|
|
9563 Default behavior is to flash the whole screen. On some platforms,
|
|
|
9564 special effects are available using the following values:
|
|
|
9565
|
|
|
9566 'display Flash the whole screen (ie, the default behavior).
|
|
|
9567 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
9568
|
|
|
9569 When effects are unavailable on a platform, the visual bell is the
|
|
|
9570 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
9571 */ );
|
|
442
|
9572 Vvisible_bell = Qnil;
|
|
428
|
9573
|
|
|
9574 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
9575 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
9576 A non-nil value is useful if the terminal can automatically preserve
|
|
|
9577 Emacs's frame display when you reenter Emacs.
|
|
|
9578 It is up to you to set this variable if your terminal can do that.
|
|
|
9579 */ );
|
|
|
9580 no_redraw_on_reenter = 0;
|
|
|
9581
|
|
|
9582 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
9583 A symbol naming the window-system under which Emacs is running,
|
|
|
9584 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
9585
|
|
|
9586 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
9587 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
9588 instead.
|
|
|
9589 */ );
|
|
|
9590 Vwindow_system = Qnil;
|
|
|
9591
|
|
|
9592 /* #### Temporary shit until window-system is eliminated. */
|
|
|
9593 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
9594 DON'T TOUCH
|
|
|
9595 */ );
|
|
|
9596 Vinitial_window_system = Qnil;
|
|
|
9597
|
|
|
9598 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
9599 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
9600 */ );
|
|
|
9601 cursor_in_echo_area = 0;
|
|
|
9602
|
|
|
9603 /* #### Shouldn't this be generalized as follows:
|
|
|
9604
|
|
|
9605 if nil, use block cursor.
|
|
|
9606 if a number, use a bar cursor of that width.
|
|
|
9607 Otherwise, use a 1-pixel bar cursor.
|
|
|
9608
|
|
|
9609 #### Or better yet, this variable should be trashed entirely
|
|
|
9610 (use a Lisp-magic variable to maintain compatibility)
|
|
|
9611 and a specifier `cursor-shape' added, which allows a block
|
|
|
9612 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
9613 maybe a caret cursor, etc. */
|
|
|
9614
|
|
|
9615 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
9616 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
9617 */ );
|
|
|
9618 Vbar_cursor = Qnil;
|
|
|
9619
|
|
|
9620 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
9621 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
|
|
|
9622 Function or functions to run before every redisplay.
|
|
|
9623 */ );
|
|
|
9624 Vpre_redisplay_hook = Qnil;
|
|
|
9625
|
|
|
9626 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
|
|
|
9627 Function or functions to run after every redisplay.
|
|
|
9628 */ );
|
|
|
9629 Vpost_redisplay_hook = Qnil;
|
|
|
9630 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
9631
|
|
442
|
9632 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
9633 Function or functions to call when a frame's buffer list has changed.
|
|
|
9634 This is called during redisplay, before redisplaying each frame.
|
|
|
9635 Functions on this hook are called with one argument, the frame.
|
|
|
9636 */ );
|
|
|
9637 Vbuffer_list_changed_hook = Qnil;
|
|
|
9638
|
|
428
|
9639 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
9640 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
9641 at next redisplay. You should not normally change this; the function
|
|
|
9642 `display-warning' automatically does this at appropriate times.
|
|
|
9643 */ );
|
|
|
9644 display_warning_tick = 0;
|
|
|
9645
|
|
|
9646 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
9647 Non-nil means inhibit display of warning messages.
|
|
|
9648 You should *bind* this, not set it. Any pending warning messages
|
|
|
9649 will be displayed when the binding no longer applies.
|
|
|
9650 */ );
|
|
|
9651 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
9652 This way, the warnings don't obliterate the splash screen. */
|
|
|
9653 inhibit_warning_display = 1;
|
|
|
9654
|
|
|
9655 DEFVAR_LISP ("window-size-change-functions",
|
|
|
9656 &Vwindow_size_change_functions /*
|
|
|
9657 Not currently implemented.
|
|
|
9658 Functions called before redisplay, if window sizes have changed.
|
|
|
9659 The value should be a list of functions that take one argument.
|
|
|
9660 Just before redisplay, for each frame, if any of its windows have changed
|
|
|
9661 size since the last redisplay, or have been split or deleted,
|
|
|
9662 all the functions in the list are called, with the frame as argument.
|
|
|
9663 */ );
|
|
|
9664 Vwindow_size_change_functions = Qnil;
|
|
|
9665
|
|
|
9666 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
|
|
|
9667 Not currently implemented.
|
|
|
9668 Functions to call before redisplaying a window with scrolling.
|
|
|
9669 Each function is called with two arguments, the window
|
|
|
9670 and its new display-start position. Note that the value of `window-end'
|
|
|
9671 is not valid when these functions are called.
|
|
|
9672 */ );
|
|
|
9673 Vwindow_scroll_functions = Qnil;
|
|
|
9674
|
|
|
9675 DEFVAR_LISP ("redisplay-end-trigger-functions",
|
|
|
9676 &Vredisplay_end_trigger_functions /*
|
|
|
9677 See `set-window-redisplay-end-trigger'.
|
|
|
9678 */ );
|
|
|
9679 Vredisplay_end_trigger_functions = Qnil;
|
|
|
9680
|
|
|
9681 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
9682 *Non-nil means column display number starts at 1.
|
|
|
9683 */ );
|
|
|
9684 column_number_start_at_one = 0;
|
|
|
9685 }
|
|
|
9686
|
|
|
9687 void
|
|
|
9688 specifier_vars_of_redisplay (void)
|
|
|
9689 {
|
|
|
9690 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
9691 *Width of left margin.
|
|
|
9692 This is a specifier; use `set-specifier' to change it.
|
|
|
9693 */ );
|
|
|
9694 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9695 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9696 set_specifier_caching (Vleft_margin_width,
|
|
438
|
9697 offsetof (struct window, left_margin_width),
|
|
428
|
9698 some_window_value_changed,
|
|
438
|
9699 offsetof (struct frame, left_margin_width),
|
|
444
|
9700 margin_width_changed_in_frame, 0);
|
|
428
|
9701
|
|
|
9702 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
9703 *Width of right margin.
|
|
|
9704 This is a specifier; use `set-specifier' to change it.
|
|
|
9705 */ );
|
|
|
9706 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9707 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9708 set_specifier_caching (Vright_margin_width,
|
|
438
|
9709 offsetof (struct window, right_margin_width),
|
|
428
|
9710 some_window_value_changed,
|
|
438
|
9711 offsetof (struct frame, right_margin_width),
|
|
444
|
9712 margin_width_changed_in_frame, 0);
|
|
428
|
9713
|
|
|
9714 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
9715 *Minimum ascent height of lines.
|
|
|
9716 This is a specifier; use `set-specifier' to change it.
|
|
|
9717 */ );
|
|
|
9718 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
9719 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9720 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
9721 offsetof (struct window, minimum_line_ascent),
|
|
428
|
9722 some_window_value_changed,
|
|
444
|
9723 0, 0, 0);
|
|
428
|
9724
|
|
|
9725 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
9726 *Minimum descent height of lines.
|
|
|
9727 This is a specifier; use `set-specifier' to change it.
|
|
|
9728 */ );
|
|
|
9729 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
9730 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9731 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
9732 offsetof (struct window, minimum_line_descent),
|
|
428
|
9733 some_window_value_changed,
|
|
444
|
9734 0, 0, 0);
|
|
428
|
9735
|
|
|
9736 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
9737 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
9738 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9739 This is a specifier; use `set-specifier' to change it.
|
|
|
9740 */ );
|
|
|
9741 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
9742 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9743 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
9744 offsetof (struct window, use_left_overflow),
|
|
428
|
9745 some_window_value_changed,
|
|
444
|
9746 0, 0, 0);
|
|
428
|
9747
|
|
|
9748 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
9749 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
9750 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9751 This is a specifier; use `set-specifier' to change it.
|
|
|
9752 */ );
|
|
|
9753 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
9754 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9755 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
9756 offsetof (struct window, use_right_overflow),
|
|
428
|
9757 some_window_value_changed,
|
|
444
|
9758 0, 0, 0);
|
|
428
|
9759
|
|
|
9760 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
9761 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
9762 This is a specifier; use `set-specifier' to change it.
|
|
|
9763 */ );
|
|
|
9764 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
9765 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
9766 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
9767 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
9768 text_cursor_visible_p_changed,
|
|
444
|
9769 0, 0, 0);
|
|
428
|
9770
|
|
|
9771 }
|
