|
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.
|
|
1268
|
4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
|
|
428
|
5 Copyright (C) 1995 Sun Microsystems, Inc.
|
|
|
6 Copyright (C) 1996 Chuck Thompson.
|
|
|
7
|
|
|
8 This file is part of XEmacs.
|
|
|
9
|
|
|
10 XEmacs is free software; you can redistribute it and/or modify it
|
|
|
11 under the terms of the GNU General Public License as published by the
|
|
|
12 Free Software Foundation; either version 2, or (at your option) any
|
|
|
13 later version.
|
|
|
14
|
|
|
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
|
|
|
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
18 for more details.
|
|
|
19
|
|
|
20 You should have received a copy of the GNU General Public License
|
|
|
21 along with XEmacs; see the file COPYING. If not, write to
|
|
|
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
23 Boston, MA 02111-1307, USA. */
|
|
|
24
|
|
|
25 /* Synched up with: Not in FSF. */
|
|
|
26
|
|
|
27 /* Author: Chuck Thompson */
|
|
|
28
|
|
|
29 /* Fixed up by Ben Wing for Mule */
|
|
|
30
|
|
|
31 /* This file has been Mule-ized. */
|
|
|
32
|
|
|
33 /*****************************************************************************
|
|
|
34 The Golden Rules of Redisplay
|
|
|
35
|
|
853
|
36 First: It Is Better To Be Correct Than Fast
|
|
|
37 Second: Thou Shalt Use Due Caution When Running Elisp From Within Redisplay
|
|
|
38 Third: It Is Better To Be Fast Than Not To Be
|
|
428
|
39 ****************************************************************************/
|
|
|
40
|
|
1318
|
41 /* Note: The second rule used to prohibit running Elisp from within
|
|
|
42 redisplay, but that's not correct any more -- use
|
|
|
43 call*_trapping_problems() or call_with_suspended_errors() instead.
|
|
853
|
44
|
|
|
45 --ben
|
|
|
46 */
|
|
|
47
|
|
428
|
48 #include <config.h>
|
|
|
49 #include "lisp.h"
|
|
|
50
|
|
|
51 #include "buffer.h"
|
|
|
52 #include "commands.h"
|
|
|
53 #include "debug.h"
|
|
872
|
54 #include "device-impl.h"
|
|
428
|
55 #include "elhash.h"
|
|
853
|
56 #include "events.h"
|
|
872
|
57 #include "extents-impl.h"
|
|
428
|
58 #include "faces.h"
|
|
872
|
59 #include "frame-impl.h"
|
|
428
|
60 #include "glyphs.h"
|
|
|
61 #include "gutter.h"
|
|
|
62 #include "insdel.h"
|
|
|
63 #include "menubar.h"
|
|
872
|
64 #include "objects-impl.h"
|
|
1318
|
65 #include "opaque.h"
|
|
428
|
66 #include "process.h"
|
|
1292
|
67 #include "profile.h"
|
|
428
|
68 #include "redisplay.h"
|
|
|
69 #include "toolbar.h"
|
|
872
|
70 #include "window-impl.h"
|
|
428
|
71 #include "line-number.h"
|
|
|
72 #include "file-coding.h"
|
|
|
73
|
|
442
|
74 #include "sysfile.h"
|
|
|
75
|
|
428
|
76 #ifdef HAVE_TTY
|
|
|
77 #include "console-tty.h"
|
|
|
78 #endif /* HAVE_TTY */
|
|
|
79
|
|
|
80 /* Note: We have to be careful throughout this code to properly handle
|
|
867
|
81 and differentiate between Ibytes and Ichars.
|
|
|
82
|
|
|
83 Since strings are generally composed of Ibytes, I've taken the tack
|
|
|
84 that any contiguous set of Ibytes is called a "string", while
|
|
|
85 any contiguous set of Ichars is called an "array". */
|
|
428
|
86
|
|
|
87 /* Return value to indicate a failure by an add_*_rune routine to add
|
|
|
88 a rune, but no propagation information needs to be returned. */
|
|
|
89 #define ADD_FAILED (prop_block_dynarr *) 1
|
|
|
90
|
|
|
91 #define BEGIN_GLYPHS 0
|
|
|
92 #define END_GLYPHS 1
|
|
|
93 #define LEFT_GLYPHS 2
|
|
|
94 #define RIGHT_GLYPHS 3
|
|
|
95
|
|
|
96 #define VERTICAL_CLIP(w, display) \
|
|
442
|
97 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
|
|
428
|
98 ? INT_MAX \
|
|
442
|
99 : vertical_clip)
|
|
428
|
100
|
|
|
101 /* The following structures are completely private to redisplay.c so
|
|
|
102 we put them here instead of in a header file, for modularity. */
|
|
|
103
|
|
826
|
104 /* NOTE: Bytexpos's not Charxpos's in this structure. */
|
|
428
|
105
|
|
|
106 typedef struct position_redisplay_data_type
|
|
|
107 {
|
|
|
108 /* This information is normally filled in by the create_*_block
|
|
|
109 routines and is used by the add_*_rune routines. */
|
|
|
110 Lisp_Object window;
|
|
|
111 /* if we are working with strings rather than buffers we need a
|
|
|
112 handle to the string */
|
|
|
113 Lisp_Object string;
|
|
|
114 struct device *d;
|
|
|
115 struct display_block *db;
|
|
|
116 struct display_line *dl;
|
|
867
|
117 Ichar ch; /* Character that is to be added. This is
|
|
428
|
118 used to communicate this information to
|
|
867
|
119 add_ichar_rune(). */
|
|
428
|
120 Lisp_Object last_charset; /* The charset of the previous character.
|
|
|
121 Used to optimize some lookups -- we
|
|
|
122 only have to do some things when
|
|
|
123 the charset changes. */
|
|
|
124 face_index last_findex; /* The face index of the previous character.
|
|
|
125 Needed to ensure the validity of the
|
|
|
126 last_charset optimization. */
|
|
|
127
|
|
|
128 int last_char_width; /* The width of the previous character. */
|
|
|
129 int font_is_bogus; /* If true, it means we couldn't instantiate
|
|
|
130 the font for this charset, so we substitute
|
|
|
131 ~'s from the ASCII charset. */
|
|
826
|
132 Bytexpos byte_charpos; /* Position of character we are processing. This
|
|
|
133 is a Bytexpos, meaning it refers to bytes (not
|
|
|
134 chars) and can refer to either buffers (1-based)
|
|
|
135 or strings (0-based). We need to be careful
|
|
|
136 when doing anything that references the text in
|
|
|
137 the buffer or string. */
|
|
|
138 Bytexpos byte_endpos; /* ????? Unknown, under-used. */
|
|
428
|
139 int pixpos;
|
|
|
140 int max_pixpos;
|
|
|
141 int blank_width; /* Width of the blank that is to be added.
|
|
|
142 This is used to communicate this information
|
|
|
143 to add_blank_rune().
|
|
|
144
|
|
|
145 This is also used rather cheesily to
|
|
|
146 communicate the width of the eol-cursor-size
|
|
|
147 blank that exists at the end of the line.
|
|
867
|
148 add_ichar_rune() is called cheesily with
|
|
428
|
149 the non-printing char '\n', which is stuck
|
|
|
150 in the output routines with its width being
|
|
|
151 BLANK_WIDTH. */
|
|
826
|
152 Bytexpos byte_cursor_charpos; /* This stores the buffer position of the
|
|
|
153 cursor. */
|
|
428
|
154 unsigned int cursor_type :3;
|
|
|
155 int cursor_x; /* rune block cursor is at */
|
|
|
156 int start_col; /* Number of character columns (each column has
|
|
|
157 a width of the default char width) that still
|
|
|
158 need to be skipped. This is used for horizontal
|
|
|
159 scrolling, where a certain number of columns
|
|
|
160 (those off the left side of the screen) need
|
|
|
161 to be skipped before anything is displayed. */
|
|
826
|
162 Bytexpos byte_start_col_enabled;
|
|
428
|
163 int start_col_xoffset; /* Number of pixels that still need to
|
|
819
|
164 be skipped. This is used for
|
|
|
165 horizontal scrolling of glyphs, where we want
|
|
|
166 to be able to scroll over part of the glyph. */
|
|
428
|
167
|
|
|
168 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
|
|
|
169 glyph differs from space_width (w).
|
|
|
170 0 if no hscroll glyph was used,
|
|
|
171 i.e. the window is not scrolled
|
|
|
172 horizontally. Used in tab
|
|
|
173 calculations. */
|
|
|
174
|
|
|
175 /* Information about the face the text should be displayed in and
|
|
|
176 any begin-glyphs and end-glyphs. */
|
|
|
177 struct extent_fragment *ef;
|
|
|
178 face_index findex;
|
|
|
179
|
|
819
|
180 /* The height of a pixmap may either be predetermined if the user has set a
|
|
|
181 baseline value, or it may be dependent on whatever the line ascent and
|
|
|
182 descent values end up being, based just on font and pixmap-ascent
|
|
|
183 information. In the first case we can immediately update the values, thus
|
|
|
184 their inclusion here. In the last case we cannot determine the actual
|
|
|
185 contribution to the line height until we have finished laying out all text
|
|
|
186 on the line. Thus we propagate the max height of such pixmaps and do a
|
|
|
187 final calculation (in calculate_baseline()) after all text has been added
|
|
|
188 to the line. */
|
|
428
|
189 int new_ascent;
|
|
|
190 int new_descent;
|
|
|
191 int max_pixmap_height;
|
|
819
|
192 int need_baseline_computation;
|
|
|
193 int end_glyph_width; /* Well, it is the kitchen sink after all ... */
|
|
428
|
194
|
|
|
195 Lisp_Object result_str; /* String where we put the result of
|
|
|
196 generating a formatted string in the modeline. */
|
|
|
197 int is_modeline; /* Non-zero if we're generating the modeline. */
|
|
|
198 Charcount modeline_charpos; /* Number of chars used in result_str so far;
|
|
|
199 corresponds to bytepos. */
|
|
|
200 Bytecount bytepos; /* Number of bytes used in result_str so far.
|
|
|
201 We don't actually copy the bytes into result_str
|
|
|
202 until the end because we don't know how big the
|
|
|
203 string is going to be until then. */
|
|
|
204 } pos_data;
|
|
|
205
|
|
|
206 enum prop_type
|
|
|
207 {
|
|
|
208 PROP_STRING,
|
|
|
209 PROP_CHAR,
|
|
|
210 PROP_MINIBUF_PROMPT,
|
|
819
|
211 PROP_BLANK,
|
|
|
212 PROP_GLYPH
|
|
428
|
213 };
|
|
|
214
|
|
|
215 /* Data that should be propagated to the next line. Either a single
|
|
867
|
216 Ichar, a string of Ibyte's or a glyph.
|
|
428
|
217
|
|
|
218 The actual data that is propagated ends up as a Dynarr of these
|
|
|
219 blocks.
|
|
|
220
|
|
819
|
221 prop_blocks are used to indicate that data that was supposed to go
|
|
|
222 on the previous line couldn't actually be displayed. Generally this
|
|
|
223 shouldn't happen if we are clipping the end of lines. If we are
|
|
|
224 wrapping then we need to display the propagation data before moving
|
|
|
225 on. Its questionable whether we should wrap or clip glyphs in this
|
|
|
226 instance. Most e-lisp relies on clipping so we preserve this
|
|
|
227 behavior.
|
|
|
228
|
|
867
|
229 #### It's unclean that both Ichars and Ibytes are here.
|
|
428
|
230 */
|
|
|
231
|
|
|
232 typedef struct prop_block prop_block;
|
|
|
233 struct prop_block
|
|
|
234 {
|
|
|
235 enum prop_type type;
|
|
|
236
|
|
|
237 union data
|
|
|
238 {
|
|
|
239 struct
|
|
|
240 {
|
|
867
|
241 Ibyte *str;
|
|
428
|
242 Bytecount len; /* length of the string. */
|
|
|
243 } p_string;
|
|
|
244
|
|
|
245 struct
|
|
|
246 {
|
|
867
|
247 Ichar ch;
|
|
826
|
248 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
|
|
428
|
249 unsigned int cursor_type :3;
|
|
|
250 } p_char;
|
|
|
251
|
|
|
252 struct
|
|
|
253 {
|
|
|
254 int width;
|
|
|
255 face_index findex;
|
|
|
256 } p_blank;
|
|
819
|
257
|
|
|
258 struct
|
|
|
259 {
|
|
|
260 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
|
|
|
261 int width;
|
|
|
262 Lisp_Object glyph;
|
|
|
263 } p_glyph;
|
|
|
264
|
|
428
|
265 } data;
|
|
|
266 };
|
|
|
267
|
|
|
268 typedef struct
|
|
|
269 {
|
|
|
270 Dynarr_declare (prop_block);
|
|
|
271 } prop_block_dynarr;
|
|
|
272
|
|
|
273
|
|
|
274 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
|
|
|
275 Charcount pos, Charcount min_pos,
|
|
|
276 Charcount max_pos, Lisp_Object elt,
|
|
|
277 int depth, int max_pixsize,
|
|
438
|
278 face_index findex, int type,
|
|
|
279 Charcount *offset,
|
|
|
280 Lisp_Object cur_ext);
|
|
428
|
281 static prop_block_dynarr *add_glyph_rune (pos_data *data,
|
|
|
282 struct glyph_block *gb,
|
|
|
283 int pos_type, int allow_cursor,
|
|
|
284 struct glyph_cachel *cachel);
|
|
665
|
285 static Bytebpos create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
286 Bytebpos byte_start_pos,
|
|
|
287 prop_block_dynarr **prop,
|
|
|
288 int type);
|
|
428
|
289 static int create_overlay_glyph_block (struct window *w,
|
|
|
290 struct display_line *dl);
|
|
|
291 static void create_left_glyph_block (struct window *w,
|
|
|
292 struct display_line *dl,
|
|
|
293 int overlay_width);
|
|
|
294 static void create_right_glyph_block (struct window *w,
|
|
|
295 struct display_line *dl);
|
|
|
296 static void redisplay_windows (Lisp_Object window, int skip_selected);
|
|
867
|
297 static void decode_mode_spec (struct window *w, Ichar spec, int type);
|
|
428
|
298 static void free_display_line (struct display_line *dl);
|
|
826
|
299 static void update_line_start_cache (struct window *w, Charbpos from,
|
|
|
300 Charbpos to, Charbpos point,
|
|
|
301 int no_regen);
|
|
665
|
302 static int point_visible (struct window *w, Charbpos point, int type);
|
|
819
|
303 static void calculate_yoffset (struct display_line *dl,
|
|
|
304 struct display_block *fixup);
|
|
|
305 static void calculate_baseline (pos_data *data);
|
|
428
|
306
|
|
1204
|
307 #ifdef ERROR_CHECK_DISPLAY
|
|
800
|
308 static void sledgehammer_check_redisplay_structs (void);
|
|
1204
|
309 #endif /* ERROR_CHECK_DISPLAY */
|
|
800
|
310
|
|
428
|
311 /* This used to be 10 but 30 seems to give much better performance. */
|
|
|
312 #define INIT_MAX_PREEMPTS 30
|
|
1268
|
313 static Fixnum max_preempts;
|
|
|
314
|
|
|
315 #define QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION 4
|
|
428
|
316
|
|
1318
|
317 /* Note that doing this can call Lisp. */
|
|
428
|
318 #define REDISPLAY_PREEMPTION_CHECK \
|
|
|
319 ((void) \
|
|
|
320 (preempted = \
|
|
|
321 (!disable_preemption && \
|
|
|
322 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
|
|
1268
|
323 (!INTERACTIVE || \
|
|
|
324 detect_input_pending (QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION)))))
|
|
428
|
325
|
|
|
326 /*
|
|
|
327 * Redisplay global variables.
|
|
|
328 */
|
|
|
329
|
|
|
330 /* We need a third set of display structures for the cursor motion
|
|
|
331 routines. We used to just give each window a third set. However,
|
|
|
332 we always fully regenerate the structures when needed so there
|
|
|
333 isn't any reason we need more than a single set. */
|
|
|
334 display_line_dynarr *cmotion_display_lines;
|
|
|
335
|
|
|
336 /* We store the extents that we need to generate in a Dynarr and then
|
|
|
337 frob them all on at the end of generating the string. We do it
|
|
|
338 this way rather than adding them as we generate the string because
|
|
|
339 we don't store the text into the resulting string until we're done
|
|
|
340 (to avoid having to resize the string multiple times), and we don't
|
|
|
341 want to go around adding extents to a string when the extents might
|
|
|
342 stretch off the end of the string. */
|
|
|
343 static EXTENT_dynarr *formatted_string_extent_dynarr;
|
|
|
344 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
|
|
|
345 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
|
|
|
346
|
|
|
347
|
|
|
348 /* #### probably temporary */
|
|
458
|
349 Fixnum cache_adjustment;
|
|
428
|
350
|
|
|
351 /* This holds a string representing the text corresponding to a single
|
|
|
352 modeline % spec. */
|
|
867
|
353 static Ibyte_dynarr *mode_spec_ibyte_string;
|
|
428
|
354
|
|
|
355 int in_display; /* 1 if in redisplay. */
|
|
|
356
|
|
1318
|
357 /* Whether we should delay size changes. Broken out of
|
|
|
358 enter_redisplay_critical_section(). */
|
|
|
359 int hold_frame_size_changes;
|
|
|
360
|
|
428
|
361 int disable_preemption; /* Used for debugging redisplay and for
|
|
|
362 force-redisplay. */
|
|
|
363
|
|
|
364 /* We only allow max_preempts preemptions before we force a redisplay. */
|
|
|
365 static int preemption_count;
|
|
|
366
|
|
|
367 /* Minimum pixel height of clipped bottom display line. */
|
|
458
|
368 Fixnum vertical_clip;
|
|
428
|
369
|
|
|
370 /* Minimum visible pixel width of clipped glyphs at right margin. */
|
|
458
|
371 Fixnum horizontal_clip;
|
|
428
|
372
|
|
|
373 /* Nonzero means reading single-character input with prompt
|
|
|
374 so put cursor on minibuffer after the prompt. */
|
|
|
375 int cursor_in_echo_area;
|
|
|
376 Lisp_Object Qcursor_in_echo_area;
|
|
|
377
|
|
|
378 /* Nonzero means truncate lines in all windows less wide than the frame */
|
|
|
379 int truncate_partial_width_windows;
|
|
|
380
|
|
|
381 /* non-nil if a buffer has changed since the last time redisplay completed */
|
|
|
382 int buffers_changed;
|
|
|
383 int buffers_changed_set;
|
|
|
384
|
|
|
385 /* non-nil if hscroll has changed somewhere or a buffer has been
|
|
|
386 narrowed or widened */
|
|
|
387 int clip_changed;
|
|
|
388 int clip_changed_set;
|
|
|
389
|
|
|
390 /* non-nil if any extent has changed since the last time redisplay completed */
|
|
|
391 int extents_changed;
|
|
|
392 int extents_changed_set;
|
|
|
393
|
|
|
394 /* non-nil if any face has changed since the last time redisplay completed */
|
|
|
395 int faces_changed;
|
|
|
396
|
|
|
397 /* Nonzero means some frames have been marked as garbaged */
|
|
|
398 int frame_changed;
|
|
|
399
|
|
|
400 /* non-zero if any of the builtin display glyphs (continuation,
|
|
|
401 hscroll, control-arrow, etc) is in need of updating
|
|
|
402 somewhere. */
|
|
|
403 int glyphs_changed;
|
|
|
404 int glyphs_changed_set;
|
|
|
405
|
|
442
|
406 /* non-zero if any subwindow has been deleted. */
|
|
428
|
407 int subwindows_changed;
|
|
|
408 int subwindows_changed_set;
|
|
|
409
|
|
|
410 /* non-zero if any displayed subwindow is in need of updating
|
|
|
411 somewhere. */
|
|
|
412 int subwindows_state_changed;
|
|
|
413 int subwindows_state_changed_set;
|
|
|
414
|
|
|
415 /* This variable is 1 if the icon has to be updated.
|
|
|
416 It is set to 1 when `frame-icon-glyph' changes. */
|
|
|
417 int icon_changed;
|
|
|
418 int icon_changed_set;
|
|
|
419
|
|
|
420 /* This variable is 1 if the menubar widget has to be updated.
|
|
|
421 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
|
|
|
422 has been updated. */
|
|
|
423 int menubar_changed;
|
|
|
424 int menubar_changed_set;
|
|
|
425
|
|
|
426 /* true iff we should redraw the modelines on the next redisplay */
|
|
|
427 int modeline_changed;
|
|
|
428 int modeline_changed_set;
|
|
|
429
|
|
|
430 /* non-nil if point has changed in some buffer since the last time
|
|
|
431 redisplay completed */
|
|
|
432 int point_changed;
|
|
|
433 int point_changed_set;
|
|
|
434
|
|
|
435 /* non-nil if some frame has changed its size */
|
|
|
436 int size_changed;
|
|
|
437
|
|
|
438 /* non-nil if some device has signaled that it wants to change size */
|
|
|
439 int asynch_device_change_pending;
|
|
|
440
|
|
|
441 /* non-nil if any toolbar has changed */
|
|
|
442 int toolbar_changed;
|
|
|
443 int toolbar_changed_set;
|
|
|
444
|
|
905
|
445 /* Nonzero if some frame has changed the layout of internal elements
|
|
|
446 (gutters or toolbars). */
|
|
|
447 int frame_layout_changed;
|
|
|
448
|
|
428
|
449 /* non-nil if any gutter has changed */
|
|
|
450 int gutter_changed;
|
|
|
451 int gutter_changed_set;
|
|
|
452
|
|
|
453 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
454 int windows_changed;
|
|
|
455
|
|
|
456 /* non-nil if any frame's window structure has changed since the last
|
|
|
457 time redisplay completed */
|
|
|
458 int windows_structure_changed;
|
|
|
459
|
|
|
460 /* If non-nil, use vertical bar cursor. */
|
|
|
461 Lisp_Object Vbar_cursor;
|
|
|
462 Lisp_Object Qbar_cursor;
|
|
|
463
|
|
442
|
464 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
|
|
|
465 then the frame will flash instead of
|
|
|
466 beeping when an error occurs */
|
|
428
|
467
|
|
|
468 /* Nonzero means no need to redraw the entire frame on resuming
|
|
|
469 a suspended Emacs. This is useful on terminals with multiple pages,
|
|
|
470 where one page is used for Emacs and another for all else. */
|
|
|
471 int no_redraw_on_reenter;
|
|
|
472
|
|
|
473 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
|
|
|
474 under which emacs is running
|
|
|
475 ('x is the only current possibility) */
|
|
|
476 Lisp_Object Vinitial_window_system;
|
|
|
477
|
|
|
478 Lisp_Object Vglobal_mode_string;
|
|
|
479
|
|
|
480 /* The number of lines scroll a window by when point leaves the window; if
|
|
|
481 it is <=0 then point is centered in the window */
|
|
458
|
482 Fixnum scroll_step;
|
|
428
|
483
|
|
|
484 /* Scroll up to this many lines, to bring point back on screen. */
|
|
458
|
485 Fixnum scroll_conservatively;
|
|
428
|
486
|
|
|
487 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
488 Lisp_Object Voverlay_arrow_position;
|
|
|
489 /* String to display for the arrow. */
|
|
|
490 Lisp_Object Voverlay_arrow_string;
|
|
|
491
|
|
442
|
492 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
|
|
|
493
|
|
458
|
494 static Fixnum last_display_warning_tick;
|
|
|
495 static Fixnum display_warning_tick;
|
|
428
|
496 Lisp_Object Qdisplay_warning_buffer;
|
|
|
497 int inhibit_warning_display;
|
|
|
498
|
|
|
499 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
500 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
501 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
502 Lisp_Object Vtext_cursor_visible_p;
|
|
|
503
|
|
1292
|
504 static Lisp_Object QSin_redisplay;
|
|
|
505
|
|
1318
|
506 static Lisp_Object Vpost_redisplay_actions;
|
|
|
507
|
|
428
|
508 int column_number_start_at_one;
|
|
|
509
|
|
442
|
510 Lisp_Object Qtop_bottom;
|
|
|
511
|
|
444
|
512 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
|
|
428
|
513
|
|
1204
|
514 static const struct memory_description rune_dglyph_description_1[] = {
|
|
|
515 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, glyph) },
|
|
|
516 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, extent) },
|
|
|
517 { XD_END }
|
|
|
518 };
|
|
|
519
|
|
|
520 static const struct sized_memory_description rune_dglyph_description = {
|
|
|
521 sizeof (struct rune_dglyph), rune_dglyph_description_1
|
|
|
522 };
|
|
|
523
|
|
|
524 static const struct memory_description rune_object_description_1[] = {
|
|
2367
|
525 { XD_BLOCK_ARRAY, RUNE_DGLYPH, 1, &rune_dglyph_description },
|
|
1204
|
526 { XD_END }
|
|
|
527 };
|
|
|
528
|
|
|
529 static const struct sized_memory_description rune_object_description = {
|
|
|
530 0, rune_object_description_1
|
|
|
531 };
|
|
|
532
|
|
|
533 static const struct memory_description rune_description_1[] = {
|
|
|
534 { XD_INT, offsetof (rune, type) },
|
|
|
535 { XD_UNION, offsetof (rune, object),
|
|
|
536 XD_INDIRECT (0, 0), &rune_object_description },
|
|
|
537 { XD_END }
|
|
|
538 };
|
|
|
539
|
|
|
540 static const struct sized_memory_description rune_description = {
|
|
|
541 sizeof (rune),
|
|
|
542 rune_description_1
|
|
|
543 };
|
|
|
544
|
|
|
545 static const struct memory_description rune_dynarr_description_1[] = {
|
|
|
546 XD_DYNARR_DESC (rune_dynarr, &rune_description),
|
|
|
547 { XD_END }
|
|
|
548 };
|
|
|
549
|
|
|
550 static const struct sized_memory_description rune_dynarr_description = {
|
|
|
551 sizeof (rune_dynarr),
|
|
|
552 rune_dynarr_description_1
|
|
|
553 };
|
|
|
554
|
|
|
555 static const struct memory_description display_block_description_1[] = {
|
|
2367
|
556 { XD_BLOCK_PTR, offsetof (display_block, runes),
|
|
1204
|
557 1, &rune_dynarr_description },
|
|
|
558 { XD_END }
|
|
|
559 };
|
|
|
560
|
|
|
561 static const struct sized_memory_description display_block_description = {
|
|
|
562 sizeof (display_block),
|
|
|
563 display_block_description_1
|
|
|
564 };
|
|
|
565
|
|
|
566 static const struct memory_description display_block_dynarr_description_1[] = {
|
|
|
567 XD_DYNARR_DESC (display_block_dynarr, &display_block_description),
|
|
|
568 { XD_END }
|
|
|
569 };
|
|
|
570
|
|
|
571 static const struct sized_memory_description display_block_dynarr_description = {
|
|
|
572 sizeof (display_block_dynarr),
|
|
|
573 display_block_dynarr_description_1
|
|
|
574 };
|
|
|
575
|
|
|
576 static const struct memory_description glyph_block_description_1[] = {
|
|
|
577 { XD_LISP_OBJECT, offsetof (glyph_block, glyph) },
|
|
|
578 { XD_LISP_OBJECT, offsetof (glyph_block, extent) },
|
|
|
579 { XD_END }
|
|
|
580 };
|
|
|
581
|
|
|
582 static const struct sized_memory_description glyph_block_description = {
|
|
|
583 sizeof (glyph_block),
|
|
|
584 glyph_block_description_1
|
|
|
585 };
|
|
|
586
|
|
|
587 static const struct memory_description glyph_block_dynarr_description_1[] = {
|
|
|
588 XD_DYNARR_DESC (glyph_block_dynarr, &glyph_block_description),
|
|
|
589 { XD_END }
|
|
|
590 };
|
|
|
591
|
|
|
592 static const struct sized_memory_description glyph_block_dynarr_description = {
|
|
|
593 sizeof (glyph_block_dynarr),
|
|
|
594 glyph_block_dynarr_description_1
|
|
|
595 };
|
|
|
596
|
|
|
597 static const struct memory_description display_line_description_1[] = {
|
|
2367
|
598 { XD_BLOCK_PTR, offsetof (display_line, display_blocks),
|
|
1204
|
599 1, &display_block_dynarr_description },
|
|
2367
|
600 { XD_BLOCK_PTR, offsetof (display_line, left_glyphs),
|
|
1204
|
601 1, &glyph_block_dynarr_description },
|
|
2367
|
602 { XD_BLOCK_PTR, offsetof (display_line, right_glyphs),
|
|
1204
|
603 1, &glyph_block_dynarr_description },
|
|
|
604 { XD_END }
|
|
|
605 };
|
|
|
606
|
|
|
607 static const struct sized_memory_description display_line_description = {
|
|
|
608 sizeof (display_line),
|
|
|
609 display_line_description_1
|
|
|
610 };
|
|
|
611
|
|
|
612 static const struct memory_description display_line_dynarr_description_1[] = {
|
|
|
613 XD_DYNARR_DESC (display_line_dynarr, &display_line_description),
|
|
|
614 { XD_END }
|
|
|
615 };
|
|
|
616
|
|
|
617 const struct sized_memory_description display_line_dynarr_description = {
|
|
|
618 sizeof (display_line_dynarr),
|
|
|
619 display_line_dynarr_description_1
|
|
|
620 };
|
|
|
621
|
|
428
|
622
|
|
|
623 /***************************************************************************/
|
|
|
624 /* */
|
|
|
625 /* low-level interfaces onto device routines */
|
|
|
626 /* */
|
|
|
627 /***************************************************************************/
|
|
|
628
|
|
|
629 static int
|
|
867
|
630 redisplay_text_width_ichar_string (struct window *w, int findex,
|
|
|
631 Ichar *str, Charcount len)
|
|
428
|
632 {
|
|
|
633 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
634 Lisp_Object window;
|
|
|
635
|
|
867
|
636 find_charsets_in_ichar_string (charsets, str, len);
|
|
793
|
637 window = wrap_window (w);
|
|
428
|
638 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
639 charsets);
|
|
|
640 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
641 text_width, (XFRAME (WINDOW_FRAME (w)),
|
|
|
642 WINDOW_FACE_CACHEL (w, findex), str, len));
|
|
|
643 }
|
|
|
644
|
|
867
|
645 static Ichar_dynarr *rtw_ichar_dynarr;
|
|
428
|
646
|
|
|
647 int
|
|
|
648 redisplay_text_width_string (struct window *w, int findex,
|
|
867
|
649 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
650 Bytecount offset, Bytecount len)
|
|
|
651 {
|
|
867
|
652 if (!rtw_ichar_dynarr)
|
|
|
653 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
654 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
655
|
|
|
656 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
657 if (STRINGP (reloc))
|
|
|
658 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
659 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
660 return redisplay_text_width_ichar_string
|
|
|
661 (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
662 Dynarr_length (rtw_ichar_dynarr));
|
|
428
|
663 }
|
|
|
664
|
|
|
665 int
|
|
|
666 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
867
|
667 Ibyte *nonreloc, Lisp_Object reloc,
|
|
428
|
668 Bytecount offset, Bytecount len)
|
|
|
669 {
|
|
|
670 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
671 Lisp_Object frame;
|
|
|
672 struct face_cachel cachel;
|
|
|
673
|
|
867
|
674 if (!rtw_ichar_dynarr)
|
|
|
675 rtw_ichar_dynarr = Dynarr_new (Ichar);
|
|
|
676 Dynarr_reset (rtw_ichar_dynarr);
|
|
428
|
677
|
|
|
678 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
679 if (STRINGP (reloc))
|
|
|
680 nonreloc = XSTRING_DATA (reloc);
|
|
867
|
681 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
|
|
|
682 find_charsets_in_ibyte_string (charsets, nonreloc, len);
|
|
428
|
683 reset_face_cachel (&cachel);
|
|
|
684 cachel.face = face;
|
|
793
|
685 frame = wrap_frame (f);
|
|
428
|
686 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
687 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
867
|
688 text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
|
|
|
689 Dynarr_length (rtw_ichar_dynarr)));
|
|
428
|
690 }
|
|
|
691
|
|
|
692 /* Return the display block from DL of the given TYPE. A display line
|
|
|
693 can have only one display block of each possible type. If DL does
|
|
|
694 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
695
|
|
|
696 struct display_block *
|
|
|
697 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
698 {
|
|
|
699 int elt;
|
|
|
700 struct display_block db;
|
|
|
701
|
|
|
702 /* Check if this display line already has a block of the desired type and
|
|
|
703 if so, return it. */
|
|
|
704 if (dl->display_blocks)
|
|
|
705 {
|
|
|
706 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
707 {
|
|
|
708 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
709 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
710 }
|
|
|
711
|
|
|
712 /* There isn't an active block of the desired type, but there
|
|
|
713 might still be allocated blocks we need to reuse. */
|
|
|
714 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
715 {
|
|
|
716 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
717
|
|
|
718 /* 'add' the block to the list */
|
|
|
719 Dynarr_increment (dl->display_blocks);
|
|
|
720
|
|
|
721 /* initialize and return */
|
|
|
722 dbp->type = type;
|
|
|
723 return dbp;
|
|
|
724 }
|
|
|
725 }
|
|
|
726 else
|
|
|
727 {
|
|
|
728 /* This line doesn't have any display blocks, so initialize the display
|
|
|
729 bock array. */
|
|
|
730 dl->display_blocks = Dynarr_new (display_block);
|
|
|
731 }
|
|
|
732
|
|
|
733 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
734 one and add it to the line. */
|
|
|
735 xzero (db);
|
|
|
736 db.type = type;
|
|
|
737 db.runes = Dynarr_new (rune);
|
|
|
738 Dynarr_add (dl->display_blocks, db);
|
|
|
739
|
|
|
740 /* Return the newly added display block. */
|
|
|
741 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
742
|
|
|
743 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
744 }
|
|
|
745
|
|
|
746 static int
|
|
|
747 tab_char_width (struct window *w)
|
|
|
748 {
|
|
|
749 struct buffer *b = XBUFFER (w->buffer);
|
|
|
750 int char_tab_width = XINT (b->tab_width);
|
|
|
751
|
|
|
752 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
753
|
|
|
754 return char_tab_width;
|
|
|
755 }
|
|
|
756
|
|
|
757 static int
|
|
|
758 space_width (struct window *w)
|
|
|
759 {
|
|
|
760 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
761 fonts the space character tends to give too narrow a value. So
|
|
|
762 we use 'n' instead. Except that we don't. We use the default
|
|
|
763 character width for the default face. If this is actually
|
|
|
764 defined by the font then it is probably the best thing to
|
|
|
765 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
766 already calculated its width. Thus we can avoid a call to
|
|
|
767 XTextWidth on X frames by just querying the default width. */
|
|
|
768 return XFONT_INSTANCE
|
|
|
769 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
770 }
|
|
|
771
|
|
|
772 static int
|
|
|
773 tab_pix_width (struct window *w)
|
|
|
774 {
|
|
|
775 return space_width (w) * tab_char_width (w);
|
|
|
776 }
|
|
|
777
|
|
|
778 /* Given a pixel position in a window, return the pixel location of
|
|
|
779 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
780 terms of spaces displayed in the default face. Formerly the space
|
|
|
781 width was determined using the currently active face. That method
|
|
|
782 leads to tabstops which do not line up. */
|
|
|
783
|
|
|
784 static int
|
|
|
785 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
786 {
|
|
|
787 int n_pos = left_pixpos;
|
|
|
788 int pix_tab_width = tab_pix_width (w);
|
|
|
789
|
|
|
790 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
791 if (WINDOW_SCROLLED (w))
|
|
|
792 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
|
|
|
793
|
|
|
794 while (n_pos <= start_pixpos)
|
|
|
795 n_pos += pix_tab_width;
|
|
|
796
|
|
|
797 return n_pos;
|
|
|
798 }
|
|
|
799
|
|
|
800 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
801 display line. The whitespace boundaries must be calculated by the text
|
|
|
802 layout routines. */
|
|
|
803
|
|
|
804 layout_bounds
|
|
|
805 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
806 {
|
|
|
807 layout_bounds bounds;
|
|
|
808
|
|
|
809 /* Set the outermost boundaries which are the boundaries of the
|
|
|
810 window itself minus the gutters (and minus the scrollbars if this
|
|
|
811 is for the modeline). */
|
|
|
812 if (!modeline)
|
|
|
813 {
|
|
|
814 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
815 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
816 }
|
|
|
817 else
|
|
|
818 {
|
|
|
819 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
820 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
821 }
|
|
|
822
|
|
|
823 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
824 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
825 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
826
|
|
|
827 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
828 depend on the contents of the line being displayed. */
|
|
|
829 bounds.left_white = bounds.left_in;
|
|
|
830 bounds.right_white = bounds.right_in;
|
|
|
831
|
|
|
832 return bounds;
|
|
|
833 }
|
|
|
834
|
|
819
|
835 /* This takes a display_block and its containing line and corrects the yoffset
|
|
|
836 of each glyph in the block to cater for the ascent of the line as a
|
|
|
837 whole. Must be called *after* the line-ascent is known! */
|
|
|
838
|
|
|
839 static void
|
|
|
840 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
|
|
|
841 {
|
|
|
842 int i;
|
|
|
843 for (i=0; i<Dynarr_length (fixup->runes); i++)
|
|
|
844 {
|
|
|
845 struct rune *r = Dynarr_atp (fixup->runes,i);
|
|
|
846 if (r->type == RUNE_DGLYPH)
|
|
|
847 {
|
|
|
848 if (r->object.dglyph.ascent < dl->ascent)
|
|
|
849 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
|
|
|
850 r->object.dglyph.descent;
|
|
|
851 }
|
|
|
852 }
|
|
|
853 }
|
|
|
854
|
|
|
855 /* Calculate the textual baseline (the ascent and descent values for the
|
|
|
856 display_line as a whole).
|
|
|
857
|
|
|
858 If the baseline is completely blank, or contains no manually positioned
|
|
|
859 glyphs, then the textual baseline is simply the baseline of the default font.
|
|
|
860 (The `contains no manually positioned glyphs' part is actually done for
|
|
867
|
861 us by `add_ichar_rune'.)
|
|
819
|
862
|
|
|
863 If the baseline contains pixmaps, and they're all manually positioned, then
|
|
|
864 the textual baseline location is constrained that way, and we need do no
|
|
|
865 work.
|
|
|
866
|
|
|
867 If the baseline contains pixmaps, and at least one is automatically
|
|
|
868 positioned, then the textual ascent is the largest ascent on the line, and
|
|
|
869 the textual descent is the largest descent (which is how things are set up at
|
|
|
870 entry to this function anyway): except that if the max_ascent + max_descent
|
|
|
871 is too small for the height of the line (say you've adjusted the baseline of
|
|
|
872 a short glyph, and there's a tall one next to it), then take the ascent and
|
|
|
873 descent for the line individually from the largest of the explicitly set
|
|
|
874 ascent/descent, and the rescaled ascent/descent of the default font, scaled
|
|
|
875 such that the largest glyph will fit.
|
|
|
876
|
|
|
877 This means that if you have a short glyph (but taller than the default
|
|
|
878 font's descent) forced right under the baseline, and a really tall
|
|
|
879 automatically positioned glyph, that the descent for the line is just big
|
|
|
880 enough for the manually positioned short glyph, and the tall one uses as
|
|
|
881 much of that space as the default font would were it as tall as the tall
|
|
|
882 glyph; but that the ascent is big enough for the tall glyph to fit.
|
|
|
883
|
|
|
884 This behaviour means that under no circumstances will changing the baseline
|
|
|
885 of a short glyph cause a tall glyph to move around; nor will it move the
|
|
|
886 textual baseline more than necessary. (Changing a tall glyph's baseline
|
|
|
887 might move the text's baseline arbitrarily, of course.) */
|
|
|
888
|
|
|
889 static void
|
|
|
890 calculate_baseline (pos_data *data)
|
|
|
891 {
|
|
|
892 /* Blank line: baseline is default font's baseline. */
|
|
|
893
|
|
|
894 if (!data->new_ascent && !data->new_descent)
|
|
|
895 {
|
|
|
896 /* We've got a blank line so initialize these values from the default
|
|
|
897 face. */
|
|
|
898 default_face_font_info (data->window, &data->new_ascent,
|
|
|
899 &data->new_descent, 0, 0, 0);
|
|
|
900 }
|
|
|
901
|
|
|
902 /* No automatically positioned glyphs? Return at once. */
|
|
|
903 if (!data->need_baseline_computation)
|
|
|
904 return;
|
|
|
905
|
|
|
906 /* Is the tallest glyph on the line automatically positioned?
|
|
|
907 If it's manually positioned, or it's automatically positioned
|
|
|
908 and there's enough room for it anyway, we need do no more work. */
|
|
|
909 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
910 {
|
|
|
911 int default_font_ascent, default_font_descent, default_font_height;
|
|
|
912 int scaled_default_font_ascent, scaled_default_font_descent;
|
|
|
913
|
|
|
914 default_face_font_info (data->window, &default_font_ascent,
|
|
|
915 &default_font_descent, &default_font_height,
|
|
|
916 0, 0);
|
|
|
917
|
|
|
918 scaled_default_font_ascent = data->max_pixmap_height *
|
|
|
919 default_font_ascent / default_font_height;
|
|
|
920
|
|
|
921 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
|
|
|
922
|
|
|
923 /* The ascent may have expanded now. Do we still need to grow the descent,
|
|
|
924 or are things big enough?
|
|
|
925
|
|
|
926 The +1 caters for the baseline row itself. */
|
|
|
927 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
928 {
|
|
|
929 scaled_default_font_descent = (data->max_pixmap_height *
|
|
|
930 default_font_descent / default_font_height) + 1;
|
|
|
931
|
|
|
932 data->new_descent = max (data->new_descent, scaled_default_font_descent);
|
|
|
933 }
|
|
|
934 }
|
|
|
935 }
|
|
|
936
|
|
428
|
937 /* Given a display line and a starting position, ensure that the
|
|
|
938 contents of the display line accurately represent the visual
|
|
|
939 representation of the buffer contents starting from the given
|
|
|
940 position when displayed in the given window. The display line ends
|
|
|
941 when the contents of the line reach the right boundary of the given
|
|
|
942 window. */
|
|
|
943
|
|
665
|
944 static Charbpos
|
|
428
|
945 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
665
|
946 Charbpos start_pos, prop_block_dynarr **prop,
|
|
428
|
947 int type)
|
|
|
948 {
|
|
826
|
949 Charbpos ret_charpos;
|
|
428
|
950 int overlay_width;
|
|
|
951 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
952
|
|
|
953 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
954 if (!bounds)
|
|
|
955 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
956
|
|
|
957 /* Reset what this line is using. */
|
|
|
958 if (dl->display_blocks)
|
|
|
959 Dynarr_reset (dl->display_blocks);
|
|
|
960 if (dl->left_glyphs)
|
|
|
961 {
|
|
|
962 Dynarr_free (dl->left_glyphs);
|
|
|
963 dl->left_glyphs = 0;
|
|
|
964 }
|
|
|
965 if (dl->right_glyphs)
|
|
|
966 {
|
|
|
967 Dynarr_free (dl->right_glyphs);
|
|
|
968 dl->right_glyphs = 0;
|
|
|
969 }
|
|
|
970
|
|
|
971 /* We aren't generating a modeline at the moment. */
|
|
|
972 dl->modeline = 0;
|
|
|
973
|
|
|
974 /* Create a display block for the text region of the line. */
|
|
|
975 {
|
|
|
976 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
665
|
977 Bytebpos hacked_up_bytebpos =
|
|
|
978 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
|
|
428
|
979 prop, type);
|
|
826
|
980 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
|
|
|
981 ret_charpos = BUF_ZV (b) + 1;
|
|
428
|
982 else
|
|
826
|
983 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
|
|
428
|
984 }
|
|
826
|
985 dl->charpos = start_pos;
|
|
|
986 if (dl->end_charpos < dl->charpos)
|
|
|
987 dl->end_charpos = dl->charpos;
|
|
428
|
988
|
|
|
989 if (MARKERP (Voverlay_arrow_position)
|
|
|
990 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
991 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
992 && (STRINGP (Voverlay_arrow_string)
|
|
|
993 || GLYPHP (Voverlay_arrow_string)))
|
|
|
994 {
|
|
|
995 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
996 }
|
|
|
997 else
|
|
|
998 overlay_width = 0;
|
|
|
999
|
|
|
1000 /* If there are left glyphs associated with any character in the
|
|
|
1001 text block, then create a display block to handle them. */
|
|
|
1002 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
1003 create_left_glyph_block (w, dl, overlay_width);
|
|
|
1004
|
|
|
1005 /* If there are right glyphs associated with any character in the
|
|
|
1006 text block, then create a display block to handle them. */
|
|
|
1007 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
1008 create_right_glyph_block (w, dl);
|
|
|
1009
|
|
|
1010 /* In the future additional types of display blocks may be generated
|
|
|
1011 here. */
|
|
|
1012
|
|
826
|
1013 w->last_redisplay_pos = ret_charpos;
|
|
|
1014
|
|
|
1015 return ret_charpos;
|
|
428
|
1016 }
|
|
|
1017
|
|
|
1018 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
1019 the block had better be empty.
|
|
|
1020
|
|
|
1021 Yes, there are multiple places where this function is called but
|
|
|
1022 that is the way it has to be. Each calling function has to deal
|
|
826
|
1023 with byte_start_col_enabled a little differently depending on the
|
|
428
|
1024 object being worked with. */
|
|
|
1025
|
|
|
1026 static prop_block_dynarr *
|
|
|
1027 add_hscroll_rune (pos_data *data)
|
|
|
1028 {
|
|
|
1029 struct glyph_block gb;
|
|
|
1030 prop_block_dynarr *retval;
|
|
826
|
1031 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
1032 int old_cursor_type = data->cursor_type;
|
|
826
|
1033 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
1034
|
|
|
1035 if (data->cursor_type == CURSOR_ON
|
|
826
|
1036 && data->byte_cursor_charpos >= data->byte_start_col_enabled
|
|
|
1037 && data->byte_cursor_charpos <= data->byte_charpos)
|
|
|
1038 {
|
|
|
1039 data->byte_cursor_charpos = data->byte_start_col_enabled;
|
|
428
|
1040 }
|
|
|
1041 else
|
|
|
1042 {
|
|
|
1043 data->cursor_type = NO_CURSOR;
|
|
|
1044 }
|
|
|
1045
|
|
826
|
1046 data->byte_endpos = data->byte_charpos;
|
|
|
1047 data->byte_charpos = data->byte_start_col_enabled;
|
|
428
|
1048
|
|
|
1049 gb.extent = Qnil;
|
|
|
1050 gb.glyph = Vhscroll_glyph;
|
|
|
1051 {
|
|
|
1052 int oldpixpos = data->pixpos;
|
|
442
|
1053 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
|
|
428
|
1054 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
1055 HSCROLL_GLYPH_INDEX));
|
|
|
1056 data->hscroll_glyph_width_adjust =
|
|
|
1057 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
|
|
|
1058 }
|
|
826
|
1059 data->byte_endpos = 0;
|
|
|
1060 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
1061 data->cursor_type = old_cursor_type;
|
|
826
|
1062 data->byte_charpos = byte_old_charpos;
|
|
|
1063
|
|
|
1064 data->byte_start_col_enabled = 0;
|
|
428
|
1065 return retval;
|
|
|
1066 }
|
|
|
1067
|
|
793
|
1068 /* Adds a character rune to a display block. If there is not enough room
|
|
|
1069 to fit the rune on the display block (as determined by the MAX_PIXPOS)
|
|
|
1070 then it adds nothing and returns ADD_FAILED. If
|
|
|
1071 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
|
|
867
|
1072 to affect the total line height. (See add_ibyte_string_runes()). */
|
|
428
|
1073
|
|
|
1074 static prop_block_dynarr *
|
|
867
|
1075 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height)
|
|
428
|
1076 {
|
|
|
1077 struct rune rb, *crb;
|
|
|
1078 int width, local;
|
|
|
1079
|
|
|
1080 if (data->start_col)
|
|
|
1081 {
|
|
|
1082 data->start_col--;
|
|
|
1083
|
|
|
1084 if (data->start_col)
|
|
|
1085 return NULL;
|
|
|
1086 }
|
|
|
1087
|
|
826
|
1088 if (data->byte_start_col_enabled)
|
|
428
|
1089 {
|
|
|
1090 return add_hscroll_rune (data);
|
|
|
1091 }
|
|
|
1092
|
|
|
1093 if (data->ch == '\n')
|
|
|
1094 {
|
|
|
1095 data->font_is_bogus = 0;
|
|
|
1096 /* Cheesy end-of-line pseudo-character. */
|
|
|
1097 width = data->blank_width;
|
|
|
1098 }
|
|
|
1099 else
|
|
|
1100 {
|
|
867
|
1101 Lisp_Object charset = ichar_charset (data->ch);
|
|
428
|
1102 if (!EQ (charset, data->last_charset) ||
|
|
|
1103 data->findex != data->last_findex)
|
|
|
1104 {
|
|
|
1105 /* OK, we need to do things the hard way. */
|
|
|
1106 struct window *w = XWINDOW (data->window);
|
|
|
1107 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
1108 Lisp_Object font_instance =
|
|
|
1109 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
1110 charset);
|
|
440
|
1111 Lisp_Font_Instance *fi;
|
|
428
|
1112
|
|
|
1113 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
1114 {
|
|
|
1115 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
1116 data->font_is_bogus = 1;
|
|
|
1117 }
|
|
|
1118 else
|
|
|
1119 data->font_is_bogus = 0;
|
|
|
1120
|
|
|
1121 fi = XFONT_INSTANCE (font_instance);
|
|
771
|
1122 if (!fi->proportional_p || data->font_is_bogus)
|
|
|
1123 {
|
|
867
|
1124 Ichar ch = data->font_is_bogus ? '~' : data->ch;
|
|
771
|
1125
|
|
|
1126 data->last_char_width =
|
|
867
|
1127 redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1128 data->findex, &ch, 1);
|
|
|
1129 }
|
|
428
|
1130 else
|
|
|
1131 data->last_char_width = -1;
|
|
819
|
1132
|
|
793
|
1133 if (!no_contribute_to_line_height)
|
|
|
1134 {
|
|
|
1135 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
|
1136 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
1137 }
|
|
819
|
1138
|
|
428
|
1139 data->last_charset = charset;
|
|
|
1140 data->last_findex = data->findex;
|
|
|
1141 }
|
|
|
1142
|
|
|
1143 width = data->last_char_width;
|
|
771
|
1144 if (width < 0) /* proportional fonts */
|
|
867
|
1145 width = redisplay_text_width_ichar_string (XWINDOW (data->window),
|
|
771
|
1146 data->findex,
|
|
|
1147 &data->ch, 1);
|
|
428
|
1148 }
|
|
|
1149
|
|
|
1150 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
1151 {
|
|
|
1152 return ADD_FAILED;
|
|
|
1153 }
|
|
|
1154
|
|
|
1155 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
1156 {
|
|
|
1157 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
1158 local = 0;
|
|
|
1159 }
|
|
|
1160 else
|
|
|
1161 {
|
|
|
1162 crb = &rb;
|
|
|
1163 local = 1;
|
|
|
1164 }
|
|
|
1165
|
|
|
1166 crb->findex = data->findex;
|
|
|
1167 crb->xpos = data->pixpos;
|
|
|
1168 crb->width = width;
|
|
826
|
1169 if (data->byte_charpos)
|
|
428
|
1170 {
|
|
|
1171 if (NILP (data->string))
|
|
826
|
1172 crb->charpos =
|
|
793
|
1173 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
|
|
|
1174 (XWINDOW (data->window))),
|
|
826
|
1175 data->byte_charpos);
|
|
428
|
1176 else
|
|
826
|
1177 crb->charpos =
|
|
|
1178 string_index_byte_to_char (data->string, data->byte_charpos);
|
|
428
|
1179 }
|
|
|
1180 else if (data->is_modeline)
|
|
826
|
1181 crb->charpos = data->modeline_charpos;
|
|
428
|
1182 else
|
|
442
|
1183 /* Text but not in buffer */
|
|
826
|
1184 crb->charpos = 0;
|
|
428
|
1185 crb->type = RUNE_CHAR;
|
|
|
1186 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1187 crb->endpos = 0;
|
|
|
1188
|
|
|
1189 if (data->cursor_type == CURSOR_ON)
|
|
|
1190 {
|
|
826
|
1191 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1192 {
|
|
|
1193 crb->cursor_type = CURSOR_ON;
|
|
|
1194 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1195 }
|
|
|
1196 else
|
|
|
1197 crb->cursor_type = CURSOR_OFF;
|
|
|
1198 }
|
|
|
1199 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1200 {
|
|
|
1201 crb->cursor_type = CURSOR_ON;
|
|
|
1202 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1203 data->cursor_type = NO_CURSOR;
|
|
|
1204 }
|
|
|
1205 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1206 crb->cursor_type = IGNORE_CURSOR;
|
|
|
1207 else
|
|
|
1208 crb->cursor_type = CURSOR_OFF;
|
|
|
1209
|
|
|
1210 if (local)
|
|
|
1211 Dynarr_add (data->db->runes, *crb);
|
|
|
1212 else
|
|
|
1213 Dynarr_increment (data->db->runes);
|
|
|
1214
|
|
|
1215 data->pixpos += width;
|
|
|
1216
|
|
|
1217 return NULL;
|
|
|
1218 }
|
|
|
1219
|
|
793
|
1220 static prop_block_dynarr *
|
|
867
|
1221 add_ichar_rune (pos_data *data)
|
|
|
1222 {
|
|
|
1223 return add_ichar_rune_1 (data, 0);
|
|
|
1224 }
|
|
|
1225
|
|
|
1226 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for
|
|
793
|
1227 each character in the string. Propagate any left-over data unless
|
|
|
1228 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
|
|
|
1229 allow this character to increase the total height of the line. (This is
|
|
|
1230 used when the character is part of a text glyph. In that case, the
|
|
|
1231 glyph code itself adjusts the line height as necessary, depending on
|
|
|
1232 whether glyph-contrib-p is true.) */
|
|
428
|
1233
|
|
|
1234 static prop_block_dynarr *
|
|
867
|
1235 add_ibyte_string_runes (pos_data *data, Ibyte *c_string,
|
|
793
|
1236 Bytecount c_length, int no_prop,
|
|
|
1237 int no_contribute_to_line_height)
|
|
428
|
1238 {
|
|
867
|
1239 Ibyte *pos, *end = c_string + c_length;
|
|
428
|
1240 prop_block_dynarr *prop;
|
|
|
1241
|
|
|
1242 /* #### This function is too simplistic. It needs to do the same
|
|
|
1243 sort of character interpretation (display-table lookup,
|
|
|
1244 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
1245 The functionality to do this in that routine needs to be
|
|
|
1246 modularized. */
|
|
|
1247
|
|
|
1248 for (pos = c_string; pos < end;)
|
|
|
1249 {
|
|
867
|
1250 Ibyte *old_pos = pos;
|
|
|
1251
|
|
|
1252 data->ch = itext_ichar (pos);
|
|
|
1253
|
|
|
1254 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
|
|
428
|
1255
|
|
|
1256 if (prop)
|
|
|
1257 {
|
|
|
1258 if (no_prop)
|
|
|
1259 return ADD_FAILED;
|
|
|
1260 else
|
|
|
1261 {
|
|
|
1262 struct prop_block pb;
|
|
|
1263 Bytecount len = end - pos;
|
|
|
1264 prop = Dynarr_new (prop_block);
|
|
|
1265
|
|
|
1266 pb.type = PROP_STRING;
|
|
867
|
1267 pb.data.p_string.str = xnew_array (Ibyte, len);
|
|
428
|
1268 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
1269 pb.data.p_string.len = len;
|
|
|
1270
|
|
|
1271 Dynarr_add (prop, pb);
|
|
|
1272 return prop;
|
|
|
1273 }
|
|
|
1274 }
|
|
867
|
1275 INC_IBYTEPTR (pos);
|
|
428
|
1276 assert (pos <= end);
|
|
464
|
1277 /* #### Duplicate code from add_string_to_fstring_db_runes
|
|
|
1278 should we do more?*/
|
|
|
1279 data->bytepos += pos - old_pos;
|
|
428
|
1280 }
|
|
|
1281
|
|
|
1282 return NULL;
|
|
|
1283 }
|
|
|
1284
|
|
|
1285 /* Add a single rune of the specified width. The area covered by this
|
|
|
1286 rune will be displayed in the foreground color of the associated
|
|
|
1287 face. */
|
|
|
1288
|
|
|
1289 static prop_block_dynarr *
|
|
|
1290 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1291 {
|
|
|
1292 struct rune rb;
|
|
|
1293
|
|
|
1294 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1295 been to add it as a tab. */
|
|
|
1296 if (data->start_col)
|
|
|
1297 {
|
|
|
1298 /* assert (w != NULL) */
|
|
|
1299 prop_block_dynarr *retval;
|
|
|
1300
|
|
|
1301 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1302 the width of this tab and return. */
|
|
|
1303 if (char_tab_width < data->start_col)
|
|
|
1304 {
|
|
|
1305 data->start_col -= char_tab_width;
|
|
|
1306 return NULL;
|
|
|
1307 }
|
|
|
1308 else if (char_tab_width == data->start_col)
|
|
|
1309 data->blank_width = 0;
|
|
|
1310 else
|
|
|
1311 {
|
|
|
1312 int spcwid = space_width (w);
|
|
|
1313
|
|
|
1314 if (spcwid >= data->blank_width)
|
|
|
1315 data->blank_width = 0;
|
|
|
1316 else
|
|
|
1317 data->blank_width -= spcwid;
|
|
|
1318 }
|
|
|
1319
|
|
|
1320 data->start_col = 0;
|
|
|
1321 retval = add_hscroll_rune (data);
|
|
|
1322
|
|
|
1323 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1324 if (retval != NULL || !data->blank_width)
|
|
|
1325 return retval;
|
|
|
1326 }
|
|
|
1327
|
|
|
1328 /* Blank runes are always calculated to fit. */
|
|
|
1329 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1330
|
|
|
1331 rb.findex = data->findex;
|
|
|
1332 rb.xpos = data->pixpos;
|
|
|
1333 rb.width = data->blank_width;
|
|
826
|
1334 if (data->byte_charpos)
|
|
|
1335 rb.charpos =
|
|
665
|
1336 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
|
|
826
|
1337 data->byte_charpos);
|
|
428
|
1338 else
|
|
|
1339 /* #### and this is really correct too? */
|
|
826
|
1340 rb.charpos = 0;
|
|
428
|
1341 rb.endpos = 0;
|
|
|
1342 rb.type = RUNE_BLANK;
|
|
|
1343
|
|
|
1344 if (data->cursor_type == CURSOR_ON)
|
|
|
1345 {
|
|
826
|
1346 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
1347 {
|
|
|
1348 rb.cursor_type = CURSOR_ON;
|
|
|
1349 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1350 }
|
|
|
1351 else
|
|
|
1352 rb.cursor_type = CURSOR_OFF;
|
|
|
1353 }
|
|
|
1354 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1355 {
|
|
|
1356 rb.cursor_type = CURSOR_ON;
|
|
|
1357 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1358 data->cursor_type = NO_CURSOR;
|
|
|
1359 }
|
|
|
1360 else
|
|
|
1361 rb.cursor_type = CURSOR_OFF;
|
|
|
1362
|
|
|
1363 Dynarr_add (data->db->runes, rb);
|
|
|
1364 data->pixpos += data->blank_width;
|
|
|
1365
|
|
|
1366 return NULL;
|
|
|
1367 }
|
|
|
1368
|
|
|
1369 /* Add runes representing a character in octal. */
|
|
|
1370
|
|
|
1371 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1372 { \
|
|
867
|
1373 if (add_failed || (add_failed = add_ichar_rune (data))) \
|
|
428
|
1374 { \
|
|
|
1375 struct prop_block pb; \
|
|
|
1376 if (!prop) \
|
|
|
1377 prop = Dynarr_new (prop_block); \
|
|
|
1378 \
|
|
|
1379 pb.type = PROP_CHAR; \
|
|
|
1380 pb.data.p_char.ch = data->ch; \
|
|
|
1381 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1382 Dynarr_add (prop, pb); \
|
|
|
1383 } \
|
|
|
1384 } while (0)
|
|
|
1385
|
|
|
1386 static prop_block_dynarr *
|
|
|
1387 add_octal_runes (pos_data *data)
|
|
|
1388 {
|
|
819
|
1389 prop_block_dynarr *add_failed, *prop = 0;
|
|
867
|
1390 Ichar orig_char = data->ch;
|
|
647
|
1391 int orig_cursor_type = data->cursor_type;
|
|
428
|
1392
|
|
|
1393 /* Initialize */
|
|
|
1394 add_failed = NULL;
|
|
|
1395
|
|
|
1396 if (data->start_col)
|
|
|
1397 data->start_col--;
|
|
|
1398
|
|
|
1399 if (!data->start_col)
|
|
|
1400 {
|
|
826
|
1401 if (data->byte_start_col_enabled)
|
|
428
|
1402 {
|
|
|
1403 add_failed = add_hscroll_rune (data);
|
|
|
1404 }
|
|
|
1405 else
|
|
|
1406 {
|
|
|
1407 struct glyph_block gb;
|
|
|
1408 struct window *w = XWINDOW (data->window);
|
|
|
1409
|
|
|
1410 gb.extent = Qnil;
|
|
|
1411 gb.glyph = Voctal_escape_glyph;
|
|
|
1412 add_failed =
|
|
|
1413 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1414 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1415 }
|
|
|
1416 }
|
|
|
1417
|
|
|
1418 /* We only propagate information if the glyph was partially
|
|
|
1419 added. */
|
|
|
1420 if (add_failed)
|
|
|
1421 return add_failed;
|
|
|
1422
|
|
|
1423 data->cursor_type = IGNORE_CURSOR;
|
|
|
1424
|
|
|
1425 if (data->ch >= 0x100)
|
|
|
1426 {
|
|
|
1427 /* If the character is an extended Mule character, it could have
|
|
|
1428 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1429 octal number. This is not that pretty, but whatever. */
|
|
|
1430 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1431 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1432
|
|
|
1433 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1434 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1435
|
|
|
1436 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1437 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1438
|
|
|
1439 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1440 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1441 }
|
|
|
1442
|
|
|
1443 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1444 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1445
|
|
|
1446 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1447 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1448
|
|
|
1449 data->ch = (7 & orig_char) + '0';
|
|
|
1450 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1451
|
|
|
1452 data->cursor_type = orig_cursor_type;
|
|
819
|
1453 return NULL;
|
|
428
|
1454 }
|
|
|
1455
|
|
|
1456 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1457
|
|
|
1458 /* Add runes representing a control character to a display block. */
|
|
|
1459
|
|
|
1460 static prop_block_dynarr *
|
|
|
1461 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1462 {
|
|
|
1463 if (!NILP (b->ctl_arrow))
|
|
|
1464 {
|
|
|
1465 prop_block_dynarr *prop;
|
|
867
|
1466 Ichar orig_char = data->ch;
|
|
647
|
1467 int old_cursor_type = data->cursor_type;
|
|
428
|
1468
|
|
|
1469 /* Initialize */
|
|
|
1470 prop = NULL;
|
|
|
1471
|
|
|
1472 if (data->start_col)
|
|
|
1473 data->start_col--;
|
|
|
1474
|
|
|
1475 if (!data->start_col)
|
|
|
1476 {
|
|
826
|
1477 if (data->byte_start_col_enabled)
|
|
428
|
1478 {
|
|
|
1479 prop_block_dynarr *retval;
|
|
|
1480
|
|
|
1481 retval = add_hscroll_rune (data);
|
|
|
1482 if (retval)
|
|
|
1483 return retval;
|
|
|
1484 }
|
|
|
1485 else
|
|
|
1486 {
|
|
|
1487 struct glyph_block gb;
|
|
|
1488 struct window *w = XWINDOW (data->window);
|
|
|
1489
|
|
|
1490 gb.extent = Qnil;
|
|
|
1491 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1492
|
|
|
1493 /* We only propagate information if the glyph was partially
|
|
|
1494 added. */
|
|
|
1495 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1496 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1497 return ADD_FAILED;
|
|
|
1498 }
|
|
|
1499 }
|
|
|
1500
|
|
|
1501 if (orig_char == 0177)
|
|
|
1502 data->ch = '?';
|
|
|
1503 else
|
|
|
1504 data->ch = orig_char ^ 0100;
|
|
|
1505 data->cursor_type = IGNORE_CURSOR;
|
|
|
1506
|
|
867
|
1507 if (add_ichar_rune (data))
|
|
428
|
1508 {
|
|
|
1509 struct prop_block pb;
|
|
|
1510 if (!prop)
|
|
|
1511 prop = Dynarr_new (prop_block);
|
|
|
1512
|
|
|
1513 pb.type = PROP_CHAR;
|
|
|
1514 pb.data.p_char.ch = data->ch;
|
|
|
1515 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1516 Dynarr_add (prop, pb);
|
|
|
1517 }
|
|
|
1518
|
|
|
1519 data->cursor_type = old_cursor_type;
|
|
|
1520 return prop;
|
|
|
1521 }
|
|
|
1522 else
|
|
|
1523 {
|
|
|
1524 return add_octal_runes (data);
|
|
|
1525 }
|
|
|
1526 }
|
|
|
1527
|
|
|
1528 static prop_block_dynarr *
|
|
|
1529 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
|
|
|
1530 {
|
|
|
1531 prop_block_dynarr *prop = NULL;
|
|
|
1532
|
|
|
1533 if (STRINGP (entry))
|
|
|
1534 {
|
|
867
|
1535 prop = add_ibyte_string_runes (data,
|
|
428
|
1536 XSTRING_DATA (entry),
|
|
|
1537 XSTRING_LENGTH (entry),
|
|
793
|
1538 0, 0);
|
|
428
|
1539 }
|
|
|
1540 else if (GLYPHP (entry))
|
|
|
1541 {
|
|
|
1542 if (data->start_col)
|
|
|
1543 data->start_col--;
|
|
|
1544
|
|
826
|
1545 if (!data->start_col && data->byte_start_col_enabled)
|
|
428
|
1546 {
|
|
|
1547 prop = add_hscroll_rune (data);
|
|
|
1548 }
|
|
|
1549 else
|
|
|
1550 {
|
|
|
1551 struct glyph_block gb;
|
|
|
1552
|
|
|
1553 gb.glyph = entry;
|
|
|
1554 gb.extent = Qnil;
|
|
|
1555 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1556 }
|
|
|
1557 }
|
|
|
1558 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1559 {
|
|
|
1560 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
867
|
1561 prop = add_ichar_rune (data);
|
|
428
|
1562 }
|
|
|
1563 else if (CONSP (entry))
|
|
|
1564 {
|
|
|
1565 if (EQ (XCAR (entry), Qformat)
|
|
|
1566 && CONSP (XCDR (entry))
|
|
|
1567 && STRINGP (XCAR (XCDR (entry))))
|
|
|
1568 {
|
|
|
1569 Lisp_Object format = XCAR (XCDR (entry));
|
|
665
|
1570 Bytebpos len = XSTRING_LENGTH (format);
|
|
867
|
1571 Ibyte *src = XSTRING_DATA (format), *end = src + len;
|
|
2367
|
1572 Ibyte *result = alloca_ibytes (len);
|
|
867
|
1573 Ibyte *dst = result;
|
|
428
|
1574
|
|
|
1575 while (src < end)
|
|
|
1576 {
|
|
867
|
1577 Ichar c = itext_ichar (src);
|
|
|
1578 INC_IBYTEPTR (src);
|
|
428
|
1579 if (c != '%' || src == end)
|
|
867
|
1580 dst += set_itext_ichar (dst, c);
|
|
428
|
1581 else
|
|
|
1582 {
|
|
867
|
1583 c = itext_ichar (src);
|
|
|
1584 INC_IBYTEPTR (src);
|
|
428
|
1585 switch (c)
|
|
|
1586 {
|
|
|
1587 /*case 'x':
|
|
|
1588 dst += long_to_string_base ((char *)dst, data->ch, 16);
|
|
|
1589 break;*/
|
|
|
1590 case '%':
|
|
867
|
1591 dst += set_itext_ichar (dst, '%');
|
|
428
|
1592 break;
|
|
442
|
1593 /* #### unimplemented */
|
|
428
|
1594 }
|
|
|
1595 }
|
|
|
1596 }
|
|
867
|
1597 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
|
|
428
|
1598 }
|
|
|
1599 }
|
|
|
1600
|
|
|
1601 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1602 have any safe way of signaling an error. */
|
|
|
1603 return prop;
|
|
|
1604 }
|
|
|
1605
|
|
|
1606 /* Given a display table entry, call the appropriate functions to
|
|
|
1607 display each element of the entry. */
|
|
|
1608
|
|
|
1609 static prop_block_dynarr *
|
|
|
1610 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1611 {
|
|
|
1612 prop_block_dynarr *prop = NULL;
|
|
|
1613 if (VECTORP (entry))
|
|
|
1614 {
|
|
440
|
1615 Lisp_Vector *de = XVECTOR (entry);
|
|
428
|
1616 EMACS_INT len = vector_length (de);
|
|
|
1617 int elt;
|
|
|
1618
|
|
|
1619 for (elt = 0; elt < len; elt++)
|
|
|
1620 {
|
|
|
1621 if (NILP (vector_data (de)[elt]))
|
|
|
1622 continue;
|
|
|
1623 else
|
|
|
1624 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
|
|
|
1625 /* Else blow it off because someone added a bad entry and we
|
|
|
1626 don't have any safe way of signaling an error. Hey, this
|
|
|
1627 comment sounds familiar. */
|
|
|
1628
|
|
|
1629 /* #### Still need to add any remaining elements to the
|
|
|
1630 propagation information. */
|
|
|
1631 if (prop)
|
|
|
1632 return prop;
|
|
|
1633 }
|
|
|
1634 }
|
|
|
1635 else
|
|
|
1636 prop = add_disp_table_entry_runes_1 (data, entry);
|
|
|
1637 return prop;
|
|
|
1638 }
|
|
|
1639
|
|
|
1640 /* Add runes which were propagated from the previous line. */
|
|
|
1641
|
|
|
1642 static prop_block_dynarr *
|
|
|
1643 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1644 {
|
|
|
1645 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1646 this is finished. */
|
|
|
1647 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1648 case of not all the propagation blocks being added was not handled
|
|
|
1649 well. */
|
|
|
1650 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1651 of bogus. A cleaner solution is just to check for
|
|
|
1652 Dynarr_length (prop) > 0. */
|
|
|
1653 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1654 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1655 record? */
|
|
|
1656 int elt;
|
|
|
1657 prop_block_dynarr *add_failed;
|
|
826
|
1658 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
|
|
647
|
1659 int old_cursor_type = data->cursor_type;
|
|
428
|
1660
|
|
|
1661 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1662 {
|
|
|
1663 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1664
|
|
|
1665 switch (pb->type)
|
|
|
1666 {
|
|
|
1667 case PROP_CHAR:
|
|
|
1668 data->ch = pb->data.p_char.ch;
|
|
826
|
1669 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
|
|
428
|
1670 data->cursor_type = pb->data.p_char.cursor_type;
|
|
867
|
1671 add_failed = add_ichar_rune (data);
|
|
428
|
1672
|
|
|
1673 if (add_failed)
|
|
|
1674 goto oops_no_more_space;
|
|
|
1675 break;
|
|
|
1676 case PROP_STRING:
|
|
|
1677 if (pb->data.p_string.str)
|
|
1726
|
1678 xfree (pb->data.p_string.str, Ibyte *);
|
|
428
|
1679 /* #### bogus bogus -- this doesn't do anything!
|
|
867
|
1680 Should probably call add_ibyte_string_runes(),
|
|
428
|
1681 once that function is fixed. */
|
|
|
1682 break;
|
|
|
1683 case PROP_MINIBUF_PROMPT:
|
|
|
1684 {
|
|
|
1685 face_index old_findex = data->findex;
|
|
826
|
1686 Bytebpos byte_old_charpos = data->byte_charpos;
|
|
428
|
1687
|
|
|
1688 data->findex = DEFAULT_INDEX;
|
|
826
|
1689 data->byte_charpos = 0;
|
|
428
|
1690 data->cursor_type = NO_CURSOR;
|
|
|
1691
|
|
|
1692 while (pb->data.p_string.len > 0)
|
|
|
1693 {
|
|
867
|
1694 data->ch = itext_ichar (pb->data.p_string.str);
|
|
|
1695 add_failed = add_ichar_rune (data);
|
|
428
|
1696
|
|
|
1697 if (add_failed)
|
|
|
1698 {
|
|
|
1699 data->findex = old_findex;
|
|
826
|
1700 data->byte_charpos = byte_old_charpos;
|
|
428
|
1701 goto oops_no_more_space;
|
|
|
1702 }
|
|
|
1703 else
|
|
|
1704 {
|
|
|
1705 /* Complicated equivalent of ptr++, len-- */
|
|
867
|
1706 Ibyte *oldpos = pb->data.p_string.str;
|
|
|
1707 INC_IBYTEPTR (pb->data.p_string.str);
|
|
428
|
1708 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1709 }
|
|
|
1710 }
|
|
|
1711
|
|
|
1712 data->findex = old_findex;
|
|
|
1713 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
826
|
1714 this function, data->byte_charpos is automatically incremented.
|
|
428
|
1715 However, we don't want that to happen if we were adding
|
|
|
1716 the minibuffer prompt. */
|
|
|
1717 {
|
|
|
1718 struct buffer *buf =
|
|
|
1719 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1720 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
826
|
1721 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
|
|
|
1722 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
|
|
428
|
1723 else
|
|
|
1724 /* #### is this correct? Does anyone know?
|
|
|
1725 Does anyone care? Is this a cheesy hack or what? */
|
|
826
|
1726 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
|
|
428
|
1727 }
|
|
|
1728 }
|
|
|
1729 break;
|
|
|
1730 case PROP_BLANK:
|
|
|
1731 {
|
|
|
1732 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1733 the blank_width, as it implies that the value carries
|
|
|
1734 over from one rune to the next, which is wrong. */
|
|
|
1735 int old_width = data->blank_width;
|
|
|
1736 face_index old_findex = data->findex;
|
|
|
1737
|
|
|
1738 data->findex = pb->data.p_blank.findex;
|
|
|
1739 data->blank_width = pb->data.p_blank.width;
|
|
826
|
1740 data->byte_cursor_charpos = 0;
|
|
428
|
1741 data->cursor_type = IGNORE_CURSOR;
|
|
|
1742
|
|
|
1743 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1744 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1745
|
|
|
1746 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1747 matter because unless something is really screwed up
|
|
|
1748 this call won't cause that arg to be used. */
|
|
|
1749 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1750
|
|
|
1751 /* This can happen in the case where we have a tab which
|
|
|
1752 is wider than the window. */
|
|
|
1753 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1754 {
|
|
|
1755 pb->data.p_blank.width -= data->blank_width;
|
|
|
1756 add_failed = ADD_FAILED;
|
|
|
1757 }
|
|
|
1758
|
|
|
1759 data->findex = old_findex;
|
|
|
1760 data->blank_width = old_width;
|
|
|
1761
|
|
|
1762 if (add_failed)
|
|
|
1763 goto oops_no_more_space;
|
|
|
1764 }
|
|
|
1765 break;
|
|
|
1766 default:
|
|
|
1767 abort ();
|
|
|
1768 }
|
|
|
1769 }
|
|
|
1770
|
|
|
1771 oops_no_more_space:
|
|
|
1772
|
|
826
|
1773 data->byte_cursor_charpos = byte_old_cursor_charpos;
|
|
428
|
1774 data->cursor_type = old_cursor_type;
|
|
|
1775 if (elt < Dynarr_length (*prop))
|
|
|
1776 {
|
|
|
1777 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1778 return *prop;
|
|
|
1779 }
|
|
|
1780 else
|
|
|
1781 {
|
|
|
1782 Dynarr_free (*prop);
|
|
|
1783 return NULL;
|
|
|
1784 }
|
|
|
1785 }
|
|
|
1786
|
|
|
1787 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1788 the display block, but add all other types to the appropriate list
|
|
|
1789 of the display line. They will be added later by different
|
|
|
1790 routines. */
|
|
|
1791
|
|
|
1792 static prop_block_dynarr *
|
|
|
1793 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1794 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1795 {
|
|
|
1796 struct window *w = XWINDOW (data->window);
|
|
|
1797
|
|
440
|
1798 /* If window faces changed, and glyph instance is text, then
|
|
|
1799 glyph sizes might have changed too */
|
|
|
1800 invalidate_glyph_geometry_maybe (gb->glyph, w);
|
|
|
1801
|
|
442
|
1802 /* This makes sure the glyph is in the cachels.
|
|
|
1803
|
|
|
1804 #### We do this to make sure the glyph is in the glyph cachels,
|
|
|
1805 so that the dirty flag can be reset after redisplay has
|
|
|
1806 finished. We should do this some other way, maybe by iterating
|
|
|
1807 over the window cache of subwindows. */
|
|
|
1808 get_glyph_cachel_index (w, gb->glyph);
|
|
|
1809
|
|
428
|
1810 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1811 if (NILP (gb->extent)
|
|
|
1812 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1813 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1814 || (pos_type == END_GLYPHS &&
|
|
442
|
1815 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1816 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
|
|
428
|
1817 {
|
|
|
1818 struct rune rb;
|
|
|
1819 int width;
|
|
|
1820 int xoffset = 0;
|
|
|
1821 int ascent, descent;
|
|
|
1822 Lisp_Object baseline;
|
|
|
1823 Lisp_Object face;
|
|
442
|
1824 Lisp_Object instance;
|
|
|
1825 face_index findex;
|
|
819
|
1826 prop_block_dynarr *retval = 0;
|
|
428
|
1827
|
|
|
1828 if (cachel)
|
|
|
1829 width = cachel->width;
|
|
|
1830 else
|
|
438
|
1831 width = glyph_width (gb->glyph, data->window);
|
|
428
|
1832
|
|
|
1833 if (!width)
|
|
|
1834 return NULL;
|
|
|
1835
|
|
|
1836 if (data->start_col || data->start_col_xoffset)
|
|
|
1837 {
|
|
|
1838 int glyph_char_width = width / space_width (w);
|
|
|
1839
|
|
|
1840 /* If we still have not fully scrolled horizontally after
|
|
|
1841 taking into account the width of the glyph, subtract its
|
|
|
1842 width and return. */
|
|
|
1843 if (glyph_char_width < data->start_col)
|
|
|
1844 {
|
|
|
1845 data->start_col -= glyph_char_width;
|
|
|
1846 return NULL;
|
|
|
1847 }
|
|
|
1848 else if (glyph_char_width == data->start_col)
|
|
|
1849 width = 0;
|
|
|
1850 else
|
|
|
1851 {
|
|
|
1852 xoffset = space_width (w) * data->start_col;
|
|
|
1853 width -= xoffset;
|
|
|
1854
|
|
|
1855 /* #### Can this happen? */
|
|
|
1856 if (width < 0)
|
|
|
1857 width = 0;
|
|
|
1858 }
|
|
|
1859
|
|
|
1860 data->start_col = 0;
|
|
|
1861 retval = add_hscroll_rune (data);
|
|
|
1862
|
|
|
1863 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1864 if (retval != NULL || !width)
|
|
|
1865 return retval;
|
|
|
1866 }
|
|
|
1867 else
|
|
|
1868 xoffset = 0;
|
|
|
1869
|
|
|
1870 if (data->pixpos + width > data->max_pixpos)
|
|
|
1871 {
|
|
|
1872 /* If this is the first object we are attempting to add to
|
|
819
|
1873 the line then we ignore the horizontal_clip threshold.
|
|
|
1874 Otherwise we will loop until the bottom of the window
|
|
|
1875 continually failing to add this glyph because it is wider
|
|
|
1876 than the window. We could alternatively just completely
|
|
|
1877 ignore the glyph and proceed from there but I think that
|
|
|
1878 this is a better solution.
|
|
|
1879
|
|
|
1880 This does, however, create a different problem in that we
|
|
|
1881 can end up adding the object to every single line, never
|
|
|
1882 getting any further - for instance an extent with a long
|
|
|
1883 start-glyph that covers multitple following
|
|
|
1884 characters. */
|
|
428
|
1885 if (Dynarr_length (data->db->runes)
|
|
|
1886 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1887 return ADD_FAILED;
|
|
819
|
1888 else {
|
|
|
1889 struct prop_block pb;
|
|
|
1890
|
|
|
1891 /* We need to account for the width of the end-of-line
|
|
|
1892 glyph if there is nothing more in the line to display,
|
|
|
1893 since we will not display it in this instance. It seems
|
|
|
1894 kind of gross doing it here, but otherwise we have to
|
|
|
1895 search the runes in create_text_block(). */
|
|
|
1896 if (data->ch == '\n')
|
|
|
1897 data->max_pixpos += data->end_glyph_width;
|
|
428
|
1898 width = data->max_pixpos - data->pixpos;
|
|
819
|
1899 /* Add the glyph we are displaying, but clipping, to the
|
|
|
1900 propagation data so that we don't try and do it
|
|
|
1901 again. */
|
|
|
1902 retval = Dynarr_new (prop_block);
|
|
|
1903 pb.type = PROP_GLYPH;
|
|
|
1904 pb.data.p_glyph.glyph = gb->glyph;
|
|
|
1905 pb.data.p_glyph.width = width;
|
|
|
1906 Dynarr_add (retval, pb);
|
|
|
1907 }
|
|
428
|
1908 }
|
|
|
1909
|
|
|
1910 if (cachel)
|
|
|
1911 {
|
|
|
1912 ascent = cachel->ascent;
|
|
|
1913 descent = cachel->descent;
|
|
|
1914 }
|
|
|
1915 else
|
|
|
1916 {
|
|
438
|
1917 ascent = glyph_ascent (gb->glyph, data->window);
|
|
|
1918 descent = glyph_descent (gb->glyph, data->window);
|
|
428
|
1919 }
|
|
|
1920
|
|
|
1921 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1922
|
|
819
|
1923 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
|
|
|
1924
|
|
428
|
1925 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1926 {
|
|
|
1927 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1928 contribution will be determined later. */
|
|
|
1929 if (NILP (baseline))
|
|
|
1930 {
|
|
|
1931 int height = ascent + descent;
|
|
819
|
1932 data->need_baseline_computation = 1;
|
|
428
|
1933 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1934 }
|
|
|
1935
|
|
|
1936 /* A string so determine contribution normally. */
|
|
|
1937 else if (EQ (baseline, Qt))
|
|
|
1938 {
|
|
|
1939 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1940 data->new_descent = max (data->new_descent, descent);
|
|
|
1941 }
|
|
|
1942
|
|
|
1943 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1944 contribution here. */
|
|
|
1945 else if (INTP (baseline))
|
|
|
1946 {
|
|
|
1947 int height = ascent + descent;
|
|
|
1948 int pix_ascent, pix_descent;
|
|
|
1949
|
|
|
1950 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1951 pix_descent = height - pix_ascent;
|
|
|
1952
|
|
|
1953 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1954 data->new_descent = max (data->new_descent, pix_descent);
|
|
819
|
1955 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1956
|
|
|
1957 rb.object.dglyph.descent = pix_descent;
|
|
428
|
1958 }
|
|
|
1959
|
|
|
1960 /* Otherwise something is screwed up. */
|
|
|
1961 else
|
|
|
1962 abort ();
|
|
|
1963 }
|
|
|
1964
|
|
|
1965 face = glyph_face (gb->glyph, data->window);
|
|
|
1966 if (NILP (face))
|
|
442
|
1967 findex = data->findex;
|
|
428
|
1968 else
|
|
442
|
1969 findex = get_builtin_face_cache_index (w, face);
|
|
|
1970
|
|
|
1971 instance = glyph_image_instance (gb->glyph, data->window,
|
|
793
|
1972 ERROR_ME_DEBUG_WARN, 1);
|
|
442
|
1973 if (TEXT_IMAGE_INSTANCEP (instance))
|
|
|
1974 {
|
|
|
1975 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
|
|
|
1976 face_index orig_findex = data->findex;
|
|
826
|
1977 Bytebpos orig_charpos = data->byte_charpos;
|
|
|
1978 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
|
|
442
|
1979
|
|
|
1980 data->findex = findex;
|
|
826
|
1981 data->byte_start_col_enabled = 0;
|
|
442
|
1982 if (!allow_cursor)
|
|
826
|
1983 data->byte_charpos = 0;
|
|
867
|
1984 add_ibyte_string_runes (data, XSTRING_DATA (string),
|
|
793
|
1985 XSTRING_LENGTH (string), 0, 1);
|
|
442
|
1986 data->findex = orig_findex;
|
|
826
|
1987 data->byte_charpos = orig_charpos;
|
|
|
1988 data->byte_start_col_enabled = orig_start_col_enabled;
|
|
819
|
1989 return retval;
|
|
442
|
1990 }
|
|
|
1991
|
|
|
1992 rb.findex = findex;
|
|
428
|
1993 rb.xpos = data->pixpos;
|
|
|
1994 rb.width = width;
|
|
826
|
1995 rb.charpos = 0; /* glyphs are never "at" anywhere */
|
|
|
1996 if (data->byte_endpos)
|
|
428
|
1997 /* #### is this necessary at all? */
|
|
665
|
1998 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
826
|
1999 data->byte_endpos);
|
|
428
|
2000 else
|
|
|
2001 rb.endpos = 0;
|
|
|
2002 rb.type = RUNE_DGLYPH;
|
|
|
2003 rb.object.dglyph.glyph = gb->glyph;
|
|
|
2004 rb.object.dglyph.extent = gb->extent;
|
|
|
2005 rb.object.dglyph.xoffset = xoffset;
|
|
819
|
2006 rb.object.dglyph.ascent = ascent;
|
|
|
2007 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
|
|
|
2008 a normal (textual) baseline. */
|
|
428
|
2009
|
|
|
2010 if (allow_cursor)
|
|
|
2011 {
|
|
826
|
2012 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
|
2013 data->byte_charpos);
|
|
428
|
2014
|
|
|
2015 if (data->cursor_type == CURSOR_ON)
|
|
|
2016 {
|
|
826
|
2017 if (data->byte_charpos == data->byte_cursor_charpos)
|
|
428
|
2018 {
|
|
|
2019 rb.cursor_type = CURSOR_ON;
|
|
|
2020 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
2021 }
|
|
|
2022 else
|
|
|
2023 rb.cursor_type = CURSOR_OFF;
|
|
|
2024 }
|
|
|
2025 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
2026 {
|
|
|
2027 rb.cursor_type = CURSOR_ON;
|
|
|
2028 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
2029 data->cursor_type = NO_CURSOR;
|
|
|
2030 }
|
|
|
2031 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
2032 rb.cursor_type = IGNORE_CURSOR;
|
|
|
2033 else if (data->cursor_type == NO_CURSOR)
|
|
|
2034 rb.cursor_type = NO_CURSOR;
|
|
|
2035 else
|
|
|
2036 rb.cursor_type = CURSOR_OFF;
|
|
|
2037 }
|
|
|
2038 else
|
|
|
2039 rb.cursor_type = CURSOR_OFF;
|
|
|
2040
|
|
|
2041 Dynarr_add (data->db->runes, rb);
|
|
|
2042 data->pixpos += width;
|
|
|
2043
|
|
819
|
2044 return retval;
|
|
428
|
2045 }
|
|
|
2046 else
|
|
|
2047 {
|
|
|
2048 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
2049 gb->findex =
|
|
|
2050 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
2051 data->window));
|
|
|
2052 else
|
|
|
2053 gb->findex = data->findex;
|
|
|
2054
|
|
|
2055 if (pos_type == BEGIN_GLYPHS)
|
|
|
2056 {
|
|
|
2057 if (!data->dl->left_glyphs)
|
|
|
2058 data->dl->left_glyphs = Dynarr_new (glyph_block);
|
|
|
2059 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
2060 return NULL;
|
|
|
2061 }
|
|
|
2062 else if (pos_type == END_GLYPHS)
|
|
|
2063 {
|
|
|
2064 if (!data->dl->right_glyphs)
|
|
|
2065 data->dl->right_glyphs = Dynarr_new (glyph_block);
|
|
|
2066 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
2067 return NULL;
|
|
|
2068 }
|
|
|
2069 else
|
|
|
2070 abort (); /* there are no unknown types */
|
|
|
2071 }
|
|
|
2072
|
|
819
|
2073 return NULL;
|
|
428
|
2074 }
|
|
|
2075
|
|
|
2076 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
2077 data. */
|
|
|
2078
|
|
|
2079 static prop_block_dynarr *
|
|
|
2080 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
2081 {
|
|
|
2082 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
2083 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
2084 int elt;
|
|
|
2085 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
2086 ? data->ef->begin_glyphs
|
|
|
2087 : data->ef->end_glyphs);
|
|
|
2088 prop_block_dynarr *prop;
|
|
|
2089
|
|
|
2090 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
2091 {
|
|
|
2092 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
2093 0);
|
|
|
2094
|
|
|
2095 if (prop)
|
|
|
2096 {
|
|
|
2097 /* #### Add some propagation information. */
|
|
|
2098 return prop;
|
|
|
2099 }
|
|
|
2100 }
|
|
|
2101
|
|
|
2102 Dynarr_reset (glyph_arr);
|
|
|
2103
|
|
|
2104 return NULL;
|
|
|
2105 }
|
|
|
2106
|
|
|
2107 /* Given a position for a buffer in a window, ensure that the given
|
|
|
2108 display line DL accurately represents the text on a line starting
|
|
|
2109 at the given position.
|
|
|
2110
|
|
826
|
2111 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's.
|
|
428
|
2112 You must do appropriate conversion. */
|
|
|
2113
|
|
665
|
2114 static Bytebpos
|
|
428
|
2115 create_text_block (struct window *w, struct display_line *dl,
|
|
826
|
2116 Bytebpos byte_start_pos, prop_block_dynarr **prop,
|
|
428
|
2117 int type)
|
|
|
2118 {
|
|
|
2119 struct frame *f = XFRAME (w->frame);
|
|
|
2120 struct buffer *b = XBUFFER (w->buffer);
|
|
|
2121 struct device *d = XDEVICE (f->device);
|
|
|
2122
|
|
|
2123 pos_data data;
|
|
|
2124
|
|
|
2125 /* Don't display anything in the minibuffer if this window is not on
|
|
|
2126 a selected frame. We consider all other windows to be active
|
|
|
2127 minibuffers as it simplifies the coding. */
|
|
|
2128 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
2129 (f == device_selected_frame (d)) ||
|
|
|
2130 is_surrogate_for_selected_frame (f));
|
|
|
2131
|
|
|
2132 int truncate_win = window_truncation_on (w);
|
|
|
2133
|
|
|
2134 /* If the buffer's value of selective_display is an integer then
|
|
|
2135 only lines that start with less than selective_display columns of
|
|
|
2136 space will be displayed. If selective_display is t then all text
|
|
|
2137 after a ^M is invisible. */
|
|
|
2138 int selective = (INTP (b->selective_display)
|
|
|
2139 ? XINT (b->selective_display)
|
|
434
|
2140 : (!NILP (b->selective_display) ? -1 : 0));
|
|
428
|
2141
|
|
|
2142 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
2143 can actually be displayed and which octal should be used for.
|
|
|
2144 #### This variable should probably have some rethought done to
|
|
|
2145 it.
|
|
|
2146
|
|
2367
|
2147 See also
|
|
|
2148
|
|
|
2149 (Info-goto-node "(internals)Future Work -- Display Tables")
|
|
|
2150
|
|
|
2151 */
|
|
867
|
2152 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
2153 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2154 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2155 ? 255 : 160));
|
|
|
2156
|
|
|
2157 Lisp_Object face_dt, window_dt;
|
|
|
2158
|
|
|
2159 /* The text display block for this display line. */
|
|
|
2160 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2161
|
|
|
2162 /* The first time through the main loop we need to force the glyph
|
|
|
2163 data to be updated. */
|
|
|
2164 int initial = 1;
|
|
|
2165
|
|
|
2166 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2167 equal to the position passed in if there are no more runs to be
|
|
|
2168 displayed. */
|
|
|
2169 int no_more_frags = 0;
|
|
|
2170
|
|
|
2171 Lisp_Object synch_minibuffers_value =
|
|
|
2172 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2173
|
|
|
2174 dl->used_prop_data = 0;
|
|
|
2175 dl->num_chars = 0;
|
|
442
|
2176 dl->line_continuation = 0;
|
|
428
|
2177
|
|
|
2178 xzero (data);
|
|
|
2179 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2180
|
|
|
2181 /* These values are used by all of the rune addition routines. We add
|
|
|
2182 them to this structure for ease of passing. */
|
|
|
2183 data.d = d;
|
|
793
|
2184 data.window = wrap_window (w);
|
|
428
|
2185 data.string = Qnil;
|
|
|
2186 data.db = db;
|
|
|
2187 data.dl = dl;
|
|
|
2188
|
|
826
|
2189 data.byte_charpos = byte_start_pos;
|
|
428
|
2190 data.pixpos = dl->bounds.left_in;
|
|
|
2191 data.last_charset = Qunbound;
|
|
|
2192 data.last_findex = DEFAULT_INDEX;
|
|
|
2193 data.result_str = Qnil;
|
|
|
2194
|
|
|
2195 /* Set the right boundary adjusting it to take into account any end
|
|
|
2196 glyph. Save the width of the end glyph for later use. */
|
|
|
2197 data.max_pixpos = dl->bounds.right_in;
|
|
|
2198 if (truncate_win)
|
|
819
|
2199 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2200 else
|
|
819
|
2201 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2202 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2203
|
|
|
2204 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2205 {
|
|
826
|
2206 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2207 data.cursor_type = CURSOR_ON;
|
|
|
2208 }
|
|
|
2209 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2210 data.cursor_type = NO_CURSOR;
|
|
|
2211 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2212 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2213 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2214 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2215 {
|
|
826
|
2216 data.byte_cursor_charpos = BYTE_BUF_PT (b);
|
|
428
|
2217 data.cursor_type = CURSOR_ON;
|
|
|
2218 }
|
|
|
2219 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2220 {
|
|
826
|
2221 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
|
|
428
|
2222 data.cursor_type = CURSOR_ON;
|
|
|
2223 }
|
|
|
2224 else
|
|
|
2225 data.cursor_type = NO_CURSOR;
|
|
|
2226 data.cursor_x = -1;
|
|
|
2227
|
|
|
2228 data.start_col = w->hscroll;
|
|
|
2229 data.start_col_xoffset = w->left_xoffset;
|
|
826
|
2230 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
2231 data.hscroll_glyph_width_adjust = 0;
|
|
|
2232
|
|
|
2233 /* We regenerate the line from the very beginning. */
|
|
|
2234 Dynarr_reset (db->runes);
|
|
|
2235
|
|
|
2236 /* Why is this less than or equal and not just less than? If the
|
|
|
2237 starting position is already equal to the maximum we can't add
|
|
|
2238 anything else, right? Wrong. We might still have a newline to
|
|
|
2239 add. A newline can use the room allocated for an end glyph since
|
|
|
2240 if we add it we know we aren't going to be adding any end
|
|
|
2241 glyph. */
|
|
|
2242
|
|
|
2243 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2244 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2245 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2246 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2247 that the loop terminates only when either (a) there is
|
|
|
2248 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2249
|
|
|
2250 #### Also I think you need to ensure that the operation
|
|
|
2251 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2252 can't get interrupted in the middle. If you run off the end
|
|
|
2253 of the line during that operation, then you keep accumulating
|
|
|
2254 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2255 there's a begin glyph at a particular position and attempting
|
|
|
2256 to display that glyph results in window-end being hit and
|
|
|
2257 propagation data being generated, then the character at that
|
|
|
2258 position won't be displayed.
|
|
|
2259
|
|
|
2260 #### See also the comment after the end of this loop, below.
|
|
|
2261 */
|
|
|
2262 while (data.pixpos <= data.max_pixpos
|
|
|
2263 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2264 {
|
|
|
2265 /* #### This check probably should not be necessary. */
|
|
826
|
2266 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
428
|
2267 {
|
|
|
2268 /* #### urk! More of this lossage! */
|
|
826
|
2269 data.byte_charpos--;
|
|
428
|
2270 goto done;
|
|
|
2271 }
|
|
|
2272
|
|
|
2273 /* If selective display was an integer and we aren't working on
|
|
|
2274 a continuation line then find the next line we are actually
|
|
|
2275 supposed to display. */
|
|
|
2276 if (selective > 0
|
|
826
|
2277 && (data.byte_charpos == BYTE_BUF_BEGV (b)
|
|
|
2278 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
|
|
|
2279 {
|
|
|
2280 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2281 {
|
|
826
|
2282 data.byte_charpos =
|
|
|
2283 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2284 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2285 {
|
|
826
|
2286 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2287 goto done;
|
|
|
2288 }
|
|
|
2289 }
|
|
|
2290 }
|
|
|
2291
|
|
|
2292 /* Check for face changes. */
|
|
826
|
2293 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
2294 {
|
|
819
|
2295 Lisp_Object last_glyph = Qnil;
|
|
|
2296
|
|
|
2297 /* Deal with glyphs that we have already displayed. The
|
|
|
2298 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2299 propagation data then we are clipping the glyph and there
|
|
|
2300 can be no propagation data before that point. The theory
|
|
|
2301 works because we always recalculate the extent-fragments
|
|
|
2302 for propagated data, we never actually propagate the
|
|
|
2303 fragments that still need to be displayed. */
|
|
|
2304 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2305 {
|
|
|
2306 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2307 Dynarr_free (*prop);
|
|
|
2308 *prop = 0;
|
|
|
2309 }
|
|
428
|
2310 /* Now compute the face and begin/end-glyph information. */
|
|
|
2311 data.findex =
|
|
665
|
2312 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
826
|
2313 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
2314
|
|
|
2315 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2316
|
|
826
|
2317 if (data.byte_charpos == data.ef->end)
|
|
428
|
2318 no_more_frags = 1;
|
|
|
2319 }
|
|
|
2320 initial = 0;
|
|
|
2321
|
|
|
2322 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2323 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2324 display then we determine what to do based on the character at the
|
|
|
2325 current buffer position. */
|
|
|
2326
|
|
|
2327 /* If the current position is covered by an invisible extent, do
|
|
|
2328 nothing (except maybe add some ellipses).
|
|
|
2329
|
|
|
2330 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2331 invisible extent should be investigated further. This is
|
|
|
2332 fairly low priority though. */
|
|
|
2333 if (data.ef->invisible)
|
|
|
2334 {
|
|
|
2335 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2336 really know what I'm doing. */
|
|
|
2337 if (*prop)
|
|
|
2338 {
|
|
|
2339 Dynarr_free (*prop);
|
|
|
2340 *prop = 0;
|
|
|
2341 }
|
|
|
2342
|
|
|
2343 /* The extent fragment code only sets this when we should
|
|
|
2344 really display the ellipses. It makes sure the ellipses
|
|
|
2345 don't get displayed more than once in a row. */
|
|
|
2346 if (data.ef->invisible_ellipses)
|
|
|
2347 {
|
|
|
2348 struct glyph_block gb;
|
|
|
2349
|
|
|
2350 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2351 data.ef->invisible_ellipses = 0;
|
|
|
2352 gb.extent = Qnil;
|
|
|
2353 gb.glyph = Vinvisible_text_glyph;
|
|
|
2354 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2355 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2356 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2357 is to display a newline (for compatibility with
|
|
|
2358 selective-display-ellipses)? Maybe that's too
|
|
|
2359 abstruse. */
|
|
|
2360 if (*prop)
|
|
|
2361 goto done;
|
|
|
2362 }
|
|
|
2363
|
|
|
2364 /* If point is in an invisible region we place it on the
|
|
|
2365 next visible character. */
|
|
|
2366 if (data.cursor_type == CURSOR_ON
|
|
826
|
2367 && data.byte_charpos == data.byte_cursor_charpos)
|
|
428
|
2368 {
|
|
|
2369 data.cursor_type = NEXT_CURSOR;
|
|
|
2370 }
|
|
|
2371
|
|
|
2372 /* #### What if we we're dealing with a display table? */
|
|
|
2373 if (data.start_col)
|
|
|
2374 data.start_col--;
|
|
|
2375
|
|
826
|
2376 if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2377 goto done;
|
|
|
2378 else
|
|
826
|
2379 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2380 }
|
|
|
2381
|
|
|
2382 /* If there is propagation data, then it represents the current
|
|
819
|
2383 buffer position being displayed. Add them and advance the
|
|
|
2384 position counter. This might also add the minibuffer
|
|
|
2385 prompt. */
|
|
428
|
2386 else if (*prop)
|
|
|
2387 {
|
|
|
2388 dl->used_prop_data = 1;
|
|
|
2389 *prop = add_propagation_runes (prop, &data);
|
|
|
2390
|
|
|
2391 if (*prop)
|
|
|
2392 goto done; /* gee, a really narrow window */
|
|
826
|
2393 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2394 goto done;
|
|
826
|
2395 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
|
|
428
|
2396 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
2397 data.byte_charpos = BYTE_BUF_BEGV (b);
|
|
428
|
2398 else
|
|
826
|
2399 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2400 }
|
|
|
2401
|
|
|
2402 /* If there are end glyphs, add them to the line. These are
|
|
|
2403 the end glyphs for the previous run of text. We add them
|
|
|
2404 here rather than doing them at the end of handling the
|
|
|
2405 previous run so that glyphs at the beginning and end of
|
|
|
2406 a line are handled correctly. */
|
|
819
|
2407 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2408 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2409 {
|
|
|
2410 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2411 /* #### I think this is safe, but could be wrong. */
|
|
826
|
2412 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
819
|
2413
|
|
|
2414 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2415 {
|
|
|
2416 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2417 tmpglyphs = data.ef->end_glyphs;
|
|
|
2418 }
|
|
|
2419
|
|
|
2420 /* If there are begin glyphs, add them to the line. */
|
|
|
2421 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2422 {
|
|
|
2423 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2424 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2425 }
|
|
|
2426
|
|
|
2427 if (*prop)
|
|
|
2428 {
|
|
|
2429 /* If we just clipped a glyph and we are at the end of a
|
|
|
2430 line and there are more glyphs to display then do
|
|
|
2431 appropriate processing to not get a continuation
|
|
|
2432 glyph. */
|
|
|
2433 if (*prop != ADD_FAILED
|
|
|
2434 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2435 && data.ch == '\n')
|
|
|
2436 {
|
|
|
2437 /* If there are no more glyphs then do the normal
|
|
|
2438 processing.
|
|
|
2439
|
|
|
2440 #### This doesn't actually work if the same glyph is
|
|
|
2441 present more than once in the block. To solve
|
|
|
2442 this we would have to carry the index around
|
|
|
2443 which might be problematic since the fragment is
|
|
|
2444 recalculated for each line. */
|
|
|
2445 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2446 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2447 {
|
|
|
2448 Dynarr_free (*prop);
|
|
|
2449 *prop = 0;
|
|
|
2450 }
|
|
|
2451 else {
|
|
|
2452 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2453 add_ichar_rune (&data); /* discard prop data. */
|
|
819
|
2454 goto done;
|
|
|
2455 }
|
|
|
2456 }
|
|
|
2457 else
|
|
|
2458 goto done;
|
|
|
2459 }
|
|
428
|
2460 }
|
|
|
2461
|
|
|
2462 /* If at end-of-buffer, we've already processed begin and
|
|
|
2463 end-glyphs at this point and there's no text to process,
|
|
|
2464 so we're done. */
|
|
826
|
2465 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2466 goto done;
|
|
|
2467
|
|
|
2468 else
|
|
|
2469 {
|
|
|
2470 Lisp_Object entry = Qnil;
|
|
|
2471 /* Get the character at the current buffer position. */
|
|
826
|
2472 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2473 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2474 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2475
|
|
|
2476 /* If there is a display table entry for it, hand it off to
|
|
|
2477 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2478 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2479 {
|
|
|
2480 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2481
|
|
|
2482 if (*prop)
|
|
|
2483 goto done;
|
|
|
2484 }
|
|
|
2485
|
|
|
2486 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2487 to the line and end this loop. */
|
|
|
2488 else if (data.ch == '\n')
|
|
|
2489 {
|
|
|
2490 /* We aren't going to be adding an end glyph so give its
|
|
|
2491 space back in order to make sure that the cursor can
|
|
|
2492 fit. */
|
|
819
|
2493 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2494
|
|
|
2495 if (selective > 0
|
|
826
|
2496 && (byte_spaces_at_point
|
|
|
2497 (b, next_bytebpos (b, data.byte_charpos))
|
|
428
|
2498 >= selective))
|
|
|
2499 {
|
|
|
2500 if (!NILP (b->selective_display_ellipses))
|
|
|
2501 {
|
|
|
2502 struct glyph_block gb;
|
|
|
2503
|
|
|
2504 gb.extent = Qnil;
|
|
|
2505 gb.glyph = Vinvisible_text_glyph;
|
|
|
2506 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2507 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2508 }
|
|
|
2509 else
|
|
|
2510 {
|
|
|
2511 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2512 line with a special "character rune" whose width
|
|
|
2513 is the EOL cursor width and whose character is
|
|
|
2514 the non-printing character '\n'. */
|
|
|
2515 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2516 *prop = add_ichar_rune (&data);
|
|
428
|
2517 }
|
|
|
2518
|
|
826
|
2519 /* We need to set data.byte_charpos to the start of the
|
|
428
|
2520 next visible region in order to make this line
|
|
|
2521 appear to contain all of the invisible area.
|
|
|
2522 Otherwise, the line cache won't work
|
|
|
2523 correctly. */
|
|
826
|
2524 INC_BYTEBPOS (b, data.byte_charpos);
|
|
|
2525 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2526 {
|
|
826
|
2527 data.byte_charpos =
|
|
|
2528 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2529 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2530 {
|
|
826
|
2531 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2532 break;
|
|
|
2533 }
|
|
|
2534 }
|
|
826
|
2535 if (BYTE_BUF_FETCH_CHAR
|
|
|
2536 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
|
|
|
2537 DEC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2538 }
|
|
|
2539 else
|
|
|
2540 {
|
|
|
2541 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2542 *prop = add_ichar_rune (&data);
|
|
428
|
2543 }
|
|
|
2544
|
|
|
2545 goto done;
|
|
|
2546 }
|
|
|
2547
|
|
|
2548 /* If the current character is ^M, and selective display is
|
|
|
2549 enabled, then add the invisible-text-glyph if
|
|
|
2550 selective-display-ellipses is set. In any case, this
|
|
|
2551 line is done. */
|
|
|
2552 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2553 {
|
|
826
|
2554 Bytebpos byte_next_charpos;
|
|
428
|
2555
|
|
|
2556 /* Find the buffer position at the end of the line. */
|
|
826
|
2557 byte_next_charpos =
|
|
|
2558 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2559 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
|
|
428
|
2560 == '\n')
|
|
826
|
2561 DEC_BYTEBPOS (b, byte_next_charpos);
|
|
428
|
2562
|
|
|
2563 /* If the cursor is somewhere in the elided text make
|
|
|
2564 sure that the cursor gets drawn appropriately. */
|
|
|
2565 if (data.cursor_type == CURSOR_ON
|
|
826
|
2566 && (data.byte_cursor_charpos >= data.byte_charpos &&
|
|
|
2567 data.byte_cursor_charpos < byte_next_charpos))
|
|
428
|
2568 {
|
|
|
2569 data.cursor_type = NEXT_CURSOR;
|
|
|
2570 }
|
|
|
2571
|
|
|
2572 /* We won't be adding a truncation or continuation glyph
|
|
|
2573 so give up the room allocated for them. */
|
|
819
|
2574 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2575
|
|
|
2576 if (!NILP (b->selective_display_ellipses))
|
|
|
2577 {
|
|
|
2578 /* We don't propagate anything from the invisible
|
|
|
2579 text glyph if it fails to fit. This is
|
|
|
2580 intentional. */
|
|
|
2581 struct glyph_block gb;
|
|
|
2582
|
|
|
2583 gb.extent = Qnil;
|
|
|
2584 gb.glyph = Vinvisible_text_glyph;
|
|
|
2585 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2586 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2587 }
|
|
|
2588
|
|
|
2589 /* Set the buffer position to the end of the line. We
|
|
|
2590 need to do this before potentially adding a newline
|
|
|
2591 so that the cursor flag will get set correctly (if
|
|
|
2592 needed). */
|
|
826
|
2593 data.byte_charpos = byte_next_charpos;
|
|
428
|
2594
|
|
|
2595 if (NILP (b->selective_display_ellipses)
|
|
826
|
2596 || data.byte_cursor_charpos == byte_next_charpos)
|
|
428
|
2597 {
|
|
|
2598 /* We have to at least add a newline character so
|
|
|
2599 that the cursor shows up properly. */
|
|
|
2600 data.ch = '\n';
|
|
|
2601 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2602 data.findex = DEFAULT_INDEX;
|
|
|
2603 data.start_col = 0;
|
|
|
2604 data.start_col_xoffset = 0;
|
|
826
|
2605 data.byte_start_col_enabled = 0;
|
|
428
|
2606
|
|
867
|
2607 add_ichar_rune (&data);
|
|
428
|
2608 }
|
|
|
2609
|
|
|
2610 /* This had better be a newline but doing it this way
|
|
|
2611 we'll see obvious incorrect results if it isn't. No
|
|
|
2612 need to abort here. */
|
|
826
|
2613 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2614
|
|
|
2615 goto done;
|
|
|
2616 }
|
|
|
2617
|
|
|
2618 /* If the current character is considered to be printable, then
|
|
|
2619 just add it. */
|
|
|
2620 else if (data.ch >= printable_min)
|
|
|
2621 {
|
|
867
|
2622 *prop = add_ichar_rune (&data);
|
|
428
|
2623 if (*prop)
|
|
|
2624 goto done;
|
|
|
2625 }
|
|
|
2626
|
|
|
2627 /* If the current character is a tab, determine the next tab
|
|
|
2628 starting position and add a blank rune which extends from the
|
|
|
2629 current pixel position to that starting position. */
|
|
|
2630 else if (data.ch == '\t')
|
|
|
2631 {
|
|
|
2632 int tab_start_pixpos = data.pixpos;
|
|
|
2633 int next_tab_start;
|
|
|
2634 int char_tab_width;
|
|
|
2635 int prop_width = 0;
|
|
|
2636
|
|
|
2637 if (data.start_col > 1)
|
|
434
|
2638 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2639 + data.start_col_xoffset;
|
|
|
2640
|
|
|
2641 next_tab_start =
|
|
|
2642 next_tab_position (w, tab_start_pixpos,
|
|
|
2643 dl->bounds.left_in +
|
|
|
2644 data.hscroll_glyph_width_adjust);
|
|
|
2645 if (next_tab_start > data.max_pixpos)
|
|
|
2646 {
|
|
|
2647 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2648 next_tab_start = data.max_pixpos;
|
|
|
2649 }
|
|
|
2650 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2651 char_tab_width =
|
|
|
2652 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2653
|
|
|
2654 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2655
|
|
|
2656 /* add_blank_rune is only supposed to be called with
|
|
|
2657 sizes guaranteed to fit in the available space. */
|
|
|
2658 assert (!(*prop));
|
|
|
2659
|
|
|
2660 if (prop_width)
|
|
|
2661 {
|
|
|
2662 struct prop_block pb;
|
|
|
2663 *prop = Dynarr_new (prop_block);
|
|
|
2664
|
|
|
2665 pb.type = PROP_BLANK;
|
|
|
2666 pb.data.p_blank.width = prop_width;
|
|
|
2667 pb.data.p_blank.findex = data.findex;
|
|
|
2668 Dynarr_add (*prop, pb);
|
|
|
2669
|
|
|
2670 goto done;
|
|
|
2671 }
|
|
|
2672 }
|
|
|
2673
|
|
|
2674 /* If character is a control character, pass it off to
|
|
|
2675 add_control_char_runes.
|
|
|
2676
|
|
|
2677 The is_*() routines have undefined results on
|
|
|
2678 arguments outside of the range [-1, 255]. (This
|
|
|
2679 often bites people who carelessly use `char' instead
|
|
|
2680 of `unsigned char'.)
|
|
|
2681 */
|
|
867
|
2682 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
2683 {
|
|
|
2684 *prop = add_control_char_runes (&data, b);
|
|
|
2685
|
|
|
2686 if (*prop)
|
|
|
2687 goto done;
|
|
|
2688 }
|
|
|
2689
|
|
|
2690 /* If the character is above the ASCII range and we have not
|
|
|
2691 already handled it, then print it as an octal number. */
|
|
|
2692 else if (data.ch >= 0200)
|
|
|
2693 {
|
|
|
2694 *prop = add_octal_runes (&data);
|
|
|
2695
|
|
|
2696 if (*prop)
|
|
|
2697 goto done;
|
|
|
2698 }
|
|
|
2699
|
|
|
2700 /* Assume the current character is considered to be printable,
|
|
|
2701 then just add it. */
|
|
|
2702 else
|
|
|
2703 {
|
|
867
|
2704 *prop = add_ichar_rune (&data);
|
|
428
|
2705 if (*prop)
|
|
|
2706 goto done;
|
|
|
2707 }
|
|
|
2708
|
|
826
|
2709 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2710 }
|
|
|
2711 }
|
|
|
2712
|
|
|
2713 done:
|
|
|
2714
|
|
|
2715 /* Determine the starting point of the next line if we did not hit the
|
|
|
2716 end of the buffer. */
|
|
826
|
2717 if (data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2718 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2719 {
|
|
|
2720 /* #### This check is not correct. If the line terminated
|
|
|
2721 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
2722 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
2723 you make the two changes mentioned at the top of this loop,
|
|
|
2724 you should be able to say '(if (*prop))'. That should also
|
|
826
|
2725 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2726 check. */
|
|
|
2727
|
|
|
2728 /* The common case is that the line ended because we hit a newline.
|
|
|
2729 In that case, the next character is just the next buffer
|
|
|
2730 position. */
|
|
|
2731 if (data.ch == '\n')
|
|
|
2732 {
|
|
|
2733 /* If data.start_col_enabled is still true, then the window is
|
|
|
2734 scrolled far enough so that nothing on this line is visible.
|
|
|
2735 We need to stick a truncation glyph at the beginning of the
|
|
|
2736 line in that case unless the line is completely blank. */
|
|
826
|
2737 if (data.byte_start_col_enabled)
|
|
428
|
2738 {
|
|
|
2739 if (data.cursor_type == CURSOR_ON)
|
|
|
2740 {
|
|
826
|
2741 if (data.byte_cursor_charpos >= byte_start_pos
|
|
|
2742 && data.byte_cursor_charpos <= data.byte_charpos)
|
|
|
2743 data.byte_cursor_charpos = data.byte_charpos;
|
|
428
|
2744 }
|
|
|
2745 data.findex = DEFAULT_INDEX;
|
|
|
2746 data.start_col = 0;
|
|
826
|
2747 data.byte_start_col_enabled = 0;
|
|
|
2748
|
|
|
2749 if (data.byte_charpos != byte_start_pos)
|
|
428
|
2750 {
|
|
|
2751 struct glyph_block gb;
|
|
|
2752
|
|
|
2753 gb.extent = Qnil;
|
|
|
2754 gb.glyph = Vhscroll_glyph;
|
|
|
2755 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2756 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2757 }
|
|
|
2758 else
|
|
|
2759 {
|
|
|
2760 /* This duplicates code down below to add a newline to
|
|
|
2761 the end of an otherwise empty line.*/
|
|
|
2762 data.ch = '\n';
|
|
|
2763 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2764
|
|
867
|
2765 add_ichar_rune (&data);
|
|
428
|
2766 }
|
|
|
2767 }
|
|
|
2768
|
|
826
|
2769 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2770 }
|
|
|
2771
|
|
|
2772 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2773 line. */
|
|
|
2774 else
|
|
|
2775 {
|
|
|
2776 struct glyph_block gb;
|
|
|
2777 struct glyph_cachel *cachel;
|
|
|
2778
|
|
|
2779 /* If the line is to be truncated then we actually have to look
|
|
|
2780 for the next newline. We also add the end-of-line glyph which
|
|
|
2781 we know will fit because we adjusted the right border before
|
|
|
2782 we starting laying out the line. */
|
|
819
|
2783 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2784 data.findex = DEFAULT_INDEX;
|
|
|
2785 gb.extent = Qnil;
|
|
|
2786
|
|
|
2787 if (truncate_win)
|
|
|
2788 {
|
|
826
|
2789 Bytebpos byte_pos;
|
|
428
|
2790
|
|
|
2791 /* Now find the start of the next line. */
|
|
826
|
2792 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
428
|
2793
|
|
|
2794 /* If the cursor is past the truncation line then we
|
|
|
2795 make it appear on the truncation glyph. If we've hit
|
|
|
2796 the end of the buffer then we also make the cursor
|
|
|
2797 appear unless eob is immediately preceded by a
|
|
|
2798 newline. In that case the cursor should actually
|
|
|
2799 appear on the next line. */
|
|
|
2800 if (data.cursor_type == CURSOR_ON
|
|
826
|
2801 && data.byte_cursor_charpos >= data.byte_charpos
|
|
|
2802 && (data.byte_cursor_charpos < byte_pos ||
|
|
|
2803 (byte_pos == BYTE_BUF_ZV (b)
|
|
|
2804 && (byte_pos == BYTE_BUF_BEGV (b)
|
|
|
2805 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
|
|
428
|
2806 != '\n')))))
|
|
826
|
2807 data.byte_cursor_charpos = byte_pos;
|
|
428
|
2808 else
|
|
|
2809 data.cursor_type = NO_CURSOR;
|
|
|
2810
|
|
826
|
2811 data.byte_charpos = byte_pos;
|
|
428
|
2812 gb.glyph = Vtruncation_glyph;
|
|
|
2813 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2814 }
|
|
|
2815 else
|
|
|
2816 {
|
|
|
2817 /* The cursor can never be on the continuation glyph. */
|
|
|
2818 data.cursor_type = NO_CURSOR;
|
|
|
2819
|
|
826
|
2820 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
2821
|
|
442
|
2822 dl->line_continuation = 1;
|
|
428
|
2823 gb.glyph = Vcontinuation_glyph;
|
|
|
2824 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2825 }
|
|
|
2826
|
|
442
|
2827 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2828
|
|
826
|
2829 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
|
|
|
2830 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
|
|
428
|
2831 /* #### Damn this losing shit. */
|
|
826
|
2832 data.byte_charpos++;
|
|
428
|
2833 }
|
|
|
2834 }
|
|
|
2835 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
826
|
2836 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
|
|
428
|
2837 {
|
|
|
2838 /* We need to add a marker to the end of the line since there is no
|
|
|
2839 newline character in order for the cursor to get drawn. We label
|
|
|
2840 it as a newline so that it gets handled correctly by the
|
|
|
2841 whitespace routines below. */
|
|
|
2842
|
|
|
2843 data.ch = '\n';
|
|
|
2844 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2845 data.findex = DEFAULT_INDEX;
|
|
|
2846 data.start_col = 0;
|
|
|
2847 data.start_col_xoffset = 0;
|
|
826
|
2848 data.byte_start_col_enabled = 0;
|
|
428
|
2849
|
|
|
2850 data.max_pixpos += data.blank_width;
|
|
867
|
2851 add_ichar_rune (&data);
|
|
428
|
2852 data.max_pixpos -= data.blank_width;
|
|
|
2853
|
|
|
2854 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2855 manipulating invalid positions is guaranteed to result in
|
|
|
2856 trouble sooner or later. */
|
|
826
|
2857 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
|
|
428
|
2858 }
|
|
|
2859
|
|
|
2860 /* Calculate left whitespace boundary. */
|
|
|
2861 {
|
|
|
2862 int elt = 0;
|
|
|
2863
|
|
|
2864 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2865 while (elt < Dynarr_length (db->runes))
|
|
|
2866 {
|
|
|
2867 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2868
|
|
|
2869 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2870 || rb->type == RUNE_BLANK)
|
|
|
2871 {
|
|
|
2872 dl->bounds.left_white += rb->width;
|
|
|
2873 elt++;
|
|
|
2874 }
|
|
|
2875 else
|
|
|
2876 elt = Dynarr_length (db->runes);
|
|
|
2877 }
|
|
|
2878 }
|
|
|
2879
|
|
|
2880 /* Calculate right whitespace boundary. */
|
|
|
2881 {
|
|
|
2882 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2883 int done = 0;
|
|
|
2884
|
|
|
2885 while (!done && elt >= 0)
|
|
|
2886 {
|
|
|
2887 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2888
|
|
|
2889 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2890 && isspace (rb->object.chr.ch))
|
|
|
2891 && !rb->type == RUNE_BLANK)
|
|
|
2892 {
|
|
|
2893 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2894 done = 1;
|
|
|
2895 }
|
|
|
2896
|
|
|
2897 elt--;
|
|
|
2898
|
|
|
2899 }
|
|
|
2900
|
|
|
2901 /* The line is blank so everything is considered to be right
|
|
|
2902 whitespace. */
|
|
|
2903 if (!done)
|
|
|
2904 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2905 }
|
|
|
2906
|
|
|
2907 /* Set the display blocks bounds. */
|
|
|
2908 db->start_pos = dl->bounds.left_in;
|
|
|
2909 if (Dynarr_length (db->runes))
|
|
|
2910 {
|
|
|
2911 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2912
|
|
|
2913 db->end_pos = rb->xpos + rb->width;
|
|
|
2914 }
|
|
|
2915 else
|
|
|
2916 db->end_pos = dl->bounds.right_white;
|
|
|
2917
|
|
819
|
2918 calculate_baseline (&data);
|
|
428
|
2919
|
|
|
2920 dl->ascent = data.new_ascent;
|
|
|
2921 dl->descent = data.new_descent;
|
|
|
2922
|
|
|
2923 {
|
|
|
2924 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2925
|
|
|
2926 if (dl->ascent < ascent)
|
|
|
2927 dl->ascent = ascent;
|
|
|
2928 }
|
|
|
2929 {
|
|
|
2930 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2931
|
|
|
2932 if (dl->descent < descent)
|
|
|
2933 dl->descent = descent;
|
|
|
2934 }
|
|
|
2935
|
|
819
|
2936 calculate_yoffset (dl, db);
|
|
|
2937
|
|
428
|
2938 dl->cursor_elt = data.cursor_x;
|
|
|
2939 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
2940 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
|
2941 dl->end_charpos = BUF_ZV (b);
|
|
428
|
2942 else
|
|
826
|
2943 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
|
|
428
|
2944 if (truncate_win)
|
|
826
|
2945 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
|
|
428
|
2946 else
|
|
|
2947 /* This doesn't correctly take into account tabs and control
|
|
|
2948 characters but if the window isn't being truncated then this
|
|
|
2949 value isn't going to end up being used anyhow. */
|
|
826
|
2950 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
2951
|
|
|
2952 /* #### handle horizontally scrolled line with text none of which
|
|
|
2953 was actually laid out. */
|
|
|
2954
|
|
|
2955 /* #### handle any remainder of overlay arrow */
|
|
|
2956
|
|
|
2957 if (*prop == ADD_FAILED)
|
|
|
2958 *prop = NULL;
|
|
|
2959
|
|
|
2960 if (truncate_win && *prop)
|
|
|
2961 {
|
|
|
2962 Dynarr_free (*prop);
|
|
|
2963 *prop = NULL;
|
|
|
2964 }
|
|
|
2965
|
|
|
2966 extent_fragment_delete (data.ef);
|
|
|
2967
|
|
|
2968 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2969 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2970 The main loop should get fixed so that it isn't necessary to call
|
|
|
2971 this function if we are already at EOB. */
|
|
|
2972
|
|
826
|
2973 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
|
|
|
2974 return data.byte_charpos + 1; /* Yuck! */
|
|
428
|
2975 else
|
|
826
|
2976 return data.byte_charpos;
|
|
428
|
2977 }
|
|
|
2978
|
|
|
2979 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2980
|
|
|
2981 static int
|
|
|
2982 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2983 {
|
|
|
2984 struct frame *f = XFRAME (w->frame);
|
|
|
2985 struct device *d = XDEVICE (f->device);
|
|
|
2986 pos_data data;
|
|
|
2987
|
|
|
2988 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2989 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2990 return 0;
|
|
|
2991
|
|
|
2992 xzero (data);
|
|
|
2993 data.ef = NULL;
|
|
|
2994 data.d = d;
|
|
793
|
2995 data.window = wrap_window (w);
|
|
428
|
2996 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2997 data.dl = dl;
|
|
|
2998 data.pixpos = dl->bounds.left_in;
|
|
|
2999 data.max_pixpos = dl->bounds.right_in;
|
|
|
3000 data.cursor_type = NO_CURSOR;
|
|
|
3001 data.cursor_x = -1;
|
|
|
3002 data.findex = DEFAULT_INDEX;
|
|
|
3003 data.last_charset = Qunbound;
|
|
|
3004 data.last_findex = DEFAULT_INDEX;
|
|
|
3005 data.result_str = Qnil;
|
|
|
3006 data.string = Qnil;
|
|
|
3007
|
|
|
3008 Dynarr_reset (data.db->runes);
|
|
|
3009
|
|
|
3010 if (STRINGP (Voverlay_arrow_string))
|
|
|
3011 {
|
|
867
|
3012 add_ibyte_string_runes
|
|
428
|
3013 (&data,
|
|
|
3014 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
3015 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
3016 1, 0);
|
|
428
|
3017 }
|
|
|
3018 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
3019 {
|
|
|
3020 struct glyph_block gb;
|
|
|
3021
|
|
|
3022 gb.glyph = Voverlay_arrow_string;
|
|
|
3023 gb.extent = Qnil;
|
|
|
3024 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3025 }
|
|
819
|
3026
|
|
428
|
3027 if (data.max_pixmap_height)
|
|
|
3028 {
|
|
|
3029 int height = data.new_ascent + data.new_descent;
|
|
|
3030 int pix_ascent, pix_descent;
|
|
819
|
3031
|
|
428
|
3032 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
3033 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
3034 calculate_baseline (&data);
|
|
428
|
3035
|
|
|
3036 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
3037 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
3038 }
|
|
|
3039
|
|
|
3040 dl->ascent = data.new_ascent;
|
|
|
3041 dl->descent = data.new_descent;
|
|
|
3042
|
|
|
3043 data.db->start_pos = dl->bounds.left_in;
|
|
|
3044 data.db->end_pos = data.pixpos;
|
|
|
3045
|
|
819
|
3046 calculate_yoffset (dl, data.db);
|
|
|
3047
|
|
428
|
3048 return data.pixpos - dl->bounds.left_in;
|
|
|
3049 }
|
|
|
3050
|
|
|
3051 /* Add a type of glyph to a margin display block. */
|
|
|
3052
|
|
|
3053 static int
|
|
|
3054 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
3055 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
3056 {
|
|
|
3057 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
3058 ? dl->left_glyphs
|
|
|
3059 : dl->right_glyphs);
|
|
|
3060 int elt, end;
|
|
|
3061 int reverse;
|
|
442
|
3062 struct window *w = XWINDOW (window);
|
|
|
3063 struct frame *f = XFRAME (w->frame);
|
|
|
3064 struct device *d = XDEVICE (f->device);
|
|
|
3065 pos_data data;
|
|
|
3066
|
|
|
3067 xzero (data);
|
|
|
3068 data.d = d;
|
|
|
3069 data.window = window;
|
|
|
3070 data.db = db;
|
|
|
3071 data.dl = dl;
|
|
|
3072 data.pixpos = start;
|
|
|
3073 data.cursor_type = NO_CURSOR;
|
|
|
3074 data.cursor_x = -1;
|
|
|
3075 data.last_charset = Qunbound;
|
|
|
3076 data.last_findex = DEFAULT_INDEX;
|
|
|
3077 data.result_str = Qnil;
|
|
|
3078 data.string = Qnil;
|
|
|
3079 data.new_ascent = dl->ascent;
|
|
|
3080 data.new_descent = dl->descent;
|
|
428
|
3081
|
|
|
3082 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
3083 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
3084 {
|
|
|
3085 reverse = 1;
|
|
|
3086 elt = Dynarr_length (gbd) - 1;
|
|
|
3087 end = 0;
|
|
|
3088 }
|
|
|
3089 else
|
|
|
3090 {
|
|
|
3091 reverse = 0;
|
|
|
3092 elt = 0;
|
|
|
3093 end = Dynarr_length (gbd);
|
|
|
3094 }
|
|
|
3095
|
|
|
3096 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
3097 {
|
|
|
3098 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3099
|
|
|
3100 if (NILP (gb->extent))
|
|
|
3101 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3102
|
|
|
3103 if (gb->active &&
|
|
|
3104 ((side == LEFT_GLYPHS &&
|
|
|
3105 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3106 || (side == RIGHT_GLYPHS &&
|
|
|
3107 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3108 {
|
|
442
|
3109 data.findex = gb->findex;
|
|
|
3110 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3111 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3112 count--;
|
|
|
3113 gb->active = 0;
|
|
|
3114 }
|
|
|
3115
|
|
|
3116 (reverse ? elt-- : elt++);
|
|
|
3117 }
|
|
|
3118
|
|
819
|
3119 calculate_baseline (&data);
|
|
442
|
3120
|
|
|
3121 dl->ascent = data.new_ascent;
|
|
|
3122 dl->descent = data.new_descent;
|
|
|
3123
|
|
819
|
3124 calculate_yoffset (dl, data.db);
|
|
|
3125
|
|
442
|
3126 return data.pixpos;
|
|
428
|
3127 }
|
|
|
3128
|
|
|
3129 /* Add a blank to a margin display block. */
|
|
|
3130
|
|
|
3131 static void
|
|
2286
|
3132 add_margin_blank (struct display_line *UNUSED (dl), struct display_block *db,
|
|
428
|
3133 struct window *w, int xpos, int width, int side)
|
|
|
3134 {
|
|
|
3135 struct rune rb;
|
|
|
3136
|
|
|
3137 rb.findex = (side == LEFT_GLYPHS
|
|
|
3138 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3139 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3140 rb.xpos = xpos;
|
|
|
3141 rb.width = width;
|
|
826
|
3142 rb.charpos = -1;
|
|
428
|
3143 rb.endpos = 0;
|
|
|
3144 rb.type = RUNE_BLANK;
|
|
|
3145 rb.cursor_type = CURSOR_OFF;
|
|
|
3146
|
|
|
3147 Dynarr_add (db->runes, rb);
|
|
|
3148 }
|
|
|
3149
|
|
|
3150 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3151 left whitespace area. */
|
|
|
3152
|
|
|
3153 static void
|
|
|
3154 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3155 int overlay_width)
|
|
|
3156 {
|
|
|
3157 Lisp_Object window;
|
|
|
3158
|
|
|
3159 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3160 int elt, end_xpos;
|
|
|
3161 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3162 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3163 int left_in_start = dl->bounds.left_in;
|
|
|
3164 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3165
|
|
|
3166 struct display_block *odb, *idb;
|
|
|
3167
|
|
793
|
3168 window = wrap_window (w);
|
|
428
|
3169
|
|
|
3170 /* We have to add the glyphs to the line in the order outside,
|
|
|
3171 inside, whitespace. However the precedence dictates that we
|
|
|
3172 determine how many will fit in the reverse order. */
|
|
|
3173
|
|
|
3174 /* Determine how many whitespace glyphs we can display and where
|
|
|
3175 they should start. */
|
|
|
3176 white_in_start = dl->bounds.left_white;
|
|
|
3177 white_out_start = left_in_start;
|
|
|
3178 white_out_cnt = white_in_cnt = 0;
|
|
|
3179 elt = 0;
|
|
|
3180
|
|
|
3181 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3182 {
|
|
|
3183 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3184
|
|
|
3185 if (NILP (gb->extent))
|
|
|
3186 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3187
|
|
|
3188 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3189 {
|
|
|
3190 int width;
|
|
|
3191
|
|
438
|
3192 width = glyph_width (gb->glyph, window);
|
|
428
|
3193
|
|
|
3194 if (white_in_start - width >= left_in_end)
|
|
|
3195 {
|
|
|
3196 white_in_cnt++;
|
|
|
3197 white_in_start -= width;
|
|
|
3198 gb->width = width;
|
|
|
3199 gb->active = 1;
|
|
|
3200 }
|
|
|
3201 else if (use_overflow
|
|
|
3202 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3203 {
|
|
|
3204 white_out_cnt++;
|
|
|
3205 white_out_start -= width;
|
|
|
3206 gb->width = width;
|
|
|
3207 gb->active = 1;
|
|
|
3208 }
|
|
|
3209 else
|
|
|
3210 gb->active = 0;
|
|
|
3211 }
|
|
|
3212
|
|
|
3213 elt++;
|
|
|
3214 }
|
|
|
3215
|
|
|
3216 /* Determine how many inside margin glyphs we can display and where
|
|
|
3217 they should start. The inside margin glyphs get whatever space
|
|
|
3218 is left after the whitespace glyphs have been displayed. These
|
|
|
3219 are tricky to calculate since if we decide to use the overflow
|
|
|
3220 area we basically have to start over. So for these we build up a
|
|
|
3221 list of just the inside margin glyphs and manipulate it to
|
|
|
3222 determine the needed info. */
|
|
|
3223 {
|
|
|
3224 glyph_block_dynarr *ib;
|
|
|
3225 int avail_in, avail_out;
|
|
|
3226 int done = 0;
|
|
|
3227 int marker = 0;
|
|
|
3228 int used_in, used_out;
|
|
|
3229
|
|
|
3230 elt = 0;
|
|
|
3231 used_in = used_out = 0;
|
|
|
3232 ib = Dynarr_new (glyph_block);
|
|
|
3233 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3234 {
|
|
|
3235 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3236
|
|
|
3237 if (NILP (gb->extent))
|
|
|
3238 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3239
|
|
|
3240 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3241 GL_INSIDE_MARGIN)
|
|
|
3242 {
|
|
438
|
3243 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3244 used_in += gb->width;
|
|
|
3245 Dynarr_add (ib, *gb);
|
|
|
3246 }
|
|
|
3247
|
|
|
3248 elt++;
|
|
|
3249 }
|
|
|
3250
|
|
|
3251 if (white_out_cnt)
|
|
|
3252 avail_in = 0;
|
|
|
3253 else
|
|
|
3254 {
|
|
|
3255 avail_in = white_in_start - left_in_end;
|
|
|
3256 if (avail_in < 0)
|
|
|
3257 avail_in = 0;
|
|
|
3258 }
|
|
|
3259
|
|
|
3260 if (!use_overflow)
|
|
|
3261 avail_out = 0;
|
|
|
3262 else
|
|
|
3263 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3264
|
|
|
3265 marker = 0;
|
|
|
3266 while (!done && marker < Dynarr_length (ib))
|
|
|
3267 {
|
|
|
3268 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3269
|
|
|
3270 /* If everything now fits in the available inside margin
|
|
|
3271 space, we're done. */
|
|
|
3272 if (used_in <= avail_in)
|
|
|
3273 done = 1;
|
|
|
3274 else
|
|
|
3275 {
|
|
|
3276 /* Otherwise see if we have room to move a glyph to the
|
|
|
3277 outside. */
|
|
|
3278 if (used_out + width <= avail_out)
|
|
|
3279 {
|
|
|
3280 used_out += width;
|
|
|
3281 used_in -= width;
|
|
|
3282 }
|
|
|
3283 else
|
|
|
3284 done = 1;
|
|
|
3285 }
|
|
|
3286
|
|
|
3287 if (!done)
|
|
|
3288 marker++;
|
|
|
3289 }
|
|
|
3290
|
|
|
3291 /* At this point we now know that everything from marker on goes in
|
|
|
3292 the inside margin and everything before it goes in the outside
|
|
|
3293 margin. The stuff going into the outside margin is guaranteed
|
|
|
3294 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3295
|
|
|
3296 in_in_end = left_in_end;
|
|
|
3297 in_out_start = white_out_start;
|
|
|
3298 in_out_cnt = in_in_cnt = 0;
|
|
|
3299
|
|
|
3300 Dynarr_free (ib);
|
|
|
3301 elt = 0;
|
|
|
3302 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3303 {
|
|
|
3304 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3305
|
|
|
3306 if (NILP (gb->extent))
|
|
|
3307 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3308
|
|
|
3309 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3310 GL_INSIDE_MARGIN)
|
|
|
3311 {
|
|
438
|
3312 int width = glyph_width (gb->glyph, window);
|
|
428
|
3313
|
|
|
3314 if (used_out)
|
|
|
3315 {
|
|
|
3316 in_out_cnt++;
|
|
|
3317 in_out_start -= width;
|
|
|
3318 gb->width = width;
|
|
|
3319 gb->active = 1;
|
|
|
3320 used_out -= width;
|
|
|
3321 }
|
|
|
3322 else if (in_in_end + width < white_in_start)
|
|
|
3323 {
|
|
|
3324 in_in_cnt++;
|
|
|
3325 in_in_end += width;
|
|
|
3326 gb->width = width;
|
|
|
3327 gb->active = 1;
|
|
|
3328 }
|
|
|
3329 else
|
|
|
3330 gb->active = 0;
|
|
|
3331 }
|
|
|
3332
|
|
|
3333 elt++;
|
|
|
3334 }
|
|
|
3335 }
|
|
|
3336
|
|
|
3337 /* Determine how many outside margin glyphs we can display. They
|
|
|
3338 always start at the left outside margin and can only use the
|
|
|
3339 outside margin space. */
|
|
|
3340 out_end = dl->bounds.left_out;
|
|
|
3341 out_cnt = 0;
|
|
|
3342 elt = 0;
|
|
|
3343
|
|
|
3344 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3345 {
|
|
|
3346 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3347
|
|
|
3348 if (NILP (gb->extent))
|
|
|
3349 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3350
|
|
|
3351 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3352 GL_OUTSIDE_MARGIN)
|
|
|
3353 {
|
|
438
|
3354 int width = glyph_width (gb->glyph, window);
|
|
428
|
3355
|
|
|
3356 if (out_end + width <= in_out_start)
|
|
|
3357 {
|
|
|
3358 out_cnt++;
|
|
|
3359 out_end += width;
|
|
|
3360 gb->width = width;
|
|
|
3361 gb->active = 1;
|
|
|
3362 }
|
|
|
3363 else
|
|
|
3364 gb->active = 0;
|
|
|
3365 }
|
|
|
3366
|
|
|
3367 elt++;
|
|
|
3368 }
|
|
|
3369
|
|
|
3370 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3371 runes to the appropriate display blocks. */
|
|
|
3372 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3373 {
|
|
|
3374 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3375 odb->start_pos = dl->bounds.left_out;
|
|
|
3376 /* #### We should stop adding a blank to account for the space
|
|
|
3377 between the end of the glyphs and the margin and instead set
|
|
|
3378 this accordingly. */
|
|
|
3379 odb->end_pos = dl->bounds.left_in;
|
|
|
3380 Dynarr_reset (odb->runes);
|
|
|
3381 }
|
|
|
3382 else
|
|
|
3383 odb = 0;
|
|
|
3384
|
|
|
3385 if (in_in_cnt || white_in_cnt)
|
|
|
3386 {
|
|
|
3387 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3388 idb->start_pos = dl->bounds.left_in;
|
|
|
3389 /* #### See above comment for odb->end_pos */
|
|
|
3390 idb->end_pos = dl->bounds.left_white;
|
|
|
3391 Dynarr_reset (idb->runes);
|
|
|
3392 }
|
|
|
3393 else
|
|
|
3394 idb = 0;
|
|
|
3395
|
|
|
3396 /* First add the outside margin glyphs. */
|
|
|
3397 if (out_cnt)
|
|
|
3398 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3399 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3400 else
|
|
|
3401 end_xpos = dl->bounds.left_out;
|
|
|
3402
|
|
|
3403 /* There may be blank space between the outside margin glyphs and
|
|
|
3404 the inside margin glyphs. If so, add a blank. */
|
|
|
3405 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3406 {
|
|
|
3407 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3408 LEFT_GLYPHS);
|
|
|
3409 }
|
|
|
3410
|
|
|
3411 /* Next add the inside margin glyphs which are actually in the
|
|
|
3412 outside margin. */
|
|
|
3413 if (in_out_cnt)
|
|
|
3414 {
|
|
|
3415 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3416 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3417 }
|
|
|
3418
|
|
|
3419 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3420 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3421 here. */
|
|
|
3422 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3423 {
|
|
|
3424 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3425 LEFT_GLYPHS);
|
|
|
3426 }
|
|
|
3427
|
|
|
3428 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3429 outside margin. */
|
|
|
3430 if (white_out_cnt)
|
|
|
3431 {
|
|
|
3432 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3433 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3434 }
|
|
|
3435
|
|
|
3436 /* We take care of clearing between the end of the glyphs and the
|
|
|
3437 start of the inside margin for lines which have glyphs. */
|
|
|
3438 if (odb && (left_in_start - end_xpos))
|
|
|
3439 {
|
|
|
3440 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3441 LEFT_GLYPHS);
|
|
|
3442 }
|
|
|
3443
|
|
|
3444 /* Next add the inside margin glyphs which are actually in the
|
|
|
3445 inside margin. */
|
|
|
3446 if (in_in_cnt)
|
|
|
3447 {
|
|
|
3448 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3449 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3450 }
|
|
|
3451 else
|
|
|
3452 end_xpos = left_in_end;
|
|
|
3453
|
|
|
3454 /* Make sure that the area between the end of the inside margin
|
|
|
3455 glyphs and the whitespace glyphs is cleared. */
|
|
|
3456 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3457 {
|
|
|
3458 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3459 LEFT_GLYPHS);
|
|
|
3460 }
|
|
|
3461
|
|
|
3462 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3463 inside margin. */
|
|
|
3464 if (white_in_cnt)
|
|
|
3465 {
|
|
|
3466 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3467 LEFT_GLYPHS, window);
|
|
|
3468 }
|
|
|
3469
|
|
|
3470 /* Whitespace glyphs always end right next to the text block so
|
|
|
3471 there is nothing we have to make sure is cleared after them. */
|
|
|
3472 }
|
|
|
3473
|
|
|
3474 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3475 right whitespace area. */
|
|
|
3476
|
|
|
3477 static void
|
|
|
3478 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3479 {
|
|
|
3480 Lisp_Object window;
|
|
|
3481
|
|
|
3482 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3483 int elt, end_xpos;
|
|
|
3484 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3485 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3486
|
|
|
3487 struct display_block *odb, *idb;
|
|
|
3488
|
|
793
|
3489 window = wrap_window (w);
|
|
428
|
3490
|
|
|
3491 /* We have to add the glyphs to the line in the order outside,
|
|
|
3492 inside, whitespace. However the precedence dictates that we
|
|
|
3493 determine how many will fit in the reverse order. */
|
|
|
3494
|
|
|
3495 /* Determine how many whitespace glyphs we can display and where
|
|
|
3496 they should start. */
|
|
|
3497 white_in_end = dl->bounds.right_white;
|
|
|
3498 white_out_end = dl->bounds.right_in;
|
|
|
3499 white_out_cnt = white_in_cnt = 0;
|
|
|
3500 elt = 0;
|
|
|
3501
|
|
|
3502 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3503 {
|
|
|
3504 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3505
|
|
|
3506 if (NILP (gb->extent))
|
|
|
3507 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3508
|
|
|
3509 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3510 {
|
|
438
|
3511 int width = glyph_width (gb->glyph, window);
|
|
428
|
3512
|
|
|
3513 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3514 {
|
|
|
3515 white_in_cnt++;
|
|
|
3516 white_in_end += width;
|
|
|
3517 gb->width = width;
|
|
|
3518 gb->active = 1;
|
|
|
3519 }
|
|
|
3520 else if (use_overflow
|
|
|
3521 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3522 {
|
|
|
3523 white_out_cnt++;
|
|
|
3524 white_out_end += width;
|
|
|
3525 gb->width = width;
|
|
|
3526 gb->active = 1;
|
|
|
3527 }
|
|
|
3528 else
|
|
|
3529 gb->active = 0;
|
|
|
3530 }
|
|
|
3531
|
|
|
3532 elt++;
|
|
|
3533 }
|
|
|
3534
|
|
|
3535 /* Determine how many inside margin glyphs we can display and where
|
|
|
3536 they should start. The inside margin glyphs get whatever space
|
|
|
3537 is left after the whitespace glyphs have been displayed. These
|
|
|
3538 are tricky to calculate since if we decide to use the overflow
|
|
|
3539 area we basically have to start over. So for these we build up a
|
|
|
3540 list of just the inside margin glyphs and manipulate it to
|
|
|
3541 determine the needed info. */
|
|
|
3542 {
|
|
|
3543 glyph_block_dynarr *ib;
|
|
|
3544 int avail_in, avail_out;
|
|
|
3545 int done = 0;
|
|
|
3546 int marker = 0;
|
|
|
3547 int used_in, used_out;
|
|
|
3548
|
|
|
3549 elt = 0;
|
|
|
3550 used_in = used_out = 0;
|
|
|
3551 ib = Dynarr_new (glyph_block);
|
|
|
3552 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3553 {
|
|
|
3554 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3555
|
|
|
3556 if (NILP (gb->extent))
|
|
|
3557 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3558
|
|
|
3559 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3560 {
|
|
438
|
3561 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3562 used_in += gb->width;
|
|
|
3563 Dynarr_add (ib, *gb);
|
|
|
3564 }
|
|
|
3565
|
|
|
3566 elt++;
|
|
|
3567 }
|
|
|
3568
|
|
|
3569 if (white_out_cnt)
|
|
|
3570 avail_in = 0;
|
|
|
3571 else
|
|
|
3572 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3573
|
|
|
3574 if (!use_overflow)
|
|
|
3575 avail_out = 0;
|
|
|
3576 else
|
|
|
3577 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3578
|
|
|
3579 marker = 0;
|
|
|
3580 while (!done && marker < Dynarr_length (ib))
|
|
|
3581 {
|
|
|
3582 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3583
|
|
|
3584 /* If everything now fits in the available inside margin
|
|
|
3585 space, we're done. */
|
|
|
3586 if (used_in <= avail_in)
|
|
|
3587 done = 1;
|
|
|
3588 else
|
|
|
3589 {
|
|
|
3590 /* Otherwise see if we have room to move a glyph to the
|
|
|
3591 outside. */
|
|
|
3592 if (used_out + width <= avail_out)
|
|
|
3593 {
|
|
|
3594 used_out += width;
|
|
|
3595 used_in -= width;
|
|
|
3596 }
|
|
|
3597 else
|
|
|
3598 done = 1;
|
|
|
3599 }
|
|
|
3600
|
|
|
3601 if (!done)
|
|
|
3602 marker++;
|
|
|
3603 }
|
|
|
3604
|
|
|
3605 /* At this point we now know that everything from marker on goes in
|
|
|
3606 the inside margin and everything before it goes in the outside
|
|
|
3607 margin. The stuff going into the outside margin is guaranteed
|
|
|
3608 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3609
|
|
|
3610 in_in_start = dl->bounds.right_in;
|
|
|
3611 in_out_end = dl->bounds.right_in;
|
|
|
3612 in_out_cnt = in_in_cnt = 0;
|
|
|
3613
|
|
|
3614 Dynarr_free (ib);
|
|
|
3615 elt = 0;
|
|
|
3616 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3617 {
|
|
|
3618 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3619
|
|
|
3620 if (NILP (gb->extent))
|
|
|
3621 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3622
|
|
|
3623 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3624 {
|
|
438
|
3625 int width = glyph_width (gb->glyph, window);
|
|
428
|
3626
|
|
|
3627 if (used_out)
|
|
|
3628 {
|
|
|
3629 in_out_cnt++;
|
|
|
3630 in_out_end += width;
|
|
|
3631 gb->width = width;
|
|
|
3632 gb->active = 1;
|
|
|
3633 used_out -= width;
|
|
|
3634 }
|
|
|
3635 else if (in_in_start - width >= white_in_end)
|
|
|
3636 {
|
|
|
3637 in_in_cnt++;
|
|
|
3638 in_in_start -= width;
|
|
|
3639 gb->width = width;
|
|
|
3640 gb->active = 1;
|
|
|
3641 }
|
|
|
3642 else
|
|
|
3643 gb->active = 0;
|
|
|
3644 }
|
|
|
3645
|
|
|
3646 elt++;
|
|
|
3647 }
|
|
|
3648 }
|
|
|
3649
|
|
|
3650 /* Determine how many outside margin glyphs we can display. They
|
|
|
3651 always start at the right outside margin and can only use the
|
|
|
3652 outside margin space. */
|
|
|
3653 out_start = dl->bounds.right_out;
|
|
|
3654 out_cnt = 0;
|
|
|
3655 elt = 0;
|
|
|
3656
|
|
|
3657 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3658 {
|
|
|
3659 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3660
|
|
|
3661 if (NILP (gb->extent))
|
|
|
3662 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3663
|
|
|
3664 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3665 {
|
|
438
|
3666 int width = glyph_width (gb->glyph, window);
|
|
428
|
3667
|
|
|
3668 if (out_start - width >= in_out_end)
|
|
|
3669 {
|
|
|
3670 out_cnt++;
|
|
|
3671 out_start -= width;
|
|
|
3672 gb->width = width;
|
|
|
3673 gb->active = 1;
|
|
|
3674 }
|
|
|
3675 else
|
|
|
3676 gb->active = 0;
|
|
|
3677 }
|
|
|
3678
|
|
|
3679 elt++;
|
|
|
3680 }
|
|
|
3681
|
|
|
3682 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3683 to the appropriate display blocks. */
|
|
|
3684 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3685 {
|
|
|
3686 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3687 /* #### See comments before odb->start_pos init in
|
|
|
3688 create_left_glyph_block */
|
|
|
3689 odb->start_pos = dl->bounds.right_in;
|
|
|
3690 odb->end_pos = dl->bounds.right_out;
|
|
|
3691 Dynarr_reset (odb->runes);
|
|
|
3692 }
|
|
|
3693 else
|
|
|
3694 odb = 0;
|
|
|
3695
|
|
|
3696 if (in_in_cnt || white_in_cnt)
|
|
|
3697 {
|
|
|
3698 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3699 idb->start_pos = dl->bounds.right_white;
|
|
|
3700 /* #### See comments before odb->start_pos init in
|
|
|
3701 create_left_glyph_block */
|
|
|
3702 idb->end_pos = dl->bounds.right_in;
|
|
|
3703 Dynarr_reset (idb->runes);
|
|
|
3704 }
|
|
|
3705 else
|
|
|
3706 idb = 0;
|
|
|
3707
|
|
|
3708 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3709 inside margin. */
|
|
|
3710 if (white_in_cnt)
|
|
|
3711 {
|
|
|
3712 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3713 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3714 window);
|
|
|
3715 }
|
|
|
3716 else
|
|
|
3717 end_xpos = dl->bounds.right_white;
|
|
|
3718
|
|
|
3719 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3720 and the inside margin glyphs is cleared. */
|
|
|
3721 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3722 {
|
|
|
3723 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3724 RIGHT_GLYPHS);
|
|
|
3725 }
|
|
|
3726
|
|
|
3727 /* Next add the inside margin glyphs which are actually in the
|
|
|
3728 inside margin. */
|
|
|
3729 if (in_in_cnt)
|
|
|
3730 {
|
|
|
3731 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3732 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3733 }
|
|
|
3734
|
|
|
3735 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3736 of the inside margin area gets cleared. */
|
|
|
3737 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3738 {
|
|
|
3739 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3740 RIGHT_GLYPHS);
|
|
|
3741 }
|
|
|
3742
|
|
|
3743 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3744 if (white_out_cnt)
|
|
|
3745 {
|
|
|
3746 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3747 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3748 }
|
|
|
3749 else
|
|
|
3750 end_xpos = dl->bounds.right_in;
|
|
|
3751
|
|
|
3752 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3753 if (in_out_cnt)
|
|
|
3754 {
|
|
|
3755 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3756 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3757 }
|
|
|
3758
|
|
|
3759 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3760 in the outside margin and the actual outside margin glyphs. */
|
|
|
3761 if (odb && (out_start - end_xpos))
|
|
|
3762 {
|
|
|
3763 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3764 RIGHT_GLYPHS);
|
|
|
3765 }
|
|
|
3766
|
|
|
3767 /* Finally, add the outside margin glyphs. */
|
|
|
3768 if (out_cnt)
|
|
|
3769 {
|
|
|
3770 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3771 RIGHT_GLYPHS, window);
|
|
|
3772 }
|
|
|
3773 }
|
|
|
3774
|
|
|
3775
|
|
|
3776 /***************************************************************************/
|
|
|
3777 /* */
|
|
|
3778 /* modeline routines */
|
|
|
3779 /* */
|
|
|
3780 /***************************************************************************/
|
|
|
3781
|
|
438
|
3782 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3783 void
|
|
|
3784 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3785 struct window *w, struct display_line *dl,
|
|
|
3786 struct display_block *db, face_index findex,
|
|
|
3787 int min_pixpos, int max_pixpos, int type)
|
|
|
3788 {
|
|
|
3789 struct frame *f = XFRAME (w->frame);
|
|
|
3790 struct device *d = XDEVICE (f->device);
|
|
|
3791
|
|
|
3792 pos_data data;
|
|
|
3793 int c_pixpos;
|
|
|
3794 Charcount offset = 0;
|
|
|
3795
|
|
|
3796 xzero (data);
|
|
|
3797 data.d = d;
|
|
|
3798 data.db = db;
|
|
|
3799 data.dl = dl;
|
|
|
3800 data.findex = findex;
|
|
|
3801 data.pixpos = min_pixpos;
|
|
|
3802 data.max_pixpos = max_pixpos;
|
|
|
3803 data.cursor_type = NO_CURSOR;
|
|
|
3804 data.last_charset = Qunbound;
|
|
|
3805 data.last_findex = DEFAULT_INDEX;
|
|
|
3806 data.result_str = result_str;
|
|
|
3807 data.is_modeline = 1;
|
|
|
3808 data.string = Qnil;
|
|
793
|
3809 data.window = wrap_window (w);
|
|
438
|
3810
|
|
|
3811 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3812 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3813 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3814
|
|
|
3815 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3816 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3817 horizontal scrolling amount */
|
|
438
|
3818 if (! NILP (result_str))
|
|
|
3819 offset = w->modeline_hscroll;
|
|
|
3820 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3821 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3822 Qnil);
|
|
|
3823
|
|
|
3824 if (Dynarr_length (db->runes))
|
|
|
3825 {
|
|
|
3826 struct rune *rb =
|
|
|
3827 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3828 c_pixpos = rb->xpos + rb->width;
|
|
|
3829 }
|
|
|
3830 else
|
|
|
3831 c_pixpos = min_pixpos;
|
|
|
3832
|
|
|
3833 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3834 to make up the difference. This usually only occurs if the
|
|
|
3835 modeline face is using a proportional width font or a fixed width
|
|
|
3836 font of a different size from the default face font. */
|
|
|
3837
|
|
|
3838 if (c_pixpos < max_pixpos)
|
|
|
3839 {
|
|
|
3840 data.pixpos = c_pixpos;
|
|
|
3841 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3842
|
|
|
3843 add_blank_rune (&data, NULL, 0);
|
|
|
3844 }
|
|
|
3845
|
|
|
3846 /* Now create the result string and frob the extents into it. */
|
|
|
3847 if (!NILP (result_str))
|
|
|
3848 {
|
|
|
3849 int elt;
|
|
|
3850 Bytecount len;
|
|
867
|
3851 Ibyte *strdata;
|
|
438
|
3852 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3853
|
|
442
|
3854 in_modeline_generation = 1;
|
|
|
3855
|
|
771
|
3856 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3857 detach_all_extents (result_str);
|
|
793
|
3858 resize_string (result_str, -1,
|
|
438
|
3859 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3860
|
|
|
3861 strdata = XSTRING_DATA (result_str);
|
|
|
3862
|
|
|
3863 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3864 {
|
|
|
3865 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3866 {
|
|
867
|
3867 len += (set_itext_ichar
|
|
438
|
3868 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3869 elt)->object.chr.ch));
|
|
|
3870 }
|
|
|
3871 }
|
|
|
3872
|
|
771
|
3873 init_string_ascii_begin (result_str);
|
|
|
3874 bump_string_modiff (result_str);
|
|
|
3875 sledgehammer_check_ascii_begin (result_str);
|
|
|
3876
|
|
438
|
3877 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3878 elt++)
|
|
|
3879 {
|
|
|
3880 Lisp_Object extent = Qnil;
|
|
|
3881 Lisp_Object child;
|
|
|
3882
|
|
793
|
3883 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3884 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3885 if (NILP (child))
|
|
|
3886 {
|
|
|
3887 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3888 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3889 }
|
|
|
3890 Fset_extent_parent (child, extent);
|
|
|
3891 set_extent_endpoints
|
|
|
3892 (XEXTENT (child),
|
|
|
3893 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3894 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3895 result_str);
|
|
|
3896 }
|
|
442
|
3897
|
|
|
3898 in_modeline_generation = 0;
|
|
438
|
3899 }
|
|
|
3900 }
|
|
|
3901
|
|
428
|
3902 /* Ensure that the given display line DL accurately represents the
|
|
|
3903 modeline for the given window. */
|
|
|
3904 static void
|
|
|
3905 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3906 {
|
|
|
3907 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3908 struct frame *f = XFRAME (w->frame);
|
|
|
3909 struct device *d = XDEVICE (f->device);
|
|
|
3910
|
|
|
3911 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3912 our feet. */
|
|
|
3913 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3914 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3915 Lisp_Object font_inst;
|
|
|
3916
|
|
|
3917 /* This will actually determine incorrect inside boundaries for the
|
|
|
3918 modeline since it ignores the margins. However being aware of this fact
|
|
|
3919 we never use those values anywhere so it doesn't matter. */
|
|
|
3920 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3921
|
|
|
3922 /* We are generating a modeline. */
|
|
|
3923 dl->modeline = 1;
|
|
|
3924 dl->cursor_elt = -1;
|
|
|
3925
|
|
|
3926 /* Reset the runes on the modeline. */
|
|
|
3927 Dynarr_reset (db->runes);
|
|
|
3928
|
|
|
3929 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3930 {
|
|
|
3931 struct rune rb;
|
|
|
3932
|
|
|
3933 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3934 if (window_scrollbar_height (w))
|
|
|
3935 return;
|
|
|
3936
|
|
|
3937 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3938 dl->descent = 0;
|
|
|
3939 /* The modeline is at the bottom of the gutters. */
|
|
|
3940 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3941
|
|
|
3942 rb.findex = MODELINE_INDEX;
|
|
|
3943 rb.xpos = dl->bounds.left_out;
|
|
|
3944 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
826
|
3945 rb.charpos = 0;
|
|
428
|
3946 rb.endpos = 0;
|
|
|
3947 rb.type = RUNE_HLINE;
|
|
|
3948 rb.object.hline.thickness = 1;
|
|
|
3949 rb.object.hline.yoffset = 0;
|
|
|
3950 rb.cursor_type = NO_CURSOR;
|
|
|
3951
|
|
|
3952 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3953 && FRAME_WIN_P (f))
|
|
|
3954 {
|
|
|
3955 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3956
|
|
|
3957 dl->ypos -= shadow_thickness;
|
|
|
3958 rb.xpos += shadow_thickness;
|
|
|
3959 rb.width -= 2 * shadow_thickness;
|
|
|
3960 }
|
|
|
3961
|
|
|
3962 Dynarr_add (db->runes, rb);
|
|
|
3963 return;
|
|
|
3964 }
|
|
|
3965
|
|
|
3966 /* !!#### not right; needs to compute the max height of
|
|
|
3967 all the charsets */
|
|
|
3968 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3969
|
|
|
3970 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3971 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3972
|
|
|
3973 min_pixpos = dl->bounds.left_out;
|
|
|
3974 max_pixpos = dl->bounds.right_out;
|
|
|
3975
|
|
|
3976 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3977 {
|
|
|
3978 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3979
|
|
|
3980 ypos_adj = shadow_thickness;
|
|
|
3981 min_pixpos += shadow_thickness;
|
|
|
3982 max_pixpos -= shadow_thickness;
|
|
|
3983 }
|
|
|
3984 else
|
|
|
3985 ypos_adj = 0;
|
|
|
3986
|
|
|
3987 generate_formatted_string_db (b->modeline_format,
|
|
|
3988 b->generated_modeline_string, w, dl, db,
|
|
|
3989 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3990
|
|
|
3991 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3992 set this until we've generated the modeline in order to account
|
|
|
3993 for any embedded faces. */
|
|
|
3994 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3995 }
|
|
|
3996
|
|
|
3997 static Charcount
|
|
867
|
3998 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
|
|
771
|
3999 Charcount pos, Charcount min_pos,
|
|
|
4000 Charcount max_pos)
|
|
428
|
4001 {
|
|
|
4002 /* This function has been Mule-ized. */
|
|
|
4003 Charcount end;
|
|
867
|
4004 const Ibyte *cur_pos = str;
|
|
428
|
4005 struct display_block *db = data->db;
|
|
|
4006
|
|
|
4007 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
4008 while (Dynarr_length (db->runes) < pos)
|
|
|
4009 add_blank_rune (data, NULL, 0);
|
|
|
4010
|
|
|
4011 end = (Dynarr_length (db->runes) +
|
|
442
|
4012 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
4013 if (max_pos != -1)
|
|
|
4014 end = min (max_pos, end);
|
|
|
4015
|
|
|
4016 while (pos < end && *cur_pos)
|
|
|
4017 {
|
|
867
|
4018 const Ibyte *old_cur_pos = cur_pos;
|
|
428
|
4019 int succeeded;
|
|
|
4020
|
|
867
|
4021 data->ch = itext_ichar (cur_pos);
|
|
|
4022 succeeded = (add_ichar_rune (data) != ADD_FAILED);
|
|
|
4023 INC_IBYTEPTR (cur_pos);
|
|
428
|
4024 if (succeeded)
|
|
|
4025 {
|
|
|
4026 pos++;
|
|
|
4027 data->modeline_charpos++;
|
|
|
4028 data->bytepos += cur_pos - old_cur_pos;
|
|
|
4029 }
|
|
|
4030 }
|
|
|
4031
|
|
|
4032 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
4033 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
4034 add_blank_rune (data, NULL, 0);
|
|
|
4035
|
|
|
4036 return Dynarr_length (db->runes);
|
|
|
4037 }
|
|
|
4038
|
|
|
4039 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
4040 modeline extents. */
|
|
|
4041 static Charcount
|
|
|
4042 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
2286
|
4043 Charcount pos, Charcount UNUSED (min_pos),
|
|
438
|
4044 Charcount max_pos, Lisp_Object extent)
|
|
428
|
4045 {
|
|
|
4046 /* This function has been Mule-ized. */
|
|
|
4047 Charcount end;
|
|
|
4048 struct display_block *db = data->db;
|
|
|
4049 struct glyph_block gb;
|
|
|
4050
|
|
|
4051 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
4052 while (Dynarr_length (db->runes) < pos)
|
|
|
4053 add_blank_rune (data, NULL, 0);
|
|
|
4054
|
|
|
4055 end = Dynarr_length (db->runes) + 1;
|
|
|
4056 if (max_pos != -1)
|
|
|
4057 end = min (max_pos, end);
|
|
|
4058
|
|
|
4059 gb.glyph = glyph;
|
|
438
|
4060 gb.extent = extent;
|
|
428
|
4061 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
4062 pos++;
|
|
|
4063
|
|
|
4064 while (Dynarr_length (db->runes) < pos &&
|
|
|
4065 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
4066 add_blank_rune (data, NULL, 0);
|
|
|
4067
|
|
|
4068 return Dynarr_length (db->runes);
|
|
|
4069 }
|
|
|
4070
|
|
|
4071 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
4072 true of max_pixsize. */
|
|
|
4073 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
4074 if (Dynarr_length (data->db->runes)) \
|
|
|
4075 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
4076 else \
|
|
|
4077 cur_pixsize = 0;
|
|
|
4078
|
|
|
4079 /* Note that this function does "positions" in terms of characters and
|
|
|
4080 not in terms of columns. This is necessary to make the formatting
|
|
|
4081 work correctly when proportional width fonts are used in the
|
|
|
4082 modeline. */
|
|
|
4083 static Charcount
|
|
|
4084 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
4085 Charcount min_pos, Charcount max_pos,
|
|
|
4086 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
4087 face_index findex, int type, Charcount *offset,
|
|
|
4088 Lisp_Object cur_ext)
|
|
428
|
4089 {
|
|
|
4090 /* This function has been Mule-ized. */
|
|
|
4091 /* #### The other losing things in this function are:
|
|
|
4092
|
|
|
4093 -- C zero-terminated-string lossage.
|
|
|
4094 -- Non-printable characters should be converted into something
|
|
|
4095 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
4096 */
|
|
|
4097
|
|
|
4098 tail_recurse:
|
|
|
4099 if (depth > 10)
|
|
|
4100 goto invalid;
|
|
|
4101
|
|
|
4102 depth++;
|
|
|
4103
|
|
|
4104 if (STRINGP (elt))
|
|
|
4105 {
|
|
|
4106 /* A string. Add to the display line and check for %-constructs
|
|
|
4107 within it. */
|
|
|
4108
|
|
867
|
4109 Ibyte *this = XSTRING_DATA (elt);
|
|
428
|
4110
|
|
|
4111 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4112 {
|
|
867
|
4113 Ibyte *last = this;
|
|
428
|
4114
|
|
|
4115 while (*this && *this != '%')
|
|
|
4116 this++;
|
|
|
4117
|
|
|
4118 if (this != last)
|
|
|
4119 {
|
|
438
|
4120 /* No %-construct */
|
|
428
|
4121 Charcount size =
|
|
438
|
4122 bytecount_to_charcount (last, this - last);
|
|
|
4123
|
|
|
4124 if (size <= *offset)
|
|
|
4125 *offset -= size;
|
|
|
4126 else
|
|
|
4127 {
|
|
|
4128 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4129 min (pos + size - *offset, max_pos));
|
|
867
|
4130 const Ibyte *tmp_last = itext_n_addr (last, *offset);
|
|
438
|
4131
|
|
|
4132 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4133 pos, pos, tmp_max);
|
|
|
4134 *offset = 0;
|
|
|
4135 }
|
|
428
|
4136 }
|
|
|
4137 else /* *this == '%' */
|
|
|
4138 {
|
|
|
4139 Charcount spec_width = 0;
|
|
|
4140
|
|
|
4141 this++; /* skip over '%' */
|
|
|
4142
|
|
|
4143 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4144 * Argument specifies minwidth but not maxwidth
|
|
|
4145 * (maxwidth can be specified by
|
|
|
4146 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4147 */
|
|
|
4148 while (isdigit (*this))
|
|
|
4149 {
|
|
|
4150 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4151 this++;
|
|
|
4152 }
|
|
|
4153 spec_width += pos;
|
|
|
4154
|
|
|
4155 if (*this == 'M')
|
|
|
4156 {
|
|
|
4157 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4158 max_pos, Vglobal_mode_string,
|
|
|
4159 depth, max_pixsize, findex,
|
|
438
|
4160 type, offset, cur_ext);
|
|
428
|
4161 }
|
|
|
4162 else if (*this == '-')
|
|
|
4163 {
|
|
|
4164 Charcount num_to_add;
|
|
|
4165
|
|
|
4166 if (max_pixsize < 0)
|
|
|
4167 num_to_add = 0;
|
|
|
4168 else if (max_pos != -1)
|
|
|
4169 num_to_add = max_pos - pos;
|
|
|
4170 else
|
|
|
4171 {
|
|
|
4172 int cur_pixsize;
|
|
|
4173 int dash_pixsize;
|
|
867
|
4174 Ibyte ch = '-';
|
|
428
|
4175 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4176
|
|
|
4177 dash_pixsize =
|
|
|
4178 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4179 1);
|
|
|
4180
|
|
|
4181 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4182 num_to_add++;
|
|
|
4183 }
|
|
|
4184
|
|
|
4185 while (num_to_add--)
|
|
|
4186 pos = add_string_to_fstring_db_runes
|
|
867
|
4187 (data, (const Ibyte *) "-", pos, pos, max_pos);
|
|
428
|
4188 }
|
|
|
4189 else if (*this != 0)
|
|
|
4190 {
|
|
867
|
4191 Ichar ch = itext_ichar (this);
|
|
|
4192 Ibyte *str;
|
|
438
|
4193 Charcount size;
|
|
|
4194
|
|
428
|
4195 decode_mode_spec (w, ch, type);
|
|
|
4196
|
|
867
|
4197 str = Dynarr_atp (mode_spec_ibyte_string, 0);
|
|
438
|
4198 size = bytecount_to_charcount
|
|
|
4199 /* Skip the null character added by `decode_mode_spec' */
|
|
867
|
4200 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
|
|
438
|
4201
|
|
|
4202 if (size <= *offset)
|
|
|
4203 *offset -= size;
|
|
|
4204 else
|
|
|
4205 {
|
|
867
|
4206 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4207
|
|
440
|
4208 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4209 computed and used here as in the plain string case
|
|
|
4210 above. -- dv */
|
|
|
4211 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4212 pos, pos,
|
|
|
4213 max_pos);
|
|
|
4214 *offset = 0;
|
|
|
4215 }
|
|
428
|
4216 }
|
|
|
4217
|
|
|
4218 /* NOT this++. There could be any sort of character at
|
|
|
4219 the current position. */
|
|
867
|
4220 INC_IBYTEPTR (this);
|
|
428
|
4221 }
|
|
|
4222
|
|
|
4223 if (max_pixsize > 0)
|
|
|
4224 {
|
|
|
4225 int cur_pixsize;
|
|
|
4226 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4227
|
|
|
4228 if (cur_pixsize >= max_pixsize)
|
|
|
4229 break;
|
|
|
4230 }
|
|
|
4231 }
|
|
|
4232 }
|
|
|
4233 else if (SYMBOLP (elt))
|
|
|
4234 {
|
|
|
4235 /* A symbol: process the value of the symbol recursively
|
|
|
4236 as if it appeared here directly. */
|
|
|
4237 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4238
|
|
|
4239 if (!UNBOUNDP (tem))
|
|
|
4240 {
|
|
438
|
4241 /* If value is a string, output that string literally:
|
|
428
|
4242 don't check for % within it. */
|
|
|
4243 if (STRINGP (tem))
|
|
|
4244 {
|
|
867
|
4245 Ibyte *str = XSTRING_DATA (tem);
|
|
826
|
4246 Charcount size = string_char_length (tem);
|
|
438
|
4247
|
|
|
4248 if (size <= *offset)
|
|
|
4249 *offset -= size;
|
|
|
4250 else
|
|
|
4251 {
|
|
867
|
4252 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4253
|
|
440
|
4254 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4255 computed and used here as in the plain string case
|
|
|
4256 above. -- dv */
|
|
|
4257 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4258 min_pos, max_pos);
|
|
|
4259 *offset = 0;
|
|
|
4260 }
|
|
428
|
4261 }
|
|
|
4262 /* Give up right away for nil or t. */
|
|
|
4263 else if (!EQ (tem, elt))
|
|
|
4264 {
|
|
|
4265 elt = tem;
|
|
|
4266 goto tail_recurse;
|
|
|
4267 }
|
|
|
4268 }
|
|
|
4269 }
|
|
|
4270 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4271 {
|
|
|
4272 Lisp_Object window, tem;
|
|
793
|
4273 window = wrap_window (w);
|
|
428
|
4274 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4275 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4276 if (!UNBOUNDP (tem))
|
|
|
4277 {
|
|
|
4278 elt = tem;
|
|
|
4279 goto tail_recurse;
|
|
|
4280 }
|
|
|
4281 }
|
|
|
4282 else if (CONSP (elt))
|
|
|
4283 {
|
|
|
4284 /* A cons cell: four distinct cases.
|
|
438
|
4285 * - If first element is a string or a cons, process all the elements
|
|
|
4286 * and effectively concatenate them.
|
|
|
4287 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4288 * at most that many characters. If positive, pad (with spaces)
|
|
|
4289 * to at least that many characters.
|
|
771
|
4290 * - If first element is another symbol or a boolean specifier, process
|
|
|
4291 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4292 * value or specifier's instance is non-nil or nil.
|
|
|
4293 * - If first element is , process the cadr or caddr
|
|
|
4294 * recursively according to whether the instance of the specifier in
|
|
|
4295 * the modeline's window is non-nil or nil.
|
|
442
|
4296 * - If first element is an extent, process the cdr recursively
|
|
|
4297 * and handle the extent's face.
|
|
428
|
4298 */
|
|
438
|
4299
|
|
428
|
4300 Lisp_Object car, tem;
|
|
|
4301
|
|
|
4302 car = XCAR (elt);
|
|
771
|
4303 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4304 {
|
|
|
4305 elt = XCDR (elt);
|
|
|
4306 if (!CONSP (elt))
|
|
|
4307 goto invalid;
|
|
|
4308
|
|
771
|
4309 if (SYMBOLP (car))
|
|
|
4310 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4311 else
|
|
|
4312 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4313 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4314 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4315 Use its car if CAR has a non-nil value. */
|
|
771
|
4316 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4317 {
|
|
771
|
4318 elt = XCAR (elt);
|
|
|
4319 goto tail_recurse;
|
|
438
|
4320 }
|
|
771
|
4321 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4322 * Get the cddr of the original list
|
|
|
4323 * and if possible find the caddr and use that.
|
|
|
4324 */
|
|
|
4325 elt = XCDR (elt);
|
|
|
4326 if (NILP (elt))
|
|
|
4327 ;
|
|
|
4328 else if (!CONSP (elt))
|
|
|
4329 goto invalid;
|
|
|
4330 else
|
|
|
4331 {
|
|
|
4332 elt = XCAR (elt);
|
|
|
4333 goto tail_recurse;
|
|
|
4334 }
|
|
|
4335 }
|
|
428
|
4336 else if (INTP (car))
|
|
|
4337 {
|
|
|
4338 Charcount lim = XINT (car);
|
|
|
4339
|
|
|
4340 elt = XCDR (elt);
|
|
|
4341
|
|
|
4342 if (lim < 0)
|
|
|
4343 {
|
|
|
4344 /* Negative int means reduce maximum width.
|
|
|
4345 * DO NOT change MIN_PIXPOS here!
|
|
|
4346 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4347 * and then pad to 20.
|
|
|
4348 */
|
|
|
4349 if (max_pos == -1)
|
|
|
4350 max_pos = pos - lim;
|
|
|
4351 else
|
|
|
4352 max_pos = min (max_pos, pos - lim);
|
|
|
4353 }
|
|
|
4354 else if (lim > 0)
|
|
|
4355 {
|
|
|
4356 /* Padding specified. Don't let it be more than
|
|
|
4357 * current maximum.
|
|
|
4358 */
|
|
|
4359 lim += pos;
|
|
|
4360 if (max_pos != -1 && lim > max_pos)
|
|
|
4361 lim = max_pos;
|
|
|
4362 /* If that's more padding than already wanted, queue it.
|
|
|
4363 * But don't reduce padding already specified even if
|
|
|
4364 * that is beyond the current truncation point.
|
|
|
4365 */
|
|
|
4366 if (lim > min_pos)
|
|
|
4367 min_pos = lim;
|
|
|
4368 }
|
|
|
4369 goto tail_recurse;
|
|
|
4370 }
|
|
|
4371 else if (STRINGP (car) || CONSP (car))
|
|
|
4372 {
|
|
|
4373 int limit = 50;
|
|
438
|
4374
|
|
428
|
4375 /* LIMIT is to protect against circular lists. */
|
|
|
4376 while (CONSP (elt) && --limit > 0
|
|
|
4377 && (pos < max_pos || max_pos == -1))
|
|
|
4378 {
|
|
|
4379 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4380 XCAR (elt), depth, max_pixsize,
|
|
|
4381 findex, type, offset, cur_ext);
|
|
428
|
4382 elt = XCDR (elt);
|
|
|
4383 }
|
|
|
4384 }
|
|
|
4385 else if (EXTENTP (car))
|
|
|
4386 {
|
|
|
4387 struct extent *ext = XEXTENT (car);
|
|
|
4388
|
|
|
4389 if (EXTENT_LIVE_P (ext))
|
|
|
4390 {
|
|
|
4391 face_index old_findex = data->findex;
|
|
|
4392 Lisp_Object face;
|
|
|
4393 Lisp_Object font_inst;
|
|
|
4394 face_index new_findex;
|
|
|
4395 Bytecount start = data->bytepos;
|
|
|
4396
|
|
|
4397 face = extent_face (ext);
|
|
|
4398 if (FACEP (face))
|
|
|
4399 {
|
|
|
4400 /* #### needs to merge faces, sigh */
|
|
|
4401 /* #### needs to handle list of faces */
|
|
|
4402 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4403 /* !!#### not right; needs to compute the max height of
|
|
|
4404 all the charsets */
|
|
|
4405 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4406 Vcharset_ascii);
|
|
|
4407
|
|
|
4408 data->dl->ascent = max (data->dl->ascent,
|
|
|
4409 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4410 data->dl->descent = max (data->dl->descent,
|
|
|
4411 XFONT_INSTANCE (font_inst)->
|
|
|
4412 descent);
|
|
|
4413 }
|
|
|
4414 else
|
|
|
4415 new_findex = old_findex;
|
|
|
4416
|
|
|
4417 data->findex = new_findex;
|
|
|
4418 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4419 XCDR (elt), depth - 1,
|
|
438
|
4420 max_pixsize, new_findex, type,
|
|
|
4421 offset, car);
|
|
428
|
4422 data->findex = old_findex;
|
|
|
4423 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4424 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4425 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4426 }
|
|
|
4427 }
|
|
|
4428 }
|
|
|
4429 else if (GLYPHP (elt))
|
|
|
4430 {
|
|
438
|
4431 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4432 horizontal scrolling facility. -- dv */
|
|
|
4433 if (*offset > 0)
|
|
|
4434 *offset -= 1;
|
|
|
4435 else
|
|
|
4436 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4437 cur_ext);
|
|
428
|
4438 }
|
|
|
4439 else
|
|
|
4440 {
|
|
|
4441 invalid:
|
|
438
|
4442 {
|
|
|
4443 char *str = GETTEXT ("*invalid*");
|
|
|
4444 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4445
|
|
|
4446 if (size <= *offset)
|
|
|
4447 *offset -= size;
|
|
|
4448 else
|
|
|
4449 {
|
|
867
|
4450 const Ibyte *tmp_str =
|
|
|
4451 itext_n_addr ((const Ibyte *) str, *offset);
|
|
438
|
4452
|
|
440
|
4453 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4454 used here as in the plain string case above. -- dv */
|
|
|
4455 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4456 min_pos, max_pos);
|
|
|
4457 *offset = 0;
|
|
|
4458 }
|
|
|
4459 }
|
|
428
|
4460 }
|
|
|
4461
|
|
|
4462 if (min_pos > pos)
|
|
|
4463 {
|
|
867
|
4464 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
|
|
438
|
4465 min_pos, -1);
|
|
428
|
4466 }
|
|
|
4467
|
|
|
4468 return pos;
|
|
|
4469 }
|
|
|
4470
|
|
|
4471 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4472 they do not have a modeline block, it does nothing. */
|
|
|
4473 static void
|
|
|
4474 regenerate_modeline (struct window *w)
|
|
|
4475 {
|
|
|
4476 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4477
|
|
|
4478 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4479 return;
|
|
|
4480 else
|
|
|
4481 {
|
|
|
4482 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4483 redisplay_update_line (w, 0, 0, 0);
|
|
|
4484 }
|
|
|
4485 }
|
|
|
4486
|
|
|
4487 /* Make sure that modeline display line is present in the given
|
|
|
4488 display structs if the window has a modeline and update that
|
|
|
4489 line. Returns true if a modeline was needed. */
|
|
|
4490 static int
|
|
|
4491 ensure_modeline_generated (struct window *w, int type)
|
|
|
4492 {
|
|
|
4493 int need_modeline;
|
|
|
4494
|
|
|
4495 /* minibuffer windows don't have modelines */
|
|
|
4496 if (MINI_WINDOW_P (w))
|
|
|
4497 need_modeline = 0;
|
|
|
4498 /* windows which haven't had it turned off do */
|
|
|
4499 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4500 need_modeline = 1;
|
|
|
4501 /* windows which have it turned off don't have a divider if there is
|
|
|
4502 a horizontal scrollbar */
|
|
|
4503 else if (window_scrollbar_height (w))
|
|
|
4504 need_modeline = 0;
|
|
|
4505 /* and in this case there is none */
|
|
|
4506 else
|
|
|
4507 need_modeline = 1;
|
|
|
4508
|
|
|
4509 if (need_modeline)
|
|
|
4510 {
|
|
|
4511 display_line_dynarr *dla;
|
|
|
4512
|
|
|
4513 dla = window_display_lines (w, type);
|
|
|
4514
|
|
|
4515 /* We don't care if there is a display line which is not
|
|
|
4516 currently a modeline because it is definitely going to become
|
|
|
4517 one if we have gotten to this point. */
|
|
|
4518 if (Dynarr_length (dla) == 0)
|
|
|
4519 {
|
|
|
4520 if (Dynarr_largest (dla) > 0)
|
|
800
|
4521 Dynarr_increment (dla);
|
|
428
|
4522 else
|
|
|
4523 {
|
|
|
4524 struct display_line modeline;
|
|
|
4525 xzero (modeline);
|
|
|
4526 Dynarr_add (dla, modeline);
|
|
|
4527 }
|
|
|
4528 }
|
|
|
4529
|
|
|
4530 /* If we're adding a new place marker go ahead and generate the
|
|
|
4531 modeline so that it is available for use by
|
|
|
4532 window_modeline_height. */
|
|
|
4533 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4534 }
|
|
|
4535
|
|
|
4536 return need_modeline;
|
|
|
4537 }
|
|
|
4538
|
|
|
4539 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4540 int
|
|
|
4541 real_current_modeline_height (struct window *w)
|
|
|
4542 {
|
|
|
4543 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4544 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4545
|
|
|
4546 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4547 {
|
|
|
4548 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4549
|
|
|
4550 if (Dynarr_length (dla))
|
|
|
4551 {
|
|
|
4552 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4553 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4554 Dynarr_atp (dla, 0)->descent);
|
|
|
4555 }
|
|
|
4556 }
|
|
|
4557 return 0;
|
|
|
4558 }
|
|
|
4559
|
|
|
4560
|
|
|
4561 /***************************************************************************/
|
|
819
|
4562 /* */
|
|
826
|
4563 /* displayable string routines */
|
|
819
|
4564 /* */
|
|
428
|
4565 /***************************************************************************/
|
|
|
4566
|
|
|
4567 /* Given a position for a string in a window, ensure that the given
|
|
|
4568 display line DL accurately represents the text on a line starting
|
|
|
4569 at the given position.
|
|
|
4570
|
|
|
4571 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4572 looked just too hard to change create_text_block to handle strings
|
|
|
4573 *and* buffers. We already make a distinction between the two
|
|
|
4574 elsewhere in the code so I think unifying them would require a
|
|
|
4575 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4576 functions cover text that the user *cannot edit* so we can remove
|
|
|
4577 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4578 modeline routines should be modified to use this code as it copes
|
|
|
4579 with many more types of display situation. */
|
|
|
4580
|
|
665
|
4581 static Charbpos
|
|
428
|
4582 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4583 struct display_line *dl,
|
|
826
|
4584 Charcount start_pos,
|
|
428
|
4585 prop_block_dynarr **prop,
|
|
|
4586 face_index default_face)
|
|
|
4587 {
|
|
|
4588 struct frame *f = XFRAME (w->frame);
|
|
|
4589 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4590 because you might well want to make use of it (selective display
|
|
|
4591 etc), its just the buffer text that we do not use. However, it
|
|
|
4592 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4593 against this case. */
|
|
|
4594 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4595 struct device *d = XDEVICE (f->device);
|
|
|
4596
|
|
|
4597 /* we're working with these a lot so precalculate them */
|
|
|
4598 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
826
|
4599 Bytecount byte_string_zv = slen;
|
|
|
4600 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4601
|
|
|
4602 pos_data data;
|
|
|
4603
|
|
|
4604 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4605
|
|
442
|
4606 /* We're going to ditch selective display for static text, it's an
|
|
|
4607 FSF thing and invisible extents are the way to go here.
|
|
|
4608 Implementing it also relies on a number of buffer-specific
|
|
428
|
4609 functions that we don't have the luxury of being able to use
|
|
|
4610 here. */
|
|
|
4611
|
|
|
4612 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4613 can actually be displayed and which octal should be used for.
|
|
|
4614 #### This variable should probably have some rethought done to
|
|
|
4615 it.
|
|
|
4616
|
|
|
4617 #### It would also be really nice if you could specify that
|
|
|
4618 the characters come out in hex instead of in octal. Mule
|
|
|
4619 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4620 but that's bogus -- we need a more general solution. I
|
|
|
4621 think you need to extend the concept of display tables
|
|
|
4622 into a more general conversion mechanism. Ideally you
|
|
|
4623 could specify a Lisp function that converts characters,
|
|
|
4624 but this violates the Second Golden Rule and besides would
|
|
|
4625 make things way way way way slow.
|
|
|
4626
|
|
|
4627 So instead, we extend the display-table concept, which was
|
|
|
4628 historically limited to 256-byte vectors, to one of the
|
|
|
4629 following:
|
|
|
4630
|
|
|
4631 a) A 256-entry vector, for backward compatibility;
|
|
|
4632 b) char-table, mapping characters to values;
|
|
|
4633 c) range-table, mapping ranges of characters to values;
|
|
|
4634 d) a list of the above.
|
|
|
4635
|
|
|
4636 The (d) option allows you to specify multiple display tables
|
|
|
4637 instead of just one. Each display table can specify conversions
|
|
|
4638 for some characters and leave others unchanged. The way the
|
|
|
4639 character gets displayed is determined by the first display table
|
|
|
4640 with a binding for that character. This way, you could call a
|
|
|
4641 function `enable-hex-display' that adds a hex display-table to
|
|
|
4642 the list of display tables for the current buffer.
|
|
|
4643
|
|
|
4644 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4645 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4646 extended characters show up as hex with a display table like
|
|
|
4647 this:
|
|
|
4648
|
|
|
4649 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4650
|
|
|
4651 Since more than one display table is possible, you have
|
|
|
4652 great flexibility in mapping ranges of characters. */
|
|
867
|
4653 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
4654 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4655 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4656 ? 255 : 160)) : 255;
|
|
|
4657
|
|
|
4658 Lisp_Object face_dt, window_dt;
|
|
|
4659
|
|
|
4660 /* The text display block for this display line. */
|
|
|
4661 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4662
|
|
|
4663 /* The first time through the main loop we need to force the glyph
|
|
|
4664 data to be updated. */
|
|
|
4665 int initial = 1;
|
|
|
4666
|
|
|
4667 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4668 equal to the position passed in if there are no more runs to be
|
|
|
4669 displayed. */
|
|
|
4670 int no_more_frags = 0;
|
|
|
4671
|
|
|
4672 dl->used_prop_data = 0;
|
|
|
4673 dl->num_chars = 0;
|
|
442
|
4674 dl->line_continuation = 0;
|
|
428
|
4675
|
|
|
4676 /* set up faces to use for clearing areas, used by
|
|
|
4677 output_display_line */
|
|
|
4678 dl->default_findex = default_face;
|
|
|
4679 if (default_face)
|
|
|
4680 {
|
|
|
4681 dl->left_margin_findex = default_face;
|
|
|
4682 dl->right_margin_findex = default_face;
|
|
|
4683 }
|
|
|
4684 else
|
|
|
4685 {
|
|
434
|
4686 dl->left_margin_findex =
|
|
428
|
4687 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4688 dl->right_margin_findex =
|
|
428
|
4689 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4690 }
|
|
|
4691
|
|
|
4692 xzero (data);
|
|
|
4693 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4694
|
|
|
4695 /* These values are used by all of the rune addition routines. We add
|
|
|
4696 them to this structure for ease of passing. */
|
|
|
4697 data.d = d;
|
|
793
|
4698 data.window = wrap_window (w);
|
|
428
|
4699 data.db = db;
|
|
|
4700 data.dl = dl;
|
|
|
4701
|
|
826
|
4702 data.byte_charpos = byte_start_pos;
|
|
428
|
4703 data.pixpos = dl->bounds.left_in;
|
|
|
4704 data.last_charset = Qunbound;
|
|
|
4705 data.last_findex = default_face;
|
|
|
4706 data.result_str = Qnil;
|
|
|
4707 data.string = disp_string;
|
|
|
4708
|
|
|
4709 /* Set the right boundary adjusting it to take into account any end
|
|
|
4710 glyph. Save the width of the end glyph for later use. */
|
|
|
4711 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4712 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4713
|
|
|
4714 data.cursor_type = NO_CURSOR;
|
|
|
4715 data.cursor_x = -1;
|
|
|
4716
|
|
|
4717 data.start_col = 0;
|
|
|
4718 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4719 the window
|
|
428
|
4720 data.start_col = w->hscroll;
|
|
826
|
4721 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
4722 */
|
|
826
|
4723 data.byte_start_col_enabled = 0;
|
|
428
|
4724 data.hscroll_glyph_width_adjust = 0;
|
|
|
4725
|
|
|
4726 /* We regenerate the line from the very beginning. */
|
|
|
4727 Dynarr_reset (db->runes);
|
|
|
4728
|
|
|
4729 /* Why is this less than or equal and not just less than? If the
|
|
|
4730 starting position is already equal to the maximum we can't add
|
|
|
4731 anything else, right? Wrong. We might still have a newline to
|
|
|
4732 add. A newline can use the room allocated for an end glyph since
|
|
|
4733 if we add it we know we aren't going to be adding any end
|
|
|
4734 glyph. */
|
|
|
4735
|
|
|
4736 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4737 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4738 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4739 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4740 that the loop terminates only when either (a) there is
|
|
|
4741 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4742
|
|
|
4743 #### Also I think you need to ensure that the operation
|
|
|
4744 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4745 can't get interrupted in the middle. If you run off the end
|
|
|
4746 of the line during that operation, then you keep accumulating
|
|
|
4747 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4748 there's a begin glyph at a particular position and attempting
|
|
|
4749 to display that glyph results in window-end being hit and
|
|
|
4750 propagation data being generated, then the character at that
|
|
|
4751 position won't be displayed.
|
|
|
4752
|
|
|
4753 #### See also the comment after the end of this loop, below.
|
|
|
4754 */
|
|
|
4755 while (data.pixpos <= data.max_pixpos)
|
|
|
4756 {
|
|
|
4757 /* #### This check probably should not be necessary. */
|
|
826
|
4758 if (data.byte_charpos > byte_string_zv)
|
|
428
|
4759 {
|
|
|
4760 /* #### urk! More of this lossage! */
|
|
826
|
4761 data.byte_charpos--;
|
|
428
|
4762 goto done;
|
|
|
4763 }
|
|
|
4764
|
|
|
4765 /* Check for face changes. */
|
|
826
|
4766 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
4767 {
|
|
819
|
4768 Lisp_Object last_glyph = Qnil;
|
|
|
4769 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4770 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4771 {
|
|
|
4772 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4773 Dynarr_free (*prop);
|
|
|
4774 *prop = 0;
|
|
|
4775 }
|
|
428
|
4776 /* Now compute the face and begin/end-glyph information. */
|
|
|
4777 data.findex =
|
|
793
|
4778 /* Remember that the extent-fragment routines deal in
|
|
826
|
4779 Bytexpos's. */
|
|
|
4780 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
4781 /* This is somewhat cheesy but the alternative is to
|
|
|
4782 propagate default_face into extent_fragment_update. */
|
|
|
4783 if (data.findex == DEFAULT_INDEX)
|
|
|
4784 data.findex = default_face;
|
|
|
4785
|
|
|
4786 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4787
|
|
826
|
4788 if (data.byte_charpos == data.ef->end)
|
|
428
|
4789 no_more_frags = 1;
|
|
|
4790 }
|
|
|
4791 initial = 0;
|
|
|
4792
|
|
|
4793 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4794 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4795 display then we determine what to do based on the character at the
|
|
|
4796 current buffer position. */
|
|
|
4797
|
|
|
4798 /* If the current position is covered by an invisible extent, do
|
|
|
4799 nothing (except maybe add some ellipses).
|
|
|
4800
|
|
|
4801 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4802 invisible extent should be investigated further. This is
|
|
|
4803 fairly low priority though. */
|
|
|
4804 if (data.ef->invisible)
|
|
|
4805 {
|
|
|
4806 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4807 really know what I'm doing. */
|
|
|
4808 if (*prop)
|
|
|
4809 {
|
|
|
4810 Dynarr_free (*prop);
|
|
|
4811 *prop = 0;
|
|
|
4812 }
|
|
|
4813
|
|
|
4814 /* The extent fragment code only sets this when we should
|
|
|
4815 really display the ellipses. It makes sure the ellipses
|
|
|
4816 don't get displayed more than once in a row. */
|
|
|
4817 if (data.ef->invisible_ellipses)
|
|
|
4818 {
|
|
|
4819 struct glyph_block gb;
|
|
|
4820
|
|
|
4821 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4822 data.ef->invisible_ellipses = 0;
|
|
|
4823 gb.extent = Qnil;
|
|
|
4824 gb.glyph = Vinvisible_text_glyph;
|
|
|
4825 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4826 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4827 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4828 is to display a newline (for compatibility with
|
|
|
4829 selective-display-ellipses)? Maybe that's too
|
|
|
4830 abstruse. */
|
|
|
4831 if (*prop)
|
|
|
4832 goto done;
|
|
|
4833 }
|
|
|
4834
|
|
638
|
4835 /* #### What if we're dealing with a display table? */
|
|
428
|
4836 if (data.start_col)
|
|
|
4837 data.start_col--;
|
|
|
4838
|
|
826
|
4839 if (data.byte_charpos == byte_string_zv)
|
|
428
|
4840 goto done;
|
|
|
4841 else
|
|
826
|
4842 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4843 }
|
|
|
4844
|
|
|
4845 /* If there is propagation data, then it represents the current
|
|
|
4846 buffer position being displayed. Add them and advance the
|
|
|
4847 position counter. This might also add the minibuffer
|
|
|
4848 prompt. */
|
|
|
4849 else if (*prop)
|
|
|
4850 {
|
|
|
4851 dl->used_prop_data = 1;
|
|
|
4852 *prop = add_propagation_runes (prop, &data);
|
|
|
4853
|
|
|
4854 if (*prop)
|
|
|
4855 goto done; /* gee, a really narrow window */
|
|
826
|
4856 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4857 goto done;
|
|
826
|
4858 else if (data.byte_charpos < 0)
|
|
428
|
4859 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
4860 data.byte_charpos = 0;
|
|
428
|
4861 else
|
|
826
|
4862 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4863 }
|
|
|
4864
|
|
|
4865 /* If there are end glyphs, add them to the line. These are
|
|
|
4866 the end glyphs for the previous run of text. We add them
|
|
|
4867 here rather than doing them at the end of handling the
|
|
|
4868 previous run so that glyphs at the beginning and end of
|
|
|
4869 a line are handled correctly. */
|
|
|
4870 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4871 {
|
|
867
|
4872 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4873 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4874
|
|
|
4875 if (*prop) {
|
|
428
|
4876 goto done;
|
|
819
|
4877 }
|
|
428
|
4878 }
|
|
|
4879
|
|
|
4880 /* If there are begin glyphs, add them to the line. */
|
|
|
4881 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4882 {
|
|
867
|
4883 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4884 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4885
|
|
|
4886 if (*prop) {
|
|
428
|
4887 goto done;
|
|
819
|
4888 }
|
|
428
|
4889 }
|
|
|
4890
|
|
|
4891 /* If at end-of-buffer, we've already processed begin and
|
|
|
4892 end-glyphs at this point and there's no text to process,
|
|
|
4893 so we're done. */
|
|
826
|
4894 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4895 goto done;
|
|
|
4896
|
|
|
4897 else
|
|
|
4898 {
|
|
|
4899 Lisp_Object entry = Qnil;
|
|
|
4900 /* Get the character at the current buffer position. */
|
|
867
|
4901 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4902 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4903 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4904
|
|
|
4905 /* If there is a display table entry for it, hand it off to
|
|
|
4906 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4907 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4908 {
|
|
|
4909 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4910
|
|
|
4911 if (*prop)
|
|
|
4912 goto done;
|
|
|
4913 }
|
|
|
4914
|
|
|
4915 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4916 to the line and end this loop. */
|
|
|
4917 else if (data.ch == '\n')
|
|
|
4918 {
|
|
|
4919 /* We aren't going to be adding an end glyph so give its
|
|
|
4920 space back in order to make sure that the cursor can
|
|
|
4921 fit. */
|
|
819
|
4922 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4923 goto done;
|
|
|
4924 }
|
|
|
4925
|
|
|
4926 /* If the current character is considered to be printable, then
|
|
|
4927 just add it. */
|
|
|
4928 else if (data.ch >= printable_min)
|
|
|
4929 {
|
|
867
|
4930 *prop = add_ichar_rune (&data);
|
|
428
|
4931 if (*prop)
|
|
|
4932 goto done;
|
|
|
4933 }
|
|
|
4934
|
|
|
4935 /* If the current character is a tab, determine the next tab
|
|
|
4936 starting position and add a blank rune which extends from the
|
|
|
4937 current pixel position to that starting position. */
|
|
|
4938 else if (data.ch == '\t')
|
|
|
4939 {
|
|
|
4940 int tab_start_pixpos = data.pixpos;
|
|
|
4941 int next_tab_start;
|
|
|
4942 int char_tab_width;
|
|
|
4943 int prop_width = 0;
|
|
|
4944
|
|
|
4945 if (data.start_col > 1)
|
|
|
4946 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4947
|
|
|
4948 next_tab_start =
|
|
|
4949 next_tab_position (w, tab_start_pixpos,
|
|
|
4950 dl->bounds.left_in +
|
|
|
4951 data.hscroll_glyph_width_adjust);
|
|
|
4952 if (next_tab_start > data.max_pixpos)
|
|
|
4953 {
|
|
|
4954 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4955 next_tab_start = data.max_pixpos;
|
|
|
4956 }
|
|
|
4957 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4958 char_tab_width =
|
|
|
4959 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4960
|
|
|
4961 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4962
|
|
|
4963 /* add_blank_rune is only supposed to be called with
|
|
819
|
4964 sizes guaranteed to fit in the available space. */
|
|
428
|
4965 assert (!(*prop));
|
|
|
4966
|
|
|
4967 if (prop_width)
|
|
|
4968 {
|
|
|
4969 struct prop_block pb;
|
|
|
4970 *prop = Dynarr_new (prop_block);
|
|
|
4971
|
|
|
4972 pb.type = PROP_BLANK;
|
|
|
4973 pb.data.p_blank.width = prop_width;
|
|
|
4974 pb.data.p_blank.findex = data.findex;
|
|
|
4975 Dynarr_add (*prop, pb);
|
|
|
4976
|
|
|
4977 goto done;
|
|
|
4978 }
|
|
|
4979 }
|
|
|
4980
|
|
|
4981 /* If character is a control character, pass it off to
|
|
|
4982 add_control_char_runes.
|
|
|
4983
|
|
|
4984 The is_*() routines have undefined results on
|
|
|
4985 arguments outside of the range [-1, 255]. (This
|
|
|
4986 often bites people who carelessly use `char' instead
|
|
|
4987 of `unsigned char'.)
|
|
|
4988 */
|
|
867
|
4989 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
4990 {
|
|
|
4991 *prop = add_control_char_runes (&data, b);
|
|
|
4992
|
|
|
4993 if (*prop)
|
|
|
4994 goto done;
|
|
|
4995 }
|
|
|
4996
|
|
|
4997 /* If the character is above the ASCII range and we have not
|
|
|
4998 already handled it, then print it as an octal number. */
|
|
|
4999 else if (data.ch >= 0200)
|
|
|
5000 {
|
|
|
5001 *prop = add_octal_runes (&data);
|
|
|
5002
|
|
|
5003 if (*prop)
|
|
|
5004 goto done;
|
|
|
5005 }
|
|
|
5006
|
|
|
5007 /* Assume the current character is considered to be printable,
|
|
|
5008 then just add it. */
|
|
|
5009 else
|
|
|
5010 {
|
|
867
|
5011 *prop = add_ichar_rune (&data);
|
|
428
|
5012 if (*prop)
|
|
|
5013 goto done;
|
|
|
5014 }
|
|
|
5015
|
|
826
|
5016 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
5017 }
|
|
|
5018 }
|
|
|
5019
|
|
819
|
5020 done:
|
|
428
|
5021
|
|
|
5022 /* Determine the starting point of the next line if we did not hit the
|
|
|
5023 end of the buffer. */
|
|
826
|
5024 if (data.byte_charpos < byte_string_zv)
|
|
428
|
5025 {
|
|
|
5026 /* #### This check is not correct. If the line terminated
|
|
|
5027 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
5028 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
5029 you make the two changes mentioned at the top of this loop,
|
|
|
5030 you should be able to say '(if (*prop))'. That should also
|
|
826
|
5031 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
5032 check. */
|
|
|
5033
|
|
|
5034 /* The common case is that the line ended because we hit a newline.
|
|
|
5035 In that case, the next character is just the next buffer
|
|
|
5036 position. */
|
|
|
5037 if (data.ch == '\n')
|
|
|
5038 {
|
|
826
|
5039 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
5040 }
|
|
|
5041
|
|
|
5042 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
5043 line. */
|
|
|
5044 else
|
|
|
5045 {
|
|
|
5046 struct glyph_block gb;
|
|
|
5047 struct glyph_cachel *cachel;
|
|
|
5048
|
|
|
5049 /* If the line is to be truncated then we actually have to look
|
|
|
5050 for the next newline. We also add the end-of-line glyph which
|
|
|
5051 we know will fit because we adjusted the right border before
|
|
|
5052 we starting laying out the line. */
|
|
819
|
5053 data.max_pixpos += data.end_glyph_width;
|
|
428
|
5054 data.findex = default_face;
|
|
|
5055 gb.extent = Qnil;
|
|
|
5056
|
|
|
5057 if (truncate_win)
|
|
|
5058 {
|
|
826
|
5059 Bytecount byte_pos;
|
|
428
|
5060
|
|
|
5061 /* Now find the start of the next line. */
|
|
867
|
5062 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
|
|
826
|
5063 data.byte_charpos, 1);
|
|
428
|
5064
|
|
|
5065 data.cursor_type = NO_CURSOR;
|
|
826
|
5066 data.byte_charpos = byte_pos;
|
|
428
|
5067 gb.glyph = Vtruncation_glyph;
|
|
|
5068 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
5069 }
|
|
|
5070 else
|
|
|
5071 {
|
|
|
5072 /* The cursor can never be on the continuation glyph. */
|
|
|
5073 data.cursor_type = NO_CURSOR;
|
|
|
5074
|
|
826
|
5075 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
5076
|
|
442
|
5077 dl->line_continuation = 1;
|
|
428
|
5078 gb.glyph = Vcontinuation_glyph;
|
|
|
5079 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
5080 }
|
|
|
5081
|
|
819
|
5082 if (data.end_glyph_width)
|
|
428
|
5083 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
5084
|
|
826
|
5085 if (truncate_win && data.byte_charpos == byte_string_zv)
|
|
428
|
5086 {
|
|
867
|
5087 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
|
|
826
|
5088 byte_string_zv);
|
|
867
|
5089 DEC_IBYTEPTR (endb);
|
|
|
5090 if (itext_ichar (endb) != '\n')
|
|
428
|
5091 {
|
|
|
5092 /* #### Damn this losing shit. */
|
|
826
|
5093 data.byte_charpos++;
|
|
428
|
5094 }
|
|
|
5095 }
|
|
|
5096 }
|
|
|
5097 }
|
|
826
|
5098 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
5099 {
|
|
|
5100 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5101 up subwindow display. Since we never have a cursor in the
|
|
|
5102 gutter we can safely ignore it. */
|
|
|
5103 }
|
|
|
5104 /* Calculate left whitespace boundary. */
|
|
|
5105 {
|
|
|
5106 int elt = 0;
|
|
|
5107
|
|
|
5108 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5109 while (elt < Dynarr_length (db->runes))
|
|
|
5110 {
|
|
|
5111 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5112
|
|
|
5113 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5114 || rb->type == RUNE_BLANK)
|
|
|
5115 {
|
|
|
5116 dl->bounds.left_white += rb->width;
|
|
|
5117 elt++;
|
|
|
5118 }
|
|
|
5119 else
|
|
|
5120 elt = Dynarr_length (db->runes);
|
|
|
5121 }
|
|
|
5122 }
|
|
|
5123
|
|
|
5124 /* Calculate right whitespace boundary. */
|
|
|
5125 {
|
|
|
5126 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5127 int done = 0;
|
|
|
5128
|
|
|
5129 while (!done && elt >= 0)
|
|
|
5130 {
|
|
|
5131 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5132
|
|
|
5133 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5134 && isspace (rb->object.chr.ch))
|
|
|
5135 && !rb->type == RUNE_BLANK)
|
|
|
5136 {
|
|
|
5137 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5138 done = 1;
|
|
|
5139 }
|
|
|
5140
|
|
|
5141 elt--;
|
|
|
5142
|
|
|
5143 }
|
|
|
5144
|
|
|
5145 /* The line is blank so everything is considered to be right
|
|
|
5146 whitespace. */
|
|
|
5147 if (!done)
|
|
|
5148 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5149 }
|
|
|
5150
|
|
|
5151 /* Set the display blocks bounds. */
|
|
|
5152 db->start_pos = dl->bounds.left_in;
|
|
|
5153 if (Dynarr_length (db->runes))
|
|
|
5154 {
|
|
|
5155 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5156
|
|
|
5157 db->end_pos = rb->xpos + rb->width;
|
|
|
5158 }
|
|
|
5159 else
|
|
|
5160 db->end_pos = dl->bounds.right_white;
|
|
|
5161
|
|
819
|
5162 calculate_baseline (&data);
|
|
428
|
5163
|
|
|
5164 dl->ascent = data.new_ascent;
|
|
|
5165 dl->descent = data.new_descent;
|
|
|
5166
|
|
|
5167 {
|
|
|
5168 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5169
|
|
|
5170 if (dl->ascent < ascent)
|
|
|
5171 dl->ascent = ascent;
|
|
|
5172 }
|
|
|
5173 {
|
|
|
5174 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5175
|
|
|
5176 if (dl->descent < descent)
|
|
|
5177 dl->descent = descent;
|
|
|
5178 }
|
|
|
5179
|
|
819
|
5180 calculate_yoffset (dl, db);
|
|
|
5181
|
|
428
|
5182 dl->cursor_elt = data.cursor_x;
|
|
|
5183 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
5184 if (data.byte_charpos > byte_string_zv)
|
|
|
5185 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5186 byte_string_zv);
|
|
428
|
5187 else
|
|
826
|
5188 dl->end_charpos =
|
|
|
5189 buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5190 data.byte_charpos) - 1;
|
|
428
|
5191 if (truncate_win)
|
|
434
|
5192 data.dl->num_chars =
|
|
826
|
5193 string_column_at_point (disp_string, dl->end_charpos,
|
|
793
|
5194 b ? XINT (b->tab_width) : 8);
|
|
428
|
5195 else
|
|
|
5196 /* This doesn't correctly take into account tabs and control
|
|
|
5197 characters but if the window isn't being truncated then this
|
|
|
5198 value isn't going to end up being used anyhow. */
|
|
826
|
5199 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
5200
|
|
|
5201 /* #### handle horizontally scrolled line with text none of which
|
|
|
5202 was actually laid out. */
|
|
|
5203
|
|
|
5204 /* #### handle any remainder of overlay arrow */
|
|
|
5205
|
|
|
5206 if (*prop == ADD_FAILED)
|
|
|
5207 *prop = NULL;
|
|
|
5208
|
|
|
5209 if (truncate_win && *prop)
|
|
|
5210 {
|
|
|
5211 Dynarr_free (*prop);
|
|
|
5212 *prop = NULL;
|
|
|
5213 }
|
|
|
5214
|
|
|
5215 extent_fragment_delete (data.ef);
|
|
|
5216
|
|
|
5217 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5218 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5219 The main loop should get fixed so that it isn't necessary to call
|
|
|
5220 this function if we are already at EOB. */
|
|
|
5221
|
|
826
|
5222 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
|
|
793
|
5223 return string_index_byte_to_char (disp_string,
|
|
826
|
5224 data.byte_charpos) + 1; /* Yuck! */
|
|
428
|
5225 else
|
|
826
|
5226 return string_index_byte_to_char (disp_string, data.byte_charpos);
|
|
428
|
5227 }
|
|
|
5228
|
|
|
5229 /* Given a display line and a starting position, ensure that the
|
|
|
5230 contents of the display line accurately represent the visual
|
|
|
5231 representation of the buffer contents starting from the given
|
|
|
5232 position when displayed in the given window. The display line ends
|
|
|
5233 when the contents of the line reach the right boundary of the given
|
|
434
|
5234 window.
|
|
|
5235
|
|
428
|
5236 This is very similar to generate_display_line but with the same
|
|
|
5237 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5238 of fixing the bytebpos stuff though.*/
|
|
|
5239
|
|
|
5240 static Charbpos
|
|
428
|
5241 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5242 struct display_line *dl,
|
|
826
|
5243 Charcount start_pos,
|
|
428
|
5244 prop_block_dynarr **prop,
|
|
|
5245 face_index default_face)
|
|
|
5246 {
|
|
826
|
5247 Charcount ret_charcount;
|
|
428
|
5248
|
|
|
5249 /* you must set bounds before calling this. */
|
|
434
|
5250
|
|
428
|
5251 /* Reset what this line is using. */
|
|
|
5252 if (dl->display_blocks)
|
|
|
5253 Dynarr_reset (dl->display_blocks);
|
|
|
5254 if (dl->left_glyphs)
|
|
|
5255 {
|
|
|
5256 Dynarr_free (dl->left_glyphs);
|
|
|
5257 dl->left_glyphs = 0;
|
|
|
5258 }
|
|
|
5259 if (dl->right_glyphs)
|
|
|
5260 {
|
|
|
5261 Dynarr_free (dl->right_glyphs);
|
|
|
5262 dl->right_glyphs = 0;
|
|
|
5263 }
|
|
|
5264
|
|
|
5265 /* We aren't generating a modeline at the moment. */
|
|
|
5266 dl->modeline = 0;
|
|
|
5267
|
|
|
5268 /* Create a display block for the text region of the line. */
|
|
826
|
5269 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
|
|
|
5270 prop, default_face);
|
|
|
5271 dl->charpos = start_pos;
|
|
|
5272 if (dl->end_charpos < dl->charpos)
|
|
|
5273 dl->end_charpos = dl->charpos;
|
|
428
|
5274
|
|
|
5275 /* If there are left glyphs associated with any character in the
|
|
|
5276 text block, then create a display block to handle them. */
|
|
|
5277 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5278 create_left_glyph_block (w, dl, 0);
|
|
|
5279
|
|
|
5280 /* If there are right glyphs associated with any character in the
|
|
|
5281 text block, then create a display block to handle them. */
|
|
|
5282 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5283 create_right_glyph_block (w, dl);
|
|
|
5284
|
|
826
|
5285 return ret_charcount;
|
|
428
|
5286 }
|
|
|
5287
|
|
1318
|
5288
|
|
|
5289 /* Tricky tricky tricky. generate_displayable_area() can (could) be called reentrantly, and redisplay is not prepared to handle this:
|
|
|
5290
|
|
|
5291 assert_failed(const char * 0x0129c8c8 `string', int 5328, const char * 0x01274068 `string') line 3620
|
|
|
5292 Dynarr_verify_mod_1(void * 0x0250f228, const char * 0x0129c8c8 `string', int 5328) line 1256 + 36 bytes
|
|
|
5293 generate_displayable_area(window * 0x02480028, long 38776292, int 0, int 0, int 265, int 169, display_line_dynarr * 0x0250f228, long 0, int 2) line 5328 + 25 bytes
|
|
|
5294 output_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 1) line 409 + 69 bytes
|
|
|
5295 redraw_exposed_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 8, int 23, int 249, int 127) line 687 + 15 bytes
|
|
|
5296 redraw_exposed_gutters(frame * 0x0228ad90, int 8, int 23, int 249, int 127) line 703 + 29 bytes
|
|
|
5297 mswindows_redraw_exposed_area(frame * 0x0228ad90, int 8, int 23, int 249, int 127) line 862 + 25 bytes
|
|
|
5298 mswindows_handle_paint(frame * 0x0228ad90) line 2176 + 25 bytes
|
|
|
5299 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 15, unsigned int 0, long 0) line 3233 + 45 bytes
|
|
|
5300 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 15, unsigned int 0, long 0) line 2488
|
|
|
5301 USER32! 77e3a244()
|
|
|
5302 USER32! 77e14730()
|
|
|
5303 USER32! 77e1558a()
|
|
|
5304 NTDLL! KiUserCallbackDispatcher@12 + 19 bytes
|
|
|
5305 USER32! 77e14680()
|
|
|
5306 USER32! 77e1a792()
|
|
|
5307 qxeIsDialogMessage(HWND__ * 0x001003e2, tagMSG * 0x0082a93c {msg=0x0000000f wp=0x00000000 lp=0x00000000}) line 2298 + 14 bytes
|
|
|
5308 mswindows_is_dialog_msg(tagMSG * 0x0082a93c {msg=0x0000000f wp=0x00000000 lp=0x00000000}) line 165 + 13 bytes
|
|
|
5309 mswindows_drain_windows_queue(int 0) line 1282 + 9 bytes
|
|
|
5310 emacs_mswindows_drain_queue() line 1326 + 7 bytes
|
|
|
5311 event_stream_drain_queue() line 1887
|
|
|
5312 event_stream_quit_p() line 1992
|
|
|
5313 check_quit() line 993
|
|
|
5314 unbind_to_hairy(int 35) line 5963
|
|
|
5315 unbind_to_1(int 35, long 20888208) line 5945 + 200 bytes
|
|
|
5316 specifier_instance_from_inst_list(long 21379344, long 38135616, long 36220304, long 20888208, _error_behavior_struct_ {...}, int 1, long 3) line 2522 + 16 bytes
|
|
|
5317 specifier_instance(long 21379344, long 38135616, long 36220304, _error_behavior_struct_ {...}, int 1, int 0, long 3) line 2625 + 65 bytes
|
|
|
5318 specifier_instance_no_quit(long 21379344, long 38135616, long 36220304, _error_behavior_struct_ {...}, int 0, long 1) line 2658 + 31 bytes
|
|
|
5319 face_property_matching_instance(long 22612340, long 20860632, long 22530956, long 36220304, _error_behavior_struct_ {...}, int 0, long 1) line 565 + 48 bytes
|
|
|
5320 ensure_face_cachel_contains_charset(face_cachel * 0x0082b014, long 36220304, long 22530956) line 1104 + 35 bytes
|
|
|
5321 update_face_cachel_data(face_cachel * 0x0082b014, long 36220304, long 22612340) line 1304 + 19 bytes
|
|
|
5322 query_string_geometry(long 21110576, long 22612340, int * 0x00000000, int * 0x0082b5b4, int * 0x00000000, long 38852960) line 2370 + 23 bytes
|
|
|
5323 mswindows_widget_query_string_geometry(long 21110576, long 22612340, int * 0x0082b5b8, int * 0x0082b5b4, long 38852960) line 2914 + 25 bytes
|
|
|
5324 widget_query_string_geometry(long 21110576, long 22612340, int * 0x0082b5b8, int * 0x0082b5b4, long 38852960) line 514 + 32 bytes
|
|
|
5325 edit_field_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 920 + 390 bytes
|
|
|
5326 widget_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 567 + 26 bytes
|
|
|
5327 image_instance_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 2015 + 26 bytes
|
|
|
5328 glyph_query_geometry(long 38853384, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 4197 + 25 bytes
|
|
|
5329 layout_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 1351 + 25 bytes
|
|
|
5330 widget_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 567 + 26 bytes
|
|
|
5331 image_instance_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 2015 + 26 bytes
|
|
|
5332 glyph_query_geometry(long 38537976, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 4197 + 25 bytes
|
|
|
5333 layout_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 1468 + 23 bytes
|
|
|
5334 widget_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 626 + 30 bytes
|
|
|
5335 image_instance_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 2102 + 51 bytes
|
|
|
5336 glyph_ascent(long 38404624, long 38273064) line 4009 + 21 bytes
|
|
|
5337 update_glyph_cachel_data(window * 0x02480028, long 36201168, glyph_cachel * 0x0248c3d8) line 4272 + 13 bytes
|
|
|
5338 get_glyph_cachel_index(window * 0x02480028, long 36201168) line 4306 + 17 bytes
|
|
|
5339 add_glyph_rune(position_redisplay_data_type * 0x0082bf2c, glyph_block * 0x024bd028, int 0, int 0, glyph_cachel * 0x00000000) line 1800 + 15 bytes
|
|
|
5340 add_glyph_runes(position_redisplay_data_type * 0x0082bf2c, int 0) line 2085 + 31 bytes
|
|
|
5341 create_string_text_block(window * 0x02480028, long 38776292, display_line * 0x02514500, long 0, prop_block_dynarr * * 0x0082c13c, int 2) line 4907 + 14 bytes
|
|
|
5342 generate_string_display_line(window * 0x02480028, long 38776292, display_line * 0x02514500, long 0, prop_block_dynarr * * 0x0082c13c, int 2) line 5293 + 29 bytes
|
|
|
5343 generate_displayable_area(window * 0x02480028, long 38776292, int 0, int 0, int 265, int 169, display_line_dynarr * 0x0250f228, long 0, int 2) line 5372 + 29 bytes
|
|
|
5344 output_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 0) line 409 + 69 bytes
|
|
|
5345 update_frame_gutters(frame * 0x0228ad90) line 639 + 15 bytes
|
|
|
5346 redisplay_frame(frame * 0x0228ad90, int 1) line 6792 + 9 bytes
|
|
|
5347 redisplay_device(device * 0x0171df00, int 1) line 6911 + 11 bytes
|
|
|
5348 redisplay_without_hooks() line 6957 + 11 bytes
|
|
|
5349 redisplay_no_pre_idle_hook() line 7029
|
|
|
5350 redisplay() line 7011
|
|
|
5351 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 5, unsigned int 0, long 10223881) line 3424
|
|
|
5352 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 5, unsigned int 0, long 10223881) line 2488
|
|
|
5353 USER32! 77e3a244()
|
|
|
5354 USER32! 77e16362()
|
|
|
5355 USER32! 77e14c1a()
|
|
|
5356 USER32! 77e1dd30()
|
|
|
5357 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 71, unsigned int 0, long 8578308) line 3926 + 21 bytes
|
|
|
5358 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 71, unsigned int 0, long 8578308) line 2488
|
|
|
5359 USER32! 77e3a244()
|
|
|
5360 USER32! 77e14730()
|
|
|
5361 USER32! 77e174b4()
|
|
|
5362 NTDLL! KiUserCallbackDispatcher@12 + 19 bytes
|
|
|
5363 mswindows_set_frame_size(frame * 0x0228ad90, int 265, int 156) line 355
|
|
|
5364 internal_set_frame_size(frame * 0x0228ad90, int 265, int 156, int 0) line 2754 + 24 bytes
|
|
|
5365 Fset_frame_displayable_pixel_size(long 36220304, long 531, long 313, long 20888208) line 3004 + 32 bytes
|
|
|
5366 Ffuncall(int 4, long * 0x0082e778) line 3844 + 168 bytes
|
|
|
5367 execute_optimized_program(const unsigned char * 0x02286e48, int 40, long * 0x01529b80) line 609 + 16 bytes
|
|
|
5368 funcall_compiled_function(long 22433308, int 0, long * 0x0082ec08) line 3452 + 85 bytes
|
|
|
5369 Ffuncall(int 1, long * 0x0082ec04) line 3883 + 17 bytes
|
|
|
5370 execute_optimized_program(const unsigned char * 0x02286d40, int 6, long * 0x01548ddc) line 609 + 16 bytes
|
|
|
5371 funcall_compiled_function(long 22505864, int 11, long * 0x0082f00c) line 3452 + 85 bytes
|
|
|
5372 Ffuncall(int 12, long * 0x0082f008) line 3883 + 17 bytes
|
|
|
5373 execute_optimized_program(const unsigned char * 0x02503e38, int 47, long * 0x0152dc48) line 609 + 16 bytes
|
|
|
5374 funcall_compiled_function(long 22436784, int 0, long * 0x0082f534) line 3452 + 85 bytes
|
|
|
5375 Ffuncall(int 1, long * 0x0082f530) line 3883 + 17 bytes
|
|
|
5376 apply1(long 22436784, long 20888208) line 4458 + 11 bytes
|
|
|
5377 Fcall_interactively(long 20742816, long 20888208, long 20888208) line 460 + 13 bytes
|
|
|
5378 Ffuncall(int 2, long * 0x0082f8ec) line 3844 + 127 bytes
|
|
|
5379 call1(long 20854392, long 20742816) line 4489 + 11 bytes
|
|
|
5380 execute_command_event(command_builder * 0x01798f98, long 24439276) line 4198 + 69 bytes
|
|
|
5381 Fdispatch_event(long 24439276) line 4569 + 13 bytes
|
|
|
5382 Fcommand_loop_1() line 569 + 9 bytes
|
|
|
5383 command_loop_1(long 20888208) line 489
|
|
|
5384 condition_case_1(long 20886024, long (long)* 0x010955a0 command_loop_1(long), long 20888208, long (long, long)* 0x01095150 cmd_error(long, long), long 20888208) line 1917 + 7 bytes
|
|
|
5385 command_loop_3() line 251 + 35 bytes
|
|
|
5386 command_loop_2(long 20888208) line 264
|
|
|
5387 internal_catch(long 20650992, long (long)* 0x010952c0 command_loop_2(long), long 20888208, int * volatile 0x00000000, long * volatile 0x00000000) line 1527 + 7 bytes
|
|
|
5388 initial_command_loop(long 20888208) line 300 + 28 bytes
|
|
|
5389 xemacs_21_5_b10_i586_pc_win32(int 1, char * * 0x00e52620, char * * 0x00e52bb0, int 0) line 2356
|
|
|
5390 main(int 1, char * * 0x00e52620, char * * 0x00e52bb0) line 2733
|
|
|
5391 mainCRTStartup() line 338 + 17 bytes
|
|
|
5392 KERNEL32! 77ea847c()
|
|
|
5393
|
|
|
5394 */
|
|
|
5395
|
|
|
5396
|
|
428
|
5397 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5398 loop through elements in the string creating display lines until we
|
|
|
5399 have covered the provided area. Simple really. */
|
|
|
5400 void
|
|
|
5401 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5402 int xpos, int ypos, int width, int height,
|
|
|
5403 display_line_dynarr* dla,
|
|
826
|
5404 Charcount start_pos,
|
|
428
|
5405 face_index default_face)
|
|
|
5406 {
|
|
|
5407 int yend = ypos + height;
|
|
|
5408 Charcount s_zv;
|
|
|
5409
|
|
|
5410 prop_block_dynarr *prop = 0;
|
|
|
5411 layout_bounds bounds;
|
|
|
5412 assert (dla);
|
|
|
5413
|
|
|
5414 Dynarr_reset (dla);
|
|
|
5415 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5416 there is something to do. */
|
|
|
5417 if (NILP (disp_string))
|
|
|
5418 return;
|
|
|
5419
|
|
826
|
5420 s_zv = string_char_length (disp_string);
|
|
428
|
5421
|
|
|
5422 bounds.left_out = xpos;
|
|
|
5423 bounds.right_out = xpos + width;
|
|
|
5424 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5425 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5426 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5427 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5428 depend on the contents of the line being displayed. */
|
|
|
5429 bounds.left_white = bounds.left_in;
|
|
|
5430 bounds.right_white = bounds.right_in;
|
|
|
5431
|
|
|
5432 while (ypos < yend)
|
|
|
5433 {
|
|
|
5434 struct display_line dl;
|
|
|
5435 struct display_line *dlp;
|
|
826
|
5436 Charcount next_pos;
|
|
428
|
5437 int local;
|
|
851
|
5438 int pos_of_dlp = -1;
|
|
428
|
5439
|
|
|
5440 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5441 {
|
|
851
|
5442 pos_of_dlp = Dynarr_length (dla);
|
|
|
5443 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5444 local = 0;
|
|
|
5445 }
|
|
|
5446 else
|
|
|
5447 {
|
|
|
5448
|
|
|
5449 xzero (dl);
|
|
|
5450 dlp = &dl;
|
|
|
5451 local = 1;
|
|
|
5452 }
|
|
|
5453
|
|
|
5454 dlp->bounds = bounds;
|
|
|
5455 dlp->offset = 0;
|
|
1318
|
5456 Dynarr_lock (dla);
|
|
428
|
5457 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5458 &prop, default_face);
|
|
1318
|
5459 Dynarr_unlock (dla);
|
|
428
|
5460 /* we need to make sure that we continue along the line if there
|
|
|
5461 is more left to display otherwise we just end up redisplaying
|
|
|
5462 the same chunk over and over again. */
|
|
|
5463 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5464 start_pos++;
|
|
|
5465 else
|
|
|
5466 start_pos = next_pos;
|
|
|
5467
|
|
|
5468 dlp->ypos = ypos + dlp->ascent;
|
|
|
5469 ypos = dlp->ypos + dlp->descent;
|
|
|
5470
|
|
|
5471 if (ypos > yend)
|
|
|
5472 {
|
|
|
5473 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5474
|
|
|
5475 dlp->clip = (ypos - yend);
|
|
|
5476 visible_height -= dlp->clip;
|
|
|
5477
|
|
|
5478 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5479 {
|
|
|
5480 if (local)
|
|
|
5481 free_display_line (dlp);
|
|
|
5482 break;
|
|
|
5483 }
|
|
|
5484 }
|
|
|
5485 else
|
|
|
5486 dlp->clip = 0;
|
|
|
5487
|
|
851
|
5488 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5489 Dynarr_add (dla, *dlp);
|
|
|
5490
|
|
|
5491 /* #### This type of check needs to be done down in the
|
|
|
5492 generate_display_line call. */
|
|
|
5493 if (start_pos >= s_zv)
|
|
|
5494 break;
|
|
|
5495 }
|
|
|
5496
|
|
|
5497 if (prop)
|
|
|
5498 Dynarr_free (prop);
|
|
|
5499 }
|
|
|
5500
|
|
|
5501
|
|
|
5502 /***************************************************************************/
|
|
|
5503 /* */
|
|
|
5504 /* window-regeneration routines */
|
|
|
5505 /* */
|
|
|
5506 /***************************************************************************/
|
|
|
5507
|
|
|
5508 /* For a given window and starting position in the buffer it contains,
|
|
|
5509 ensure that the TYPE display lines accurately represent the
|
|
|
5510 presentation of the window. We pass the buffer instead of getting
|
|
|
5511 it from the window since redisplay_window may have temporarily
|
|
|
5512 changed it to the echo area buffer. */
|
|
|
5513
|
|
|
5514 static void
|
|
665
|
5515 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5516 {
|
|
|
5517 struct frame *f = XFRAME (w->frame);
|
|
|
5518 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5519 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5520 int yend; /* set farther down */
|
|
|
5521 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5522 int force;
|
|
428
|
5523
|
|
|
5524 prop_block_dynarr *prop;
|
|
|
5525 layout_bounds bounds;
|
|
|
5526 display_line_dynarr *dla;
|
|
|
5527 int need_modeline;
|
|
|
5528
|
|
|
5529 /* The lines had better exist by this point. */
|
|
|
5530 if (!(dla = window_display_lines (w, type)))
|
|
|
5531 abort ();
|
|
|
5532 Dynarr_reset (dla);
|
|
|
5533 w->max_line_len = 0;
|
|
|
5534
|
|
|
5535 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5536 for this function to get called from some other points where that
|
|
|
5537 update may not have occurred. This acts as a safety check. */
|
|
|
5538 if (!Dynarr_length (w->face_cachels))
|
|
|
5539 reset_face_cachels (w);
|
|
|
5540 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5541 reset_glyph_cachels (w);
|
|
|
5542
|
|
|
5543 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5544 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5545 w->last_point_x[type] = -1;
|
|
|
5546 w->last_point_y[type] = -1;
|
|
|
5547
|
|
|
5548 /* Make sure a modeline is in the structs if needed. */
|
|
|
5549 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5550
|
|
|
5551 /* Wait until here to set this so that the structs have a modeline
|
|
|
5552 generated in the case where one didn't exist. */
|
|
|
5553 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5554
|
|
|
5555 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5556
|
|
|
5557 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5558 if (MINI_WINDOW_P (w)
|
|
|
5559 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5560 && !echo_area_active (f)
|
|
|
5561 && start_pos == BUF_BEGV (b))
|
|
|
5562 {
|
|
|
5563 struct prop_block pb;
|
|
|
5564 Lisp_Object string;
|
|
|
5565 prop = Dynarr_new (prop_block);
|
|
|
5566
|
|
|
5567 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5568 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5569 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5570 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5571 Dynarr_add (prop, pb);
|
|
|
5572 }
|
|
|
5573 else
|
|
|
5574 prop = 0;
|
|
|
5575
|
|
442
|
5576 /* When we are computing things for scrolling purposes, make
|
|
|
5577 sure at least one line is always generated */
|
|
|
5578 force = (type == CMOTION_DISP);
|
|
|
5579
|
|
|
5580 /* Make sure this is set always */
|
|
|
5581 /* Note the conversion at end */
|
|
|
5582 w->window_end_pos[type] = start_pos;
|
|
|
5583 while (ypos < yend || force)
|
|
428
|
5584 {
|
|
|
5585 struct display_line dl;
|
|
|
5586 struct display_line *dlp;
|
|
|
5587 int local;
|
|
851
|
5588 int pos_of_dlp = -1;
|
|
428
|
5589
|
|
|
5590 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5591 {
|
|
851
|
5592 pos_of_dlp = Dynarr_length (dla);
|
|
|
5593 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5594 local = 0;
|
|
|
5595 }
|
|
|
5596 else
|
|
|
5597 {
|
|
|
5598
|
|
|
5599 xzero (dl);
|
|
|
5600 dlp = &dl;
|
|
|
5601 local = 1;
|
|
|
5602 }
|
|
|
5603
|
|
|
5604 dlp->bounds = bounds;
|
|
|
5605 dlp->offset = 0;
|
|
1318
|
5606 Dynarr_lock (dla);
|
|
428
|
5607 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
1318
|
5608 Dynarr_unlock (dla);
|
|
428
|
5609
|
|
|
5610 if (yclip > dlp->ascent)
|
|
|
5611 {
|
|
|
5612 /* this should never happen, but if it does just display the
|
|
|
5613 whole line */
|
|
|
5614 yclip = 0;
|
|
|
5615 }
|
|
|
5616
|
|
|
5617 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5618 ypos = dlp->ypos + dlp->descent;
|
|
|
5619
|
|
|
5620 /* See if we've been asked to start midway through a line, for
|
|
|
5621 partial display line scrolling. */
|
|
434
|
5622 if (yclip)
|
|
428
|
5623 {
|
|
|
5624 dlp->top_clip = yclip;
|
|
|
5625 yclip = 0;
|
|
|
5626 }
|
|
|
5627 else
|
|
|
5628 dlp->top_clip = 0;
|
|
|
5629
|
|
|
5630 if (ypos > yend)
|
|
|
5631 {
|
|
|
5632 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5633
|
|
|
5634 dlp->clip = (ypos - yend);
|
|
|
5635 /* Although this seems strange we could have a single very
|
|
|
5636 tall line visible for which we need to account for both
|
|
|
5637 the top clip and the bottom clip. */
|
|
|
5638 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5639
|
|
442
|
5640 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5641 {
|
|
|
5642 if (local)
|
|
|
5643 free_display_line (dlp);
|
|
|
5644 break;
|
|
|
5645 }
|
|
|
5646 }
|
|
|
5647 else
|
|
|
5648 dlp->clip = 0;
|
|
|
5649
|
|
|
5650 if (dlp->cursor_elt != -1)
|
|
|
5651 {
|
|
|
5652 /* #### This check is steaming crap. Have to get things
|
|
|
5653 fixed so when create_text_block hits EOB, we're done,
|
|
|
5654 period. */
|
|
|
5655 if (w->last_point_x[type] == -1)
|
|
|
5656 {
|
|
|
5657 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5658 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5659 }
|
|
|
5660 else
|
|
|
5661 {
|
|
|
5662 /* #### This means that we've added a cursor at EOB
|
|
|
5663 twice. Yuck oh yuck. */
|
|
1318
|
5664 struct display_block *db;
|
|
|
5665
|
|
|
5666 Dynarr_lock (dla);
|
|
|
5667 db = get_display_block_from_line (dlp, TEXT);
|
|
|
5668 Dynarr_unlock (dla);
|
|
428
|
5669
|
|
|
5670 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5671 dlp->cursor_elt = -1;
|
|
|
5672 }
|
|
|
5673 }
|
|
|
5674
|
|
|
5675 if (dlp->num_chars > w->max_line_len)
|
|
|
5676 w->max_line_len = dlp->num_chars;
|
|
|
5677
|
|
851
|
5678 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5679 Dynarr_add (dla, *dlp);
|
|
|
5680
|
|
|
5681 /* #### This isn't right, but it is close enough for now. */
|
|
|
5682 w->window_end_pos[type] = start_pos;
|
|
|
5683
|
|
|
5684 /* #### This type of check needs to be done down in the
|
|
|
5685 generate_display_line call. */
|
|
|
5686 if (start_pos > BUF_ZV (b))
|
|
|
5687 break;
|
|
442
|
5688
|
|
|
5689 force = 0;
|
|
428
|
5690 }
|
|
|
5691
|
|
|
5692 if (prop)
|
|
|
5693 Dynarr_free (prop);
|
|
|
5694
|
|
|
5695 /* #### More not quite right, but close enough. */
|
|
442
|
5696 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5697 as the number of characters between the window end and the
|
|
|
5698 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5699 the justification for this?
|
|
|
5700
|
|
|
5701 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5702 that can change. This representation allows initalizing with 0.
|
|
|
5703 */
|
|
428
|
5704 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5705
|
|
|
5706 if (need_modeline)
|
|
|
5707 {
|
|
|
5708 /* We know that this is the right thing to use because we put it
|
|
|
5709 there when we first started working in this function. */
|
|
|
5710 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5711 }
|
|
|
5712 }
|
|
|
5713
|
|
826
|
5714 #define REGEN_INC_FIND_START_END \
|
|
|
5715 do { \
|
|
|
5716 /* Determine start and end of lines. */ \
|
|
|
5717 if (!Dynarr_length (cdla)) \
|
|
|
5718 return 0; \
|
|
|
5719 else \
|
|
|
5720 { \
|
|
428
|
5721 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
826
|
5722 { \
|
|
|
5723 dla_start = 1; \
|
|
|
5724 } \
|
|
|
5725 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5726 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5727 { \
|
|
|
5728 dla_start = 0; \
|
|
|
5729 } \
|
|
|
5730 else \
|
|
|
5731 abort (); /* structs differ */ \
|
|
|
5732 \
|
|
|
5733 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5734 } \
|
|
|
5735 \
|
|
|
5736 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
|
|
|
5737 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5738 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5739 full regen. */ \
|
|
|
5740 if (startp != start_pos) \
|
|
|
5741 return 0; \
|
|
|
5742 \
|
|
|
5743 /* Point is outside the visible region so give up. */ \
|
|
|
5744 if (pointm < start_pos) \
|
|
|
5745 return 0; \
|
|
|
5746 \
|
|
428
|
5747 } while (0)
|
|
|
5748
|
|
|
5749 /* This attempts to incrementally update the display structures. It
|
|
|
5750 returns a boolean indicating success or failure. This function is
|
|
|
5751 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5752 called from that function. However, because of the nature of the
|
|
|
5753 changes it deals with it sometimes makes different assumptions
|
|
|
5754 which can lead to success which are much more difficult to make
|
|
|
5755 when dealing with buffer changes. */
|
|
|
5756
|
|
|
5757 static int
|
|
665
|
5758 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5759 Charbpos pointm,
|
|
428
|
5760 Charcount beg_unchanged,
|
|
|
5761 Charcount end_unchanged)
|
|
|
5762 {
|
|
|
5763 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5764 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5765 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5766
|
|
|
5767 int dla_start = 0;
|
|
|
5768 int dla_end, line;
|
|
|
5769 int first_line, last_line;
|
|
665
|
5770 Charbpos start_pos;
|
|
428
|
5771 /* Don't define this in the loop where it is used because we
|
|
|
5772 definitely want its value to survive between passes. */
|
|
|
5773 prop_block_dynarr *prop = NULL;
|
|
|
5774
|
|
|
5775 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5776 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5777 under which this can happen, but I believe that it is probably a
|
|
|
5778 reasonable happening. */
|
|
|
5779 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5780 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5781 return 0;
|
|
|
5782
|
|
|
5783 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5784 go ahead and proceed with the optimization attempt. */
|
|
|
5785 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5786 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5787 {
|
|
|
5788 struct frame *f = XFRAME (w->frame);
|
|
|
5789 struct device *d = XDEVICE (f->device);
|
|
|
5790 struct frame *sel_f = device_selected_frame (d);
|
|
|
5791 int success = 0;
|
|
|
5792
|
|
|
5793 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5794 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5795 {
|
|
|
5796
|
|
|
5797 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5798 {
|
|
|
5799 /* Always regenerate the modeline in case it is
|
|
|
5800 displaying the current line or column. */
|
|
|
5801 regenerate_modeline (w);
|
|
|
5802 success = 1;
|
|
|
5803 }
|
|
|
5804 }
|
|
|
5805 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5806 {
|
|
|
5807 if (f->modeline_changed)
|
|
|
5808 regenerate_modeline (w);
|
|
|
5809 success = 1;
|
|
|
5810 }
|
|
|
5811
|
|
|
5812 if (!success)
|
|
|
5813 return 0;
|
|
|
5814 }
|
|
|
5815
|
|
|
5816 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5817 return 1;
|
|
|
5818
|
|
|
5819 /* assert: There are no buffer modifications or they are all below the
|
|
|
5820 visible region. We assume that regenerate_window_incrementally has
|
|
|
5821 not called us unless this is true. */
|
|
|
5822
|
|
|
5823 REGEN_INC_FIND_START_END;
|
|
|
5824
|
|
|
5825 /* If the changed are starts before the visible area, give up. */
|
|
|
5826 if (beg_unchanged < startp)
|
|
|
5827 return 0;
|
|
|
5828
|
|
|
5829 /* Find what display line the extent changes first affect. */
|
|
|
5830 line = dla_start;
|
|
|
5831 while (line <= dla_end)
|
|
|
5832 {
|
|
|
5833 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5834 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5835 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5836
|
|
|
5837 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5838 break;
|
|
|
5839
|
|
|
5840 line++;
|
|
|
5841 }
|
|
|
5842
|
|
|
5843 /* If the changes are below the visible area then if point hasn't
|
|
|
5844 moved return success otherwise fail in order to be safe. */
|
|
|
5845 if (line > dla_end)
|
|
|
5846 {
|
|
|
5847 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5848 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5849 return 1;
|
|
|
5850 else
|
|
|
5851 return 0;
|
|
|
5852 }
|
|
|
5853
|
|
|
5854 /* At this point we know what line the changes first affect. We now
|
|
|
5855 begin redrawing lines as long as we are still in the affected
|
|
|
5856 region and the line's size and positioning don't change.
|
|
|
5857 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5858 structs which could lead to an assertion failure. However, if we
|
|
|
5859 fail the next thing that is going to happen is a full regen so we
|
|
|
5860 will actually end up being safe. */
|
|
|
5861 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5862 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5863 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5864 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5865
|
|
|
5866 first_line = last_line = line;
|
|
|
5867 while (line <= dla_end)
|
|
|
5868 {
|
|
2286
|
5869 Charbpos old_start, old_end;
|
|
428
|
5870 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5871 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5872 struct display_block *db;
|
|
|
5873 int initial_size;
|
|
|
5874
|
|
826
|
5875 assert (cdl->charpos == ddl->charpos);
|
|
|
5876 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5877 assert (cdl->offset == ddl->offset);
|
|
|
5878
|
|
|
5879 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5880 initial_size = Dynarr_length (db->runes);
|
|
826
|
5881 old_start = ddl->charpos + ddl->offset;
|
|
|
5882 old_end = ddl->end_charpos + ddl->offset;
|
|
428
|
5883
|
|
|
5884 /* If this is the first line being updated and it used
|
|
|
5885 propagation data, fail. Otherwise we'll be okay because
|
|
|
5886 we'll have the necessary propagation data. */
|
|
|
5887 if (line == first_line && ddl->used_prop_data)
|
|
|
5888 return 0;
|
|
|
5889
|
|
2286
|
5890 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
|
5891 &prop, DESIRED_DISP);
|
|
428
|
5892 ddl->offset = 0;
|
|
|
5893
|
|
|
5894 /* #### If there is propagated stuff the fail. We could
|
|
|
5895 probably actually deal with this if the line had propagated
|
|
|
5896 information when originally created by a full
|
|
|
5897 regeneration. */
|
|
|
5898 if (prop)
|
|
|
5899 {
|
|
|
5900 Dynarr_free (prop);
|
|
|
5901 return 0;
|
|
|
5902 }
|
|
|
5903
|
|
|
5904 /* If any line position parameters have changed or a
|
|
|
5905 cursor has disappeared or disappeared, fail. */
|
|
|
5906 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5907 if (cdl->ypos != ddl->ypos
|
|
|
5908 || cdl->ascent != ddl->ascent
|
|
|
5909 || cdl->descent != ddl->descent
|
|
|
5910 || cdl->top_clip != ddl->top_clip
|
|
|
5911 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5912 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
826
|
5913 || old_start != ddl->charpos
|
|
|
5914 || old_end != ddl->end_charpos
|
|
428
|
5915 || initial_size != Dynarr_length (db->runes))
|
|
|
5916 {
|
|
|
5917 return 0;
|
|
|
5918 }
|
|
|
5919
|
|
|
5920 if (ddl->cursor_elt != -1)
|
|
|
5921 {
|
|
|
5922 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5923 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5924 }
|
|
|
5925
|
|
|
5926 last_line = line;
|
|
|
5927
|
|
|
5928 /* If the extent changes end on the line we just updated then
|
|
|
5929 we're done. Otherwise go on to the next line. */
|
|
826
|
5930 if (end_unchanged <= ddl->end_charpos)
|
|
428
|
5931 break;
|
|
|
5932 else
|
|
|
5933 line++;
|
|
|
5934 }
|
|
|
5935
|
|
|
5936 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5937 return 1;
|
|
|
5938 }
|
|
|
5939
|
|
|
5940 /* Attempt to update the display data structures based on knowledge of
|
|
|
5941 the changed region in the buffer. Returns a boolean indicating
|
|
|
5942 success or failure. If this function returns a failure then a
|
|
|
5943 regenerate_window _must_ be performed next in order to maintain
|
|
|
5944 invariants located here. */
|
|
|
5945
|
|
|
5946 static int
|
|
665
|
5947 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5948 Charbpos pointm)
|
|
428
|
5949 {
|
|
|
5950 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5951 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5952 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5953 Charcount beg_unchanged, end_unchanged;
|
|
|
5954 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5955
|
|
|
5956 int dla_start = 0;
|
|
|
5957 int dla_end, line;
|
|
665
|
5958 Charbpos start_pos;
|
|
428
|
5959
|
|
|
5960 /* If this function is called, the current and desired structures
|
|
|
5961 had better be identical. If they are not, then that is a bug. */
|
|
|
5962 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5963
|
|
|
5964 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5965 screws us up. */
|
|
|
5966 if (MINI_WINDOW_P (w))
|
|
|
5967 return 0;
|
|
|
5968
|
|
|
5969 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
5970 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
5971 ? -1
|
|
|
5972 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
5973
|
|
|
5974 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
5975 and succeed. */
|
|
|
5976 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
5977 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5978 extent_beg_unchanged,
|
|
|
5979 extent_end_unchanged);
|
|
|
5980
|
|
|
5981 /* We can't deal with deleted newlines. */
|
|
|
5982 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
5983 return 0;
|
|
|
5984
|
|
|
5985 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
5986 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
5987 ? -1
|
|
|
5988 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
5989
|
|
|
5990 REGEN_INC_FIND_START_END;
|
|
|
5991
|
|
|
5992 /* If the changed area starts before the visible area, give up. */
|
|
|
5993 if (beg_unchanged < startp)
|
|
|
5994 return 0;
|
|
|
5995
|
|
|
5996 /* Find what display line the buffer changes first affect. */
|
|
|
5997 line = dla_start;
|
|
|
5998 while (line <= dla_end)
|
|
|
5999 {
|
|
|
6000 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
6001 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
6002 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
6003
|
|
|
6004 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
6005 break;
|
|
|
6006
|
|
|
6007 line++;
|
|
|
6008 }
|
|
|
6009
|
|
|
6010 /* If the changes are below the visible area then if point hasn't
|
|
|
6011 moved return success otherwise fail in order to be safe. */
|
|
|
6012 if (line > dla_end)
|
|
|
6013 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
6014 extent_beg_unchanged,
|
|
|
6015 extent_end_unchanged);
|
|
|
6016 else
|
|
|
6017 /* At this point we know what line the changes first affect. We
|
|
|
6018 now redraw that line. If the changes are contained within it
|
|
|
6019 we are going to succeed and can update just that one line.
|
|
|
6020 Otherwise we fail. If we fail we will have altered the desired
|
|
|
6021 structs which could lead to an assertion failure. However, if
|
|
|
6022 we fail the next thing that is going to happen is a full regen
|
|
|
6023 so we will actually end up being safe. */
|
|
|
6024 {
|
|
|
6025 prop_block_dynarr *prop = NULL;
|
|
|
6026 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
6027 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
6028
|
|
826
|
6029 assert (cdl->charpos == ddl->charpos);
|
|
|
6030 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
6031 assert (cdl->offset == ddl->offset);
|
|
|
6032
|
|
442
|
6033 /* If the line continues to next display line, fail. */
|
|
|
6034 if (ddl->line_continuation)
|
|
|
6035 return 0;
|
|
428
|
6036
|
|
|
6037 /* If the line was generated using propagation data, fail. */
|
|
|
6038 if (ddl->used_prop_data)
|
|
|
6039 return 0;
|
|
|
6040
|
|
2286
|
6041 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
|
6042 &prop, DESIRED_DISP);
|
|
428
|
6043 ddl->offset = 0;
|
|
|
6044
|
|
|
6045 /* If there is propagated stuff then it is pretty much a
|
|
|
6046 guarantee that more than just the one line is affected. */
|
|
|
6047 if (prop)
|
|
|
6048 {
|
|
|
6049 Dynarr_free (prop);
|
|
|
6050 return 0;
|
|
|
6051 }
|
|
|
6052
|
|
442
|
6053 /* If the line continues to next display line, fail. */
|
|
|
6054 if (ddl->line_continuation)
|
|
|
6055 return 0;
|
|
428
|
6056
|
|
|
6057 /* If any line position parameters have changed or a
|
|
|
6058 cursor has disappeared or disappeared, fail. */
|
|
|
6059 if (cdl->ypos != ddl->ypos
|
|
|
6060 || cdl->ascent != ddl->ascent
|
|
|
6061 || cdl->descent != ddl->descent
|
|
|
6062 || cdl->top_clip != ddl->top_clip
|
|
|
6063 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
6064 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
6065 {
|
|
|
6066 return 0;
|
|
|
6067 }
|
|
|
6068
|
|
|
6069 /* If the changed area also ends on this line, then we may be in
|
|
|
6070 business. Update everything and return success. */
|
|
826
|
6071 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
|
|
428
|
6072 {
|
|
|
6073 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6074 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6075 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
6076 w->buffer);
|
|
|
6077 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
6078 w->buffer);
|
|
|
6079
|
|
|
6080 if (ddl->cursor_elt != -1)
|
|
|
6081 {
|
|
|
6082 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
6083 w->last_point_y[DESIRED_DISP] = line;
|
|
|
6084 }
|
|
|
6085
|
|
|
6086 redisplay_update_line (w, line, line, 1);
|
|
|
6087 regenerate_modeline (w);
|
|
|
6088
|
|
|
6089 /* #### For now we just flush the cache until this has been
|
|
|
6090 tested. After that is done, this should correct the
|
|
|
6091 cache directly. */
|
|
|
6092 Dynarr_reset (w->line_start_cache);
|
|
|
6093
|
|
|
6094 /* Adjust the extent changed boundaries to remove any
|
|
|
6095 overlap with the buffer changes since we've just
|
|
|
6096 successfully updated that area. */
|
|
|
6097 if (extent_beg_unchanged != -1
|
|
|
6098 && extent_beg_unchanged >= beg_unchanged
|
|
|
6099 && extent_beg_unchanged < end_unchanged)
|
|
|
6100 extent_beg_unchanged = end_unchanged;
|
|
|
6101
|
|
|
6102 if (extent_end_unchanged != -1
|
|
|
6103 && extent_end_unchanged >= beg_unchanged
|
|
|
6104 && extent_end_unchanged < end_unchanged)
|
|
|
6105 extent_end_unchanged = beg_unchanged - 1;
|
|
|
6106
|
|
|
6107 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
6108 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
6109
|
|
|
6110 /* This could lead to odd results if it fails, but since the
|
|
|
6111 buffer changes update succeeded this probably will to.
|
|
|
6112 We already know that the extent changes start at or after
|
|
|
6113 the line because we checked before entering the loop. */
|
|
|
6114 if (extent_beg_unchanged != -1
|
|
|
6115 && extent_end_unchanged != -1
|
|
826
|
6116 && ((extent_beg_unchanged < ddl->charpos)
|
|
|
6117 || (extent_end_unchanged > ddl->end_charpos)))
|
|
428
|
6118 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
6119 extent_beg_unchanged,
|
|
|
6120 extent_end_unchanged);
|
|
|
6121 else
|
|
|
6122 return 1;
|
|
|
6123 }
|
|
|
6124 }
|
|
|
6125
|
|
|
6126 /* Oh, well. */
|
|
|
6127 return 0;
|
|
|
6128 }
|
|
|
6129
|
|
|
6130 /* Given a window and a point, update the given display lines such
|
|
|
6131 that point is displayed in the middle of the window.
|
|
|
6132 Return the window's new start position. */
|
|
|
6133
|
|
665
|
6134 static Charbpos
|
|
|
6135 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
6136 {
|
|
665
|
6137 Charbpos startp;
|
|
428
|
6138
|
|
|
6139 /* We need to make sure that the modeline is generated so that the
|
|
|
6140 window height can be calculated correctly. */
|
|
|
6141 ensure_modeline_generated (w, type);
|
|
|
6142
|
|
|
6143 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
6144 regenerate_window (w, startp, point, type);
|
|
|
6145 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
6146
|
|
|
6147 return startp;
|
|
|
6148 }
|
|
|
6149
|
|
|
6150 /* Given a window and a set of display lines, return a boolean
|
|
|
6151 indicating whether the given point is contained within. */
|
|
|
6152
|
|
|
6153 static int
|
|
665
|
6154 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
6155 {
|
|
|
6156 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6157 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6158 int first_line;
|
|
|
6159
|
|
|
6160 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
6161 first_line = 1;
|
|
|
6162 else
|
|
|
6163 first_line = 0;
|
|
|
6164
|
|
|
6165 if (Dynarr_length (dla) > first_line)
|
|
|
6166 {
|
|
665
|
6167 Charbpos start, end;
|
|
428
|
6168 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
6169
|
|
826
|
6170 start = dl->charpos;
|
|
428
|
6171 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
6172
|
|
|
6173 if (point >= start && point <= end)
|
|
|
6174 {
|
|
|
6175 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
6176 {
|
|
|
6177 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
6178
|
|
826
|
6179 if (point >= (dl->charpos + dl->offset)
|
|
|
6180 && point <= (dl->end_charpos + dl->offset))
|
|
428
|
6181 return !dl->clip;
|
|
|
6182 else
|
|
|
6183 return 1;
|
|
|
6184 }
|
|
|
6185 else
|
|
|
6186 return 1;
|
|
|
6187 }
|
|
|
6188 else
|
|
|
6189 return 0;
|
|
|
6190 }
|
|
|
6191 else
|
|
|
6192 return 0;
|
|
|
6193 }
|
|
|
6194
|
|
|
6195 /* Return pixel position the middle of the window, not including the
|
|
|
6196 modeline and any potential horizontal scrollbar. */
|
|
|
6197
|
|
|
6198 int
|
|
|
6199 window_half_pixpos (struct window *w)
|
|
|
6200 {
|
|
|
6201 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
6202 }
|
|
|
6203
|
|
|
6204 /* Return the display line which is currently in the middle of the
|
|
|
6205 window W for display lines TYPE. */
|
|
|
6206
|
|
|
6207 int
|
|
665
|
6208 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6209 {
|
|
|
6210 display_line_dynarr *dla;
|
|
|
6211 int half;
|
|
|
6212 int elt;
|
|
|
6213 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
6214
|
|
|
6215 if (type == CMOTION_DISP)
|
|
|
6216 regenerate_window (w, start, point, type);
|
|
|
6217
|
|
|
6218 dla = window_display_lines (w, type);
|
|
|
6219 half = window_half_pixpos (w);
|
|
|
6220
|
|
|
6221 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6222 {
|
|
|
6223 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6224 int line_bot = dl->ypos + dl->descent;
|
|
|
6225
|
|
|
6226 if (line_bot > half)
|
|
|
6227 return elt;
|
|
|
6228 }
|
|
|
6229
|
|
|
6230 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6231 being displayed. */
|
|
|
6232 return -1;
|
|
|
6233 }
|
|
|
6234
|
|
|
6235 /* Return a value for point that would place it at the beginning of
|
|
|
6236 the line which is in the middle of the window. */
|
|
|
6237
|
|
665
|
6238 Charbpos
|
|
|
6239 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6240 {
|
|
|
6241 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6242 int line = line_at_center (w, type, start, point);
|
|
|
6243
|
|
|
6244 if (line == -1)
|
|
|
6245 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6246 else
|
|
|
6247 {
|
|
|
6248 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6249 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6250
|
|
826
|
6251 return dl->charpos;
|
|
428
|
6252 }
|
|
|
6253 }
|
|
|
6254
|
|
|
6255 /* For a given window, ensure that the current visual representation
|
|
|
6256 is accurate. */
|
|
|
6257
|
|
|
6258 static void
|
|
|
6259 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6260 {
|
|
|
6261 struct window *w = XWINDOW (window);
|
|
|
6262 struct frame *f = XFRAME (w->frame);
|
|
|
6263 struct device *d = XDEVICE (f->device);
|
|
|
6264 Lisp_Object old_buffer = w->buffer;
|
|
|
6265 Lisp_Object the_buffer = w->buffer;
|
|
|
6266 struct buffer *b;
|
|
|
6267 int echo_active = 0;
|
|
|
6268 int startp = 1;
|
|
|
6269 int pointm;
|
|
|
6270 int old_startp = 1;
|
|
|
6271 int old_pointm = 1;
|
|
|
6272 int selected_in_its_frame;
|
|
|
6273 int selected_globally;
|
|
|
6274 int skip_output = 0;
|
|
|
6275 int truncation_changed;
|
|
|
6276 int inactive_minibuffer =
|
|
|
6277 (MINI_WINDOW_P (w) &&
|
|
|
6278 (f != device_selected_frame (d)) &&
|
|
|
6279 !is_surrogate_for_selected_frame (f));
|
|
|
6280
|
|
|
6281 /* #### In the new world this function actually does a bunch of
|
|
|
6282 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6283 implemented yet. */
|
|
|
6284
|
|
|
6285 /* If this is a combination window, do its children; that's all.
|
|
|
6286 The selected window is always a leaf so we don't check for
|
|
|
6287 skip_selected here. */
|
|
|
6288 if (!NILP (w->vchild))
|
|
|
6289 {
|
|
|
6290 redisplay_windows (w->vchild, skip_selected);
|
|
|
6291 return;
|
|
|
6292 }
|
|
|
6293 if (!NILP (w->hchild))
|
|
|
6294 {
|
|
|
6295 redisplay_windows (w->hchild, skip_selected);
|
|
|
6296 return;
|
|
|
6297 }
|
|
|
6298
|
|
|
6299 /* Is this window the selected window on its frame? */
|
|
|
6300 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6301 selected_globally =
|
|
|
6302 selected_in_its_frame &&
|
|
|
6303 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6304 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6305 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6306 if (skip_selected && selected_in_its_frame)
|
|
|
6307 return;
|
|
|
6308
|
|
|
6309 /* It is possible that the window is not fully initialized yet. */
|
|
|
6310 if (NILP (w->buffer))
|
|
|
6311 return;
|
|
|
6312
|
|
|
6313 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6314 {
|
|
|
6315 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6316 echo_active = 1;
|
|
|
6317 }
|
|
|
6318
|
|
|
6319 b = XBUFFER (w->buffer);
|
|
|
6320
|
|
|
6321 if (echo_active)
|
|
|
6322 {
|
|
|
6323 old_pointm = selected_globally
|
|
|
6324 ? BUF_PT (b)
|
|
|
6325 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6326 pointm = 1;
|
|
|
6327 }
|
|
|
6328 else
|
|
|
6329 {
|
|
|
6330 if (selected_globally)
|
|
|
6331 {
|
|
|
6332 pointm = BUF_PT (b);
|
|
|
6333 }
|
|
|
6334 else
|
|
|
6335 {
|
|
|
6336 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6337
|
|
|
6338 if (pointm < BUF_BEGV (b))
|
|
|
6339 pointm = BUF_BEGV (b);
|
|
|
6340 else if (pointm > BUF_ZV (b))
|
|
|
6341 pointm = BUF_ZV (b);
|
|
|
6342 }
|
|
|
6343 }
|
|
|
6344 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6345
|
|
|
6346 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6347 cache elements. */
|
|
|
6348 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6349 || !Dynarr_length (w->face_cachels)
|
|
|
6350 || f->faces_changed)
|
|
|
6351 reset_face_cachels (w);
|
|
|
6352 else
|
|
|
6353 mark_face_cachels_as_not_updated (w);
|
|
|
6354
|
|
|
6355 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6356 the cache purely because glyphs have changed - this is now
|
|
|
6357 handled by the dirty flag.*/
|
|
|
6358 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6359 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6360 reset_glyph_cachels (w);
|
|
|
6361 else
|
|
|
6362 mark_glyph_cachels_as_not_updated (w);
|
|
|
6363
|
|
|
6364 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6365 to find a new starting position. */
|
|
|
6366 if (!MINI_WINDOW_P (w)
|
|
|
6367 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6368 {
|
|
|
6369 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6370
|
|
|
6371 goto regeneration_done;
|
|
|
6372 }
|
|
|
6373
|
|
|
6374 if (echo_active)
|
|
|
6375 {
|
|
|
6376 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6377 startp = 1;
|
|
|
6378 }
|
|
|
6379 else
|
|
|
6380 {
|
|
|
6381 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6382 if (startp < BUF_BEGV (b))
|
|
|
6383 startp = BUF_BEGV (b);
|
|
|
6384 else if (startp > BUF_ZV (b))
|
|
|
6385 startp = BUF_ZV (b);
|
|
|
6386 }
|
|
|
6387 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6388
|
|
|
6389 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6390 (unsigned int) window_truncation_on (w));
|
|
428
|
6391
|
|
|
6392 /* If w->force_start is set, then some function set w->start and we
|
|
|
6393 should display from there and change point, if necessary, to
|
|
|
6394 ensure that it is visible. */
|
|
|
6395 if (w->force_start || inactive_minibuffer)
|
|
|
6396 {
|
|
|
6397 w->force_start = 0;
|
|
|
6398 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6399 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6400
|
|
|
6401 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6402
|
|
|
6403 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6404 {
|
|
|
6405 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6406
|
|
|
6407 if (selected_globally)
|
|
|
6408 BUF_SET_PT (b, pointm);
|
|
|
6409
|
|
|
6410 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6411 the_buffer);
|
|
|
6412
|
|
|
6413 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6414 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6415 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6416 }
|
|
|
6417
|
|
|
6418 goto regeneration_done;
|
|
|
6419 }
|
|
|
6420
|
|
|
6421 /* If nothing has changed since the last redisplay, then we just
|
|
|
6422 need to make sure that point is still visible. */
|
|
|
6423 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6424 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6425 && pointm >= startp
|
|
|
6426 /* This check is to make sure we restore the minibuffer after a
|
|
|
6427 temporary change to the echo area. */
|
|
|
6428 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6429 && !f->frame_changed
|
|
|
6430 && !truncation_changed
|
|
442
|
6431 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6432 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6433 )
|
|
|
6434 {
|
|
|
6435 /* Check if the cursor has actually moved. */
|
|
|
6436 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6437 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6438 && selected_globally
|
|
|
6439 && !w->windows_changed
|
|
|
6440 && !f->clip_changed
|
|
|
6441 && !f->extents_changed
|
|
|
6442 && !f->faces_changed
|
|
|
6443 && !f->glyphs_changed
|
|
|
6444 && !f->subwindows_changed
|
|
442
|
6445 /* && !f->subwindows_state_changed*/
|
|
428
|
6446 && !f->point_changed
|
|
|
6447 && !f->windows_structure_changed)
|
|
|
6448 {
|
|
|
6449 /* If not, we're done. */
|
|
|
6450 if (f->modeline_changed)
|
|
|
6451 regenerate_modeline (w);
|
|
|
6452
|
|
|
6453 skip_output = 1;
|
|
|
6454 goto regeneration_done;
|
|
|
6455 }
|
|
|
6456 else
|
|
|
6457 {
|
|
|
6458 /* If the new point is visible in the redisplay structures,
|
|
|
6459 then let the output update routines handle it, otherwise
|
|
|
6460 do things the hard way. */
|
|
|
6461 if (!w->windows_changed
|
|
|
6462 && !f->clip_changed
|
|
|
6463 && !f->extents_changed
|
|
|
6464 && !f->faces_changed
|
|
|
6465 && !f->glyphs_changed
|
|
|
6466 && !f->subwindows_changed
|
|
442
|
6467 /* && !f->subwindows_state_changed*/
|
|
428
|
6468 && !f->windows_structure_changed)
|
|
|
6469 {
|
|
|
6470 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6471 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6472 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6473 {
|
|
|
6474 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6475 {
|
|
|
6476 /* Always regenerate in case it is displaying
|
|
|
6477 the current line or column. */
|
|
|
6478 regenerate_modeline (w);
|
|
|
6479
|
|
|
6480 skip_output = 1;
|
|
|
6481 goto regeneration_done;
|
|
|
6482 }
|
|
|
6483 }
|
|
|
6484 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6485 {
|
|
|
6486 if (f->modeline_changed)
|
|
|
6487 regenerate_modeline (w);
|
|
|
6488
|
|
|
6489 skip_output = 1;
|
|
|
6490 goto regeneration_done;
|
|
|
6491 }
|
|
|
6492 }
|
|
|
6493
|
|
|
6494 /* If we weren't able to take the shortcut method, then use
|
|
|
6495 the brute force method. */
|
|
|
6496 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6497
|
|
|
6498 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6499 goto regeneration_done;
|
|
|
6500 }
|
|
|
6501 }
|
|
|
6502
|
|
|
6503 /* Check if the starting point is no longer at the beginning of a
|
|
|
6504 line, in which case find a new starting point. We also recenter
|
|
|
6505 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6506 up with a blank window. */
|
|
|
6507 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6508 && !(startp == BUF_BEGV (b)
|
|
|
6509 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6510 || (pointm == startp &&
|
|
|
6511 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6512 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6513 || (startp == BUF_ZV (b)))
|
|
|
6514 {
|
|
|
6515 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6516
|
|
|
6517 goto regeneration_done;
|
|
|
6518 }
|
|
|
6519 /* See if we can update the data structures locally based on
|
|
|
6520 knowledge of what changed in the buffer. */
|
|
|
6521 else if (!w->windows_changed
|
|
|
6522 && !f->clip_changed
|
|
|
6523 && !f->faces_changed
|
|
|
6524 && !f->glyphs_changed
|
|
|
6525 && !f->subwindows_changed
|
|
442
|
6526 /* && !f->subwindows_state_changed*/
|
|
428
|
6527 && !f->windows_structure_changed
|
|
|
6528 && !f->frame_changed
|
|
|
6529 && !truncation_changed
|
|
|
6530 && pointm >= startp
|
|
|
6531 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6532 {
|
|
|
6533 if (f->modeline_changed
|
|
|
6534 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6535 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6536 regenerate_modeline (w);
|
|
|
6537
|
|
|
6538 skip_output = 1;
|
|
|
6539 goto regeneration_done;
|
|
|
6540 }
|
|
|
6541 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6542 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6543 else
|
|
|
6544 {
|
|
|
6545 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6546
|
|
|
6547 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6548 goto regeneration_done;
|
|
|
6549 }
|
|
|
6550
|
|
|
6551 /* We still haven't gotten the window regenerated with point
|
|
|
6552 visible. Next we try scrolling a little and see if point comes
|
|
|
6553 back onto the screen. */
|
|
|
6554 if (scroll_step > 0)
|
|
|
6555 {
|
|
|
6556 int scrolled = scroll_conservatively;
|
|
|
6557 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6558 {
|
|
|
6559 startp = vmotion (w, startp,
|
|
|
6560 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6561 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6562
|
|
|
6563 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6564 goto regeneration_done;
|
|
|
6565 }
|
|
|
6566 }
|
|
|
6567
|
|
|
6568 /* We still haven't managed to get the screen drawn with point on
|
|
|
6569 the screen, so just center it and be done with it. */
|
|
|
6570 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6571
|
|
|
6572
|
|
|
6573 regeneration_done:
|
|
|
6574
|
|
|
6575 /* If the window's frame is changed then reset the current display
|
|
|
6576 lines in order to force a full repaint. */
|
|
|
6577 if (f->frame_changed)
|
|
|
6578 {
|
|
|
6579 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6580
|
|
|
6581 Dynarr_reset (cla);
|
|
|
6582 }
|
|
|
6583
|
|
|
6584 /* Must do this before calling redisplay_output_window because it
|
|
|
6585 sets some markers on the window. */
|
|
|
6586 if (echo_active)
|
|
|
6587 {
|
|
|
6588 w->buffer = old_buffer;
|
|
|
6589 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6590 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6591 }
|
|
|
6592
|
|
|
6593 /* These also have to be set before calling redisplay_output_window
|
|
|
6594 since it sets the CURRENT_DISP values based on them. */
|
|
|
6595 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6596 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6597 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6598 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6599
|
|
|
6600 if (!skip_output)
|
|
|
6601 {
|
|
665
|
6602 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6603 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6604 ? BUF_ZV (b)
|
|
|
6605 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6606 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6607 if (w->start_at_line_beg)
|
|
|
6608 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6609 redisplay_output_window (w);
|
|
|
6610 /*
|
|
|
6611 * If we just displayed the echo area, the line start cache is
|
|
|
6612 * no longer valid, because the minibuffer window is associated
|
|
|
6613 * with the window now.
|
|
|
6614 */
|
|
|
6615 if (echo_active)
|
|
|
6616 w->line_cache_last_updated = make_int (-1);
|
|
|
6617 }
|
|
|
6618
|
|
|
6619 /* #### This should be dependent on face changes and will need to be
|
|
|
6620 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6621 mark_face_cachels_as_clean (w);
|
|
|
6622
|
|
438
|
6623 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6624 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6625 flag since everything must be up-to-date. */
|
|
428
|
6626 if (glyphs_changed)
|
|
|
6627 mark_glyph_cachels_as_clean (w);
|
|
|
6628
|
|
|
6629 w->windows_changed = 0;
|
|
|
6630 }
|
|
|
6631
|
|
|
6632 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6633 currently visible in all frames on all devices. #### There has to
|
|
|
6634 be a better way to do this. */
|
|
|
6635
|
|
|
6636 static int
|
|
2286
|
6637 reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure))
|
|
428
|
6638 {
|
|
|
6639 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6640 return 0;
|
|
|
6641 }
|
|
|
6642
|
|
|
6643 static void
|
|
|
6644 reset_buffer_changes (void)
|
|
|
6645 {
|
|
|
6646 Lisp_Object frmcons, devcons, concons;
|
|
|
6647
|
|
|
6648 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6649 {
|
|
|
6650 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6651
|
|
|
6652 if (FRAME_REPAINT_P (f))
|
|
|
6653 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6654 }
|
|
|
6655 }
|
|
|
6656
|
|
|
6657 /* Ensure that all windows underneath the given window in the window
|
|
|
6658 hierarchy are correctly displayed. */
|
|
|
6659
|
|
|
6660 static void
|
|
|
6661 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6662 {
|
|
|
6663 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6664 {
|
|
|
6665 redisplay_window (window, skip_selected);
|
|
|
6666 }
|
|
|
6667 }
|
|
|
6668
|
|
1318
|
6669 /* Register an action to be called at the end of redisplay.
|
|
|
6670 in_display is 0 when this is called.
|
|
|
6671 This is used when it is discovered that an action needs to be taken,
|
|
|
6672 but it's during redisplay, so it's not safe. (Typically, it's an action
|
|
|
6673 that needs to enter redisplay, which can't happen reentrantly.)
|
|
|
6674
|
|
|
6675 NEVER signal an error in these functions.
|
|
|
6676 */
|
|
|
6677
|
|
|
6678 void
|
|
|
6679 register_post_redisplay_action (void (*fun) (Lisp_Object), Lisp_Object arg)
|
|
|
6680 {
|
|
|
6681 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions,
|
|
|
6682 list1 (Fcons (make_opaque_ptr
|
|
|
6683 ((void *) fun), arg)));
|
|
|
6684 }
|
|
|
6685
|
|
1320
|
6686 static int running_post_redisplay_actions;
|
|
|
6687
|
|
1318
|
6688 static void
|
|
|
6689 run_post_redisplay_actions (void)
|
|
|
6690 {
|
|
1320
|
6691 int depth;
|
|
|
6692
|
|
|
6693 if (running_post_redisplay_actions)
|
|
|
6694 return;
|
|
|
6695
|
|
|
6696 depth = internal_bind_int (&running_post_redisplay_actions, 1);
|
|
|
6697 /* If the function pushes further actions, they will be tacked onto
|
|
|
6698 the end of the list, and we'll run them when we're done with the
|
|
|
6699 current ones. */
|
|
1318
|
6700 while (!NILP (Vpost_redisplay_actions))
|
|
|
6701 {
|
|
|
6702 Lisp_Object car = XCAR (Vpost_redisplay_actions);
|
|
|
6703 void (*fun) (Lisp_Object) =
|
|
|
6704 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car));
|
|
|
6705 (*fun) (XCDR (car));
|
|
|
6706 free_opaque_ptr (XCAR (car));
|
|
|
6707 free_cons (car);
|
|
|
6708 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
|
|
|
6709 }
|
|
1320
|
6710 unbind_to (depth);
|
|
1318
|
6711 }
|
|
|
6712
|
|
|
6713 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
|
|
|
6714
|
|
|
6715 static Lisp_Object
|
|
2286
|
6716 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe))
|
|
1318
|
6717 {
|
|
|
6718 assert (!in_display);
|
|
|
6719 return Qnil;
|
|
|
6720 }
|
|
|
6721
|
|
|
6722 #endif
|
|
|
6723
|
|
|
6724 /* Within the guts of redisplay, we are defenseless and cannot allow any of
|
|
|
6725 the following to happen:
|
|
|
6726
|
|
|
6727 1) garbage collection
|
|
|
6728 2) QUIT
|
|
|
6729 3) any non-local exits
|
|
|
6730 4) frame size changes
|
|
|
6731 5) deletion of any buffers, windows, frames, etc.
|
|
|
6732 6) modification of buffer text
|
|
|
6733 7) reentrant entry of redisplay (see the stack trace above
|
|
|
6734 generate_displayable_area())
|
|
|
6735
|
|
|
6736 The general reason is that the redisplay code is written to assume that
|
|
|
6737 it is the only code running, and thus (a) cannot tolerate structures
|
|
|
6738 changed out from under it (hence 1, 4, 5, 6, 7) and (b) at various points
|
|
|
6739 within redisplay the redisplay structures may be in an inconsistent
|
|
|
6740 state and there are no unwind-protects to clean the structures up in
|
|
|
6741 case of non-local exit (hence 2, 3). Fixing redisplay to address these
|
|
|
6742 issues is hard and perhaps not worth it (and might slow things down a
|
|
|
6743 fair amount). We address 1, 4, 5 and 6 ourselves inside of
|
|
|
6744 enter_redisplay_critical_section() by simply inhibiting them, but we
|
|
|
6745 cannot handle 2 and 3, which must be handled at the actual point where
|
|
|
6746 they may occur (especially, internal_equal() or any place that may call
|
|
|
6747 Lisp), by wrapping the code in call_trapping_problems() or
|
|
|
6748 call_with_suspended_errors(). [[ NOTE: We could address QUIT by inhibiting
|
|
|
6749 it but this would be anti-social because it would prevent the user from
|
|
|
6750 interrupting any Lisp code called within the critical section. With the
|
|
|
6751 call_*() wrapping, C-g will interrupt the Lisp code and throw back to
|
|
|
6752 the innermost wrapping. ]] In fact we do turn off QUIT handling, since
|
|
|
6753 it's just too dangerous otherwise. See below.
|
|
|
6754
|
|
|
6755 Code calling enter_redisplay_critical_section() must check for reentrancy
|
|
|
6756 (#7) and take appropriate corrective action.
|
|
|
6757
|
|
|
6758 To help debug potential problems, we arrange (when
|
|
|
6759 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every time
|
|
|
6760 we execute QUIT or call Lisp code unless proper wrapping is in place, as
|
|
|
6761 well as further checks when we actually Fsignal(), Fthrow(),
|
|
|
6762 garbage_collect_1().
|
|
|
6763
|
|
|
6764 #### If a frame-size change does occur we should probably actually be
|
|
|
6765 preempting redisplay. */
|
|
|
6766
|
|
|
6767 /* Count of number of recursive times we call
|
|
|
6768 enter_redisplay_critical_section() or
|
|
|
6769 enter_redisplay_critical_section_maybe().
|
|
|
6770 enter_redisplay_critical_section() cannot occur reentrantly but we have
|
|
|
6771 to know in the *maybe() version whether to exit the section when we're
|
|
|
6772 done. */
|
|
|
6773 static int in_display_nesting;
|
|
|
6774
|
|
|
6775 static Lisp_Object
|
|
2286
|
6776 end_hold_frame_size_changes (Lisp_Object UNUSED (obj))
|
|
1318
|
6777 {
|
|
|
6778 if (!hold_frame_size_changes)
|
|
|
6779 {
|
|
|
6780 /* we used to have a function to do this for only one frame, and
|
|
|
6781 it was typical to call it at the end of a critical section
|
|
|
6782 (which occurs once per frame); but what then happens if multiple
|
|
|
6783 frames have frame changes held up?
|
|
|
6784
|
|
|
6785 This means we are O(N^2) over frames. I seriously doubt it matters.
|
|
|
6786 --ben */
|
|
|
6787 Lisp_Object frmcons, devcons, concons;
|
|
|
6788
|
|
|
6789 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6790 {
|
|
|
6791 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6792 if (f->size_change_pending)
|
|
|
6793 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6794 }
|
|
|
6795 }
|
|
|
6796 return Qnil;
|
|
|
6797 }
|
|
|
6798
|
|
|
6799 /* Call this to temporarily prevent frame-size changes from being processed.
|
|
|
6800 To undo, use unbind_to(), passing it the value returned by this function.
|
|
|
6801 */
|
|
|
6802
|
|
|
6803 int
|
|
|
6804 begin_hold_frame_size_changes (void)
|
|
|
6805 {
|
|
|
6806 int depth = specpdl_depth ();
|
|
|
6807 record_unwind_protect (end_hold_frame_size_changes, Qnil);
|
|
|
6808 internal_bind_int (&hold_frame_size_changes, 1 + hold_frame_size_changes);
|
|
|
6809 return depth;
|
|
|
6810 }
|
|
|
6811
|
|
|
6812 int
|
|
|
6813 enter_redisplay_critical_section (void)
|
|
|
6814 {
|
|
|
6815 int depth = specpdl_depth ();
|
|
|
6816
|
|
|
6817 /* Reentrant entry is deadly. The calling function must check for this. */
|
|
|
6818 assert (!in_display);
|
|
|
6819 begin_hold_frame_size_changes ();
|
|
|
6820 /* Make sure in_display gets reset, but don't set it yet so that
|
|
|
6821 commit_ritual_suicide() can be used. */
|
|
|
6822 internal_bind_int (&in_display, 0);
|
|
|
6823 internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
|
|
|
6824 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
|
|
|
6825 /* Force every call to QUIT to check for in_displayness. This will
|
|
|
6826 verify proper wrapping, as in the previous comment, aborting if not. */
|
|
|
6827 something_happened++;
|
|
|
6828 /* Verify that no nonlocal exits blow past us. */
|
|
|
6829 record_unwind_protect (commit_ritual_suicide, Qnil);
|
|
|
6830 #endif
|
|
|
6831 in_display++;
|
|
|
6832
|
|
|
6833 set_trapping_problems_flags (INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
|
|
|
6834 /* Even checking for QUIT can cause arbitrary Lisp code to be executed,
|
|
|
6835 e.g. through a menu handler. We really don't want that happening
|
|
|
6836 inside of redisplay. Code that we `eval' is at least written with the
|
|
|
6837 expectation that it's inside of redisplay, and shouldn't try anything
|
|
|
6838 weird; but that's not the case for menu code (e.g. custom loads huge
|
|
|
6839 amounts of LISP FILES from a menu handler! FMH!). Safest just to turn
|
|
|
6840 this off. We could turn it on using UNINHIBIT_QUIT or
|
|
|
6841 begin_do_check_for_quit() in certain places if we want, if we know
|
|
|
6842 it's not in an especially tricky place. */
|
|
|
6843 begin_dont_check_for_quit ();
|
|
|
6844 return depth;
|
|
|
6845 }
|
|
|
6846
|
|
|
6847 void
|
|
|
6848 exit_redisplay_critical_section (int depth)
|
|
|
6849 {
|
|
|
6850 in_display--;
|
|
|
6851 assert (!in_display);
|
|
|
6852 unbind_to (depth);
|
|
|
6853
|
|
|
6854 run_post_redisplay_actions ();
|
|
|
6855 }
|
|
|
6856
|
|
|
6857 /* Enter the redisplay critical section if we're not already in it. This
|
|
|
6858 is for code that needs frame changes held up and other protections from
|
|
|
6859 being inside, but doesn't modify the redisplay structures, and doesn't
|
|
|
6860 look at them in a way that they will be confused by inconsistencies. */
|
|
|
6861
|
|
|
6862 int
|
|
|
6863 enter_redisplay_critical_section_maybe (void)
|
|
|
6864 {
|
|
|
6865 if (!in_display)
|
|
|
6866 return enter_redisplay_critical_section ();
|
|
|
6867 else
|
|
|
6868 return internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
|
|
|
6869 }
|
|
|
6870
|
|
|
6871 void
|
|
|
6872 exit_redisplay_critical_section_maybe (int depth)
|
|
|
6873 {
|
|
|
6874 if (in_display_nesting == 1)
|
|
|
6875 exit_redisplay_critical_section (depth);
|
|
|
6876 else
|
|
|
6877 unbind_to (depth);
|
|
|
6878 }
|
|
|
6879
|
|
1279
|
6880 /* Ensure that all windows on the given frame are correctly displayed.
|
|
|
6881 Return non-zero if pre-empted. */
|
|
428
|
6882
|
|
442
|
6883 int
|
|
428
|
6884 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6885 {
|
|
|
6886 struct device *d = XDEVICE (f->device);
|
|
853
|
6887 int depth;
|
|
428
|
6888
|
|
1279
|
6889 assert (f->init_finished);
|
|
|
6890
|
|
1318
|
6891 /* NOTE: Without sufficient checks for stream frames, we got weird
|
|
|
6892 crashes in pdump. These came and went very easily -- adding the
|
|
|
6893 critical-section code for redisplay was enough to trigger them.
|
|
|
6894 Perhaps I should have debugged them but there didn't seem to be any
|
|
|
6895 point. --ben */
|
|
1279
|
6896 if (FRAME_STREAM_P (f)) /* nothing to do */
|
|
|
6897 return 0;
|
|
|
6898
|
|
1318
|
6899 /* Reentrancy into redisplay can be deadly. See stack trace above
|
|
|
6900 generate_displayable_area(). */
|
|
|
6901 if (in_display)
|
|
|
6902 return 1;
|
|
|
6903
|
|
545
|
6904 if (preemption_check
|
|
|
6905 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6906 {
|
|
|
6907 /* The preemption check itself takes a lot of time,
|
|
|
6908 so normally don't do it here. We do it if called
|
|
|
6909 from Lisp, though (`redisplay-frame'). */
|
|
|
6910 int preempted;
|
|
|
6911
|
|
|
6912 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6913 if (preempted)
|
|
|
6914 return 1;
|
|
|
6915 }
|
|
|
6916
|
|
442
|
6917 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6918 {
|
|
|
6919 Lisp_Object frame;
|
|
|
6920
|
|
|
6921 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6922 f->buffer_alist);
|
|
793
|
6923 frame = wrap_frame (f);
|
|
442
|
6924 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6925 }
|
|
|
6926
|
|
428
|
6927 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6928 any which are already pending. */
|
|
|
6929 if (f->size_change_pending)
|
|
|
6930 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6931
|
|
|
6932 /* If frame size might need to be changed, due to changed size
|
|
|
6933 of toolbars, scrollbars etc, change it now */
|
|
|
6934 if (f->size_slipped)
|
|
|
6935 {
|
|
|
6936 adjust_frame_size (f);
|
|
|
6937 assert (!f->size_slipped);
|
|
|
6938 }
|
|
|
6939
|
|
1318
|
6940 /* The menubar, toolbar, and icon updates should be done before
|
|
853
|
6941 enter_redisplay_critical_section is called and we are officially
|
|
1318
|
6942 'in_display'. They is because they tend to eval Lisp code, which
|
|
|
6943 needs to be carefully wrapped within the critical section (and hence
|
|
|
6944 is difficult to debug). */
|
|
428
|
6945
|
|
|
6946 #ifdef HAVE_MENUBARS
|
|
|
6947 /* Update the menubar. It is done first since it could change
|
|
|
6948 the menubar's visibility. This way we avoid having flashing
|
|
|
6949 caused by an Expose event generated by the visibility change
|
|
|
6950 being handled. */
|
|
|
6951 update_frame_menubars (f);
|
|
|
6952 #endif /* HAVE_MENUBARS */
|
|
|
6953 #ifdef HAVE_TOOLBARS
|
|
905
|
6954 /* Update the toolbars geometry. We don't update the toolbars
|
|
|
6955 themselves at this point since the space they are trying to
|
|
|
6956 occupy may currently by occupied by gutter elements. Instead we
|
|
|
6957 update the geometry, then update the gutter geometry, then update
|
|
|
6958 the gutters - which will cause mapped windows to be repositioned
|
|
|
6959 - and finally update the toolbars. */
|
|
|
6960 update_frame_toolbars_geometry (f);
|
|
428
|
6961 #endif /* HAVE_TOOLBARS */
|
|
442
|
6962 /* Gutter update proper has to be done inside display when no frame
|
|
|
6963 size changes can occur, thus we separately update the gutter
|
|
|
6964 geometry here if it needs it. */
|
|
|
6965 update_frame_gutter_geometry (f);
|
|
428
|
6966
|
|
|
6967 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
6968 if (f->clear)
|
|
|
6969 f->frame_changed = 1;
|
|
|
6970
|
|
442
|
6971 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
6972 to cause subwindows to get instantiated. This is because
|
|
428
|
6973 subwindows_state_changed is less strict - dealing with things
|
|
|
6974 like the clicked state of button. We have to do this before
|
|
|
6975 redisplaying the gutters as subwindows get unmapped in the
|
|
|
6976 process.*/
|
|
442
|
6977 if (f->frame_changed)
|
|
|
6978 reset_frame_subwindow_instance_cache (f);
|
|
|
6979
|
|
|
6980 if (f->frame_changed || f->subwindows_changed)
|
|
|
6981 {
|
|
428
|
6982 /* we have to do this so the gutter gets regenerated. */
|
|
|
6983 reset_gutter_display_lines (f);
|
|
|
6984 }
|
|
|
6985
|
|
853
|
6986 depth = enter_redisplay_critical_section ();
|
|
428
|
6987
|
|
|
6988 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
1318
|
6989
|
|
|
6990 /* See comments in enter_redisplay_critical_section() */
|
|
428
|
6991
|
|
442
|
6992 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
6993
|
|
|
6994 /* We can now update the gutters, safe in the knowledge that our
|
|
|
6995 efforts won't get undone. */
|
|
|
6996
|
|
|
6997 /* This can call lisp, but redisplay is protected by binding
|
|
|
6998 inhibit_quit. More importantly the code involving display lines
|
|
|
6999 *assumes* that GC will not happen and so does not GCPRO
|
|
|
7000 anything. Since we use this code the whole time with the gutters
|
|
1318
|
7001 we cannot allow GC to happen when manipulating the gutters.
|
|
|
7002
|
|
|
7003 This must be inside of the critical section for various reasons.
|
|
|
7004 For example, it messes with display structures, which be left in
|
|
|
7005 an inconsistent state. */
|
|
442
|
7006 update_frame_gutters (f);
|
|
|
7007
|
|
428
|
7008 /* Erase the frame before outputting its contents. */
|
|
|
7009 if (f->clear)
|
|
|
7010 {
|
|
442
|
7011 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
7012 }
|
|
|
7013
|
|
|
7014 /* Do the selected window first. */
|
|
|
7015 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
7016
|
|
|
7017 /* Then do the rest. */
|
|
|
7018 redisplay_windows (f->root_window, 1);
|
|
|
7019
|
|
442
|
7020 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
7021
|
|
|
7022 update_frame_title (f);
|
|
|
7023
|
|
905
|
7024 #ifdef HAVE_TOOLBARS
|
|
|
7025 /* Finally update the toolbars. It seems its possible to get in a
|
|
|
7026 cycle between updating the gutter and the toolbars. Basically we
|
|
|
7027 want to end up with both being up-to-date and this doesn't seem
|
|
|
7028 possible in a single pass. */
|
|
|
7029 update_frame_toolbars (f);
|
|
|
7030 #endif /* HAVE_TOOLBARS */
|
|
|
7031
|
|
428
|
7032 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
7033 f->window_face_cache_reset = 0;
|
|
|
7034 f->echo_area_garbaged = 0;
|
|
|
7035 f->clear = 0;
|
|
|
7036
|
|
|
7037 if (!f->size_change_pending)
|
|
|
7038 f->size_changed = 0;
|
|
|
7039
|
|
|
7040 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
7041
|
|
853
|
7042 /* Allow frame size changes to occur again. */
|
|
|
7043 exit_redisplay_critical_section (depth);
|
|
428
|
7044
|
|
|
7045 return 0;
|
|
|
7046 }
|
|
|
7047
|
|
440
|
7048 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
7049 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
7050 no automatic redisplay, as printers do, then the device is not
|
|
|
7051 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
7052 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
7053 when called from "lazy" redisplay();
|
|
|
7054 */
|
|
428
|
7055
|
|
|
7056 static int
|
|
440
|
7057 redisplay_device (struct device *d, int automatic)
|
|
428
|
7058 {
|
|
|
7059 Lisp_Object frame, frmcons;
|
|
|
7060 int size_change_failed = 0;
|
|
|
7061 struct frame *f;
|
|
|
7062
|
|
545
|
7063 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
7064 return 0;
|
|
|
7065
|
|
428
|
7066 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
7067 return 0;
|
|
|
7068
|
|
|
7069 /* It is possible that redisplay has been called before the
|
|
545
|
7070 device is fully initialized, or that the console implementation
|
|
|
7071 allows frameless devices. If so then continue with the next
|
|
|
7072 device. */
|
|
428
|
7073 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
7074 return 0;
|
|
|
7075
|
|
545
|
7076 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
7077 {
|
|
|
7078 int preempted;
|
|
|
7079 REDISPLAY_PREEMPTION_CHECK;
|
|
|
7080 if (preempted)
|
|
|
7081 return 1;
|
|
|
7082 }
|
|
428
|
7083
|
|
|
7084 /* Always do the selected frame first. */
|
|
|
7085 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
7086
|
|
|
7087 f = XFRAME (frame);
|
|
|
7088
|
|
|
7089 if (f->icon_changed || f->windows_changed)
|
|
|
7090 update_frame_icon (f);
|
|
|
7091
|
|
|
7092 if (FRAME_REPAINT_P (f))
|
|
|
7093 {
|
|
|
7094 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
7095 {
|
|
588
|
7096 int preempted = redisplay_frame (f, 1);
|
|
545
|
7097 if (preempted)
|
|
|
7098 return 1;
|
|
|
7099 }
|
|
428
|
7100
|
|
|
7101 /* If the frame redisplay did not get preempted, then this flag
|
|
|
7102 should have gotten set to 0. It might be possible for that
|
|
|
7103 not to happen if a size change event were to occur at an odd
|
|
|
7104 time. To make sure we don't miss anything we simply don't
|
|
|
7105 reset the top level flags until the condition ends up being
|
|
|
7106 in the right state. */
|
|
|
7107 if (f->size_changed)
|
|
|
7108 size_change_failed = 1;
|
|
|
7109 }
|
|
|
7110
|
|
|
7111 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
7112 {
|
|
|
7113 f = XFRAME (XCAR (frmcons));
|
|
|
7114
|
|
|
7115 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
7116 continue;
|
|
|
7117
|
|
|
7118 if (f->icon_changed || f->windows_changed)
|
|
|
7119 update_frame_icon (f);
|
|
|
7120
|
|
|
7121 if (FRAME_REPAINT_P (f))
|
|
|
7122 {
|
|
430
|
7123 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
7124 {
|
|
588
|
7125 int preempted = redisplay_frame (f, 1);
|
|
545
|
7126 if (preempted)
|
|
|
7127 return 1;
|
|
428
|
7128 }
|
|
|
7129
|
|
|
7130 if (f->size_change_pending)
|
|
|
7131 size_change_failed = 1;
|
|
|
7132 }
|
|
|
7133 }
|
|
|
7134
|
|
|
7135 /* If we get here then we redisplayed all of our frames without
|
|
|
7136 getting preempted so mark ourselves as clean. */
|
|
|
7137 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
7138
|
|
|
7139 if (!size_change_failed)
|
|
|
7140 d->size_changed = 0;
|
|
|
7141
|
|
|
7142 return 0;
|
|
|
7143 }
|
|
|
7144
|
|
|
7145 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
7146 the current contents of their respective buffers. */
|
|
|
7147
|
|
|
7148 static void
|
|
|
7149 redisplay_without_hooks (void)
|
|
|
7150 {
|
|
|
7151 Lisp_Object devcons, concons;
|
|
|
7152 int size_change_failed = 0;
|
|
1292
|
7153 PROFILE_DECLARE ();
|
|
|
7154
|
|
|
7155 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay);
|
|
428
|
7156
|
|
|
7157 if (asynch_device_change_pending)
|
|
|
7158 handle_asynch_device_change ();
|
|
|
7159
|
|
|
7160 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
7161 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
7162 goto done;
|
|
|
7163
|
|
|
7164 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
7165 {
|
|
|
7166 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
7167 int preempted;
|
|
|
7168
|
|
430
|
7169 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
7170 {
|
|
440
|
7171 preempted = redisplay_device (d, 1);
|
|
428
|
7172
|
|
|
7173 if (preempted)
|
|
|
7174 {
|
|
|
7175 preemption_count++;
|
|
|
7176 RESET_CHANGED_SET_FLAGS;
|
|
|
7177 goto done;
|
|
|
7178 }
|
|
|
7179
|
|
|
7180 /* See comment in redisplay_device. */
|
|
|
7181 if (d->size_changed)
|
|
|
7182 size_change_failed = 1;
|
|
|
7183 }
|
|
|
7184 }
|
|
|
7185 preemption_count = 0;
|
|
|
7186
|
|
|
7187 /* Mark redisplay as accurate */
|
|
|
7188 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
7189 RESET_CHANGED_SET_FLAGS;
|
|
|
7190
|
|
|
7191 if (faces_changed)
|
|
|
7192 {
|
|
|
7193 mark_all_faces_as_clean ();
|
|
|
7194 faces_changed = 0;
|
|
|
7195 }
|
|
|
7196
|
|
|
7197 if (!size_change_failed)
|
|
|
7198 size_changed = 0;
|
|
|
7199
|
|
|
7200 reset_buffer_changes ();
|
|
|
7201
|
|
|
7202 done:
|
|
800
|
7203 #ifdef ERROR_CHECK_DISPLAY
|
|
|
7204 sledgehammer_check_redisplay_structs ();
|
|
|
7205 #endif /* ERROR_CHECK_DISPLAY */
|
|
1292
|
7206
|
|
|
7207 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay);
|
|
428
|
7208 }
|
|
|
7209
|
|
1318
|
7210 /* Note: All places in the C code that call redisplay() are prepared to
|
|
|
7211 handle GCing, which can happen from run_pre_idle_hook(). However, we
|
|
|
7212 can't currently handle GC inside the guts of redisplay; see
|
|
|
7213 enter_redisplay_critical_section().
|
|
853
|
7214
|
|
|
7215 (#### What about other external entry points to the redisplay code?
|
|
|
7216 Someone should go through and make sure that all callers can handle
|
|
|
7217 GC there, too.)
|
|
|
7218 */
|
|
|
7219
|
|
428
|
7220 void
|
|
|
7221 redisplay (void)
|
|
|
7222 {
|
|
853
|
7223 run_pre_idle_hook ();
|
|
|
7224 redisplay_no_pre_idle_hook ();
|
|
|
7225 }
|
|
|
7226
|
|
|
7227 void
|
|
|
7228 redisplay_no_pre_idle_hook (void)
|
|
|
7229 {
|
|
428
|
7230 if (last_display_warning_tick != display_warning_tick &&
|
|
|
7231 !inhibit_warning_display)
|
|
|
7232 {
|
|
|
7233 /* If an error occurs during this function, oh well.
|
|
|
7234 If we report another warning, we could get stuck in an
|
|
|
7235 infinite loop reporting warnings. */
|
|
853
|
7236 call0_trapping_problems
|
|
|
7237 (0, Qdisplay_warning_buffer,
|
|
|
7238 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
7239 last_display_warning_tick = display_warning_tick;
|
|
|
7240 }
|
|
|
7241
|
|
|
7242 redisplay_without_hooks ();
|
|
|
7243 }
|
|
|
7244
|
|
853
|
7245 Lisp_Object
|
|
|
7246 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker)
|
|
|
7247 {
|
|
|
7248 return
|
|
|
7249 eval_in_buffer_trapping_problems
|
|
|
7250 ("Error calling function within redisplay", current_buffer,
|
|
1318
|
7251 dont_trust_this_damn_sucker, 0);
|
|
853
|
7252 }
|
|
428
|
7253
|
|
|
7254 /* Efficiently determine the window line number, and return a pointer
|
|
|
7255 to its printed representation. Do this regardless of whether
|
|
|
7256 line-number-mode is on. The first line in the buffer is counted as
|
|
|
7257 1. If narrowing is in effect, the lines are counted from the
|
|
|
7258 beginning of the visible portion of the buffer. */
|
|
|
7259 static char *
|
|
|
7260 window_line_number (struct window *w, int type)
|
|
|
7261 {
|
|
|
7262 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
7263 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7264 /* Be careful in the order of these tests. The first clause will
|
|
|
7265 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
7266 This can occur when the frame title is computed really early */
|
|
665
|
7267 Charbpos pos =
|
|
428
|
7268 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
7269 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
7270 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
7271 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
7272 ? BUF_PT (b)
|
|
|
7273 : marker_position (w->pointm[type]));
|
|
|
7274 EMACS_INT line;
|
|
|
7275
|
|
|
7276 line = buffer_line_number (b, pos, 1);
|
|
|
7277
|
|
603
|
7278 {
|
|
|
7279 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
7280
|
|
|
7281 long_to_string (window_line_number_buf, line + 1);
|
|
|
7282
|
|
|
7283 return window_line_number_buf;
|
|
|
7284 }
|
|
428
|
7285 }
|
|
|
7286
|
|
|
7287
|
|
|
7288 /* Given a character representing an object in a modeline
|
|
|
7289 specification, return a string (stored into the global array
|
|
867
|
7290 `mode_spec_ibyte_string') with the information that object
|
|
428
|
7291 represents.
|
|
|
7292
|
|
|
7293 This function is largely unchanged from previous versions of the
|
|
|
7294 redisplay engine.
|
|
|
7295
|
|
|
7296 Warning! This code is also used for frame titles and can be called
|
|
|
7297 very early in the device/frame update process! JV
|
|
|
7298 */
|
|
|
7299
|
|
|
7300 static void
|
|
867
|
7301 decode_mode_spec (struct window *w, Ichar spec, int type)
|
|
428
|
7302 {
|
|
|
7303 Lisp_Object obj = Qnil;
|
|
442
|
7304 const char *str = NULL;
|
|
428
|
7305 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7306
|
|
867
|
7307 Dynarr_reset (mode_spec_ibyte_string);
|
|
428
|
7308
|
|
|
7309 switch (spec)
|
|
|
7310 {
|
|
|
7311 /* print buffer name */
|
|
|
7312 case 'b':
|
|
|
7313 obj = b->name;
|
|
|
7314 break;
|
|
|
7315
|
|
|
7316 /* print visited file name */
|
|
|
7317 case 'f':
|
|
|
7318 obj = b->filename;
|
|
|
7319 break;
|
|
|
7320
|
|
|
7321 /* print the current column */
|
|
|
7322 case 'c':
|
|
|
7323 {
|
|
665
|
7324 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
7325 ? BUF_PT (b)
|
|
|
7326 : marker_position (w->pointm[type]);
|
|
|
7327 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
7328 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
7329
|
|
|
7330 long_to_string (buf, col);
|
|
|
7331
|
|
867
|
7332 Dynarr_add_many (mode_spec_ibyte_string,
|
|
|
7333 (const Ibyte *) buf, strlen (buf));
|
|
428
|
7334
|
|
|
7335 goto decode_mode_spec_done;
|
|
|
7336 }
|
|
|
7337 /* print the file coding system */
|
|
|
7338 case 'C':
|
|
|
7339 {
|
|
|
7340 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
7341 /* Be very careful here not to get an error. */
|
|
|
7342 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
7343 {
|
|
771
|
7344 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
7345 if (CODING_SYSTEMP (codesys))
|
|
|
7346 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
7347 }
|
|
|
7348 }
|
|
|
7349 break;
|
|
|
7350
|
|
|
7351 /* print the current line number */
|
|
|
7352 case 'l':
|
|
|
7353 str = window_line_number (w, type);
|
|
|
7354 break;
|
|
|
7355
|
|
|
7356 /* print value of mode-name (obsolete) */
|
|
|
7357 case 'm':
|
|
|
7358 obj = b->mode_name;
|
|
|
7359 break;
|
|
|
7360
|
|
|
7361 /* print hyphen and frame number, if != 1 */
|
|
|
7362 case 'N':
|
|
|
7363 #ifdef HAVE_TTY
|
|
|
7364 {
|
|
|
7365 struct frame *f = XFRAME (w->frame);
|
|
|
7366 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
7367 {
|
|
|
7368 /* Naughty, naughty */
|
|
|
7369 char * writable_str = alloca_array (char, 10);
|
|
|
7370 sprintf (writable_str, "-%d", f->order_count);
|
|
|
7371 str = writable_str;
|
|
|
7372 }
|
|
|
7373 }
|
|
|
7374 #endif /* HAVE_TTY */
|
|
|
7375 break;
|
|
|
7376
|
|
|
7377 /* print Narrow if appropriate */
|
|
|
7378 case 'n':
|
|
|
7379 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
7380 || BUF_ZV (b) < BUF_Z (b))
|
|
|
7381 str = " Narrow";
|
|
|
7382 break;
|
|
|
7383
|
|
|
7384 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
7385 case '*':
|
|
|
7386 str = (!NILP (b->read_only)
|
|
|
7387 ? "%"
|
|
|
7388 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7389 ? "*"
|
|
|
7390 : "-"));
|
|
|
7391 break;
|
|
|
7392
|
|
|
7393 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
7394 read-only but still indicate whether it is modified. */
|
|
|
7395 case '+':
|
|
|
7396 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7397 ? "*"
|
|
|
7398 : (!NILP (b->read_only)
|
|
|
7399 ? "%"
|
|
|
7400 : "-"));
|
|
|
7401 break;
|
|
|
7402
|
|
|
7403 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
7404 modeline-format doc string. */
|
|
|
7405 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
7406 case '&':
|
|
|
7407 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7408 ? "*"
|
|
|
7409 : "-");
|
|
|
7410 break;
|
|
|
7411
|
|
|
7412 /* print process status */
|
|
|
7413 case 's':
|
|
|
7414 obj = Fget_buffer_process (w->buffer);
|
|
|
7415 if (NILP (obj))
|
|
|
7416 str = GETTEXT ("no process");
|
|
|
7417 else
|
|
|
7418 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7419 break;
|
|
|
7420
|
|
|
7421 /* Print name of selected frame. */
|
|
|
7422 case 'S':
|
|
|
7423 obj = XFRAME (w->frame)->name;
|
|
|
7424 break;
|
|
|
7425
|
|
|
7426 /* indicate TEXT or BINARY */
|
|
|
7427 case 't':
|
|
|
7428 /* #### NT does not use this any more. Now what? */
|
|
|
7429 str = "T";
|
|
|
7430 break;
|
|
|
7431
|
|
|
7432 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7433 case 'p':
|
|
|
7434 {
|
|
665
|
7435 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7436
|
|
|
7437 /* This had better be while the desired lines are being done. */
|
|
|
7438 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7439 {
|
|
|
7440 if (pos <= BUF_BEGV (b))
|
|
|
7441 str = "All";
|
|
|
7442 else
|
|
|
7443 str = "Bottom";
|
|
|
7444 }
|
|
|
7445 else if (pos <= BUF_BEGV (b))
|
|
|
7446 str = "Top";
|
|
|
7447 else
|
|
|
7448 {
|
|
|
7449 /* This hard limit is ok since the string it will hold has a
|
|
|
7450 fixed maximum length of 3. But just to be safe... */
|
|
|
7451 char buf[10];
|
|
|
7452 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7453 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7454
|
|
|
7455 /* Avoid overflow on big buffers */
|
|
|
7456 int percent = total > LONG_MAX/200 ?
|
|
|
7457 (chars + total/200) / (total / 100) :
|
|
|
7458 (chars * 100 + total/2) / total;
|
|
|
7459
|
|
|
7460 /* We can't normally display a 3-digit number, so get us a
|
|
|
7461 2-digit number that is close. */
|
|
|
7462 if (percent == 100)
|
|
|
7463 percent = 99;
|
|
|
7464
|
|
|
7465 sprintf (buf, "%d%%", percent);
|
|
867
|
7466 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7467 strlen (buf));
|
|
|
7468
|
|
|
7469 goto decode_mode_spec_done;
|
|
|
7470 }
|
|
|
7471 break;
|
|
|
7472 }
|
|
|
7473
|
|
|
7474 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7475 Top, or print Bottom or All */
|
|
|
7476 case 'P':
|
|
|
7477 {
|
|
665
|
7478 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7479 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7480
|
|
|
7481 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7482 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7483 botpos may be negative. */
|
|
|
7484 if (botpos < toppos)
|
|
|
7485 botpos = toppos;
|
|
|
7486
|
|
|
7487 if (botpos >= BUF_ZV (b))
|
|
|
7488 {
|
|
|
7489 if (toppos <= BUF_BEGV (b))
|
|
|
7490 str = "All";
|
|
|
7491 else
|
|
|
7492 str = "Bottom";
|
|
|
7493 }
|
|
|
7494 else
|
|
|
7495 {
|
|
|
7496 /* This hard limit is ok since the string it will hold has a
|
|
|
7497 fixed maximum length of around 6. But just to be safe... */
|
|
|
7498 char buf[10];
|
|
|
7499 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7500 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7501
|
|
|
7502 /* Avoid overflow on big buffers */
|
|
|
7503 int percent = total > LONG_MAX/200 ?
|
|
|
7504 (chars + total/200) / (total / 100) :
|
|
|
7505 (chars * 100 + total/2) / max (total, 1);
|
|
|
7506
|
|
|
7507 /* We can't normally display a 3-digit number, so get us a
|
|
|
7508 2-digit number that is close. */
|
|
|
7509 if (percent == 100)
|
|
|
7510 percent = 99;
|
|
|
7511
|
|
|
7512 if (toppos <= BUF_BEGV (b))
|
|
|
7513 sprintf (buf, "Top%d%%", percent);
|
|
|
7514 else
|
|
|
7515 sprintf (buf, "%d%%", percent);
|
|
|
7516
|
|
867
|
7517 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7518 strlen (buf));
|
|
|
7519
|
|
|
7520 goto decode_mode_spec_done;
|
|
|
7521 }
|
|
|
7522 break;
|
|
|
7523 }
|
|
|
7524
|
|
|
7525 /* print % */
|
|
|
7526 case '%':
|
|
|
7527 str = "%";
|
|
|
7528 break;
|
|
|
7529
|
|
|
7530 /* print one [ for each recursive editing level. */
|
|
|
7531 case '[':
|
|
|
7532 {
|
|
|
7533 int i;
|
|
|
7534
|
|
|
7535 if (command_loop_level > 5)
|
|
|
7536 {
|
|
|
7537 str = "[[[... ";
|
|
|
7538 break;
|
|
|
7539 }
|
|
|
7540
|
|
|
7541 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7542 Dynarr_add (mode_spec_ibyte_string, '[');
|
|
428
|
7543
|
|
|
7544 goto decode_mode_spec_done;
|
|
|
7545 }
|
|
|
7546
|
|
|
7547 /* print one ] for each recursive editing level. */
|
|
|
7548 case ']':
|
|
|
7549 {
|
|
|
7550 int i;
|
|
|
7551
|
|
|
7552 if (command_loop_level > 5)
|
|
|
7553 {
|
|
|
7554 str = "...]]]";
|
|
|
7555 break;
|
|
|
7556 }
|
|
|
7557
|
|
|
7558 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7559 Dynarr_add (mode_spec_ibyte_string, ']');
|
|
428
|
7560
|
|
|
7561 goto decode_mode_spec_done;
|
|
|
7562 }
|
|
|
7563
|
|
|
7564 /* print infinitely many dashes -- handle at top level now */
|
|
|
7565 case '-':
|
|
|
7566 break;
|
|
|
7567
|
|
|
7568 }
|
|
|
7569
|
|
|
7570 if (STRINGP (obj))
|
|
867
|
7571 Dynarr_add_many (mode_spec_ibyte_string,
|
|
428
|
7572 XSTRING_DATA (obj),
|
|
|
7573 XSTRING_LENGTH (obj));
|
|
|
7574 else if (str)
|
|
867
|
7575 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
|
|
428
|
7576
|
|
|
7577 decode_mode_spec_done:
|
|
867
|
7578 Dynarr_add (mode_spec_ibyte_string, '\0');
|
|
428
|
7579 }
|
|
|
7580
|
|
|
7581 /* Given a display line, free all of its data structures. */
|
|
|
7582
|
|
|
7583 static void
|
|
|
7584 free_display_line (struct display_line *dl)
|
|
|
7585 {
|
|
|
7586 int block;
|
|
|
7587
|
|
|
7588 if (dl->display_blocks)
|
|
|
7589 {
|
|
|
7590 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
1318
|
7591 {
|
|
428
|
7592 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7593
|
|
|
7594 Dynarr_free (db->runes);
|
|
|
7595 }
|
|
|
7596
|
|
|
7597 Dynarr_free (dl->display_blocks);
|
|
|
7598 dl->display_blocks = NULL;
|
|
|
7599 }
|
|
|
7600
|
|
|
7601 if (dl->left_glyphs)
|
|
|
7602 {
|
|
|
7603 Dynarr_free (dl->left_glyphs);
|
|
|
7604 dl->left_glyphs = NULL;
|
|
|
7605 }
|
|
|
7606
|
|
|
7607 if (dl->right_glyphs)
|
|
|
7608 {
|
|
|
7609 Dynarr_free (dl->right_glyphs);
|
|
|
7610 dl->right_glyphs = NULL;
|
|
|
7611 }
|
|
|
7612 }
|
|
|
7613
|
|
|
7614
|
|
|
7615 /* Given an array of display lines, free them and all data structures
|
|
|
7616 contained within them. */
|
|
|
7617
|
|
|
7618 void
|
|
|
7619 free_display_lines (display_line_dynarr *dla)
|
|
|
7620 {
|
|
|
7621 int line;
|
|
|
7622
|
|
|
7623 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7624 {
|
|
|
7625 free_display_line (Dynarr_atp (dla, line));
|
|
|
7626 }
|
|
|
7627
|
|
|
7628 Dynarr_free (dla);
|
|
|
7629 }
|
|
|
7630
|
|
|
7631 /* Call internal free routine for each set of display lines. */
|
|
|
7632
|
|
|
7633 void
|
|
|
7634 free_display_structs (struct window_mirror *mir)
|
|
|
7635 {
|
|
|
7636 if (mir->current_display_lines)
|
|
|
7637 {
|
|
|
7638 free_display_lines (mir->current_display_lines);
|
|
|
7639 mir->current_display_lines = 0;
|
|
|
7640 }
|
|
|
7641
|
|
|
7642 if (mir->desired_display_lines)
|
|
|
7643 {
|
|
|
7644 free_display_lines (mir->desired_display_lines);
|
|
|
7645 mir->desired_display_lines = 0;
|
|
|
7646 }
|
|
|
7647 }
|
|
|
7648
|
|
|
7649
|
|
|
7650 static void
|
|
|
7651 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7652 {
|
|
|
7653 if (gba)
|
|
|
7654 {
|
|
|
7655 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7656 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7657
|
|
|
7658 for (; gb < gb_last; gb++)
|
|
|
7659 {
|
|
|
7660 if (!NILP (gb->glyph))
|
|
|
7661 mark_object (gb->glyph);
|
|
|
7662 if (!NILP (gb->extent))
|
|
|
7663 mark_object (gb->extent);
|
|
|
7664 }
|
|
|
7665 }
|
|
|
7666 }
|
|
|
7667
|
|
442
|
7668 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7669 the glyph will also mark the image_instance. */
|
|
|
7670 void
|
|
428
|
7671 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7672 {
|
|
|
7673 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7674 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7675
|
|
|
7676 for (; dl < dl_last; dl++)
|
|
|
7677 {
|
|
|
7678 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7679 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7680 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7681
|
|
|
7682 for (; db < db_last; db++)
|
|
|
7683 {
|
|
|
7684 rune_dynarr *ra = db->runes;
|
|
|
7685 rune *r = Dynarr_atp (ra, 0);
|
|
|
7686 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7687
|
|
|
7688 for (; r < r_last; r++)
|
|
|
7689 {
|
|
|
7690 if (r->type == RUNE_DGLYPH)
|
|
|
7691 {
|
|
|
7692 if (!NILP (r->object.dglyph.glyph))
|
|
|
7693 mark_object (r->object.dglyph.glyph);
|
|
|
7694 if (!NILP (r->object.dglyph.extent))
|
|
|
7695 mark_object (r->object.dglyph.extent);
|
|
|
7696 }
|
|
|
7697 }
|
|
|
7698 }
|
|
|
7699
|
|
|
7700 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7701 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7702 }
|
|
|
7703 }
|
|
|
7704
|
|
|
7705
|
|
2367
|
7706
|
|
|
7707 /*
|
|
|
7708
|
|
|
7709 Info on line-start cache:
|
|
|
7710
|
|
|
7711 (Info-goto-node "(internals)Line Start Cache")
|
|
|
7712 */
|
|
428
|
7713
|
|
|
7714 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7715 allocating and freeing it. */
|
|
|
7716 static line_start_cache_dynarr *internal_cache;
|
|
|
7717
|
|
|
7718 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7719 the TYPE display structs. */
|
|
|
7720
|
|
|
7721 static void
|
|
|
7722 update_internal_cache_list (struct window *w, int type)
|
|
|
7723 {
|
|
|
7724 int line;
|
|
|
7725 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7726
|
|
|
7727 Dynarr_reset (internal_cache);
|
|
|
7728 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7729 {
|
|
|
7730 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7731
|
|
|
7732 if (dl->modeline)
|
|
|
7733 continue;
|
|
|
7734 else
|
|
|
7735 {
|
|
|
7736 struct line_start_cache lsc;
|
|
434
|
7737
|
|
826
|
7738 lsc.start = dl->charpos;
|
|
|
7739 lsc.end = dl->end_charpos;
|
|
428
|
7740 lsc.height = dl->ascent + dl->descent;
|
|
|
7741
|
|
|
7742 Dynarr_add (internal_cache, lsc);
|
|
|
7743 }
|
|
|
7744 }
|
|
|
7745 }
|
|
|
7746
|
|
|
7747 /* Reset the line cache if necessary. This should be run at the
|
|
|
7748 beginning of any function which access the cache. */
|
|
|
7749
|
|
|
7750 static void
|
|
|
7751 validate_line_start_cache (struct window *w)
|
|
|
7752 {
|
|
|
7753 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7754 struct frame *f = XFRAME (w->frame);
|
|
|
7755
|
|
|
7756 if (!w->line_cache_validation_override)
|
|
|
7757 {
|
|
|
7758 /* f->extents_changed used to be in here because extent face and
|
|
|
7759 size changes can cause text shifting. However, the extent
|
|
|
7760 covering the region is constantly having its face set and
|
|
|
7761 priority altered by the mouse code. This means that the line
|
|
|
7762 start cache is constantly being invalidated. This is bad
|
|
|
7763 since the mouse code also triggers heavy usage of the cache.
|
|
|
7764 Since it is an unlikely that f->extents being changed
|
|
|
7765 indicates that the cache really needs to be updated and if it
|
|
|
7766 does redisplay will catch it pretty quickly we no longer
|
|
|
7767 invalidate the cache if it is set. This greatly speeds up
|
|
|
7768 dragging out regions with the mouse. */
|
|
|
7769 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7770 || f->faces_changed
|
|
|
7771 || f->clip_changed)
|
|
|
7772 {
|
|
|
7773 Dynarr_reset (w->line_start_cache);
|
|
|
7774 }
|
|
|
7775 }
|
|
|
7776 }
|
|
|
7777
|
|
|
7778 /* Return the very first buffer position contained in the given
|
|
|
7779 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7780 cache is valid. */
|
|
|
7781
|
|
665
|
7782 static Charbpos
|
|
428
|
7783 line_start_cache_start (struct window *w)
|
|
|
7784 {
|
|
|
7785 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7786
|
|
|
7787 if (!Dynarr_length (cache))
|
|
|
7788 return -1;
|
|
|
7789 else
|
|
|
7790 return Dynarr_atp (cache, 0)->start;
|
|
|
7791 }
|
|
|
7792
|
|
|
7793 /* Return the very last buffer position contained in the given
|
|
|
7794 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7795 cache is valid. */
|
|
|
7796
|
|
665
|
7797 static Charbpos
|
|
428
|
7798 line_start_cache_end (struct window *w)
|
|
|
7799 {
|
|
|
7800 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7801
|
|
|
7802 if (!Dynarr_length (cache))
|
|
|
7803 return -1;
|
|
|
7804 else
|
|
|
7805 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7806 }
|
|
|
7807
|
|
|
7808 /* Return the index of the line POINT is contained within in window
|
|
|
7809 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7810 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7811 a guarantee of the number of entries in the cache present on either
|
|
|
7812 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7813 then it will be treated as 0, but the cache window will not be
|
|
|
7814 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7815 for any reason. */
|
|
|
7816
|
|
|
7817 int
|
|
665
|
7818 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7819 {
|
|
|
7820 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7821 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7822 int top, bottom, pos;
|
|
428
|
7823
|
|
|
7824 validate_line_start_cache (w);
|
|
|
7825 w->line_cache_validation_override++;
|
|
|
7826
|
|
|
7827 /* Let functions pass in negative values, but we still treat -1
|
|
|
7828 specially. */
|
|
|
7829 /* #### bogosity alert */
|
|
|
7830 if (min_past < 0 && min_past != -1)
|
|
|
7831 min_past = -min_past;
|
|
|
7832
|
|
|
7833 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7834 || line_start_cache_end (w) < point)
|
|
|
7835 {
|
|
|
7836 int loop;
|
|
|
7837 int win_char_height = window_char_height (w, 1);
|
|
|
7838
|
|
|
7839 /* Occasionally we get here with a 0 height
|
|
|
7840 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7841 count of 0 so handle that case. */
|
|
|
7842 if (!win_char_height)
|
|
|
7843 win_char_height = 1;
|
|
|
7844
|
|
|
7845 if (!Dynarr_length (cache))
|
|
|
7846 {
|
|
665
|
7847 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7848 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7849
|
|
|
7850 update_line_start_cache (w, from, to, point, 0);
|
|
|
7851
|
|
|
7852 if (!Dynarr_length (cache))
|
|
|
7853 {
|
|
|
7854 w->line_cache_validation_override--;
|
|
|
7855 return -1;
|
|
|
7856 }
|
|
|
7857 }
|
|
|
7858
|
|
|
7859 assert (Dynarr_length (cache));
|
|
|
7860
|
|
|
7861 loop = 0;
|
|
|
7862 while (line_start_cache_start (w) > point
|
|
|
7863 && (loop < cache_adjustment || min_past == -1))
|
|
|
7864 {
|
|
665
|
7865 Charbpos from, to;
|
|
428
|
7866
|
|
|
7867 from = line_start_cache_start (w);
|
|
|
7868 if (from <= BUF_BEGV (b))
|
|
|
7869 break;
|
|
|
7870
|
|
|
7871 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7872 to = line_start_cache_end (w);
|
|
|
7873
|
|
|
7874 update_line_start_cache (w, from, to, point, 0);
|
|
|
7875 loop++;
|
|
|
7876 }
|
|
|
7877
|
|
|
7878 if (line_start_cache_start (w) > point)
|
|
|
7879 {
|
|
665
|
7880 Charbpos from, to;
|
|
428
|
7881
|
|
|
7882 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7883 if (from >= BUF_ZV (b))
|
|
|
7884 {
|
|
|
7885 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7886 from = to;
|
|
|
7887 to = BUF_ZV (b);
|
|
|
7888 }
|
|
|
7889 else
|
|
|
7890 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7891
|
|
|
7892 update_line_start_cache (w, from, to, point, 0);
|
|
|
7893 }
|
|
|
7894
|
|
|
7895 loop = 0;
|
|
|
7896 while (line_start_cache_end (w) < point
|
|
|
7897 && (loop < cache_adjustment || min_past == -1))
|
|
|
7898 {
|
|
665
|
7899 Charbpos from, to;
|
|
428
|
7900
|
|
|
7901 to = line_start_cache_end (w);
|
|
|
7902 if (to >= BUF_ZV (b))
|
|
|
7903 break;
|
|
|
7904
|
|
|
7905 from = line_start_cache_end (w);
|
|
|
7906 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7907
|
|
|
7908 update_line_start_cache (w, from, to, point, 0);
|
|
|
7909 loop++;
|
|
|
7910 }
|
|
|
7911
|
|
|
7912 if (line_start_cache_end (w) < point)
|
|
|
7913 {
|
|
665
|
7914 Charbpos from, to;
|
|
428
|
7915
|
|
|
7916 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7917 if (from >= BUF_ZV (b))
|
|
|
7918 {
|
|
|
7919 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7920 from = to;
|
|
|
7921 to = BUF_ZV (b);
|
|
|
7922 }
|
|
|
7923 else
|
|
|
7924 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7925
|
|
|
7926 update_line_start_cache (w, from, to, point, 0);
|
|
|
7927 }
|
|
|
7928 }
|
|
|
7929
|
|
|
7930 assert (Dynarr_length (cache));
|
|
|
7931
|
|
|
7932 if (min_past == -1)
|
|
|
7933 min_past = 0;
|
|
|
7934
|
|
|
7935 /* This could happen if the buffer is narrowed. */
|
|
|
7936 if (line_start_cache_start (w) > point
|
|
|
7937 || line_start_cache_end (w) < point)
|
|
|
7938 {
|
|
|
7939 w->line_cache_validation_override--;
|
|
|
7940 return -1;
|
|
|
7941 }
|
|
|
7942
|
|
|
7943 find_point_loop:
|
|
|
7944
|
|
|
7945 top = Dynarr_length (cache) - 1;
|
|
|
7946 bottom = 0;
|
|
|
7947
|
|
|
7948 while (1)
|
|
|
7949 {
|
|
647
|
7950 int new_pos;
|
|
665
|
7951 Charbpos start, end;
|
|
428
|
7952
|
|
|
7953 pos = (bottom + top + 1) >> 1;
|
|
|
7954 start = Dynarr_atp (cache, pos)->start;
|
|
|
7955 end = Dynarr_atp (cache, pos)->end;
|
|
|
7956
|
|
|
7957 if (point >= start && point <= end)
|
|
|
7958 {
|
|
|
7959 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
7960 {
|
|
665
|
7961 Charbpos from =
|
|
428
|
7962 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
7963 -min_past - 1);
|
|
665
|
7964 Charbpos to = line_start_cache_end (w);
|
|
428
|
7965
|
|
|
7966 update_line_start_cache (w, from, to, point, 0);
|
|
|
7967 goto find_point_loop;
|
|
|
7968 }
|
|
|
7969 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
7970 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
7971 {
|
|
665
|
7972 Charbpos from = line_start_cache_end (w);
|
|
|
7973 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7974 (min_past
|
|
|
7975 ? min_past
|
|
|
7976 : 1));
|
|
|
7977
|
|
|
7978 update_line_start_cache (w, from, to, point, 0);
|
|
|
7979 goto find_point_loop;
|
|
|
7980 }
|
|
|
7981 else
|
|
|
7982 {
|
|
|
7983 w->line_cache_validation_override--;
|
|
|
7984 return pos;
|
|
|
7985 }
|
|
|
7986 }
|
|
|
7987 else if (point > end)
|
|
|
7988 bottom = pos + 1;
|
|
|
7989 else if (point < start)
|
|
|
7990 top = pos - 1;
|
|
|
7991 else
|
|
|
7992 abort ();
|
|
|
7993
|
|
|
7994 new_pos = (bottom + top + 1) >> 1;
|
|
|
7995 if (pos == new_pos)
|
|
|
7996 {
|
|
|
7997 w->line_cache_validation_override--;
|
|
|
7998 return -1;
|
|
|
7999 }
|
|
|
8000 }
|
|
|
8001 }
|
|
|
8002
|
|
|
8003 /* Return a boolean indicating if POINT would be visible in window W
|
|
1708
|
8004 if display of the window was to begin at STARTP. If PARTIALLY is
|
|
|
8005 zero, then if POINT has fewer visible pixels than the window clip,
|
|
|
8006 0 is returned; otherwise, 1 is returned if POINT has any visible
|
|
|
8007 pixels. */
|
|
428
|
8008 int
|
|
1708
|
8009 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point,
|
|
|
8010 int partially)
|
|
428
|
8011 {
|
|
|
8012 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
8013 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
8014 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
8015 int start_elt;
|
|
|
8016
|
|
|
8017 /* If point is before the intended start it obviously can't be visible. */
|
|
|
8018 if (point < startp)
|
|
|
8019 return 0;
|
|
|
8020
|
|
|
8021 /* If point or start are not in the accessible buffer range, then
|
|
|
8022 fail. */
|
|
|
8023 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
8024 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
8025 return 0;
|
|
|
8026
|
|
|
8027 validate_line_start_cache (w);
|
|
|
8028 w->line_cache_validation_override++;
|
|
|
8029
|
|
|
8030 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
8031 if (start_elt == -1)
|
|
|
8032 {
|
|
|
8033 w->line_cache_validation_override--;
|
|
|
8034 return 0;
|
|
|
8035 }
|
|
|
8036
|
|
|
8037 assert (line_start_cache_start (w) <= startp
|
|
|
8038 && line_start_cache_end (w) >= startp);
|
|
|
8039
|
|
|
8040 while (1)
|
|
|
8041 {
|
|
|
8042 int height;
|
|
|
8043
|
|
|
8044 /* Expand the cache if necessary. */
|
|
|
8045 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
8046 {
|
|
665
|
8047 Charbpos old_startp =
|
|
428
|
8048 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
8049
|
|
|
8050 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
8051 window_char_height (w, 0));
|
|
|
8052
|
|
|
8053 /* We've already actually processed old_startp, so increment
|
|
|
8054 immediately. */
|
|
|
8055 start_elt++;
|
|
|
8056
|
|
|
8057 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
8058 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
8059 {
|
|
|
8060 w->line_cache_validation_override--;
|
|
|
8061 return 0;
|
|
|
8062 }
|
|
|
8063 }
|
|
|
8064
|
|
|
8065 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
8066
|
|
|
8067 if (pixpos + height > bottom)
|
|
|
8068 {
|
|
1708
|
8069 if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0)))
|
|
428
|
8070 {
|
|
|
8071 w->line_cache_validation_override--;
|
|
|
8072 return 0;
|
|
|
8073 }
|
|
|
8074 }
|
|
|
8075
|
|
|
8076 pixpos += height;
|
|
|
8077 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
8078 {
|
|
|
8079 w->line_cache_validation_override--;
|
|
|
8080 return 1;
|
|
|
8081 }
|
|
|
8082
|
|
|
8083 start_elt++;
|
|
|
8084 }
|
|
|
8085 }
|
|
|
8086
|
|
|
8087 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8088 the buffer position at the beginning or end of the last line
|
|
|
8089 displayed. The end of the last line is also know as the window end
|
|
|
8090 position.
|
|
|
8091
|
|
442
|
8092 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
8093 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
8094 does occur in the following situation: A mouse event has come in and we
|
|
|
8095 need to compute its location in a window. That code (in
|
|
|
8096 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
8097
|
|
428
|
8098 #### With a little work this could probably be reworked as just a
|
|
|
8099 call to start_with_line_at_pixpos. */
|
|
|
8100
|
|
665
|
8101 static Charbpos
|
|
|
8102 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
8103 int may_error)
|
|
428
|
8104 {
|
|
|
8105 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8106 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
8107 int pixpos = 0;
|
|
|
8108 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
8109 Charbpos cur_start;
|
|
428
|
8110 int start_elt;
|
|
|
8111
|
|
|
8112 validate_line_start_cache (w);
|
|
|
8113 w->line_cache_validation_override++;
|
|
|
8114
|
|
|
8115 if (startp < BUF_BEGV (b))
|
|
|
8116 startp = BUF_BEGV (b);
|
|
|
8117 else if (startp > BUF_ZV (b))
|
|
|
8118 startp = BUF_ZV (b);
|
|
|
8119 cur_start = startp;
|
|
|
8120
|
|
|
8121 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
8122 if (start_elt == -1)
|
|
442
|
8123 return may_error ? 0 : startp;
|
|
428
|
8124
|
|
|
8125 while (1)
|
|
|
8126 {
|
|
|
8127 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
8128
|
|
|
8129 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
8130
|
|
|
8131 if (pixpos + height > bottom)
|
|
|
8132 {
|
|
|
8133 /* Adjust for any possible clip. */
|
|
|
8134 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
8135 start_elt--;
|
|
|
8136
|
|
|
8137 if (start_elt < 0)
|
|
|
8138 {
|
|
|
8139 w->line_cache_validation_override--;
|
|
|
8140 if (end)
|
|
|
8141 return BUF_ZV (b);
|
|
|
8142 else
|
|
|
8143 return BUF_BEGV (b);
|
|
|
8144 }
|
|
|
8145 else
|
|
|
8146 {
|
|
|
8147 w->line_cache_validation_override--;
|
|
|
8148 if (end)
|
|
|
8149 return Dynarr_atp (cache, start_elt)->end;
|
|
|
8150 else
|
|
|
8151 return Dynarr_atp (cache, start_elt)->start;
|
|
|
8152 }
|
|
|
8153 }
|
|
|
8154
|
|
|
8155 pixpos += height;
|
|
|
8156 start_elt++;
|
|
|
8157 if (start_elt == Dynarr_length (cache))
|
|
|
8158 {
|
|
665
|
8159 Charbpos from = line_start_cache_end (w);
|
|
428
|
8160 int win_char_height = window_char_height (w, 0);
|
|
665
|
8161 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
8162 (win_char_height
|
|
|
8163 ? win_char_height
|
|
|
8164 : 1));
|
|
|
8165
|
|
|
8166 /* We've hit the end of the bottom so that's what it is. */
|
|
|
8167 if (from >= BUF_ZV (b))
|
|
|
8168 {
|
|
|
8169 w->line_cache_validation_override--;
|
|
|
8170 return BUF_ZV (b);
|
|
|
8171 }
|
|
|
8172
|
|
|
8173 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
8174
|
|
|
8175 /* Updating the cache invalidates any current indexes. */
|
|
|
8176 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
8177 }
|
|
|
8178 }
|
|
|
8179 }
|
|
|
8180
|
|
|
8181 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8182 the buffer position at the beginning of the last line displayed. */
|
|
|
8183
|
|
665
|
8184 Charbpos
|
|
|
8185 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
8186 {
|
|
442
|
8187 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
8188 }
|
|
|
8189
|
|
|
8190 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8191 the buffer position at the end of the last line displayed. This is
|
|
|
8192 also know as the window end position. */
|
|
|
8193
|
|
665
|
8194 Charbpos
|
|
|
8195 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
8196 {
|
|
442
|
8197 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
8198 }
|
|
|
8199
|
|
665
|
8200 static Charbpos
|
|
|
8201 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
8202 {
|
|
|
8203 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
8204 }
|
|
|
8205
|
|
|
8206
|
|
428
|
8207 /* For window W, what does the starting position have to be so that
|
|
|
8208 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
8209
|
|
665
|
8210 Charbpos
|
|
|
8211 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
8212 {
|
|
|
8213 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8214 int cur_elt;
|
|
665
|
8215 Charbpos cur_pos, prev_pos = point;
|
|
428
|
8216 int point_line_height;
|
|
|
8217 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
8218
|
|
|
8219 validate_line_start_cache (w);
|
|
|
8220 w->line_cache_validation_override++;
|
|
|
8221
|
|
|
8222 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
8223 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
8224 if (cur_elt < 0)
|
|
|
8225 {
|
|
|
8226 w->line_cache_validation_override--;
|
|
|
8227 return point;
|
|
|
8228 }
|
|
|
8229
|
|
|
8230 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8231
|
|
|
8232 while (1)
|
|
|
8233 {
|
|
|
8234 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8235
|
|
|
8236 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8237
|
|
|
8238 /* Do not take into account the value of vertical_clip here.
|
|
|
8239 That is the responsibility of the calling functions. */
|
|
|
8240 if (pixheight < 0)
|
|
|
8241 {
|
|
|
8242 w->line_cache_validation_override--;
|
|
|
8243 if (-pixheight > point_line_height)
|
|
|
8244 /* We can't make the target line cover pixpos, so put it
|
|
|
8245 above pixpos. That way it will at least be visible. */
|
|
|
8246 return prev_pos;
|
|
|
8247 else
|
|
|
8248 return cur_pos;
|
|
|
8249 }
|
|
|
8250
|
|
|
8251 cur_elt--;
|
|
|
8252 while (cur_elt < 0)
|
|
|
8253 {
|
|
665
|
8254 Charbpos from, to;
|
|
428
|
8255 int win_char_height;
|
|
|
8256
|
|
|
8257 if (cur_pos <= BUF_BEGV (b))
|
|
|
8258 {
|
|
|
8259 w->line_cache_validation_override--;
|
|
|
8260 return BUF_BEGV (b);
|
|
|
8261 }
|
|
|
8262
|
|
|
8263 win_char_height = window_char_height (w, 0);
|
|
|
8264 if (!win_char_height)
|
|
|
8265 win_char_height = 1;
|
|
|
8266
|
|
|
8267 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
8268 to = line_start_cache_end (w);
|
|
|
8269 update_line_start_cache (w, from, to, point, 0);
|
|
|
8270
|
|
|
8271 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
8272 assert (cur_elt >= -1);
|
|
|
8273 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
8274 point is in the top line and not at BUF_BEGV, then
|
|
434
|
8275 setting the window_start to a newline before the start of
|
|
428
|
8276 the first line will always cause scrolling.
|
|
|
8277
|
|
|
8278 However in my (jv) opinion this is wrong. That new line
|
|
|
8279 can be hidden in various ways: invisible extents, an
|
|
|
8280 explicit window-start not at a newline character etc.
|
|
|
8281 The existence of those are indeed known to create crashes
|
|
|
8282 on that assert. So we have no option but to continue the
|
|
|
8283 search if we found point at the top of the line_start_cache
|
|
|
8284 again. */
|
|
434
|
8285 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
8286 }
|
|
|
8287 prev_pos = cur_pos;
|
|
|
8288 }
|
|
|
8289 }
|
|
|
8290
|
|
|
8291 /* For window W, what does the starting position have to be so that
|
|
|
8292 the line containing point is on display line LINE. If LINE is
|
|
|
8293 positive it is considered to be the number of lines from the top of
|
|
|
8294 the window (0 is the top line). If it is negative the number is
|
|
|
8295 considered to be the number of lines from the bottom (-1 is the
|
|
|
8296 bottom line). */
|
|
|
8297
|
|
665
|
8298 Charbpos
|
|
|
8299 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
8300 {
|
|
|
8301 validate_line_start_cache (w);
|
|
|
8302 w->line_cache_validation_override++;
|
|
|
8303
|
|
|
8304 if (line >= 0)
|
|
|
8305 {
|
|
|
8306 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
8307
|
|
|
8308 if (cur_elt - line < 0)
|
|
|
8309 cur_elt = 0; /* Hit the top */
|
|
|
8310 else
|
|
|
8311 cur_elt -= line;
|
|
|
8312
|
|
|
8313 w->line_cache_validation_override--;
|
|
|
8314 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8315 }
|
|
|
8316 else
|
|
|
8317 {
|
|
|
8318 /* The calculated value of pixpos is correct for the bottom line
|
|
|
8319 or what we want when line is -1. Therefore we subtract one
|
|
|
8320 because we have already handled one line. */
|
|
|
8321 int new_line = -line - 1;
|
|
|
8322 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
8323 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
8324 Charbpos retval, search_point;
|
|
428
|
8325
|
|
|
8326 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
8327 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
8328 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
8329 line, so back up from the bottom by the height of the line
|
|
|
8330 containing point. */
|
|
|
8331 if (scroll_on_clipped_lines)
|
|
|
8332 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8333 else
|
|
|
8334 pixpos -= 1;
|
|
|
8335
|
|
|
8336 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
8337 {
|
|
|
8338 /* Hit the bottom of the buffer. */
|
|
|
8339 int adjustment =
|
|
|
8340 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
8341 Lisp_Object window;
|
|
|
8342 int defheight;
|
|
|
8343
|
|
793
|
8344 window = wrap_window (w);
|
|
428
|
8345 default_face_height_and_width (window, &defheight, 0);
|
|
|
8346
|
|
|
8347 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
8348
|
|
|
8349 pixpos -= (adjustment * defheight);
|
|
|
8350 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
8351 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
8352 }
|
|
|
8353 else
|
|
|
8354 cur_elt = cur_elt + new_line;
|
|
|
8355
|
|
|
8356 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8357
|
|
|
8358 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
8359 w->line_cache_validation_override--;
|
|
|
8360 return retval;
|
|
|
8361 }
|
|
|
8362 }
|
|
|
8363
|
|
|
8364 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8365 buffer starting positions for display lines. This allows the
|
|
|
8366 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8367 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8368 display structs which are in the given range.
|
|
|
8369
|
|
|
8370 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8371 that this function will actually add information outside of the
|
|
|
8372 lines containing those positions. This can't hurt but it could
|
|
|
8373 possibly help.
|
|
|
8374
|
|
|
8375 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8376 It might help to make the cache a dynarr of caches so that we can
|
|
|
8377 cover more areas. This might, however, turn out to be a lot of
|
|
|
8378 overhead for too little gain. */
|
|
|
8379
|
|
|
8380 static void
|
|
665
|
8381 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8382 Charbpos point, int no_regen)
|
|
428
|
8383 {
|
|
|
8384 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8385 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8386 Charbpos low_bound, high_bound;
|
|
428
|
8387
|
|
|
8388 validate_line_start_cache (w);
|
|
|
8389 w->line_cache_validation_override++;
|
|
|
8390
|
|
|
8391 if (from < BUF_BEGV (b))
|
|
|
8392 from = BUF_BEGV (b);
|
|
|
8393 if (to > BUF_ZV (b))
|
|
|
8394 to = BUF_ZV (b);
|
|
|
8395
|
|
|
8396 if (from > to)
|
|
|
8397 {
|
|
|
8398 w->line_cache_validation_override--;
|
|
|
8399 return;
|
|
|
8400 }
|
|
|
8401
|
|
|
8402 if (Dynarr_length (cache))
|
|
|
8403 {
|
|
|
8404 low_bound = line_start_cache_start (w);
|
|
|
8405 high_bound = line_start_cache_end (w);
|
|
|
8406
|
|
|
8407 /* Check to see if the desired range is already in the cache. */
|
|
|
8408 if (from >= low_bound && to <= high_bound)
|
|
|
8409 {
|
|
|
8410 w->line_cache_validation_override--;
|
|
|
8411 return;
|
|
|
8412 }
|
|
|
8413
|
|
|
8414 /* Check to make sure that the desired range is adjacent to the
|
|
|
8415 current cache. If not, invalidate the cache. */
|
|
|
8416 if (to < low_bound || from > high_bound)
|
|
|
8417 {
|
|
|
8418 Dynarr_reset (cache);
|
|
|
8419 low_bound = high_bound = -1;
|
|
|
8420 }
|
|
|
8421 }
|
|
|
8422 else
|
|
|
8423 {
|
|
|
8424 low_bound = high_bound = -1;
|
|
|
8425 }
|
|
|
8426
|
|
|
8427 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8428
|
|
|
8429 /* This could be integrated into the next two sections, but it is easier
|
|
|
8430 to follow what's going on by having it separate. */
|
|
|
8431 if (no_regen)
|
|
|
8432 {
|
|
665
|
8433 Charbpos start, end;
|
|
428
|
8434
|
|
|
8435 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8436 if (!Dynarr_length (internal_cache))
|
|
|
8437 {
|
|
|
8438 w->line_cache_validation_override--;
|
|
|
8439 return;
|
|
|
8440 }
|
|
|
8441
|
|
|
8442 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8443 end =
|
|
|
8444 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8445
|
|
|
8446 /* We aren't allowed to generate additional information to fill in
|
|
|
8447 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8448 cache. */
|
|
|
8449 if (Dynarr_length (cache))
|
|
|
8450 {
|
|
|
8451 if (end < low_bound || start > high_bound)
|
|
|
8452 Dynarr_reset (cache);
|
|
|
8453
|
|
|
8454 /* #### What should really happen if what we are doing is
|
|
|
8455 extending a line (the last line)? */
|
|
|
8456 if (Dynarr_length (cache) == 1
|
|
|
8457 && Dynarr_length (internal_cache) == 1)
|
|
|
8458 Dynarr_reset (cache);
|
|
|
8459 }
|
|
|
8460
|
|
|
8461 if (!Dynarr_length (cache))
|
|
|
8462 {
|
|
|
8463 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8464 Dynarr_length (internal_cache));
|
|
|
8465 w->line_cache_validation_override--;
|
|
|
8466 return;
|
|
|
8467 }
|
|
|
8468
|
|
|
8469 /* An extra check just in case the calling function didn't pass in
|
|
|
8470 the bounds of the DESIRED structs in the first place. */
|
|
|
8471 if (start >= low_bound && end <= high_bound)
|
|
|
8472 {
|
|
|
8473 w->line_cache_validation_override--;
|
|
|
8474 return;
|
|
|
8475 }
|
|
|
8476
|
|
|
8477 /* At this point we know that the internal cache partially overlaps
|
|
|
8478 the main cache. */
|
|
|
8479 if (start < low_bound)
|
|
|
8480 {
|
|
|
8481 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8482 while (ic_elt >= 0)
|
|
|
8483 {
|
|
|
8484 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8485 break;
|
|
|
8486 else
|
|
|
8487 ic_elt--;
|
|
|
8488 }
|
|
|
8489
|
|
|
8490 if (!(ic_elt >= 0))
|
|
|
8491 {
|
|
|
8492 Dynarr_reset (cache);
|
|
|
8493 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8494 Dynarr_length (internal_cache));
|
|
|
8495 w->line_cache_validation_override--;
|
|
|
8496 return;
|
|
|
8497 }
|
|
|
8498
|
|
|
8499 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8500 ic_elt + 1);
|
|
|
8501 }
|
|
|
8502
|
|
|
8503 if (end > high_bound)
|
|
|
8504 {
|
|
|
8505 int ic_elt = 0;
|
|
|
8506
|
|
|
8507 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8508 {
|
|
|
8509 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8510 break;
|
|
|
8511 else
|
|
|
8512 ic_elt++;
|
|
|
8513 }
|
|
|
8514
|
|
|
8515 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8516 {
|
|
|
8517 Dynarr_reset (cache);
|
|
|
8518 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8519 Dynarr_length (internal_cache));
|
|
|
8520 w->line_cache_validation_override--;
|
|
|
8521 return;
|
|
|
8522 }
|
|
|
8523
|
|
|
8524 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8525 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8526 }
|
|
|
8527
|
|
|
8528 w->line_cache_validation_override--;
|
|
|
8529 return;
|
|
|
8530 }
|
|
|
8531
|
|
|
8532 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8533 {
|
|
665
|
8534 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8535 int marker = 0;
|
|
|
8536 int old_lb = low_bound;
|
|
|
8537
|
|
|
8538 while (startp < old_lb || low_bound == -1)
|
|
|
8539 {
|
|
|
8540 int ic_elt;
|
|
665
|
8541 Charbpos new_startp;
|
|
428
|
8542
|
|
|
8543 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8544 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8545
|
|
|
8546 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8547 to layout a single line. This is not possible since we
|
|
|
8548 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8549 assert (Dynarr_length (internal_cache));
|
|
428
|
8550 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8551
|
|
|
8552 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8553 if (low_bound != -1)
|
|
|
8554 {
|
|
|
8555 while (ic_elt >= 0)
|
|
|
8556 {
|
|
|
8557 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8558 break;
|
|
|
8559 else
|
|
|
8560 ic_elt--;
|
|
|
8561 }
|
|
|
8562 }
|
|
|
8563 assert (ic_elt >= 0);
|
|
|
8564
|
|
|
8565 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8566
|
|
|
8567 /*
|
|
|
8568 * Handle invisible text properly:
|
|
|
8569 * If the last line we're inserting has the same end as the
|
|
|
8570 * line before which it will be added, merge the two lines.
|
|
|
8571 */
|
|
|
8572 if (Dynarr_length (cache) &&
|
|
|
8573 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8574 Dynarr_atp (cache, marker)->end)
|
|
|
8575 {
|
|
|
8576 Dynarr_atp (cache, marker)->start
|
|
|
8577 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8578 Dynarr_atp (cache, marker)->height
|
|
|
8579 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8580 ic_elt--;
|
|
|
8581 }
|
|
|
8582
|
|
|
8583 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8584 {
|
|
|
8585 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8586 ic_elt + 1, marker);
|
|
|
8587 marker += (ic_elt + 1);
|
|
|
8588 }
|
|
|
8589
|
|
|
8590 if (startp < low_bound || low_bound == -1)
|
|
|
8591 low_bound = startp;
|
|
|
8592 startp = new_startp;
|
|
|
8593 if (startp > BUF_ZV (b))
|
|
|
8594 {
|
|
|
8595 w->line_cache_validation_override--;
|
|
|
8596 return;
|
|
|
8597 }
|
|
|
8598 }
|
|
|
8599 }
|
|
|
8600
|
|
|
8601 assert (Dynarr_length (cache));
|
|
|
8602 assert (from >= low_bound);
|
|
|
8603
|
|
|
8604 /* Readjust the high_bound to account for any changes made while
|
|
|
8605 correcting the low_bound. */
|
|
|
8606 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8607
|
|
|
8608 if (to > high_bound)
|
|
|
8609 {
|
|
665
|
8610 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8611
|
|
|
8612 do
|
|
|
8613 {
|
|
|
8614 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8615 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8616
|
|
|
8617 /* See comment above about regenerate_window failing. */
|
|
|
8618 assert (Dynarr_length (internal_cache));
|
|
|
8619
|
|
|
8620 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8621 Dynarr_length (internal_cache));
|
|
|
8622 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8623 startp = high_bound + 1;
|
|
|
8624 }
|
|
|
8625 while (to > high_bound);
|
|
|
8626 }
|
|
|
8627
|
|
|
8628 w->line_cache_validation_override--;
|
|
|
8629 assert (to <= high_bound);
|
|
|
8630 }
|
|
|
8631
|
|
|
8632
|
|
|
8633 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8634 return the pixel location corresponding to those coordinates. The
|
|
|
8635 pixel location returned is the center of the given character
|
|
|
8636 position. The pixel values are generated relative to the window,
|
|
|
8637 not the frame.
|
|
|
8638
|
|
|
8639 The modeline is considered to be part of the window. */
|
|
|
8640
|
|
|
8641 void
|
|
|
8642 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8643 int *pix_x, int *pix_y)
|
|
|
8644 {
|
|
|
8645 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8646 int num_disp_lines, modeline;
|
|
|
8647 Lisp_Object window;
|
|
|
8648 int defheight, defwidth;
|
|
|
8649
|
|
793
|
8650 window = wrap_window (w);
|
|
428
|
8651 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8652
|
|
|
8653 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8654 the window, use the first window line or character position
|
|
|
8655 instead. */
|
|
|
8656 if (char_y < 0)
|
|
|
8657 char_y = 0;
|
|
|
8658 if (char_x < 0)
|
|
|
8659 char_x = 0;
|
|
|
8660
|
|
|
8661 num_disp_lines = Dynarr_length (dla);
|
|
|
8662 modeline = 0;
|
|
|
8663 if (num_disp_lines)
|
|
|
8664 {
|
|
|
8665 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8666 {
|
|
|
8667 num_disp_lines--;
|
|
|
8668 modeline = 1;
|
|
|
8669 }
|
|
|
8670 }
|
|
|
8671
|
|
|
8672 /* First check if the y position intersects the display lines. */
|
|
|
8673 if (char_y < num_disp_lines)
|
|
|
8674 {
|
|
|
8675 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8676 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8677
|
|
|
8678 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8679 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8680
|
|
|
8681 if (char_x < Dynarr_length (db->runes))
|
|
|
8682 {
|
|
|
8683 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8684
|
|
|
8685 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8686 }
|
|
|
8687 else
|
|
|
8688 {
|
|
|
8689 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8690 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8691
|
|
|
8692 char_x -= last_rune;
|
|
|
8693
|
|
|
8694 *pix_x = rb->xpos + rb->width;
|
|
|
8695 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8696 *pix_x += (defwidth >> 1);
|
|
|
8697 }
|
|
|
8698 }
|
|
|
8699 else
|
|
|
8700 {
|
|
|
8701 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8702 modeline in this since we don't have true character positions in
|
|
|
8703 it. */
|
|
|
8704
|
|
|
8705 if (!Dynarr_length (w->face_cachels))
|
|
|
8706 reset_face_cachels (w);
|
|
|
8707
|
|
|
8708 char_y -= num_disp_lines;
|
|
|
8709
|
|
|
8710 if (Dynarr_length (dla))
|
|
|
8711 {
|
|
|
8712 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8713 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8714 }
|
|
|
8715 else
|
|
|
8716 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8717
|
|
|
8718 *pix_y += (char_y * defheight);
|
|
|
8719 *pix_y += (defheight >> 1);
|
|
|
8720
|
|
|
8721 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8722 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8723 *pix_x += (char_x * defwidth);
|
|
|
8724 *pix_x += (defwidth >> 1);
|
|
|
8725 }
|
|
|
8726
|
|
|
8727 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8728 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8729 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8730 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8731
|
|
|
8732 *pix_x -= w->pixel_left;
|
|
|
8733 *pix_y -= w->pixel_top;
|
|
|
8734 }
|
|
|
8735
|
|
|
8736 /* Given a display line and a position, determine if there is a glyph
|
|
|
8737 there and return information about it if there is. */
|
|
|
8738
|
|
|
8739 static void
|
|
|
8740 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8741 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8742 int *high_x_coord)
|
|
|
8743 {
|
|
|
8744 struct display_block *db;
|
|
|
8745 int elt;
|
|
|
8746 int block =
|
|
|
8747 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8748
|
|
|
8749 /* We use get_next_display_block to get the actual display block
|
|
|
8750 that would be displayed at x_coord. */
|
|
|
8751
|
|
|
8752 if (block == NO_BLOCK)
|
|
|
8753 return;
|
|
|
8754 else
|
|
|
8755 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8756
|
|
|
8757 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8758 {
|
|
|
8759 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8760
|
|
|
8761 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8762 {
|
|
|
8763 if (rb->type == RUNE_DGLYPH)
|
|
|
8764 {
|
|
|
8765 *obj1 = rb->object.dglyph.glyph;
|
|
|
8766 *obj2 = rb->object.dglyph.extent;
|
|
|
8767 }
|
|
|
8768 else
|
|
|
8769 {
|
|
|
8770 *obj1 = Qnil;
|
|
|
8771 *obj2 = Qnil;
|
|
|
8772 }
|
|
|
8773
|
|
|
8774 if (low_x_coord)
|
|
|
8775 *low_x_coord = rb->xpos;
|
|
|
8776 if (high_x_coord)
|
|
|
8777 *high_x_coord = rb->xpos + rb->width;
|
|
|
8778
|
|
|
8779 return;
|
|
|
8780 }
|
|
|
8781 }
|
|
|
8782 }
|
|
|
8783
|
|
|
8784 #define UPDATE_CACHE_RETURN \
|
|
|
8785 do { \
|
|
|
8786 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8787 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8788 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8789 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8790 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8791 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8792 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8793 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8794 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8795 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8796 d->pixel_to_glyph_cache.w = *w; \
|
|
826
|
8797 d->pixel_to_glyph_cache.charpos = *charpos; \
|
|
428
|
8798 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8799 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8800 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8801 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8802 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8803 RETURN_SANS_WARNINGS position; \
|
|
|
8804 } while (0)
|
|
|
8805
|
|
|
8806 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8807 information about what is located under those coordinates.
|
|
|
8808
|
|
|
8809 The return value will be one of:
|
|
|
8810
|
|
|
8811 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8812 OVER_MODELINE: over a modeline
|
|
|
8813 OVER_BORDER: over an internal border
|
|
|
8814 OVER_NOTHING: over the text area, but not over text
|
|
|
8815 OVER_OUTSIDE: outside of the frame border
|
|
|
8816 OVER_TEXT: over text in the text area
|
|
|
8817
|
|
|
8818 OBJ1 is one of
|
|
|
8819
|
|
|
8820 -- a toolbar button
|
|
|
8821 -- a glyph
|
|
|
8822 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8823
|
|
|
8824 OBJ2 is one of
|
|
|
8825
|
|
|
8826 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8827 -- nil otherwise.
|
|
|
8828
|
|
|
8829 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8830 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8831
|
|
|
8832 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8833 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8834
|
|
|
8835 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8836 */
|
|
|
8837
|
|
|
8838 int
|
|
|
8839 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8840 int *col, int *row, int *obj_x, int *obj_y,
|
|
826
|
8841 struct window **w, Charbpos *charpos,
|
|
665
|
8842 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8843 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8844 {
|
|
|
8845 struct device *d;
|
|
|
8846 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8847 Lisp_Object window;
|
|
|
8848 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8849 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8850 int position = OVER_NOTHING;
|
|
|
8851 int device_check_failed = 0;
|
|
|
8852 display_line_dynarr *dla;
|
|
|
8853
|
|
|
8854 /* This is a safety valve in case this got called with a frame in
|
|
|
8855 the middle of being deleted. */
|
|
|
8856 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8857 {
|
|
|
8858 device_check_failed = 1;
|
|
|
8859 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8860 }
|
|
|
8861 else
|
|
|
8862 {
|
|
|
8863 d = XDEVICE (f->device);
|
|
|
8864 cache = &d->pixel_to_glyph_cache;
|
|
|
8865 }
|
|
|
8866
|
|
|
8867 if (!device_check_failed
|
|
|
8868 && cache->valid
|
|
|
8869 && cache->frame == f
|
|
|
8870 && cache->low_x_coord <= x_coord
|
|
|
8871 && cache->high_x_coord > x_coord
|
|
|
8872 && cache->low_y_coord <= y_coord
|
|
|
8873 && cache->high_y_coord > y_coord)
|
|
|
8874 {
|
|
|
8875 *col = cache->col;
|
|
|
8876 *row = cache->row;
|
|
|
8877 *obj_x = cache->obj_x;
|
|
|
8878 *obj_y = cache->obj_y;
|
|
|
8879 *w = cache->w;
|
|
826
|
8880 *charpos = cache->charpos;
|
|
428
|
8881 *closest = cache->closest;
|
|
|
8882 *modeline_closest = cache->modeline_closest;
|
|
|
8883 *obj1 = cache->obj1;
|
|
|
8884 *obj2 = cache->obj2;
|
|
|
8885
|
|
|
8886 return cache->retval;
|
|
|
8887 }
|
|
|
8888 else
|
|
|
8889 {
|
|
|
8890 *col = 0;
|
|
|
8891 *row = 0;
|
|
|
8892 *obj_x = 0;
|
|
|
8893 *obj_y = 0;
|
|
|
8894 *w = 0;
|
|
826
|
8895 *charpos = 0;
|
|
428
|
8896 *closest = 0;
|
|
|
8897 *modeline_closest = -1;
|
|
|
8898 *obj1 = Qnil;
|
|
|
8899 *obj2 = Qnil;
|
|
|
8900
|
|
|
8901 low_x_coord = x_coord;
|
|
|
8902 high_x_coord = x_coord + 1;
|
|
|
8903 low_y_coord = y_coord;
|
|
|
8904 high_y_coord = y_coord + 1;
|
|
|
8905 }
|
|
|
8906
|
|
|
8907 if (device_check_failed)
|
|
|
8908 return OVER_NOTHING;
|
|
|
8909
|
|
|
8910 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8911 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8912 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8913 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8914
|
|
|
8915 /* Check if the mouse is outside of the text area actually used by
|
|
|
8916 redisplay. */
|
|
|
8917 if (y_coord < frm_top)
|
|
|
8918 {
|
|
|
8919 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8920 {
|
|
|
8921 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8922 high_y_coord = frm_top;
|
|
|
8923 position = OVER_BORDER;
|
|
|
8924 }
|
|
|
8925 else if (y_coord >= 0)
|
|
|
8926 {
|
|
|
8927 low_y_coord = 0;
|
|
|
8928 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8929 position = OVER_TOOLBAR;
|
|
|
8930 }
|
|
|
8931 else
|
|
|
8932 {
|
|
|
8933 low_y_coord = y_coord;
|
|
|
8934 high_y_coord = 0;
|
|
|
8935 position = OVER_OUTSIDE;
|
|
|
8936 }
|
|
|
8937 }
|
|
|
8938 else if (y_coord >= frm_bottom)
|
|
|
8939 {
|
|
|
8940 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
8941 {
|
|
|
8942 low_y_coord = frm_bottom;
|
|
|
8943 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8944 position = OVER_BORDER;
|
|
|
8945 }
|
|
|
8946 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
8947 {
|
|
|
8948 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8949 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8950 position = OVER_TOOLBAR;
|
|
|
8951 }
|
|
|
8952 else
|
|
|
8953 {
|
|
|
8954 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8955 high_y_coord = y_coord;
|
|
|
8956 position = OVER_OUTSIDE;
|
|
|
8957 }
|
|
|
8958 }
|
|
|
8959
|
|
|
8960 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
8961 {
|
|
|
8962 if (x_coord < frm_left)
|
|
|
8963 {
|
|
|
8964 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
8965 {
|
|
|
8966 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8967 high_x_coord = frm_left;
|
|
|
8968 position = OVER_BORDER;
|
|
|
8969 }
|
|
|
8970 else if (x_coord >= 0)
|
|
|
8971 {
|
|
|
8972 low_x_coord = 0;
|
|
|
8973 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8974 position = OVER_TOOLBAR;
|
|
|
8975 }
|
|
|
8976 else
|
|
|
8977 {
|
|
|
8978 low_x_coord = x_coord;
|
|
|
8979 high_x_coord = 0;
|
|
|
8980 position = OVER_OUTSIDE;
|
|
|
8981 }
|
|
|
8982 }
|
|
|
8983 else if (x_coord >= frm_right)
|
|
|
8984 {
|
|
|
8985 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
8986 {
|
|
|
8987 low_x_coord = frm_right;
|
|
|
8988 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8989 position = OVER_BORDER;
|
|
|
8990 }
|
|
|
8991 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
8992 {
|
|
|
8993 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8994 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8995 position = OVER_TOOLBAR;
|
|
|
8996 }
|
|
|
8997 else
|
|
|
8998 {
|
|
|
8999 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
9000 high_x_coord = x_coord;
|
|
|
9001 position = OVER_OUTSIDE;
|
|
|
9002 }
|
|
|
9003 }
|
|
|
9004 }
|
|
|
9005
|
|
|
9006 #ifdef HAVE_TOOLBARS
|
|
|
9007 if (position == OVER_TOOLBAR)
|
|
|
9008 {
|
|
|
9009 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
9010 *obj2 = Qnil;
|
|
|
9011 *w = 0;
|
|
|
9012 UPDATE_CACHE_RETURN;
|
|
|
9013 }
|
|
|
9014 #endif /* HAVE_TOOLBARS */
|
|
|
9015
|
|
|
9016 /* We still have to return the window the pointer is next to and its
|
|
|
9017 relative y position even if it is outside the x boundary. */
|
|
|
9018 if (x_coord < frm_left)
|
|
|
9019 x_coord = frm_left;
|
|
|
9020 else if (x_coord > frm_right)
|
|
|
9021 x_coord = frm_right;
|
|
|
9022
|
|
|
9023 /* Same in reverse. */
|
|
|
9024 if (y_coord < frm_top)
|
|
|
9025 y_coord = frm_top;
|
|
|
9026 else if (y_coord > frm_bottom)
|
|
|
9027 y_coord = frm_bottom;
|
|
|
9028
|
|
|
9029 /* Find what window the given coordinates are actually in. */
|
|
|
9030 window = f->root_window;
|
|
|
9031 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
9032
|
|
|
9033 /* If we didn't find a window, we're done. */
|
|
|
9034 if (!*w)
|
|
|
9035 {
|
|
|
9036 UPDATE_CACHE_RETURN;
|
|
|
9037 }
|
|
|
9038 else if (position != OVER_NOTHING)
|
|
|
9039 {
|
|
|
9040 *closest = 0;
|
|
|
9041 *modeline_closest = -1;
|
|
|
9042
|
|
|
9043 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
9044 {
|
|
|
9045 *w = 0;
|
|
|
9046 UPDATE_CACHE_RETURN;
|
|
|
9047 }
|
|
|
9048 }
|
|
|
9049
|
|
|
9050 /* Check if the window is a minibuffer but isn't active. */
|
|
|
9051 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
9052 {
|
|
|
9053 /* Must reset the window value since some callers will ignore
|
|
|
9054 the return value if it is set. */
|
|
|
9055 *w = 0;
|
|
|
9056 UPDATE_CACHE_RETURN;
|
|
|
9057 }
|
|
|
9058
|
|
|
9059 /* See if the point is over window vertical divider */
|
|
|
9060 if (window_needs_vertical_divider (*w))
|
|
|
9061 {
|
|
|
9062 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
9063 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
9064 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
9065 int div_y_low = WINDOW_TOP (*w);
|
|
|
9066
|
|
|
9067 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
9068 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
9069 {
|
|
|
9070 low_x_coord = div_x_low;
|
|
|
9071 high_x_coord = div_x_high;
|
|
|
9072 low_y_coord = div_y_low;
|
|
|
9073 high_y_coord = div_y_high;
|
|
|
9074 position = OVER_V_DIVIDER;
|
|
|
9075 UPDATE_CACHE_RETURN;
|
|
|
9076 }
|
|
|
9077 }
|
|
|
9078
|
|
|
9079 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
9080
|
|
|
9081 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
9082 {
|
|
|
9083 int really_over_nothing = 0;
|
|
|
9084 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
9085
|
|
|
9086 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
9087 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
9088 {
|
|
|
9089 int check_margin_glyphs = 0;
|
|
|
9090 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
9091 struct rune *rb = 0;
|
|
|
9092
|
|
|
9093 if (x_coord < dl->bounds.left_white
|
|
|
9094 || x_coord >= dl->bounds.right_white)
|
|
|
9095 check_margin_glyphs = 1;
|
|
|
9096
|
|
|
9097 low_y_coord = dl->ypos - dl->ascent;
|
|
|
9098 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
9099
|
|
|
9100 if (position == OVER_BORDER
|
|
|
9101 || position == OVER_OUTSIDE
|
|
|
9102 || check_margin_glyphs)
|
|
|
9103 {
|
|
|
9104 int x_check, left_bound;
|
|
|
9105
|
|
|
9106 if (check_margin_glyphs)
|
|
|
9107 {
|
|
|
9108 x_check = x_coord;
|
|
|
9109 left_bound = dl->bounds.left_white;
|
|
|
9110 }
|
|
|
9111 else
|
|
|
9112 {
|
|
|
9113 x_check = high_x_coord;
|
|
|
9114 left_bound = frm_left;
|
|
|
9115 }
|
|
|
9116
|
|
|
9117 if (Dynarr_length (db->runes))
|
|
|
9118 {
|
|
|
9119 if (x_check <= left_bound)
|
|
|
9120 {
|
|
|
9121 if (dl->modeline)
|
|
826
|
9122 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
9123 else
|
|
826
|
9124 *closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
9125 }
|
|
|
9126 else
|
|
|
9127 {
|
|
|
9128 if (dl->modeline)
|
|
|
9129 *modeline_closest =
|
|
|
9130 Dynarr_atp (db->runes,
|
|
826
|
9131 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
9132 else
|
|
|
9133 *closest =
|
|
|
9134 Dynarr_atp (db->runes,
|
|
826
|
9135 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
9136 }
|
|
|
9137
|
|
|
9138 if (dl->modeline)
|
|
|
9139 *modeline_closest += dl->offset;
|
|
|
9140 else
|
|
|
9141 *closest += dl->offset;
|
|
|
9142 }
|
|
|
9143 else
|
|
|
9144 {
|
|
|
9145 /* #### What should be here. */
|
|
|
9146 if (dl->modeline)
|
|
|
9147 *modeline_closest = 0;
|
|
|
9148 else
|
|
|
9149 *closest = 0;
|
|
|
9150 }
|
|
|
9151
|
|
|
9152 if (check_margin_glyphs)
|
|
|
9153 {
|
|
|
9154 if (x_coord < dl->bounds.left_in
|
|
|
9155 || x_coord >= dl->bounds.right_in)
|
|
|
9156 {
|
|
|
9157 /* If we are over the outside margins then we
|
|
|
9158 know the loop over the text block isn't going
|
|
|
9159 to accomplish anything. So we go ahead and
|
|
|
9160 set what information we can right here and
|
|
|
9161 return. */
|
|
|
9162 (*row)--;
|
|
|
9163 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
9164 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
9165 &low_x_coord, &high_x_coord);
|
|
|
9166
|
|
|
9167 UPDATE_CACHE_RETURN;
|
|
|
9168 }
|
|
|
9169 }
|
|
|
9170 else
|
|
|
9171 UPDATE_CACHE_RETURN;
|
|
|
9172 }
|
|
|
9173
|
|
|
9174 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
9175 {
|
|
|
9176 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
9177
|
|
|
9178 if (!past_end)
|
|
|
9179 rb = Dynarr_atp (db->runes, *col);
|
|
|
9180
|
|
|
9181 if (past_end ||
|
|
|
9182 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
9183 {
|
|
|
9184 if (past_end)
|
|
|
9185 {
|
|
|
9186 (*col)--;
|
|
|
9187 rb = Dynarr_atp (db->runes, *col);
|
|
|
9188 }
|
|
|
9189
|
|
826
|
9190 *charpos = rb->charpos + dl->offset;
|
|
428
|
9191 low_x_coord = rb->xpos;
|
|
|
9192 high_x_coord = rb->xpos + rb->width;
|
|
|
9193
|
|
|
9194 if (rb->type == RUNE_DGLYPH)
|
|
|
9195 {
|
|
|
9196 int elt = *col + 1;
|
|
|
9197
|
|
|
9198 /* Find the first character after the glyph. */
|
|
|
9199 while (elt < Dynarr_length (db->runes))
|
|
|
9200 {
|
|
|
9201 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
9202 {
|
|
|
9203 if (dl->modeline)
|
|
|
9204 *modeline_closest =
|
|
826
|
9205 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
9206 dl->offset);
|
|
|
9207 else
|
|
|
9208 *closest =
|
|
826
|
9209 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
9210 dl->offset);
|
|
|
9211 break;
|
|
|
9212 }
|
|
|
9213
|
|
|
9214 elt++;
|
|
|
9215 }
|
|
|
9216
|
|
|
9217 /* In this case we failed to find a non-glyph
|
|
|
9218 character so we return the last position
|
|
|
9219 displayed on the line. */
|
|
|
9220 if (elt == Dynarr_length (db->runes))
|
|
|
9221 {
|
|
|
9222 if (dl->modeline)
|
|
826
|
9223 *modeline_closest = dl->end_charpos + dl->offset;
|
|
428
|
9224 else
|
|
826
|
9225 *closest = dl->end_charpos + dl->offset;
|
|
428
|
9226 really_over_nothing = 1;
|
|
|
9227 }
|
|
|
9228 }
|
|
|
9229 else
|
|
|
9230 {
|
|
|
9231 if (dl->modeline)
|
|
826
|
9232 *modeline_closest = rb->charpos + dl->offset;
|
|
428
|
9233 else
|
|
826
|
9234 *closest = rb->charpos + dl->offset;
|
|
428
|
9235 }
|
|
|
9236
|
|
|
9237 if (dl->modeline)
|
|
|
9238 {
|
|
|
9239 *row = window_displayed_height (*w);
|
|
|
9240
|
|
|
9241 if (position == OVER_NOTHING)
|
|
|
9242 position = OVER_MODELINE;
|
|
|
9243
|
|
|
9244 if (rb->type == RUNE_DGLYPH)
|
|
|
9245 {
|
|
|
9246 *obj1 = rb->object.dglyph.glyph;
|
|
|
9247 *obj2 = rb->object.dglyph.extent;
|
|
|
9248 }
|
|
|
9249 else if (rb->type == RUNE_CHAR)
|
|
|
9250 {
|
|
|
9251 *obj1 = Qnil;
|
|
|
9252 *obj2 = Qnil;
|
|
|
9253 }
|
|
|
9254 else
|
|
|
9255 {
|
|
|
9256 *obj1 = Qnil;
|
|
|
9257 *obj2 = Qnil;
|
|
|
9258 }
|
|
|
9259
|
|
|
9260 UPDATE_CACHE_RETURN;
|
|
|
9261 }
|
|
|
9262 else if (past_end
|
|
|
9263 || (rb->type == RUNE_CHAR
|
|
|
9264 && rb->object.chr.ch == '\n'))
|
|
|
9265 {
|
|
|
9266 (*row)--;
|
|
|
9267 /* At this point we may have glyphs in the right
|
|
|
9268 inside margin. */
|
|
|
9269 if (check_margin_glyphs)
|
|
|
9270 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
9271 &low_x_coord, &high_x_coord);
|
|
|
9272 UPDATE_CACHE_RETURN;
|
|
|
9273 }
|
|
|
9274 else
|
|
|
9275 {
|
|
|
9276 (*row)--;
|
|
|
9277 if (rb->type == RUNE_DGLYPH)
|
|
|
9278 {
|
|
|
9279 *obj1 = rb->object.dglyph.glyph;
|
|
|
9280 *obj2 = rb->object.dglyph.extent;
|
|
|
9281 }
|
|
|
9282 else if (rb->type == RUNE_CHAR)
|
|
|
9283 {
|
|
|
9284 *obj1 = Qnil;
|
|
|
9285 *obj2 = Qnil;
|
|
|
9286 }
|
|
|
9287 else
|
|
|
9288 {
|
|
|
9289 *obj1 = Qnil;
|
|
|
9290 *obj2 = Qnil;
|
|
|
9291 }
|
|
|
9292
|
|
|
9293 *obj_x = x_coord - rb->xpos;
|
|
|
9294 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
9295
|
|
|
9296 /* At this point we may have glyphs in the left
|
|
|
9297 inside margin. */
|
|
|
9298 if (check_margin_glyphs)
|
|
|
9299 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
9300
|
|
|
9301 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
9302 position = OVER_TEXT;
|
|
|
9303
|
|
|
9304 UPDATE_CACHE_RETURN;
|
|
|
9305 }
|
|
|
9306 }
|
|
|
9307 }
|
|
|
9308 }
|
|
|
9309 }
|
|
|
9310
|
|
|
9311 *row = Dynarr_length (dla) - 1;
|
|
|
9312 if (FRAME_WIN_P (f))
|
|
|
9313 {
|
|
|
9314 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
9315
|
|
|
9316 if (bot_elt >= 0)
|
|
|
9317 {
|
|
|
9318 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
9319 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
9320 Lisp_Object lwin;
|
|
|
9321 int defheight;
|
|
|
9322
|
|
793
|
9323 lwin = wrap_window (*w);
|
|
428
|
9324 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
9325
|
|
|
9326 *row += (adj_area / defheight);
|
|
|
9327 }
|
|
|
9328 }
|
|
|
9329
|
|
|
9330 /* #### This should be checked out some more to determine what
|
|
|
9331 should really be going on. */
|
|
|
9332 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
9333 *closest = 0;
|
|
|
9334 else
|
|
442
|
9335 *closest = end_of_last_line_may_error (*w,
|
|
428
|
9336 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
9337 *col = 0;
|
|
|
9338 UPDATE_CACHE_RETURN;
|
|
|
9339 }
|
|
|
9340 #undef UPDATE_CACHE_RETURN
|
|
|
9341
|
|
|
9342
|
|
|
9343 /***************************************************************************/
|
|
|
9344 /* */
|
|
|
9345 /* Lisp functions */
|
|
|
9346 /* */
|
|
|
9347 /***************************************************************************/
|
|
|
9348
|
|
|
9349 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
9350 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
9351 */
|
|
|
9352 ())
|
|
|
9353 {
|
|
|
9354 Lisp_Object devcons, concons;
|
|
|
9355
|
|
1318
|
9356 if (in_display)
|
|
|
9357 return Qnil;
|
|
|
9358
|
|
428
|
9359 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
9360 {
|
|
|
9361 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
9362 Lisp_Object frmcons;
|
|
|
9363
|
|
1279
|
9364 if (DEVICE_STREAM_P (d))
|
|
|
9365 continue;
|
|
|
9366
|
|
428
|
9367 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9368 {
|
|
|
9369 struct frame *f = XFRAME (XCAR (frmcons));
|
|
853
|
9370 int depth;
|
|
428
|
9371
|
|
|
9372 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9373 {
|
|
|
9374 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9375
|
|
|
9376 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9377
|
|
428
|
9378 /*
|
|
|
9379 * If the frame size has changed, there may be random
|
|
|
9380 * chud on the screen left from previous messages
|
|
|
9381 * because redisplay_frame hasn't been called yet.
|
|
|
9382 * Clear the screen to get rid of the potential mess.
|
|
|
9383 */
|
|
|
9384 if (f->echo_area_garbaged)
|
|
|
9385 {
|
|
442
|
9386 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9387 f->echo_area_garbaged = 0;
|
|
|
9388 }
|
|
853
|
9389 depth = enter_redisplay_critical_section ();
|
|
428
|
9390 redisplay_window (window, 0);
|
|
853
|
9391 exit_redisplay_critical_section (depth);
|
|
442
|
9392 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
9393 }
|
|
|
9394 }
|
|
|
9395 }
|
|
|
9396
|
|
|
9397 return Qnil;
|
|
|
9398 }
|
|
|
9399
|
|
|
9400 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9401 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9402 FRAME defaults to the selected frame if omitted.
|
|
|
9403 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9404 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9405 input and is guaranteed to proceed to completion.
|
|
|
9406 */
|
|
|
9407 (frame, no_preempt))
|
|
|
9408 {
|
|
|
9409 struct frame *f = decode_frame (frame);
|
|
|
9410 int count = specpdl_depth ();
|
|
|
9411
|
|
|
9412 if (!NILP (no_preempt))
|
|
853
|
9413 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9414
|
|
|
9415 f->clear = 1;
|
|
|
9416 redisplay_frame (f, 1);
|
|
|
9417
|
|
442
|
9418 /* See the comment in Fredisplay_frame. */
|
|
|
9419 RESET_CHANGED_SET_FLAGS;
|
|
|
9420
|
|
771
|
9421 return unbind_to (count);
|
|
428
|
9422 }
|
|
|
9423
|
|
|
9424 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9425 Ensure that FRAME's contents are correctly displayed.
|
|
|
9426 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9427 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9428 the frame.
|
|
|
9429 FRAME defaults to the selected frame if omitted.
|
|
|
9430 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9431 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9432 input and is guaranteed to proceed to completion.
|
|
|
9433 */
|
|
|
9434 (frame, no_preempt))
|
|
|
9435 {
|
|
|
9436 struct frame *f = decode_frame (frame);
|
|
|
9437 int count = specpdl_depth ();
|
|
|
9438
|
|
|
9439 if (!NILP (no_preempt))
|
|
853
|
9440 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9441
|
|
|
9442 redisplay_frame (f, 1);
|
|
|
9443
|
|
442
|
9444 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9445 changes to the display will not get registered by redisplay
|
|
|
9446 because it thinks it already has registered changes. If you
|
|
|
9447 really knew what you were doing you could confuse redisplay by
|
|
|
9448 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9449 that if you know what you are doing you will not be that
|
|
|
9450 stupid. */
|
|
|
9451 RESET_CHANGED_SET_FLAGS;
|
|
|
9452
|
|
771
|
9453 return unbind_to (count);
|
|
428
|
9454 }
|
|
|
9455
|
|
|
9456 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9457 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9458 DEVICE defaults to the selected device if omitted.
|
|
|
9459 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9460 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9461 input and is guaranteed to proceed to completion.
|
|
|
9462 */
|
|
|
9463 (device, no_preempt))
|
|
|
9464 {
|
|
|
9465 struct device *d = decode_device (device);
|
|
|
9466 Lisp_Object frmcons;
|
|
|
9467 int count = specpdl_depth ();
|
|
|
9468
|
|
|
9469 if (!NILP (no_preempt))
|
|
853
|
9470 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9471
|
|
|
9472 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9473 {
|
|
|
9474 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9475 }
|
|
440
|
9476 redisplay_device (d, 0);
|
|
428
|
9477
|
|
442
|
9478 /* See the comment in Fredisplay_frame. */
|
|
|
9479 RESET_CHANGED_SET_FLAGS;
|
|
|
9480
|
|
771
|
9481 return unbind_to (count);
|
|
428
|
9482 }
|
|
|
9483
|
|
|
9484 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9485 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9486 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9487 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9488 the device.
|
|
|
9489 DEVICE defaults to the selected device if omitted.
|
|
|
9490 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9491 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9492 input and is guaranteed to proceed to completion.
|
|
853
|
9493
|
|
|
9494 Note: If you simply want everything redisplayed, the current idiom is
|
|
|
9495 `(sit-for 0)'.
|
|
428
|
9496 */
|
|
|
9497 (device, no_preempt))
|
|
|
9498 {
|
|
|
9499 struct device *d = decode_device (device);
|
|
|
9500 int count = specpdl_depth ();
|
|
|
9501
|
|
|
9502 if (!NILP (no_preempt))
|
|
853
|
9503 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9504
|
|
440
|
9505 redisplay_device (d, 0);
|
|
428
|
9506
|
|
442
|
9507 /* See the comment in Fredisplay_frame. */
|
|
|
9508 RESET_CHANGED_SET_FLAGS;
|
|
|
9509
|
|
771
|
9510 return unbind_to (count);
|
|
428
|
9511 }
|
|
|
9512
|
|
|
9513 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9514 regardless if the all flag is set or not. It remains in existence
|
|
|
9515 solely for backwards compatibility. */
|
|
|
9516 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9517 Force the modeline of the current buffer to be redisplayed.
|
|
|
9518 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9519 */
|
|
2286
|
9520 (UNUSED (all)))
|
|
428
|
9521 {
|
|
|
9522 MARK_MODELINE_CHANGED;
|
|
|
9523 return Qnil;
|
|
|
9524 }
|
|
|
9525
|
|
|
9526 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9527 Force an immediate update of the cursor on FRAME.
|
|
|
9528 FRAME defaults to the selected frame if omitted.
|
|
|
9529 */
|
|
|
9530 (frame))
|
|
|
9531 {
|
|
1279
|
9532 struct frame *f = decode_frame (frame);
|
|
|
9533
|
|
|
9534 if (!FRAME_STREAM_P (f))
|
|
|
9535 redisplay_redraw_cursor (f, 1);
|
|
428
|
9536 return Qnil;
|
|
|
9537 }
|
|
|
9538
|
|
|
9539
|
|
|
9540 /***************************************************************************/
|
|
|
9541 /* */
|
|
872
|
9542 /* Change flags */
|
|
428
|
9543 /* */
|
|
|
9544 /***************************************************************************/
|
|
|
9545
|
|
|
9546 static void
|
|
2286
|
9547 margin_width_changed_in_frame (Lisp_Object UNUSED (specifier),
|
|
|
9548 struct frame *UNUSED (f),
|
|
|
9549 Lisp_Object UNUSED (oldval))
|
|
428
|
9550 {
|
|
|
9551 /* Nothing to be done? */
|
|
|
9552 }
|
|
|
9553
|
|
|
9554 int
|
|
2286
|
9555 redisplay_variable_changed (Lisp_Object UNUSED (sym),
|
|
|
9556 Lisp_Object *UNUSED (val),
|
|
|
9557 Lisp_Object UNUSED (in_object),
|
|
|
9558 int UNUSED (flags))
|
|
428
|
9559 {
|
|
|
9560 /* #### clip_changed should really be renamed something like
|
|
|
9561 global_redisplay_change. */
|
|
|
9562 MARK_CLIP_CHANGED;
|
|
|
9563 return 0;
|
|
|
9564 }
|
|
|
9565
|
|
|
9566 /* This is called if the built-in glyphs have their properties
|
|
|
9567 changed. */
|
|
|
9568 void
|
|
2286
|
9569 redisplay_glyph_changed (Lisp_Object UNUSED (glyph),
|
|
|
9570 Lisp_Object UNUSED (property), Lisp_Object locale)
|
|
428
|
9571 {
|
|
|
9572 if (WINDOWP (locale))
|
|
|
9573 {
|
|
|
9574 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9575 }
|
|
|
9576 else if (FRAMEP (locale))
|
|
|
9577 {
|
|
|
9578 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9579 }
|
|
|
9580 else if (DEVICEP (locale))
|
|
|
9581 {
|
|
|
9582 Lisp_Object frmcons;
|
|
|
9583 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9584 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9585 }
|
|
|
9586 else if (CONSOLEP (locale))
|
|
|
9587 {
|
|
|
9588 Lisp_Object frmcons, devcons;
|
|
|
9589 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9590 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9591 }
|
|
|
9592 else /* global or buffer */
|
|
|
9593 {
|
|
|
9594 Lisp_Object frmcons, devcons, concons;
|
|
|
9595 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9596 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9597 }
|
|
|
9598 }
|
|
|
9599
|
|
|
9600 static void
|
|
2286
|
9601 text_cursor_visible_p_changed (Lisp_Object UNUSED (specifier),
|
|
|
9602 struct window *w, Lisp_Object UNUSED (oldval))
|
|
428
|
9603 {
|
|
|
9604 if (XFRAME (w->frame)->init_finished)
|
|
|
9605 Fforce_cursor_redisplay (w->frame);
|
|
|
9606 }
|
|
|
9607
|
|
872
|
9608 void
|
|
|
9609 mark_buffers_changed (void)
|
|
|
9610 {
|
|
|
9611 MARK_TYPE_CHANGED (buffers);
|
|
|
9612 }
|
|
|
9613
|
|
|
9614 void
|
|
|
9615 mark_clip_changed (void)
|
|
|
9616 {
|
|
|
9617 MARK_TYPE_CHANGED (clip);
|
|
|
9618 }
|
|
|
9619
|
|
|
9620 void
|
|
|
9621 mark_extents_changed (void)
|
|
|
9622 {
|
|
|
9623 MARK_TYPE_CHANGED (extents);
|
|
|
9624 }
|
|
|
9625
|
|
|
9626 void
|
|
|
9627 mark_icon_changed (void)
|
|
|
9628 {
|
|
|
9629 MARK_TYPE_CHANGED (icon);
|
|
|
9630 }
|
|
|
9631
|
|
|
9632 void
|
|
|
9633 mark_menubar_changed (void)
|
|
|
9634 {
|
|
|
9635 MARK_TYPE_CHANGED (menubar);
|
|
|
9636 }
|
|
|
9637
|
|
|
9638 void
|
|
|
9639 mark_modeline_changed (void)
|
|
|
9640 {
|
|
|
9641 MARK_TYPE_CHANGED (modeline);
|
|
|
9642 }
|
|
|
9643
|
|
|
9644 void
|
|
|
9645 mark_point_changed (void)
|
|
|
9646 {
|
|
|
9647 MARK_TYPE_CHANGED (point);
|
|
|
9648 }
|
|
|
9649
|
|
|
9650 void
|
|
|
9651 mark_toolbar_changed (void)
|
|
|
9652 {
|
|
|
9653 MARK_TYPE_CHANGED (toolbar);
|
|
|
9654 }
|
|
|
9655
|
|
|
9656 void
|
|
|
9657 mark_gutter_changed (void)
|
|
|
9658 {
|
|
|
9659 MARK_TYPE_CHANGED (gutter);
|
|
|
9660 }
|
|
|
9661
|
|
|
9662 void
|
|
|
9663 mark_glyphs_changed (void)
|
|
|
9664 {
|
|
|
9665 MARK_TYPE_CHANGED (glyphs);
|
|
|
9666 }
|
|
|
9667
|
|
|
9668 void
|
|
|
9669 mark_subwindows_changed (void)
|
|
|
9670 {
|
|
|
9671 MARK_TYPE_CHANGED (subwindows);
|
|
|
9672 }
|
|
|
9673
|
|
|
9674 void
|
|
|
9675 mark_subwindows_state_changed (void)
|
|
|
9676 {
|
|
|
9677 MARK_TYPE_CHANGED (subwindows_state);
|
|
|
9678 }
|
|
|
9679
|
|
428
|
9680 #ifdef MEMORY_USAGE_STATS
|
|
|
9681
|
|
|
9682
|
|
|
9683 /***************************************************************************/
|
|
|
9684 /* */
|
|
|
9685 /* memory usage computation */
|
|
|
9686 /* */
|
|
|
9687 /***************************************************************************/
|
|
|
9688
|
|
|
9689 static int
|
|
|
9690 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9691 {
|
|
|
9692 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9693 }
|
|
|
9694
|
|
|
9695 static int
|
|
|
9696 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9697 struct overhead_stats *ovstats)
|
|
|
9698 {
|
|
|
9699 int total, i;
|
|
|
9700
|
|
|
9701 if (!dyn)
|
|
|
9702 return 0;
|
|
|
9703
|
|
|
9704 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9705 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9706 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9707
|
|
|
9708 return total;
|
|
|
9709 }
|
|
|
9710
|
|
|
9711 static int
|
|
|
9712 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9713 struct overhead_stats *ovstats)
|
|
|
9714 {
|
|
|
9715 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9716 }
|
|
|
9717
|
|
|
9718 int
|
|
|
9719 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9720 struct overhead_stats *ovstats)
|
|
|
9721 {
|
|
|
9722 int total, i;
|
|
|
9723
|
|
|
9724 if (!dyn)
|
|
|
9725 return 0;
|
|
|
9726
|
|
|
9727 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9728 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9729 {
|
|
|
9730 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9731 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9732 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9733 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9734 }
|
|
|
9735
|
|
|
9736 return total;
|
|
|
9737 }
|
|
|
9738
|
|
|
9739 int
|
|
|
9740 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9741 struct overhead_stats *ovstats)
|
|
|
9742 {
|
|
|
9743 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9744 }
|
|
|
9745
|
|
|
9746 #endif /* MEMORY_USAGE_STATS */
|
|
|
9747
|
|
1204
|
9748 #ifdef ERROR_CHECK_DISPLAY
|
|
|
9749
|
|
800
|
9750 static int
|
|
2286
|
9751 sledgehammer_check_redisplay_structs_1 (struct window *w,
|
|
|
9752 void *UNUSED (closure))
|
|
800
|
9753 {
|
|
|
9754 int i, j;
|
|
|
9755 display_line_dynarr *dl;
|
|
|
9756
|
|
|
9757 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9758
|
|
|
9759 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9760 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9761 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9762 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9763
|
|
|
9764 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9765
|
|
|
9766 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9767 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9768 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9769 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9770
|
|
|
9771 return 0;
|
|
|
9772 }
|
|
|
9773
|
|
|
9774 static void
|
|
|
9775 sledgehammer_check_redisplay_structs (void)
|
|
|
9776 {
|
|
|
9777 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9778 }
|
|
|
9779
|
|
1204
|
9780 #endif /* ERROR_CHECK_DISPLAY */
|
|
|
9781
|
|
428
|
9782
|
|
|
9783 /***************************************************************************/
|
|
|
9784 /* */
|
|
|
9785 /* initialization */
|
|
|
9786 /* */
|
|
|
9787 /***************************************************************************/
|
|
|
9788
|
|
|
9789 void
|
|
|
9790 init_redisplay (void)
|
|
|
9791 {
|
|
|
9792 disable_preemption = 0;
|
|
|
9793 preemption_count = 0;
|
|
|
9794
|
|
|
9795 #ifndef PDUMP
|
|
|
9796 if (!initialized)
|
|
|
9797 #endif
|
|
|
9798 {
|
|
440
|
9799 if (!cmotion_display_lines)
|
|
|
9800 cmotion_display_lines = Dynarr_new (display_line);
|
|
867
|
9801 if (!mode_spec_ibyte_string)
|
|
|
9802 mode_spec_ibyte_string = Dynarr_new (Ibyte);
|
|
440
|
9803 if (!formatted_string_extent_dynarr)
|
|
|
9804 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9805 if (!formatted_string_extent_start_dynarr)
|
|
|
9806 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9807 if (!formatted_string_extent_end_dynarr)
|
|
|
9808 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9809 if (!internal_cache)
|
|
|
9810 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9811 }
|
|
|
9812
|
|
|
9813 /* window system is nil when in -batch mode */
|
|
|
9814 if (!initialized || noninteractive)
|
|
|
9815 return;
|
|
|
9816
|
|
|
9817 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9818 initializing the terminal. This is especially important when the
|
|
|
9819 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9820 using the window system.
|
|
|
9821
|
|
|
9822 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9823 with an error message if that doesn't work. */
|
|
|
9824
|
|
|
9825 #ifdef HAVE_X_WINDOWS
|
|
|
9826 if (!strcmp (display_use, "x"))
|
|
|
9827 {
|
|
|
9828 /* Some stuff checks this way early. */
|
|
|
9829 Vwindow_system = Qx;
|
|
|
9830 Vinitial_window_system = Qx;
|
|
|
9831 return;
|
|
|
9832 }
|
|
|
9833 #endif /* HAVE_X_WINDOWS */
|
|
|
9834
|
|
462
|
9835 #ifdef HAVE_GTK
|
|
|
9836 if (!strcmp (display_use, "gtk"))
|
|
|
9837 {
|
|
|
9838 Vwindow_system = Qgtk;
|
|
|
9839 Vinitial_window_system = Qgtk;
|
|
|
9840 return;
|
|
|
9841 }
|
|
|
9842 #endif
|
|
|
9843
|
|
428
|
9844 #ifdef HAVE_MS_WINDOWS
|
|
|
9845 if (!strcmp (display_use, "mswindows"))
|
|
|
9846 {
|
|
|
9847 /* Some stuff checks this way early. */
|
|
|
9848 Vwindow_system = Qmswindows;
|
|
|
9849 Vinitial_window_system = Qmswindows;
|
|
|
9850 return;
|
|
|
9851 }
|
|
|
9852 #endif /* HAVE_MS_WINDOWS */
|
|
|
9853
|
|
|
9854 #ifdef HAVE_TTY
|
|
|
9855 /* If no window system has been specified, try to use the terminal. */
|
|
|
9856 if (!isatty (0))
|
|
|
9857 {
|
|
|
9858 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9859 exit (1);
|
|
|
9860 }
|
|
|
9861
|
|
|
9862 /* Look at the TERM variable */
|
|
771
|
9863 if (!egetenv ("TERM"))
|
|
428
|
9864 {
|
|
|
9865 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9866 exit (1);
|
|
|
9867 }
|
|
|
9868
|
|
|
9869 Vinitial_window_system = Qtty;
|
|
|
9870 return;
|
|
|
9871 #else /* not HAVE_TTY */
|
|
|
9872 /* No DISPLAY specified, and no TTY support. */
|
|
|
9873 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9874 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9875 exit (1);
|
|
|
9876 #endif
|
|
|
9877 /* Unreached. */
|
|
|
9878 }
|
|
|
9879
|
|
|
9880 void
|
|
|
9881 syms_of_redisplay (void)
|
|
|
9882 {
|
|
563
|
9883 DEFSYMBOL (Qcursor_in_echo_area);
|
|
|
9884 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9885 DEFSYMBOL (Qbar_cursor);
|
|
|
9886 DEFSYMBOL (Qtop_bottom);
|
|
|
9887 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9888
|
|
|
9889 DEFSUBR (Fredisplay_echo_area);
|
|
|
9890 DEFSUBR (Fredraw_frame);
|
|
|
9891 DEFSUBR (Fredisplay_frame);
|
|
|
9892 DEFSUBR (Fredraw_device);
|
|
|
9893 DEFSUBR (Fredisplay_device);
|
|
|
9894 DEFSUBR (Fredraw_modeline);
|
|
|
9895 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9896 }
|
|
|
9897
|
|
|
9898 void
|
|
|
9899 vars_of_redisplay (void)
|
|
|
9900 {
|
|
1292
|
9901 QSin_redisplay = build_msg_string ("(in redisplay)");
|
|
|
9902 staticpro (&QSin_redisplay);
|
|
428
|
9903
|
|
1318
|
9904 Vpost_redisplay_actions = Qnil;
|
|
|
9905 staticpro (&Vpost_redisplay_actions);
|
|
|
9906
|
|
428
|
9907 #if 0
|
|
|
9908 staticpro (&last_arrow_position);
|
|
|
9909 staticpro (&last_arrow_string);
|
|
|
9910 last_arrow_position = Qnil;
|
|
|
9911 last_arrow_string = Qnil;
|
|
|
9912 #endif /* 0 */
|
|
|
9913
|
|
|
9914 /* #### Probably temporary */
|
|
|
9915 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9916 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9917 line start cache.
|
|
|
9918 */ );
|
|
|
9919 cache_adjustment = 2;
|
|
|
9920
|
|
1268
|
9921 DEFVAR_INT ("maximum-preempts", &max_preempts /*
|
|
|
9922 Maximum number of times redisplay can be preempted by user input.
|
|
|
9923 */ );
|
|
|
9924 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
9925
|
|
428
|
9926 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
9927 Minimum pixel height for clipped bottom display line.
|
|
|
9928 A clipped line shorter than this won't be displayed.
|
|
|
9929 */ ,
|
|
|
9930 redisplay_variable_changed);
|
|
|
9931 vertical_clip = 5;
|
|
|
9932
|
|
|
9933 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
9934 Minimum visible area for clipped glyphs at right boundary.
|
|
|
9935 Clipped glyphs shorter than this won't be displayed.
|
|
|
9936 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
9937 */ ,
|
|
|
9938 redisplay_variable_changed);
|
|
|
9939 horizontal_clip = 5;
|
|
|
9940
|
|
|
9941 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
9942 String displayed by modeline-format's "%m" specification.
|
|
|
9943 */ );
|
|
|
9944 Vglobal_mode_string = Qnil;
|
|
|
9945
|
|
|
9946 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
9947 Marker for where to display an arrow on top of the buffer text.
|
|
|
9948 This must be the beginning of a line in order to work.
|
|
|
9949 See also `overlay-arrow-string'.
|
|
|
9950 */ ,
|
|
|
9951 redisplay_variable_changed);
|
|
|
9952 Voverlay_arrow_position = Qnil;
|
|
|
9953
|
|
|
9954 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
9955 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
9956 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
9957 well as a string.)
|
|
428
|
9958 */ ,
|
|
|
9959 redisplay_variable_changed);
|
|
|
9960 Voverlay_arrow_string = Qnil;
|
|
|
9961
|
|
|
9962 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
9963 *The number of lines to try scrolling a window by when point moves out.
|
|
|
9964 If that fails to bring point back on frame, point is centered instead.
|
|
|
9965 If this is zero, point is always centered after it moves off screen.
|
|
|
9966 */ );
|
|
|
9967 scroll_step = 0;
|
|
|
9968
|
|
|
9969 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
9970 *Scroll up to this many lines, to bring point back on screen.
|
|
|
9971 */ );
|
|
|
9972 scroll_conservatively = 0;
|
|
|
9973
|
|
|
9974 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
9975 &truncate_partial_width_windows /*
|
|
|
9976 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
9977 */ ,
|
|
|
9978 redisplay_variable_changed);
|
|
|
9979 truncate_partial_width_windows = 1;
|
|
|
9980
|
|
442
|
9981 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
9982 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
9983
|
|
|
9984 Default behavior is to flash the whole screen. On some platforms,
|
|
|
9985 special effects are available using the following values:
|
|
|
9986
|
|
|
9987 'display Flash the whole screen (ie, the default behavior).
|
|
|
9988 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
9989
|
|
|
9990 When effects are unavailable on a platform, the visual bell is the
|
|
|
9991 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
9992 */ );
|
|
442
|
9993 Vvisible_bell = Qnil;
|
|
428
|
9994
|
|
|
9995 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
9996 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
9997 A non-nil value is useful if the terminal can automatically preserve
|
|
|
9998 Emacs's frame display when you reenter Emacs.
|
|
|
9999 It is up to you to set this variable if your terminal can do that.
|
|
|
10000 */ );
|
|
|
10001 no_redraw_on_reenter = 0;
|
|
|
10002
|
|
|
10003 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
10004 A symbol naming the window-system under which Emacs is running,
|
|
|
10005 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
10006
|
|
|
10007 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
10008 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
10009 instead.
|
|
|
10010 */ );
|
|
|
10011 Vwindow_system = Qnil;
|
|
|
10012
|
|
|
10013 /* #### Temporary shit until window-system is eliminated. */
|
|
|
10014 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
10015 DON'T TOUCH
|
|
|
10016 */ );
|
|
|
10017 Vinitial_window_system = Qnil;
|
|
|
10018
|
|
|
10019 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
10020 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
10021 */ );
|
|
|
10022 cursor_in_echo_area = 0;
|
|
|
10023
|
|
|
10024 /* #### Shouldn't this be generalized as follows:
|
|
|
10025
|
|
|
10026 if nil, use block cursor.
|
|
|
10027 if a number, use a bar cursor of that width.
|
|
|
10028 Otherwise, use a 1-pixel bar cursor.
|
|
|
10029
|
|
|
10030 #### Or better yet, this variable should be trashed entirely
|
|
|
10031 (use a Lisp-magic variable to maintain compatibility)
|
|
|
10032 and a specifier `cursor-shape' added, which allows a block
|
|
|
10033 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
10034 maybe a caret cursor, etc. */
|
|
|
10035
|
|
|
10036 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
10037 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
10038 */ );
|
|
|
10039 Vbar_cursor = Qnil;
|
|
|
10040
|
|
442
|
10041 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
10042 Function or functions to call when a frame's buffer list has changed.
|
|
|
10043 This is called during redisplay, before redisplaying each frame.
|
|
|
10044 Functions on this hook are called with one argument, the frame.
|
|
|
10045 */ );
|
|
|
10046 Vbuffer_list_changed_hook = Qnil;
|
|
|
10047
|
|
428
|
10048 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
10049 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
10050 at next redisplay. You should not normally change this; the function
|
|
|
10051 `display-warning' automatically does this at appropriate times.
|
|
|
10052 */ );
|
|
|
10053 display_warning_tick = 0;
|
|
|
10054
|
|
|
10055 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
10056 Non-nil means inhibit display of warning messages.
|
|
|
10057 You should *bind* this, not set it. Any pending warning messages
|
|
|
10058 will be displayed when the binding no longer applies.
|
|
|
10059 */ );
|
|
|
10060 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
10061 This way, the warnings don't obliterate the splash screen. */
|
|
|
10062 inhibit_warning_display = 1;
|
|
|
10063
|
|
|
10064 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
10065 *Non-nil means column display number starts at 1.
|
|
|
10066 */ );
|
|
|
10067 column_number_start_at_one = 0;
|
|
|
10068 }
|
|
|
10069
|
|
|
10070 void
|
|
|
10071 specifier_vars_of_redisplay (void)
|
|
|
10072 {
|
|
|
10073 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
10074 *Width of left margin.
|
|
|
10075 This is a specifier; use `set-specifier' to change it.
|
|
|
10076 */ );
|
|
|
10077 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
10078 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
10079 set_specifier_caching (Vleft_margin_width,
|
|
438
|
10080 offsetof (struct window, left_margin_width),
|
|
428
|
10081 some_window_value_changed,
|
|
438
|
10082 offsetof (struct frame, left_margin_width),
|
|
444
|
10083 margin_width_changed_in_frame, 0);
|
|
428
|
10084
|
|
|
10085 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
10086 *Width of right margin.
|
|
|
10087 This is a specifier; use `set-specifier' to change it.
|
|
|
10088 */ );
|
|
|
10089 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
10090 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
10091 set_specifier_caching (Vright_margin_width,
|
|
438
|
10092 offsetof (struct window, right_margin_width),
|
|
428
|
10093 some_window_value_changed,
|
|
438
|
10094 offsetof (struct frame, right_margin_width),
|
|
444
|
10095 margin_width_changed_in_frame, 0);
|
|
428
|
10096
|
|
|
10097 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
10098 *Minimum ascent height of lines.
|
|
|
10099 This is a specifier; use `set-specifier' to change it.
|
|
|
10100 */ );
|
|
|
10101 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
10102 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
10103 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
10104 offsetof (struct window, minimum_line_ascent),
|
|
428
|
10105 some_window_value_changed,
|
|
444
|
10106 0, 0, 0);
|
|
428
|
10107
|
|
|
10108 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
10109 *Minimum descent height of lines.
|
|
|
10110 This is a specifier; use `set-specifier' to change it.
|
|
|
10111 */ );
|
|
|
10112 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
10113 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
10114 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
10115 offsetof (struct window, minimum_line_descent),
|
|
428
|
10116 some_window_value_changed,
|
|
444
|
10117 0, 0, 0);
|
|
428
|
10118
|
|
|
10119 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
10120 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
10121 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
10122 This is a specifier; use `set-specifier' to change it.
|
|
|
10123 */ );
|
|
|
10124 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
10125 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
10126 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
10127 offsetof (struct window, use_left_overflow),
|
|
428
|
10128 some_window_value_changed,
|
|
444
|
10129 0, 0, 0);
|
|
428
|
10130
|
|
|
10131 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
10132 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
10133 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
10134 This is a specifier; use `set-specifier' to change it.
|
|
|
10135 */ );
|
|
|
10136 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
10137 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
10138 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
10139 offsetof (struct window, use_right_overflow),
|
|
428
|
10140 some_window_value_changed,
|
|
444
|
10141 0, 0, 0);
|
|
428
|
10142
|
|
|
10143 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
10144 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
10145 This is a specifier; use `set-specifier' to change it.
|
|
|
10146 */ );
|
|
|
10147 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
10148 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
10149 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
10150 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
10151 text_cursor_visible_p_changed,
|
|
444
|
10152 0, 0, 0);
|
|
428
|
10153
|
|
|
10154 }
|
