|
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[] = {
|
|
|
525 { XD_STRUCT_ARRAY, RUNE_DGLYPH, 1, &rune_dglyph_description },
|
|
|
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[] = {
|
|
|
556 { XD_STRUCT_PTR, offsetof (display_block, runes),
|
|
|
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[] = {
|
|
|
598 { XD_STRUCT_PTR, offsetof (display_line, display_blocks),
|
|
|
599 1, &display_block_dynarr_description },
|
|
|
600 { XD_STRUCT_PTR, offsetof (display_line, left_glyphs),
|
|
|
601 1, &glyph_block_dynarr_description },
|
|
|
602 { XD_STRUCT_PTR, offsetof (display_line, right_glyphs),
|
|
|
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;
|
|
|
1572 Ibyte *result = alloca_array (Ibyte, len);
|
|
|
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)
|
|
|
1678 xfree (pb->data.p_string.str);
|
|
|
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
|
|
|
2147 #### It would also be really nice if you could specify that
|
|
|
2148 the characters come out in hex instead of in octal. Mule
|
|
|
2149 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
2150 but that's bogus -- we need a more general solution. I
|
|
|
2151 think you need to extend the concept of display tables
|
|
|
2152 into a more general conversion mechanism. Ideally you
|
|
|
2153 could specify a Lisp function that converts characters,
|
|
|
2154 but this violates the Second Golden Rule and besides would
|
|
|
2155 make things way way way way slow.
|
|
|
2156
|
|
|
2157 So instead, we extend the display-table concept, which was
|
|
|
2158 historically limited to 256-byte vectors, to one of the
|
|
|
2159 following:
|
|
|
2160
|
|
|
2161 a) A 256-entry vector, for backward compatibility;
|
|
|
2162 b) char-table, mapping characters to values;
|
|
|
2163 c) range-table, mapping ranges of characters to values;
|
|
|
2164 d) a list of the above.
|
|
|
2165
|
|
|
2166 The (d) option allows you to specify multiple display tables
|
|
|
2167 instead of just one. Each display table can specify conversions
|
|
|
2168 for some characters and leave others unchanged. The way the
|
|
|
2169 character gets displayed is determined by the first display table
|
|
|
2170 with a binding for that character. This way, you could call a
|
|
|
2171 function `enable-hex-display' that adds a hex display-table to
|
|
|
2172 the list of display tables for the current buffer.
|
|
|
2173
|
|
|
2174 #### ...not yet implemented... Also, we extend the concept of
|
|
|
2175 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
2176 extended characters show up as hex with a display table like
|
|
|
2177 this:
|
|
|
2178
|
|
|
2179 #s(range-table data ((256 524288) (format "%x")))
|
|
|
2180
|
|
|
2181 Since more than one display table is possible, you have
|
|
|
2182 great flexibility in mapping ranges of characters. */
|
|
867
|
2183 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
2184 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2185 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2186 ? 255 : 160));
|
|
|
2187
|
|
|
2188 Lisp_Object face_dt, window_dt;
|
|
|
2189
|
|
|
2190 /* The text display block for this display line. */
|
|
|
2191 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2192
|
|
|
2193 /* The first time through the main loop we need to force the glyph
|
|
|
2194 data to be updated. */
|
|
|
2195 int initial = 1;
|
|
|
2196
|
|
|
2197 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2198 equal to the position passed in if there are no more runs to be
|
|
|
2199 displayed. */
|
|
|
2200 int no_more_frags = 0;
|
|
|
2201
|
|
|
2202 Lisp_Object synch_minibuffers_value =
|
|
|
2203 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2204
|
|
|
2205 dl->used_prop_data = 0;
|
|
|
2206 dl->num_chars = 0;
|
|
442
|
2207 dl->line_continuation = 0;
|
|
428
|
2208
|
|
|
2209 xzero (data);
|
|
|
2210 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2211
|
|
|
2212 /* These values are used by all of the rune addition routines. We add
|
|
|
2213 them to this structure for ease of passing. */
|
|
|
2214 data.d = d;
|
|
793
|
2215 data.window = wrap_window (w);
|
|
428
|
2216 data.string = Qnil;
|
|
|
2217 data.db = db;
|
|
|
2218 data.dl = dl;
|
|
|
2219
|
|
826
|
2220 data.byte_charpos = byte_start_pos;
|
|
428
|
2221 data.pixpos = dl->bounds.left_in;
|
|
|
2222 data.last_charset = Qunbound;
|
|
|
2223 data.last_findex = DEFAULT_INDEX;
|
|
|
2224 data.result_str = Qnil;
|
|
|
2225
|
|
|
2226 /* Set the right boundary adjusting it to take into account any end
|
|
|
2227 glyph. Save the width of the end glyph for later use. */
|
|
|
2228 data.max_pixpos = dl->bounds.right_in;
|
|
|
2229 if (truncate_win)
|
|
819
|
2230 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2231 else
|
|
819
|
2232 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2233 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2234
|
|
|
2235 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2236 {
|
|
826
|
2237 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2238 data.cursor_type = CURSOR_ON;
|
|
|
2239 }
|
|
|
2240 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2241 data.cursor_type = NO_CURSOR;
|
|
|
2242 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2243 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2244 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2245 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2246 {
|
|
826
|
2247 data.byte_cursor_charpos = BYTE_BUF_PT (b);
|
|
428
|
2248 data.cursor_type = CURSOR_ON;
|
|
|
2249 }
|
|
|
2250 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2251 {
|
|
826
|
2252 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
|
|
428
|
2253 data.cursor_type = CURSOR_ON;
|
|
|
2254 }
|
|
|
2255 else
|
|
|
2256 data.cursor_type = NO_CURSOR;
|
|
|
2257 data.cursor_x = -1;
|
|
|
2258
|
|
|
2259 data.start_col = w->hscroll;
|
|
|
2260 data.start_col_xoffset = w->left_xoffset;
|
|
826
|
2261 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
2262 data.hscroll_glyph_width_adjust = 0;
|
|
|
2263
|
|
|
2264 /* We regenerate the line from the very beginning. */
|
|
|
2265 Dynarr_reset (db->runes);
|
|
|
2266
|
|
|
2267 /* Why is this less than or equal and not just less than? If the
|
|
|
2268 starting position is already equal to the maximum we can't add
|
|
|
2269 anything else, right? Wrong. We might still have a newline to
|
|
|
2270 add. A newline can use the room allocated for an end glyph since
|
|
|
2271 if we add it we know we aren't going to be adding any end
|
|
|
2272 glyph. */
|
|
|
2273
|
|
|
2274 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2275 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2276 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2277 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2278 that the loop terminates only when either (a) there is
|
|
|
2279 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2280
|
|
|
2281 #### Also I think you need to ensure that the operation
|
|
|
2282 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2283 can't get interrupted in the middle. If you run off the end
|
|
|
2284 of the line during that operation, then you keep accumulating
|
|
|
2285 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2286 there's a begin glyph at a particular position and attempting
|
|
|
2287 to display that glyph results in window-end being hit and
|
|
|
2288 propagation data being generated, then the character at that
|
|
|
2289 position won't be displayed.
|
|
|
2290
|
|
|
2291 #### See also the comment after the end of this loop, below.
|
|
|
2292 */
|
|
|
2293 while (data.pixpos <= data.max_pixpos
|
|
|
2294 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2295 {
|
|
|
2296 /* #### This check probably should not be necessary. */
|
|
826
|
2297 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
428
|
2298 {
|
|
|
2299 /* #### urk! More of this lossage! */
|
|
826
|
2300 data.byte_charpos--;
|
|
428
|
2301 goto done;
|
|
|
2302 }
|
|
|
2303
|
|
|
2304 /* If selective display was an integer and we aren't working on
|
|
|
2305 a continuation line then find the next line we are actually
|
|
|
2306 supposed to display. */
|
|
|
2307 if (selective > 0
|
|
826
|
2308 && (data.byte_charpos == BYTE_BUF_BEGV (b)
|
|
|
2309 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
|
|
|
2310 {
|
|
|
2311 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2312 {
|
|
826
|
2313 data.byte_charpos =
|
|
|
2314 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2315 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2316 {
|
|
826
|
2317 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2318 goto done;
|
|
|
2319 }
|
|
|
2320 }
|
|
|
2321 }
|
|
|
2322
|
|
|
2323 /* Check for face changes. */
|
|
826
|
2324 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
2325 {
|
|
819
|
2326 Lisp_Object last_glyph = Qnil;
|
|
|
2327
|
|
|
2328 /* Deal with glyphs that we have already displayed. The
|
|
|
2329 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2330 propagation data then we are clipping the glyph and there
|
|
|
2331 can be no propagation data before that point. The theory
|
|
|
2332 works because we always recalculate the extent-fragments
|
|
|
2333 for propagated data, we never actually propagate the
|
|
|
2334 fragments that still need to be displayed. */
|
|
|
2335 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2336 {
|
|
|
2337 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2338 Dynarr_free (*prop);
|
|
|
2339 *prop = 0;
|
|
|
2340 }
|
|
428
|
2341 /* Now compute the face and begin/end-glyph information. */
|
|
|
2342 data.findex =
|
|
665
|
2343 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
826
|
2344 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
2345
|
|
|
2346 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2347
|
|
826
|
2348 if (data.byte_charpos == data.ef->end)
|
|
428
|
2349 no_more_frags = 1;
|
|
|
2350 }
|
|
|
2351 initial = 0;
|
|
|
2352
|
|
|
2353 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2354 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2355 display then we determine what to do based on the character at the
|
|
|
2356 current buffer position. */
|
|
|
2357
|
|
|
2358 /* If the current position is covered by an invisible extent, do
|
|
|
2359 nothing (except maybe add some ellipses).
|
|
|
2360
|
|
|
2361 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2362 invisible extent should be investigated further. This is
|
|
|
2363 fairly low priority though. */
|
|
|
2364 if (data.ef->invisible)
|
|
|
2365 {
|
|
|
2366 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2367 really know what I'm doing. */
|
|
|
2368 if (*prop)
|
|
|
2369 {
|
|
|
2370 Dynarr_free (*prop);
|
|
|
2371 *prop = 0;
|
|
|
2372 }
|
|
|
2373
|
|
|
2374 /* The extent fragment code only sets this when we should
|
|
|
2375 really display the ellipses. It makes sure the ellipses
|
|
|
2376 don't get displayed more than once in a row. */
|
|
|
2377 if (data.ef->invisible_ellipses)
|
|
|
2378 {
|
|
|
2379 struct glyph_block gb;
|
|
|
2380
|
|
|
2381 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2382 data.ef->invisible_ellipses = 0;
|
|
|
2383 gb.extent = Qnil;
|
|
|
2384 gb.glyph = Vinvisible_text_glyph;
|
|
|
2385 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2386 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2387 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2388 is to display a newline (for compatibility with
|
|
|
2389 selective-display-ellipses)? Maybe that's too
|
|
|
2390 abstruse. */
|
|
|
2391 if (*prop)
|
|
|
2392 goto done;
|
|
|
2393 }
|
|
|
2394
|
|
|
2395 /* If point is in an invisible region we place it on the
|
|
|
2396 next visible character. */
|
|
|
2397 if (data.cursor_type == CURSOR_ON
|
|
826
|
2398 && data.byte_charpos == data.byte_cursor_charpos)
|
|
428
|
2399 {
|
|
|
2400 data.cursor_type = NEXT_CURSOR;
|
|
|
2401 }
|
|
|
2402
|
|
|
2403 /* #### What if we we're dealing with a display table? */
|
|
|
2404 if (data.start_col)
|
|
|
2405 data.start_col--;
|
|
|
2406
|
|
826
|
2407 if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2408 goto done;
|
|
|
2409 else
|
|
826
|
2410 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2411 }
|
|
|
2412
|
|
|
2413 /* If there is propagation data, then it represents the current
|
|
819
|
2414 buffer position being displayed. Add them and advance the
|
|
|
2415 position counter. This might also add the minibuffer
|
|
|
2416 prompt. */
|
|
428
|
2417 else if (*prop)
|
|
|
2418 {
|
|
|
2419 dl->used_prop_data = 1;
|
|
|
2420 *prop = add_propagation_runes (prop, &data);
|
|
|
2421
|
|
|
2422 if (*prop)
|
|
|
2423 goto done; /* gee, a really narrow window */
|
|
826
|
2424 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2425 goto done;
|
|
826
|
2426 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
|
|
428
|
2427 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
2428 data.byte_charpos = BYTE_BUF_BEGV (b);
|
|
428
|
2429 else
|
|
826
|
2430 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2431 }
|
|
|
2432
|
|
|
2433 /* If there are end glyphs, add them to the line. These are
|
|
|
2434 the end glyphs for the previous run of text. We add them
|
|
|
2435 here rather than doing them at the end of handling the
|
|
|
2436 previous run so that glyphs at the beginning and end of
|
|
|
2437 a line are handled correctly. */
|
|
819
|
2438 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2439 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2440 {
|
|
|
2441 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2442 /* #### I think this is safe, but could be wrong. */
|
|
826
|
2443 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
819
|
2444
|
|
|
2445 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2446 {
|
|
|
2447 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2448 tmpglyphs = data.ef->end_glyphs;
|
|
|
2449 }
|
|
|
2450
|
|
|
2451 /* If there are begin glyphs, add them to the line. */
|
|
|
2452 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2453 {
|
|
|
2454 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2455 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2456 }
|
|
|
2457
|
|
|
2458 if (*prop)
|
|
|
2459 {
|
|
|
2460 /* If we just clipped a glyph and we are at the end of a
|
|
|
2461 line and there are more glyphs to display then do
|
|
|
2462 appropriate processing to not get a continuation
|
|
|
2463 glyph. */
|
|
|
2464 if (*prop != ADD_FAILED
|
|
|
2465 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2466 && data.ch == '\n')
|
|
|
2467 {
|
|
|
2468 /* If there are no more glyphs then do the normal
|
|
|
2469 processing.
|
|
|
2470
|
|
|
2471 #### This doesn't actually work if the same glyph is
|
|
|
2472 present more than once in the block. To solve
|
|
|
2473 this we would have to carry the index around
|
|
|
2474 which might be problematic since the fragment is
|
|
|
2475 recalculated for each line. */
|
|
|
2476 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2477 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2478 {
|
|
|
2479 Dynarr_free (*prop);
|
|
|
2480 *prop = 0;
|
|
|
2481 }
|
|
|
2482 else {
|
|
|
2483 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2484 add_ichar_rune (&data); /* discard prop data. */
|
|
819
|
2485 goto done;
|
|
|
2486 }
|
|
|
2487 }
|
|
|
2488 else
|
|
|
2489 goto done;
|
|
|
2490 }
|
|
428
|
2491 }
|
|
|
2492
|
|
|
2493 /* If at end-of-buffer, we've already processed begin and
|
|
|
2494 end-glyphs at this point and there's no text to process,
|
|
|
2495 so we're done. */
|
|
826
|
2496 else if (data.byte_charpos == BYTE_BUF_ZV (b))
|
|
428
|
2497 goto done;
|
|
|
2498
|
|
|
2499 else
|
|
|
2500 {
|
|
|
2501 Lisp_Object entry = Qnil;
|
|
|
2502 /* Get the character at the current buffer position. */
|
|
826
|
2503 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2504 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2505 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2506
|
|
|
2507 /* If there is a display table entry for it, hand it off to
|
|
|
2508 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2509 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2510 {
|
|
|
2511 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2512
|
|
|
2513 if (*prop)
|
|
|
2514 goto done;
|
|
|
2515 }
|
|
|
2516
|
|
|
2517 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2518 to the line and end this loop. */
|
|
|
2519 else if (data.ch == '\n')
|
|
|
2520 {
|
|
|
2521 /* We aren't going to be adding an end glyph so give its
|
|
|
2522 space back in order to make sure that the cursor can
|
|
|
2523 fit. */
|
|
819
|
2524 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2525
|
|
|
2526 if (selective > 0
|
|
826
|
2527 && (byte_spaces_at_point
|
|
|
2528 (b, next_bytebpos (b, data.byte_charpos))
|
|
428
|
2529 >= selective))
|
|
|
2530 {
|
|
|
2531 if (!NILP (b->selective_display_ellipses))
|
|
|
2532 {
|
|
|
2533 struct glyph_block gb;
|
|
|
2534
|
|
|
2535 gb.extent = Qnil;
|
|
|
2536 gb.glyph = Vinvisible_text_glyph;
|
|
|
2537 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2538 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2539 }
|
|
|
2540 else
|
|
|
2541 {
|
|
|
2542 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2543 line with a special "character rune" whose width
|
|
|
2544 is the EOL cursor width and whose character is
|
|
|
2545 the non-printing character '\n'. */
|
|
|
2546 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2547 *prop = add_ichar_rune (&data);
|
|
428
|
2548 }
|
|
|
2549
|
|
826
|
2550 /* We need to set data.byte_charpos to the start of the
|
|
428
|
2551 next visible region in order to make this line
|
|
|
2552 appear to contain all of the invisible area.
|
|
|
2553 Otherwise, the line cache won't work
|
|
|
2554 correctly. */
|
|
826
|
2555 INC_BYTEBPOS (b, data.byte_charpos);
|
|
|
2556 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
|
|
428
|
2557 {
|
|
826
|
2558 data.byte_charpos =
|
|
|
2559 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2560 if (data.byte_charpos >= BYTE_BUF_ZV (b))
|
|
428
|
2561 {
|
|
826
|
2562 data.byte_charpos = BYTE_BUF_ZV (b);
|
|
428
|
2563 break;
|
|
|
2564 }
|
|
|
2565 }
|
|
826
|
2566 if (BYTE_BUF_FETCH_CHAR
|
|
|
2567 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
|
|
|
2568 DEC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2569 }
|
|
|
2570 else
|
|
|
2571 {
|
|
|
2572 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
867
|
2573 *prop = add_ichar_rune (&data);
|
|
428
|
2574 }
|
|
|
2575
|
|
|
2576 goto done;
|
|
|
2577 }
|
|
|
2578
|
|
|
2579 /* If the current character is ^M, and selective display is
|
|
|
2580 enabled, then add the invisible-text-glyph if
|
|
|
2581 selective-display-ellipses is set. In any case, this
|
|
|
2582 line is done. */
|
|
|
2583 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2584 {
|
|
826
|
2585 Bytebpos byte_next_charpos;
|
|
428
|
2586
|
|
|
2587 /* Find the buffer position at the end of the line. */
|
|
826
|
2588 byte_next_charpos =
|
|
|
2589 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
|
2590 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
|
|
428
|
2591 == '\n')
|
|
826
|
2592 DEC_BYTEBPOS (b, byte_next_charpos);
|
|
428
|
2593
|
|
|
2594 /* If the cursor is somewhere in the elided text make
|
|
|
2595 sure that the cursor gets drawn appropriately. */
|
|
|
2596 if (data.cursor_type == CURSOR_ON
|
|
826
|
2597 && (data.byte_cursor_charpos >= data.byte_charpos &&
|
|
|
2598 data.byte_cursor_charpos < byte_next_charpos))
|
|
428
|
2599 {
|
|
|
2600 data.cursor_type = NEXT_CURSOR;
|
|
|
2601 }
|
|
|
2602
|
|
|
2603 /* We won't be adding a truncation or continuation glyph
|
|
|
2604 so give up the room allocated for them. */
|
|
819
|
2605 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2606
|
|
|
2607 if (!NILP (b->selective_display_ellipses))
|
|
|
2608 {
|
|
|
2609 /* We don't propagate anything from the invisible
|
|
|
2610 text glyph if it fails to fit. This is
|
|
|
2611 intentional. */
|
|
|
2612 struct glyph_block gb;
|
|
|
2613
|
|
|
2614 gb.extent = Qnil;
|
|
|
2615 gb.glyph = Vinvisible_text_glyph;
|
|
|
2616 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2617 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2618 }
|
|
|
2619
|
|
|
2620 /* Set the buffer position to the end of the line. We
|
|
|
2621 need to do this before potentially adding a newline
|
|
|
2622 so that the cursor flag will get set correctly (if
|
|
|
2623 needed). */
|
|
826
|
2624 data.byte_charpos = byte_next_charpos;
|
|
428
|
2625
|
|
|
2626 if (NILP (b->selective_display_ellipses)
|
|
826
|
2627 || data.byte_cursor_charpos == byte_next_charpos)
|
|
428
|
2628 {
|
|
|
2629 /* We have to at least add a newline character so
|
|
|
2630 that the cursor shows up properly. */
|
|
|
2631 data.ch = '\n';
|
|
|
2632 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2633 data.findex = DEFAULT_INDEX;
|
|
|
2634 data.start_col = 0;
|
|
|
2635 data.start_col_xoffset = 0;
|
|
826
|
2636 data.byte_start_col_enabled = 0;
|
|
428
|
2637
|
|
867
|
2638 add_ichar_rune (&data);
|
|
428
|
2639 }
|
|
|
2640
|
|
|
2641 /* This had better be a newline but doing it this way
|
|
|
2642 we'll see obvious incorrect results if it isn't. No
|
|
|
2643 need to abort here. */
|
|
826
|
2644 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
|
|
428
|
2645
|
|
|
2646 goto done;
|
|
|
2647 }
|
|
|
2648
|
|
|
2649 /* If the current character is considered to be printable, then
|
|
|
2650 just add it. */
|
|
|
2651 else if (data.ch >= printable_min)
|
|
|
2652 {
|
|
867
|
2653 *prop = add_ichar_rune (&data);
|
|
428
|
2654 if (*prop)
|
|
|
2655 goto done;
|
|
|
2656 }
|
|
|
2657
|
|
|
2658 /* If the current character is a tab, determine the next tab
|
|
|
2659 starting position and add a blank rune which extends from the
|
|
|
2660 current pixel position to that starting position. */
|
|
|
2661 else if (data.ch == '\t')
|
|
|
2662 {
|
|
|
2663 int tab_start_pixpos = data.pixpos;
|
|
|
2664 int next_tab_start;
|
|
|
2665 int char_tab_width;
|
|
|
2666 int prop_width = 0;
|
|
|
2667
|
|
|
2668 if (data.start_col > 1)
|
|
434
|
2669 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2670 + data.start_col_xoffset;
|
|
|
2671
|
|
|
2672 next_tab_start =
|
|
|
2673 next_tab_position (w, tab_start_pixpos,
|
|
|
2674 dl->bounds.left_in +
|
|
|
2675 data.hscroll_glyph_width_adjust);
|
|
|
2676 if (next_tab_start > data.max_pixpos)
|
|
|
2677 {
|
|
|
2678 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2679 next_tab_start = data.max_pixpos;
|
|
|
2680 }
|
|
|
2681 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2682 char_tab_width =
|
|
|
2683 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2684
|
|
|
2685 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2686
|
|
|
2687 /* add_blank_rune is only supposed to be called with
|
|
|
2688 sizes guaranteed to fit in the available space. */
|
|
|
2689 assert (!(*prop));
|
|
|
2690
|
|
|
2691 if (prop_width)
|
|
|
2692 {
|
|
|
2693 struct prop_block pb;
|
|
|
2694 *prop = Dynarr_new (prop_block);
|
|
|
2695
|
|
|
2696 pb.type = PROP_BLANK;
|
|
|
2697 pb.data.p_blank.width = prop_width;
|
|
|
2698 pb.data.p_blank.findex = data.findex;
|
|
|
2699 Dynarr_add (*prop, pb);
|
|
|
2700
|
|
|
2701 goto done;
|
|
|
2702 }
|
|
|
2703 }
|
|
|
2704
|
|
|
2705 /* If character is a control character, pass it off to
|
|
|
2706 add_control_char_runes.
|
|
|
2707
|
|
|
2708 The is_*() routines have undefined results on
|
|
|
2709 arguments outside of the range [-1, 255]. (This
|
|
|
2710 often bites people who carelessly use `char' instead
|
|
|
2711 of `unsigned char'.)
|
|
|
2712 */
|
|
867
|
2713 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
2714 {
|
|
|
2715 *prop = add_control_char_runes (&data, b);
|
|
|
2716
|
|
|
2717 if (*prop)
|
|
|
2718 goto done;
|
|
|
2719 }
|
|
|
2720
|
|
|
2721 /* If the character is above the ASCII range and we have not
|
|
|
2722 already handled it, then print it as an octal number. */
|
|
|
2723 else if (data.ch >= 0200)
|
|
|
2724 {
|
|
|
2725 *prop = add_octal_runes (&data);
|
|
|
2726
|
|
|
2727 if (*prop)
|
|
|
2728 goto done;
|
|
|
2729 }
|
|
|
2730
|
|
|
2731 /* Assume the current character is considered to be printable,
|
|
|
2732 then just add it. */
|
|
|
2733 else
|
|
|
2734 {
|
|
867
|
2735 *prop = add_ichar_rune (&data);
|
|
428
|
2736 if (*prop)
|
|
|
2737 goto done;
|
|
|
2738 }
|
|
|
2739
|
|
826
|
2740 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2741 }
|
|
|
2742 }
|
|
|
2743
|
|
|
2744 done:
|
|
|
2745
|
|
|
2746 /* Determine the starting point of the next line if we did not hit the
|
|
|
2747 end of the buffer. */
|
|
826
|
2748 if (data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2749 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2750 {
|
|
|
2751 /* #### This check is not correct. If the line terminated
|
|
|
2752 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
2753 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
2754 you make the two changes mentioned at the top of this loop,
|
|
|
2755 you should be able to say '(if (*prop))'. That should also
|
|
826
|
2756 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
2757 check. */
|
|
|
2758
|
|
|
2759 /* The common case is that the line ended because we hit a newline.
|
|
|
2760 In that case, the next character is just the next buffer
|
|
|
2761 position. */
|
|
|
2762 if (data.ch == '\n')
|
|
|
2763 {
|
|
|
2764 /* If data.start_col_enabled is still true, then the window is
|
|
|
2765 scrolled far enough so that nothing on this line is visible.
|
|
|
2766 We need to stick a truncation glyph at the beginning of the
|
|
|
2767 line in that case unless the line is completely blank. */
|
|
826
|
2768 if (data.byte_start_col_enabled)
|
|
428
|
2769 {
|
|
|
2770 if (data.cursor_type == CURSOR_ON)
|
|
|
2771 {
|
|
826
|
2772 if (data.byte_cursor_charpos >= byte_start_pos
|
|
|
2773 && data.byte_cursor_charpos <= data.byte_charpos)
|
|
|
2774 data.byte_cursor_charpos = data.byte_charpos;
|
|
428
|
2775 }
|
|
|
2776 data.findex = DEFAULT_INDEX;
|
|
|
2777 data.start_col = 0;
|
|
826
|
2778 data.byte_start_col_enabled = 0;
|
|
|
2779
|
|
|
2780 if (data.byte_charpos != byte_start_pos)
|
|
428
|
2781 {
|
|
|
2782 struct glyph_block gb;
|
|
|
2783
|
|
|
2784 gb.extent = Qnil;
|
|
|
2785 gb.glyph = Vhscroll_glyph;
|
|
|
2786 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2787 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2788 }
|
|
|
2789 else
|
|
|
2790 {
|
|
|
2791 /* This duplicates code down below to add a newline to
|
|
|
2792 the end of an otherwise empty line.*/
|
|
|
2793 data.ch = '\n';
|
|
|
2794 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2795
|
|
867
|
2796 add_ichar_rune (&data);
|
|
428
|
2797 }
|
|
|
2798 }
|
|
|
2799
|
|
826
|
2800 INC_BYTEBPOS (b, data.byte_charpos);
|
|
428
|
2801 }
|
|
|
2802
|
|
|
2803 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2804 line. */
|
|
|
2805 else
|
|
|
2806 {
|
|
|
2807 struct glyph_block gb;
|
|
|
2808 struct glyph_cachel *cachel;
|
|
|
2809
|
|
|
2810 /* If the line is to be truncated then we actually have to look
|
|
|
2811 for the next newline. We also add the end-of-line glyph which
|
|
|
2812 we know will fit because we adjusted the right border before
|
|
|
2813 we starting laying out the line. */
|
|
819
|
2814 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2815 data.findex = DEFAULT_INDEX;
|
|
|
2816 gb.extent = Qnil;
|
|
|
2817
|
|
|
2818 if (truncate_win)
|
|
|
2819 {
|
|
826
|
2820 Bytebpos byte_pos;
|
|
428
|
2821
|
|
|
2822 /* Now find the start of the next line. */
|
|
826
|
2823 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
|
|
428
|
2824
|
|
|
2825 /* If the cursor is past the truncation line then we
|
|
|
2826 make it appear on the truncation glyph. If we've hit
|
|
|
2827 the end of the buffer then we also make the cursor
|
|
|
2828 appear unless eob is immediately preceded by a
|
|
|
2829 newline. In that case the cursor should actually
|
|
|
2830 appear on the next line. */
|
|
|
2831 if (data.cursor_type == CURSOR_ON
|
|
826
|
2832 && data.byte_cursor_charpos >= data.byte_charpos
|
|
|
2833 && (data.byte_cursor_charpos < byte_pos ||
|
|
|
2834 (byte_pos == BYTE_BUF_ZV (b)
|
|
|
2835 && (byte_pos == BYTE_BUF_BEGV (b)
|
|
|
2836 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
|
|
428
|
2837 != '\n')))))
|
|
826
|
2838 data.byte_cursor_charpos = byte_pos;
|
|
428
|
2839 else
|
|
|
2840 data.cursor_type = NO_CURSOR;
|
|
|
2841
|
|
826
|
2842 data.byte_charpos = byte_pos;
|
|
428
|
2843 gb.glyph = Vtruncation_glyph;
|
|
|
2844 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2845 }
|
|
|
2846 else
|
|
|
2847 {
|
|
|
2848 /* The cursor can never be on the continuation glyph. */
|
|
|
2849 data.cursor_type = NO_CURSOR;
|
|
|
2850
|
|
826
|
2851 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
2852
|
|
442
|
2853 dl->line_continuation = 1;
|
|
428
|
2854 gb.glyph = Vcontinuation_glyph;
|
|
|
2855 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2856 }
|
|
|
2857
|
|
442
|
2858 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2859
|
|
826
|
2860 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
|
|
|
2861 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
|
|
428
|
2862 /* #### Damn this losing shit. */
|
|
826
|
2863 data.byte_charpos++;
|
|
428
|
2864 }
|
|
|
2865 }
|
|
|
2866 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
826
|
2867 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
|
|
428
|
2868 {
|
|
|
2869 /* We need to add a marker to the end of the line since there is no
|
|
|
2870 newline character in order for the cursor to get drawn. We label
|
|
|
2871 it as a newline so that it gets handled correctly by the
|
|
|
2872 whitespace routines below. */
|
|
|
2873
|
|
|
2874 data.ch = '\n';
|
|
|
2875 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2876 data.findex = DEFAULT_INDEX;
|
|
|
2877 data.start_col = 0;
|
|
|
2878 data.start_col_xoffset = 0;
|
|
826
|
2879 data.byte_start_col_enabled = 0;
|
|
428
|
2880
|
|
|
2881 data.max_pixpos += data.blank_width;
|
|
867
|
2882 add_ichar_rune (&data);
|
|
428
|
2883 data.max_pixpos -= data.blank_width;
|
|
|
2884
|
|
|
2885 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2886 manipulating invalid positions is guaranteed to result in
|
|
|
2887 trouble sooner or later. */
|
|
826
|
2888 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
|
|
428
|
2889 }
|
|
|
2890
|
|
|
2891 /* Calculate left whitespace boundary. */
|
|
|
2892 {
|
|
|
2893 int elt = 0;
|
|
|
2894
|
|
|
2895 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2896 while (elt < Dynarr_length (db->runes))
|
|
|
2897 {
|
|
|
2898 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2899
|
|
|
2900 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2901 || rb->type == RUNE_BLANK)
|
|
|
2902 {
|
|
|
2903 dl->bounds.left_white += rb->width;
|
|
|
2904 elt++;
|
|
|
2905 }
|
|
|
2906 else
|
|
|
2907 elt = Dynarr_length (db->runes);
|
|
|
2908 }
|
|
|
2909 }
|
|
|
2910
|
|
|
2911 /* Calculate right whitespace boundary. */
|
|
|
2912 {
|
|
|
2913 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2914 int done = 0;
|
|
|
2915
|
|
|
2916 while (!done && elt >= 0)
|
|
|
2917 {
|
|
|
2918 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2919
|
|
|
2920 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2921 && isspace (rb->object.chr.ch))
|
|
|
2922 && !rb->type == RUNE_BLANK)
|
|
|
2923 {
|
|
|
2924 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2925 done = 1;
|
|
|
2926 }
|
|
|
2927
|
|
|
2928 elt--;
|
|
|
2929
|
|
|
2930 }
|
|
|
2931
|
|
|
2932 /* The line is blank so everything is considered to be right
|
|
|
2933 whitespace. */
|
|
|
2934 if (!done)
|
|
|
2935 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2936 }
|
|
|
2937
|
|
|
2938 /* Set the display blocks bounds. */
|
|
|
2939 db->start_pos = dl->bounds.left_in;
|
|
|
2940 if (Dynarr_length (db->runes))
|
|
|
2941 {
|
|
|
2942 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2943
|
|
|
2944 db->end_pos = rb->xpos + rb->width;
|
|
|
2945 }
|
|
|
2946 else
|
|
|
2947 db->end_pos = dl->bounds.right_white;
|
|
|
2948
|
|
819
|
2949 calculate_baseline (&data);
|
|
428
|
2950
|
|
|
2951 dl->ascent = data.new_ascent;
|
|
|
2952 dl->descent = data.new_descent;
|
|
|
2953
|
|
|
2954 {
|
|
|
2955 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2956
|
|
|
2957 if (dl->ascent < ascent)
|
|
|
2958 dl->ascent = ascent;
|
|
|
2959 }
|
|
|
2960 {
|
|
|
2961 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2962
|
|
|
2963 if (dl->descent < descent)
|
|
|
2964 dl->descent = descent;
|
|
|
2965 }
|
|
|
2966
|
|
819
|
2967 calculate_yoffset (dl, db);
|
|
|
2968
|
|
428
|
2969 dl->cursor_elt = data.cursor_x;
|
|
|
2970 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
2971 if (data.byte_charpos > BYTE_BUF_ZV (b))
|
|
|
2972 dl->end_charpos = BUF_ZV (b);
|
|
428
|
2973 else
|
|
826
|
2974 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
|
|
428
|
2975 if (truncate_win)
|
|
826
|
2976 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
|
|
428
|
2977 else
|
|
|
2978 /* This doesn't correctly take into account tabs and control
|
|
|
2979 characters but if the window isn't being truncated then this
|
|
|
2980 value isn't going to end up being used anyhow. */
|
|
826
|
2981 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
2982
|
|
|
2983 /* #### handle horizontally scrolled line with text none of which
|
|
|
2984 was actually laid out. */
|
|
|
2985
|
|
|
2986 /* #### handle any remainder of overlay arrow */
|
|
|
2987
|
|
|
2988 if (*prop == ADD_FAILED)
|
|
|
2989 *prop = NULL;
|
|
|
2990
|
|
|
2991 if (truncate_win && *prop)
|
|
|
2992 {
|
|
|
2993 Dynarr_free (*prop);
|
|
|
2994 *prop = NULL;
|
|
|
2995 }
|
|
|
2996
|
|
|
2997 extent_fragment_delete (data.ef);
|
|
|
2998
|
|
|
2999 /* #### If we started at EOB, then make sure we return a value past
|
|
|
3000 it so that regenerate_window will exit properly. This is bogus.
|
|
|
3001 The main loop should get fixed so that it isn't necessary to call
|
|
|
3002 this function if we are already at EOB. */
|
|
|
3003
|
|
826
|
3004 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
|
|
|
3005 return data.byte_charpos + 1; /* Yuck! */
|
|
428
|
3006 else
|
|
826
|
3007 return data.byte_charpos;
|
|
428
|
3008 }
|
|
|
3009
|
|
|
3010 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
3011
|
|
|
3012 static int
|
|
|
3013 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3014 {
|
|
|
3015 struct frame *f = XFRAME (w->frame);
|
|
|
3016 struct device *d = XDEVICE (f->device);
|
|
|
3017 pos_data data;
|
|
|
3018
|
|
|
3019 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
3020 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
3021 return 0;
|
|
|
3022
|
|
|
3023 xzero (data);
|
|
|
3024 data.ef = NULL;
|
|
|
3025 data.d = d;
|
|
793
|
3026 data.window = wrap_window (w);
|
|
428
|
3027 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
3028 data.dl = dl;
|
|
|
3029 data.pixpos = dl->bounds.left_in;
|
|
|
3030 data.max_pixpos = dl->bounds.right_in;
|
|
|
3031 data.cursor_type = NO_CURSOR;
|
|
|
3032 data.cursor_x = -1;
|
|
|
3033 data.findex = DEFAULT_INDEX;
|
|
|
3034 data.last_charset = Qunbound;
|
|
|
3035 data.last_findex = DEFAULT_INDEX;
|
|
|
3036 data.result_str = Qnil;
|
|
|
3037 data.string = Qnil;
|
|
|
3038
|
|
|
3039 Dynarr_reset (data.db->runes);
|
|
|
3040
|
|
|
3041 if (STRINGP (Voverlay_arrow_string))
|
|
|
3042 {
|
|
867
|
3043 add_ibyte_string_runes
|
|
428
|
3044 (&data,
|
|
|
3045 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
3046 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
3047 1, 0);
|
|
428
|
3048 }
|
|
|
3049 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
3050 {
|
|
|
3051 struct glyph_block gb;
|
|
|
3052
|
|
|
3053 gb.glyph = Voverlay_arrow_string;
|
|
|
3054 gb.extent = Qnil;
|
|
|
3055 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3056 }
|
|
819
|
3057
|
|
428
|
3058 if (data.max_pixmap_height)
|
|
|
3059 {
|
|
|
3060 int height = data.new_ascent + data.new_descent;
|
|
|
3061 int pix_ascent, pix_descent;
|
|
819
|
3062
|
|
428
|
3063 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
3064 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
3065 calculate_baseline (&data);
|
|
428
|
3066
|
|
|
3067 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
3068 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
3069 }
|
|
|
3070
|
|
|
3071 dl->ascent = data.new_ascent;
|
|
|
3072 dl->descent = data.new_descent;
|
|
|
3073
|
|
|
3074 data.db->start_pos = dl->bounds.left_in;
|
|
|
3075 data.db->end_pos = data.pixpos;
|
|
|
3076
|
|
819
|
3077 calculate_yoffset (dl, data.db);
|
|
|
3078
|
|
428
|
3079 return data.pixpos - dl->bounds.left_in;
|
|
|
3080 }
|
|
|
3081
|
|
|
3082 /* Add a type of glyph to a margin display block. */
|
|
|
3083
|
|
|
3084 static int
|
|
|
3085 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
3086 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
3087 {
|
|
|
3088 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
3089 ? dl->left_glyphs
|
|
|
3090 : dl->right_glyphs);
|
|
|
3091 int elt, end;
|
|
|
3092 int reverse;
|
|
442
|
3093 struct window *w = XWINDOW (window);
|
|
|
3094 struct frame *f = XFRAME (w->frame);
|
|
|
3095 struct device *d = XDEVICE (f->device);
|
|
|
3096 pos_data data;
|
|
|
3097
|
|
|
3098 xzero (data);
|
|
|
3099 data.d = d;
|
|
|
3100 data.window = window;
|
|
|
3101 data.db = db;
|
|
|
3102 data.dl = dl;
|
|
|
3103 data.pixpos = start;
|
|
|
3104 data.cursor_type = NO_CURSOR;
|
|
|
3105 data.cursor_x = -1;
|
|
|
3106 data.last_charset = Qunbound;
|
|
|
3107 data.last_findex = DEFAULT_INDEX;
|
|
|
3108 data.result_str = Qnil;
|
|
|
3109 data.string = Qnil;
|
|
|
3110 data.new_ascent = dl->ascent;
|
|
|
3111 data.new_descent = dl->descent;
|
|
428
|
3112
|
|
|
3113 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
3114 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
3115 {
|
|
|
3116 reverse = 1;
|
|
|
3117 elt = Dynarr_length (gbd) - 1;
|
|
|
3118 end = 0;
|
|
|
3119 }
|
|
|
3120 else
|
|
|
3121 {
|
|
|
3122 reverse = 0;
|
|
|
3123 elt = 0;
|
|
|
3124 end = Dynarr_length (gbd);
|
|
|
3125 }
|
|
|
3126
|
|
|
3127 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
3128 {
|
|
|
3129 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3130
|
|
|
3131 if (NILP (gb->extent))
|
|
|
3132 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3133
|
|
|
3134 if (gb->active &&
|
|
|
3135 ((side == LEFT_GLYPHS &&
|
|
|
3136 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3137 || (side == RIGHT_GLYPHS &&
|
|
|
3138 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3139 {
|
|
442
|
3140 data.findex = gb->findex;
|
|
|
3141 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3142 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3143 count--;
|
|
|
3144 gb->active = 0;
|
|
|
3145 }
|
|
|
3146
|
|
|
3147 (reverse ? elt-- : elt++);
|
|
|
3148 }
|
|
|
3149
|
|
819
|
3150 calculate_baseline (&data);
|
|
442
|
3151
|
|
|
3152 dl->ascent = data.new_ascent;
|
|
|
3153 dl->descent = data.new_descent;
|
|
|
3154
|
|
819
|
3155 calculate_yoffset (dl, data.db);
|
|
|
3156
|
|
442
|
3157 return data.pixpos;
|
|
428
|
3158 }
|
|
|
3159
|
|
|
3160 /* Add a blank to a margin display block. */
|
|
|
3161
|
|
|
3162 static void
|
|
|
3163 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
3164 struct window *w, int xpos, int width, int side)
|
|
|
3165 {
|
|
|
3166 struct rune rb;
|
|
|
3167
|
|
|
3168 rb.findex = (side == LEFT_GLYPHS
|
|
|
3169 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3170 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3171 rb.xpos = xpos;
|
|
|
3172 rb.width = width;
|
|
826
|
3173 rb.charpos = -1;
|
|
428
|
3174 rb.endpos = 0;
|
|
|
3175 rb.type = RUNE_BLANK;
|
|
|
3176 rb.cursor_type = CURSOR_OFF;
|
|
|
3177
|
|
|
3178 Dynarr_add (db->runes, rb);
|
|
|
3179 }
|
|
|
3180
|
|
|
3181 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3182 left whitespace area. */
|
|
|
3183
|
|
|
3184 static void
|
|
|
3185 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3186 int overlay_width)
|
|
|
3187 {
|
|
|
3188 Lisp_Object window;
|
|
|
3189
|
|
|
3190 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3191 int elt, end_xpos;
|
|
|
3192 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3193 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3194 int left_in_start = dl->bounds.left_in;
|
|
|
3195 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3196
|
|
|
3197 struct display_block *odb, *idb;
|
|
|
3198
|
|
793
|
3199 window = wrap_window (w);
|
|
428
|
3200
|
|
|
3201 /* We have to add the glyphs to the line in the order outside,
|
|
|
3202 inside, whitespace. However the precedence dictates that we
|
|
|
3203 determine how many will fit in the reverse order. */
|
|
|
3204
|
|
|
3205 /* Determine how many whitespace glyphs we can display and where
|
|
|
3206 they should start. */
|
|
|
3207 white_in_start = dl->bounds.left_white;
|
|
|
3208 white_out_start = left_in_start;
|
|
|
3209 white_out_cnt = white_in_cnt = 0;
|
|
|
3210 elt = 0;
|
|
|
3211
|
|
|
3212 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3213 {
|
|
|
3214 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3215
|
|
|
3216 if (NILP (gb->extent))
|
|
|
3217 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3218
|
|
|
3219 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3220 {
|
|
|
3221 int width;
|
|
|
3222
|
|
438
|
3223 width = glyph_width (gb->glyph, window);
|
|
428
|
3224
|
|
|
3225 if (white_in_start - width >= left_in_end)
|
|
|
3226 {
|
|
|
3227 white_in_cnt++;
|
|
|
3228 white_in_start -= width;
|
|
|
3229 gb->width = width;
|
|
|
3230 gb->active = 1;
|
|
|
3231 }
|
|
|
3232 else if (use_overflow
|
|
|
3233 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3234 {
|
|
|
3235 white_out_cnt++;
|
|
|
3236 white_out_start -= width;
|
|
|
3237 gb->width = width;
|
|
|
3238 gb->active = 1;
|
|
|
3239 }
|
|
|
3240 else
|
|
|
3241 gb->active = 0;
|
|
|
3242 }
|
|
|
3243
|
|
|
3244 elt++;
|
|
|
3245 }
|
|
|
3246
|
|
|
3247 /* Determine how many inside margin glyphs we can display and where
|
|
|
3248 they should start. The inside margin glyphs get whatever space
|
|
|
3249 is left after the whitespace glyphs have been displayed. These
|
|
|
3250 are tricky to calculate since if we decide to use the overflow
|
|
|
3251 area we basically have to start over. So for these we build up a
|
|
|
3252 list of just the inside margin glyphs and manipulate it to
|
|
|
3253 determine the needed info. */
|
|
|
3254 {
|
|
|
3255 glyph_block_dynarr *ib;
|
|
|
3256 int avail_in, avail_out;
|
|
|
3257 int done = 0;
|
|
|
3258 int marker = 0;
|
|
|
3259 int used_in, used_out;
|
|
|
3260
|
|
|
3261 elt = 0;
|
|
|
3262 used_in = used_out = 0;
|
|
|
3263 ib = Dynarr_new (glyph_block);
|
|
|
3264 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3265 {
|
|
|
3266 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3267
|
|
|
3268 if (NILP (gb->extent))
|
|
|
3269 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3270
|
|
|
3271 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3272 GL_INSIDE_MARGIN)
|
|
|
3273 {
|
|
438
|
3274 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3275 used_in += gb->width;
|
|
|
3276 Dynarr_add (ib, *gb);
|
|
|
3277 }
|
|
|
3278
|
|
|
3279 elt++;
|
|
|
3280 }
|
|
|
3281
|
|
|
3282 if (white_out_cnt)
|
|
|
3283 avail_in = 0;
|
|
|
3284 else
|
|
|
3285 {
|
|
|
3286 avail_in = white_in_start - left_in_end;
|
|
|
3287 if (avail_in < 0)
|
|
|
3288 avail_in = 0;
|
|
|
3289 }
|
|
|
3290
|
|
|
3291 if (!use_overflow)
|
|
|
3292 avail_out = 0;
|
|
|
3293 else
|
|
|
3294 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3295
|
|
|
3296 marker = 0;
|
|
|
3297 while (!done && marker < Dynarr_length (ib))
|
|
|
3298 {
|
|
|
3299 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3300
|
|
|
3301 /* If everything now fits in the available inside margin
|
|
|
3302 space, we're done. */
|
|
|
3303 if (used_in <= avail_in)
|
|
|
3304 done = 1;
|
|
|
3305 else
|
|
|
3306 {
|
|
|
3307 /* Otherwise see if we have room to move a glyph to the
|
|
|
3308 outside. */
|
|
|
3309 if (used_out + width <= avail_out)
|
|
|
3310 {
|
|
|
3311 used_out += width;
|
|
|
3312 used_in -= width;
|
|
|
3313 }
|
|
|
3314 else
|
|
|
3315 done = 1;
|
|
|
3316 }
|
|
|
3317
|
|
|
3318 if (!done)
|
|
|
3319 marker++;
|
|
|
3320 }
|
|
|
3321
|
|
|
3322 /* At this point we now know that everything from marker on goes in
|
|
|
3323 the inside margin and everything before it goes in the outside
|
|
|
3324 margin. The stuff going into the outside margin is guaranteed
|
|
|
3325 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3326
|
|
|
3327 in_in_end = left_in_end;
|
|
|
3328 in_out_start = white_out_start;
|
|
|
3329 in_out_cnt = in_in_cnt = 0;
|
|
|
3330
|
|
|
3331 Dynarr_free (ib);
|
|
|
3332 elt = 0;
|
|
|
3333 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3334 {
|
|
|
3335 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3336
|
|
|
3337 if (NILP (gb->extent))
|
|
|
3338 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3339
|
|
|
3340 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3341 GL_INSIDE_MARGIN)
|
|
|
3342 {
|
|
438
|
3343 int width = glyph_width (gb->glyph, window);
|
|
428
|
3344
|
|
|
3345 if (used_out)
|
|
|
3346 {
|
|
|
3347 in_out_cnt++;
|
|
|
3348 in_out_start -= width;
|
|
|
3349 gb->width = width;
|
|
|
3350 gb->active = 1;
|
|
|
3351 used_out -= width;
|
|
|
3352 }
|
|
|
3353 else if (in_in_end + width < white_in_start)
|
|
|
3354 {
|
|
|
3355 in_in_cnt++;
|
|
|
3356 in_in_end += width;
|
|
|
3357 gb->width = width;
|
|
|
3358 gb->active = 1;
|
|
|
3359 }
|
|
|
3360 else
|
|
|
3361 gb->active = 0;
|
|
|
3362 }
|
|
|
3363
|
|
|
3364 elt++;
|
|
|
3365 }
|
|
|
3366 }
|
|
|
3367
|
|
|
3368 /* Determine how many outside margin glyphs we can display. They
|
|
|
3369 always start at the left outside margin and can only use the
|
|
|
3370 outside margin space. */
|
|
|
3371 out_end = dl->bounds.left_out;
|
|
|
3372 out_cnt = 0;
|
|
|
3373 elt = 0;
|
|
|
3374
|
|
|
3375 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3376 {
|
|
|
3377 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3378
|
|
|
3379 if (NILP (gb->extent))
|
|
|
3380 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3381
|
|
|
3382 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3383 GL_OUTSIDE_MARGIN)
|
|
|
3384 {
|
|
438
|
3385 int width = glyph_width (gb->glyph, window);
|
|
428
|
3386
|
|
|
3387 if (out_end + width <= in_out_start)
|
|
|
3388 {
|
|
|
3389 out_cnt++;
|
|
|
3390 out_end += width;
|
|
|
3391 gb->width = width;
|
|
|
3392 gb->active = 1;
|
|
|
3393 }
|
|
|
3394 else
|
|
|
3395 gb->active = 0;
|
|
|
3396 }
|
|
|
3397
|
|
|
3398 elt++;
|
|
|
3399 }
|
|
|
3400
|
|
|
3401 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3402 runes to the appropriate display blocks. */
|
|
|
3403 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3404 {
|
|
|
3405 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3406 odb->start_pos = dl->bounds.left_out;
|
|
|
3407 /* #### We should stop adding a blank to account for the space
|
|
|
3408 between the end of the glyphs and the margin and instead set
|
|
|
3409 this accordingly. */
|
|
|
3410 odb->end_pos = dl->bounds.left_in;
|
|
|
3411 Dynarr_reset (odb->runes);
|
|
|
3412 }
|
|
|
3413 else
|
|
|
3414 odb = 0;
|
|
|
3415
|
|
|
3416 if (in_in_cnt || white_in_cnt)
|
|
|
3417 {
|
|
|
3418 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3419 idb->start_pos = dl->bounds.left_in;
|
|
|
3420 /* #### See above comment for odb->end_pos */
|
|
|
3421 idb->end_pos = dl->bounds.left_white;
|
|
|
3422 Dynarr_reset (idb->runes);
|
|
|
3423 }
|
|
|
3424 else
|
|
|
3425 idb = 0;
|
|
|
3426
|
|
|
3427 /* First add the outside margin glyphs. */
|
|
|
3428 if (out_cnt)
|
|
|
3429 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3430 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3431 else
|
|
|
3432 end_xpos = dl->bounds.left_out;
|
|
|
3433
|
|
|
3434 /* There may be blank space between the outside margin glyphs and
|
|
|
3435 the inside margin glyphs. If so, add a blank. */
|
|
|
3436 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3437 {
|
|
|
3438 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3439 LEFT_GLYPHS);
|
|
|
3440 }
|
|
|
3441
|
|
|
3442 /* Next add the inside margin glyphs which are actually in the
|
|
|
3443 outside margin. */
|
|
|
3444 if (in_out_cnt)
|
|
|
3445 {
|
|
|
3446 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3447 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3448 }
|
|
|
3449
|
|
|
3450 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3451 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3452 here. */
|
|
|
3453 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3454 {
|
|
|
3455 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3456 LEFT_GLYPHS);
|
|
|
3457 }
|
|
|
3458
|
|
|
3459 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3460 outside margin. */
|
|
|
3461 if (white_out_cnt)
|
|
|
3462 {
|
|
|
3463 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3464 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3465 }
|
|
|
3466
|
|
|
3467 /* We take care of clearing between the end of the glyphs and the
|
|
|
3468 start of the inside margin for lines which have glyphs. */
|
|
|
3469 if (odb && (left_in_start - end_xpos))
|
|
|
3470 {
|
|
|
3471 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3472 LEFT_GLYPHS);
|
|
|
3473 }
|
|
|
3474
|
|
|
3475 /* Next add the inside margin glyphs which are actually in the
|
|
|
3476 inside margin. */
|
|
|
3477 if (in_in_cnt)
|
|
|
3478 {
|
|
|
3479 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3480 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3481 }
|
|
|
3482 else
|
|
|
3483 end_xpos = left_in_end;
|
|
|
3484
|
|
|
3485 /* Make sure that the area between the end of the inside margin
|
|
|
3486 glyphs and the whitespace glyphs is cleared. */
|
|
|
3487 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3488 {
|
|
|
3489 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3490 LEFT_GLYPHS);
|
|
|
3491 }
|
|
|
3492
|
|
|
3493 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3494 inside margin. */
|
|
|
3495 if (white_in_cnt)
|
|
|
3496 {
|
|
|
3497 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3498 LEFT_GLYPHS, window);
|
|
|
3499 }
|
|
|
3500
|
|
|
3501 /* Whitespace glyphs always end right next to the text block so
|
|
|
3502 there is nothing we have to make sure is cleared after them. */
|
|
|
3503 }
|
|
|
3504
|
|
|
3505 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3506 right whitespace area. */
|
|
|
3507
|
|
|
3508 static void
|
|
|
3509 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3510 {
|
|
|
3511 Lisp_Object window;
|
|
|
3512
|
|
|
3513 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3514 int elt, end_xpos;
|
|
|
3515 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3516 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3517
|
|
|
3518 struct display_block *odb, *idb;
|
|
|
3519
|
|
793
|
3520 window = wrap_window (w);
|
|
428
|
3521
|
|
|
3522 /* We have to add the glyphs to the line in the order outside,
|
|
|
3523 inside, whitespace. However the precedence dictates that we
|
|
|
3524 determine how many will fit in the reverse order. */
|
|
|
3525
|
|
|
3526 /* Determine how many whitespace glyphs we can display and where
|
|
|
3527 they should start. */
|
|
|
3528 white_in_end = dl->bounds.right_white;
|
|
|
3529 white_out_end = dl->bounds.right_in;
|
|
|
3530 white_out_cnt = white_in_cnt = 0;
|
|
|
3531 elt = 0;
|
|
|
3532
|
|
|
3533 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3534 {
|
|
|
3535 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3536
|
|
|
3537 if (NILP (gb->extent))
|
|
|
3538 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3539
|
|
|
3540 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3541 {
|
|
438
|
3542 int width = glyph_width (gb->glyph, window);
|
|
428
|
3543
|
|
|
3544 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3545 {
|
|
|
3546 white_in_cnt++;
|
|
|
3547 white_in_end += width;
|
|
|
3548 gb->width = width;
|
|
|
3549 gb->active = 1;
|
|
|
3550 }
|
|
|
3551 else if (use_overflow
|
|
|
3552 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3553 {
|
|
|
3554 white_out_cnt++;
|
|
|
3555 white_out_end += width;
|
|
|
3556 gb->width = width;
|
|
|
3557 gb->active = 1;
|
|
|
3558 }
|
|
|
3559 else
|
|
|
3560 gb->active = 0;
|
|
|
3561 }
|
|
|
3562
|
|
|
3563 elt++;
|
|
|
3564 }
|
|
|
3565
|
|
|
3566 /* Determine how many inside margin glyphs we can display and where
|
|
|
3567 they should start. The inside margin glyphs get whatever space
|
|
|
3568 is left after the whitespace glyphs have been displayed. These
|
|
|
3569 are tricky to calculate since if we decide to use the overflow
|
|
|
3570 area we basically have to start over. So for these we build up a
|
|
|
3571 list of just the inside margin glyphs and manipulate it to
|
|
|
3572 determine the needed info. */
|
|
|
3573 {
|
|
|
3574 glyph_block_dynarr *ib;
|
|
|
3575 int avail_in, avail_out;
|
|
|
3576 int done = 0;
|
|
|
3577 int marker = 0;
|
|
|
3578 int used_in, used_out;
|
|
|
3579
|
|
|
3580 elt = 0;
|
|
|
3581 used_in = used_out = 0;
|
|
|
3582 ib = Dynarr_new (glyph_block);
|
|
|
3583 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3584 {
|
|
|
3585 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3586
|
|
|
3587 if (NILP (gb->extent))
|
|
|
3588 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3589
|
|
|
3590 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3591 {
|
|
438
|
3592 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3593 used_in += gb->width;
|
|
|
3594 Dynarr_add (ib, *gb);
|
|
|
3595 }
|
|
|
3596
|
|
|
3597 elt++;
|
|
|
3598 }
|
|
|
3599
|
|
|
3600 if (white_out_cnt)
|
|
|
3601 avail_in = 0;
|
|
|
3602 else
|
|
|
3603 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3604
|
|
|
3605 if (!use_overflow)
|
|
|
3606 avail_out = 0;
|
|
|
3607 else
|
|
|
3608 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3609
|
|
|
3610 marker = 0;
|
|
|
3611 while (!done && marker < Dynarr_length (ib))
|
|
|
3612 {
|
|
|
3613 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3614
|
|
|
3615 /* If everything now fits in the available inside margin
|
|
|
3616 space, we're done. */
|
|
|
3617 if (used_in <= avail_in)
|
|
|
3618 done = 1;
|
|
|
3619 else
|
|
|
3620 {
|
|
|
3621 /* Otherwise see if we have room to move a glyph to the
|
|
|
3622 outside. */
|
|
|
3623 if (used_out + width <= avail_out)
|
|
|
3624 {
|
|
|
3625 used_out += width;
|
|
|
3626 used_in -= width;
|
|
|
3627 }
|
|
|
3628 else
|
|
|
3629 done = 1;
|
|
|
3630 }
|
|
|
3631
|
|
|
3632 if (!done)
|
|
|
3633 marker++;
|
|
|
3634 }
|
|
|
3635
|
|
|
3636 /* At this point we now know that everything from marker on goes in
|
|
|
3637 the inside margin and everything before it goes in the outside
|
|
|
3638 margin. The stuff going into the outside margin is guaranteed
|
|
|
3639 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3640
|
|
|
3641 in_in_start = dl->bounds.right_in;
|
|
|
3642 in_out_end = dl->bounds.right_in;
|
|
|
3643 in_out_cnt = in_in_cnt = 0;
|
|
|
3644
|
|
|
3645 Dynarr_free (ib);
|
|
|
3646 elt = 0;
|
|
|
3647 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3648 {
|
|
|
3649 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3650
|
|
|
3651 if (NILP (gb->extent))
|
|
|
3652 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3653
|
|
|
3654 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3655 {
|
|
438
|
3656 int width = glyph_width (gb->glyph, window);
|
|
428
|
3657
|
|
|
3658 if (used_out)
|
|
|
3659 {
|
|
|
3660 in_out_cnt++;
|
|
|
3661 in_out_end += width;
|
|
|
3662 gb->width = width;
|
|
|
3663 gb->active = 1;
|
|
|
3664 used_out -= width;
|
|
|
3665 }
|
|
|
3666 else if (in_in_start - width >= white_in_end)
|
|
|
3667 {
|
|
|
3668 in_in_cnt++;
|
|
|
3669 in_in_start -= width;
|
|
|
3670 gb->width = width;
|
|
|
3671 gb->active = 1;
|
|
|
3672 }
|
|
|
3673 else
|
|
|
3674 gb->active = 0;
|
|
|
3675 }
|
|
|
3676
|
|
|
3677 elt++;
|
|
|
3678 }
|
|
|
3679 }
|
|
|
3680
|
|
|
3681 /* Determine how many outside margin glyphs we can display. They
|
|
|
3682 always start at the right outside margin and can only use the
|
|
|
3683 outside margin space. */
|
|
|
3684 out_start = dl->bounds.right_out;
|
|
|
3685 out_cnt = 0;
|
|
|
3686 elt = 0;
|
|
|
3687
|
|
|
3688 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3689 {
|
|
|
3690 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3691
|
|
|
3692 if (NILP (gb->extent))
|
|
|
3693 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3694
|
|
|
3695 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3696 {
|
|
438
|
3697 int width = glyph_width (gb->glyph, window);
|
|
428
|
3698
|
|
|
3699 if (out_start - width >= in_out_end)
|
|
|
3700 {
|
|
|
3701 out_cnt++;
|
|
|
3702 out_start -= width;
|
|
|
3703 gb->width = width;
|
|
|
3704 gb->active = 1;
|
|
|
3705 }
|
|
|
3706 else
|
|
|
3707 gb->active = 0;
|
|
|
3708 }
|
|
|
3709
|
|
|
3710 elt++;
|
|
|
3711 }
|
|
|
3712
|
|
|
3713 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3714 to the appropriate display blocks. */
|
|
|
3715 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3716 {
|
|
|
3717 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3718 /* #### See comments before odb->start_pos init in
|
|
|
3719 create_left_glyph_block */
|
|
|
3720 odb->start_pos = dl->bounds.right_in;
|
|
|
3721 odb->end_pos = dl->bounds.right_out;
|
|
|
3722 Dynarr_reset (odb->runes);
|
|
|
3723 }
|
|
|
3724 else
|
|
|
3725 odb = 0;
|
|
|
3726
|
|
|
3727 if (in_in_cnt || white_in_cnt)
|
|
|
3728 {
|
|
|
3729 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3730 idb->start_pos = dl->bounds.right_white;
|
|
|
3731 /* #### See comments before odb->start_pos init in
|
|
|
3732 create_left_glyph_block */
|
|
|
3733 idb->end_pos = dl->bounds.right_in;
|
|
|
3734 Dynarr_reset (idb->runes);
|
|
|
3735 }
|
|
|
3736 else
|
|
|
3737 idb = 0;
|
|
|
3738
|
|
|
3739 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3740 inside margin. */
|
|
|
3741 if (white_in_cnt)
|
|
|
3742 {
|
|
|
3743 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3744 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3745 window);
|
|
|
3746 }
|
|
|
3747 else
|
|
|
3748 end_xpos = dl->bounds.right_white;
|
|
|
3749
|
|
|
3750 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3751 and the inside margin glyphs is cleared. */
|
|
|
3752 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3753 {
|
|
|
3754 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3755 RIGHT_GLYPHS);
|
|
|
3756 }
|
|
|
3757
|
|
|
3758 /* Next add the inside margin glyphs which are actually in the
|
|
|
3759 inside margin. */
|
|
|
3760 if (in_in_cnt)
|
|
|
3761 {
|
|
|
3762 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3763 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3764 }
|
|
|
3765
|
|
|
3766 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3767 of the inside margin area gets cleared. */
|
|
|
3768 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3769 {
|
|
|
3770 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3771 RIGHT_GLYPHS);
|
|
|
3772 }
|
|
|
3773
|
|
|
3774 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3775 if (white_out_cnt)
|
|
|
3776 {
|
|
|
3777 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3778 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3779 }
|
|
|
3780 else
|
|
|
3781 end_xpos = dl->bounds.right_in;
|
|
|
3782
|
|
|
3783 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3784 if (in_out_cnt)
|
|
|
3785 {
|
|
|
3786 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3787 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3788 }
|
|
|
3789
|
|
|
3790 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3791 in the outside margin and the actual outside margin glyphs. */
|
|
|
3792 if (odb && (out_start - end_xpos))
|
|
|
3793 {
|
|
|
3794 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3795 RIGHT_GLYPHS);
|
|
|
3796 }
|
|
|
3797
|
|
|
3798 /* Finally, add the outside margin glyphs. */
|
|
|
3799 if (out_cnt)
|
|
|
3800 {
|
|
|
3801 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3802 RIGHT_GLYPHS, window);
|
|
|
3803 }
|
|
|
3804 }
|
|
|
3805
|
|
|
3806
|
|
|
3807 /***************************************************************************/
|
|
|
3808 /* */
|
|
|
3809 /* modeline routines */
|
|
|
3810 /* */
|
|
|
3811 /***************************************************************************/
|
|
|
3812
|
|
438
|
3813 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3814 void
|
|
|
3815 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3816 struct window *w, struct display_line *dl,
|
|
|
3817 struct display_block *db, face_index findex,
|
|
|
3818 int min_pixpos, int max_pixpos, int type)
|
|
|
3819 {
|
|
|
3820 struct frame *f = XFRAME (w->frame);
|
|
|
3821 struct device *d = XDEVICE (f->device);
|
|
|
3822
|
|
|
3823 pos_data data;
|
|
|
3824 int c_pixpos;
|
|
|
3825 Charcount offset = 0;
|
|
|
3826
|
|
|
3827 xzero (data);
|
|
|
3828 data.d = d;
|
|
|
3829 data.db = db;
|
|
|
3830 data.dl = dl;
|
|
|
3831 data.findex = findex;
|
|
|
3832 data.pixpos = min_pixpos;
|
|
|
3833 data.max_pixpos = max_pixpos;
|
|
|
3834 data.cursor_type = NO_CURSOR;
|
|
|
3835 data.last_charset = Qunbound;
|
|
|
3836 data.last_findex = DEFAULT_INDEX;
|
|
|
3837 data.result_str = result_str;
|
|
|
3838 data.is_modeline = 1;
|
|
|
3839 data.string = Qnil;
|
|
793
|
3840 data.window = wrap_window (w);
|
|
438
|
3841
|
|
|
3842 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3843 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3844 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3845
|
|
|
3846 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3847 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3848 horizontal scrolling amount */
|
|
438
|
3849 if (! NILP (result_str))
|
|
|
3850 offset = w->modeline_hscroll;
|
|
|
3851 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3852 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3853 Qnil);
|
|
|
3854
|
|
|
3855 if (Dynarr_length (db->runes))
|
|
|
3856 {
|
|
|
3857 struct rune *rb =
|
|
|
3858 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3859 c_pixpos = rb->xpos + rb->width;
|
|
|
3860 }
|
|
|
3861 else
|
|
|
3862 c_pixpos = min_pixpos;
|
|
|
3863
|
|
|
3864 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3865 to make up the difference. This usually only occurs if the
|
|
|
3866 modeline face is using a proportional width font or a fixed width
|
|
|
3867 font of a different size from the default face font. */
|
|
|
3868
|
|
|
3869 if (c_pixpos < max_pixpos)
|
|
|
3870 {
|
|
|
3871 data.pixpos = c_pixpos;
|
|
|
3872 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3873
|
|
|
3874 add_blank_rune (&data, NULL, 0);
|
|
|
3875 }
|
|
|
3876
|
|
|
3877 /* Now create the result string and frob the extents into it. */
|
|
|
3878 if (!NILP (result_str))
|
|
|
3879 {
|
|
|
3880 int elt;
|
|
|
3881 Bytecount len;
|
|
867
|
3882 Ibyte *strdata;
|
|
438
|
3883 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3884
|
|
442
|
3885 in_modeline_generation = 1;
|
|
|
3886
|
|
771
|
3887 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3888 detach_all_extents (result_str);
|
|
793
|
3889 resize_string (result_str, -1,
|
|
438
|
3890 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3891
|
|
|
3892 strdata = XSTRING_DATA (result_str);
|
|
|
3893
|
|
|
3894 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3895 {
|
|
|
3896 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3897 {
|
|
867
|
3898 len += (set_itext_ichar
|
|
438
|
3899 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3900 elt)->object.chr.ch));
|
|
|
3901 }
|
|
|
3902 }
|
|
|
3903
|
|
771
|
3904 init_string_ascii_begin (result_str);
|
|
|
3905 bump_string_modiff (result_str);
|
|
|
3906 sledgehammer_check_ascii_begin (result_str);
|
|
|
3907
|
|
438
|
3908 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3909 elt++)
|
|
|
3910 {
|
|
|
3911 Lisp_Object extent = Qnil;
|
|
|
3912 Lisp_Object child;
|
|
|
3913
|
|
793
|
3914 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3915 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3916 if (NILP (child))
|
|
|
3917 {
|
|
|
3918 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3919 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3920 }
|
|
|
3921 Fset_extent_parent (child, extent);
|
|
|
3922 set_extent_endpoints
|
|
|
3923 (XEXTENT (child),
|
|
|
3924 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3925 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3926 result_str);
|
|
|
3927 }
|
|
442
|
3928
|
|
|
3929 in_modeline_generation = 0;
|
|
438
|
3930 }
|
|
|
3931 }
|
|
|
3932
|
|
428
|
3933 /* Ensure that the given display line DL accurately represents the
|
|
|
3934 modeline for the given window. */
|
|
|
3935 static void
|
|
|
3936 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3937 {
|
|
|
3938 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3939 struct frame *f = XFRAME (w->frame);
|
|
|
3940 struct device *d = XDEVICE (f->device);
|
|
|
3941
|
|
|
3942 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3943 our feet. */
|
|
|
3944 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3945 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3946 Lisp_Object font_inst;
|
|
|
3947
|
|
|
3948 /* This will actually determine incorrect inside boundaries for the
|
|
|
3949 modeline since it ignores the margins. However being aware of this fact
|
|
|
3950 we never use those values anywhere so it doesn't matter. */
|
|
|
3951 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3952
|
|
|
3953 /* We are generating a modeline. */
|
|
|
3954 dl->modeline = 1;
|
|
|
3955 dl->cursor_elt = -1;
|
|
|
3956
|
|
|
3957 /* Reset the runes on the modeline. */
|
|
|
3958 Dynarr_reset (db->runes);
|
|
|
3959
|
|
|
3960 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3961 {
|
|
|
3962 struct rune rb;
|
|
|
3963
|
|
|
3964 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3965 if (window_scrollbar_height (w))
|
|
|
3966 return;
|
|
|
3967
|
|
|
3968 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3969 dl->descent = 0;
|
|
|
3970 /* The modeline is at the bottom of the gutters. */
|
|
|
3971 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3972
|
|
|
3973 rb.findex = MODELINE_INDEX;
|
|
|
3974 rb.xpos = dl->bounds.left_out;
|
|
|
3975 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
826
|
3976 rb.charpos = 0;
|
|
428
|
3977 rb.endpos = 0;
|
|
|
3978 rb.type = RUNE_HLINE;
|
|
|
3979 rb.object.hline.thickness = 1;
|
|
|
3980 rb.object.hline.yoffset = 0;
|
|
|
3981 rb.cursor_type = NO_CURSOR;
|
|
|
3982
|
|
|
3983 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3984 && FRAME_WIN_P (f))
|
|
|
3985 {
|
|
|
3986 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3987
|
|
|
3988 dl->ypos -= shadow_thickness;
|
|
|
3989 rb.xpos += shadow_thickness;
|
|
|
3990 rb.width -= 2 * shadow_thickness;
|
|
|
3991 }
|
|
|
3992
|
|
|
3993 Dynarr_add (db->runes, rb);
|
|
|
3994 return;
|
|
|
3995 }
|
|
|
3996
|
|
|
3997 /* !!#### not right; needs to compute the max height of
|
|
|
3998 all the charsets */
|
|
|
3999 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
4000
|
|
|
4001 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
4002 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
4003
|
|
|
4004 min_pixpos = dl->bounds.left_out;
|
|
|
4005 max_pixpos = dl->bounds.right_out;
|
|
|
4006
|
|
|
4007 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
4008 {
|
|
|
4009 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
4010
|
|
|
4011 ypos_adj = shadow_thickness;
|
|
|
4012 min_pixpos += shadow_thickness;
|
|
|
4013 max_pixpos -= shadow_thickness;
|
|
|
4014 }
|
|
|
4015 else
|
|
|
4016 ypos_adj = 0;
|
|
|
4017
|
|
|
4018 generate_formatted_string_db (b->modeline_format,
|
|
|
4019 b->generated_modeline_string, w, dl, db,
|
|
|
4020 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
4021
|
|
|
4022 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
4023 set this until we've generated the modeline in order to account
|
|
|
4024 for any embedded faces. */
|
|
|
4025 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
4026 }
|
|
|
4027
|
|
|
4028 static Charcount
|
|
867
|
4029 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
|
|
771
|
4030 Charcount pos, Charcount min_pos,
|
|
|
4031 Charcount max_pos)
|
|
428
|
4032 {
|
|
|
4033 /* This function has been Mule-ized. */
|
|
|
4034 Charcount end;
|
|
867
|
4035 const Ibyte *cur_pos = str;
|
|
428
|
4036 struct display_block *db = data->db;
|
|
|
4037
|
|
|
4038 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
4039 while (Dynarr_length (db->runes) < pos)
|
|
|
4040 add_blank_rune (data, NULL, 0);
|
|
|
4041
|
|
|
4042 end = (Dynarr_length (db->runes) +
|
|
442
|
4043 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
4044 if (max_pos != -1)
|
|
|
4045 end = min (max_pos, end);
|
|
|
4046
|
|
|
4047 while (pos < end && *cur_pos)
|
|
|
4048 {
|
|
867
|
4049 const Ibyte *old_cur_pos = cur_pos;
|
|
428
|
4050 int succeeded;
|
|
|
4051
|
|
867
|
4052 data->ch = itext_ichar (cur_pos);
|
|
|
4053 succeeded = (add_ichar_rune (data) != ADD_FAILED);
|
|
|
4054 INC_IBYTEPTR (cur_pos);
|
|
428
|
4055 if (succeeded)
|
|
|
4056 {
|
|
|
4057 pos++;
|
|
|
4058 data->modeline_charpos++;
|
|
|
4059 data->bytepos += cur_pos - old_cur_pos;
|
|
|
4060 }
|
|
|
4061 }
|
|
|
4062
|
|
|
4063 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
4064 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
4065 add_blank_rune (data, NULL, 0);
|
|
|
4066
|
|
|
4067 return Dynarr_length (db->runes);
|
|
|
4068 }
|
|
|
4069
|
|
|
4070 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
4071 modeline extents. */
|
|
|
4072 static Charcount
|
|
|
4073 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
438
|
4074 Charcount pos, Charcount min_pos,
|
|
|
4075 Charcount max_pos, Lisp_Object extent)
|
|
428
|
4076 {
|
|
|
4077 /* This function has been Mule-ized. */
|
|
|
4078 Charcount end;
|
|
|
4079 struct display_block *db = data->db;
|
|
|
4080 struct glyph_block gb;
|
|
|
4081
|
|
|
4082 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
4083 while (Dynarr_length (db->runes) < pos)
|
|
|
4084 add_blank_rune (data, NULL, 0);
|
|
|
4085
|
|
|
4086 end = Dynarr_length (db->runes) + 1;
|
|
|
4087 if (max_pos != -1)
|
|
|
4088 end = min (max_pos, end);
|
|
|
4089
|
|
|
4090 gb.glyph = glyph;
|
|
438
|
4091 gb.extent = extent;
|
|
428
|
4092 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
4093 pos++;
|
|
|
4094
|
|
|
4095 while (Dynarr_length (db->runes) < pos &&
|
|
|
4096 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
4097 add_blank_rune (data, NULL, 0);
|
|
|
4098
|
|
|
4099 return Dynarr_length (db->runes);
|
|
|
4100 }
|
|
|
4101
|
|
|
4102 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
4103 true of max_pixsize. */
|
|
|
4104 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
4105 if (Dynarr_length (data->db->runes)) \
|
|
|
4106 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
4107 else \
|
|
|
4108 cur_pixsize = 0;
|
|
|
4109
|
|
|
4110 /* Note that this function does "positions" in terms of characters and
|
|
|
4111 not in terms of columns. This is necessary to make the formatting
|
|
|
4112 work correctly when proportional width fonts are used in the
|
|
|
4113 modeline. */
|
|
|
4114 static Charcount
|
|
|
4115 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
4116 Charcount min_pos, Charcount max_pos,
|
|
|
4117 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
4118 face_index findex, int type, Charcount *offset,
|
|
|
4119 Lisp_Object cur_ext)
|
|
428
|
4120 {
|
|
|
4121 /* This function has been Mule-ized. */
|
|
|
4122 /* #### The other losing things in this function are:
|
|
|
4123
|
|
|
4124 -- C zero-terminated-string lossage.
|
|
|
4125 -- Non-printable characters should be converted into something
|
|
|
4126 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
4127 */
|
|
|
4128
|
|
|
4129 tail_recurse:
|
|
|
4130 if (depth > 10)
|
|
|
4131 goto invalid;
|
|
|
4132
|
|
|
4133 depth++;
|
|
|
4134
|
|
|
4135 if (STRINGP (elt))
|
|
|
4136 {
|
|
|
4137 /* A string. Add to the display line and check for %-constructs
|
|
|
4138 within it. */
|
|
|
4139
|
|
867
|
4140 Ibyte *this = XSTRING_DATA (elt);
|
|
428
|
4141
|
|
|
4142 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4143 {
|
|
867
|
4144 Ibyte *last = this;
|
|
428
|
4145
|
|
|
4146 while (*this && *this != '%')
|
|
|
4147 this++;
|
|
|
4148
|
|
|
4149 if (this != last)
|
|
|
4150 {
|
|
438
|
4151 /* No %-construct */
|
|
428
|
4152 Charcount size =
|
|
438
|
4153 bytecount_to_charcount (last, this - last);
|
|
|
4154
|
|
|
4155 if (size <= *offset)
|
|
|
4156 *offset -= size;
|
|
|
4157 else
|
|
|
4158 {
|
|
|
4159 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4160 min (pos + size - *offset, max_pos));
|
|
867
|
4161 const Ibyte *tmp_last = itext_n_addr (last, *offset);
|
|
438
|
4162
|
|
|
4163 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4164 pos, pos, tmp_max);
|
|
|
4165 *offset = 0;
|
|
|
4166 }
|
|
428
|
4167 }
|
|
|
4168 else /* *this == '%' */
|
|
|
4169 {
|
|
|
4170 Charcount spec_width = 0;
|
|
|
4171
|
|
|
4172 this++; /* skip over '%' */
|
|
|
4173
|
|
|
4174 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4175 * Argument specifies minwidth but not maxwidth
|
|
|
4176 * (maxwidth can be specified by
|
|
|
4177 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4178 */
|
|
|
4179 while (isdigit (*this))
|
|
|
4180 {
|
|
|
4181 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4182 this++;
|
|
|
4183 }
|
|
|
4184 spec_width += pos;
|
|
|
4185
|
|
|
4186 if (*this == 'M')
|
|
|
4187 {
|
|
|
4188 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4189 max_pos, Vglobal_mode_string,
|
|
|
4190 depth, max_pixsize, findex,
|
|
438
|
4191 type, offset, cur_ext);
|
|
428
|
4192 }
|
|
|
4193 else if (*this == '-')
|
|
|
4194 {
|
|
|
4195 Charcount num_to_add;
|
|
|
4196
|
|
|
4197 if (max_pixsize < 0)
|
|
|
4198 num_to_add = 0;
|
|
|
4199 else if (max_pos != -1)
|
|
|
4200 num_to_add = max_pos - pos;
|
|
|
4201 else
|
|
|
4202 {
|
|
|
4203 int cur_pixsize;
|
|
|
4204 int dash_pixsize;
|
|
867
|
4205 Ibyte ch = '-';
|
|
428
|
4206 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4207
|
|
|
4208 dash_pixsize =
|
|
|
4209 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4210 1);
|
|
|
4211
|
|
|
4212 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4213 num_to_add++;
|
|
|
4214 }
|
|
|
4215
|
|
|
4216 while (num_to_add--)
|
|
|
4217 pos = add_string_to_fstring_db_runes
|
|
867
|
4218 (data, (const Ibyte *) "-", pos, pos, max_pos);
|
|
428
|
4219 }
|
|
|
4220 else if (*this != 0)
|
|
|
4221 {
|
|
867
|
4222 Ichar ch = itext_ichar (this);
|
|
|
4223 Ibyte *str;
|
|
438
|
4224 Charcount size;
|
|
|
4225
|
|
428
|
4226 decode_mode_spec (w, ch, type);
|
|
|
4227
|
|
867
|
4228 str = Dynarr_atp (mode_spec_ibyte_string, 0);
|
|
438
|
4229 size = bytecount_to_charcount
|
|
|
4230 /* Skip the null character added by `decode_mode_spec' */
|
|
867
|
4231 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
|
|
438
|
4232
|
|
|
4233 if (size <= *offset)
|
|
|
4234 *offset -= size;
|
|
|
4235 else
|
|
|
4236 {
|
|
867
|
4237 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4238
|
|
440
|
4239 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4240 computed and used here as in the plain string case
|
|
|
4241 above. -- dv */
|
|
|
4242 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4243 pos, pos,
|
|
|
4244 max_pos);
|
|
|
4245 *offset = 0;
|
|
|
4246 }
|
|
428
|
4247 }
|
|
|
4248
|
|
|
4249 /* NOT this++. There could be any sort of character at
|
|
|
4250 the current position. */
|
|
867
|
4251 INC_IBYTEPTR (this);
|
|
428
|
4252 }
|
|
|
4253
|
|
|
4254 if (max_pixsize > 0)
|
|
|
4255 {
|
|
|
4256 int cur_pixsize;
|
|
|
4257 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4258
|
|
|
4259 if (cur_pixsize >= max_pixsize)
|
|
|
4260 break;
|
|
|
4261 }
|
|
|
4262 }
|
|
|
4263 }
|
|
|
4264 else if (SYMBOLP (elt))
|
|
|
4265 {
|
|
|
4266 /* A symbol: process the value of the symbol recursively
|
|
|
4267 as if it appeared here directly. */
|
|
|
4268 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4269
|
|
|
4270 if (!UNBOUNDP (tem))
|
|
|
4271 {
|
|
438
|
4272 /* If value is a string, output that string literally:
|
|
428
|
4273 don't check for % within it. */
|
|
|
4274 if (STRINGP (tem))
|
|
|
4275 {
|
|
867
|
4276 Ibyte *str = XSTRING_DATA (tem);
|
|
826
|
4277 Charcount size = string_char_length (tem);
|
|
438
|
4278
|
|
|
4279 if (size <= *offset)
|
|
|
4280 *offset -= size;
|
|
|
4281 else
|
|
|
4282 {
|
|
867
|
4283 const Ibyte *tmp_str = itext_n_addr (str, *offset);
|
|
438
|
4284
|
|
440
|
4285 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4286 computed and used here as in the plain string case
|
|
|
4287 above. -- dv */
|
|
|
4288 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4289 min_pos, max_pos);
|
|
|
4290 *offset = 0;
|
|
|
4291 }
|
|
428
|
4292 }
|
|
|
4293 /* Give up right away for nil or t. */
|
|
|
4294 else if (!EQ (tem, elt))
|
|
|
4295 {
|
|
|
4296 elt = tem;
|
|
|
4297 goto tail_recurse;
|
|
|
4298 }
|
|
|
4299 }
|
|
|
4300 }
|
|
|
4301 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4302 {
|
|
|
4303 Lisp_Object window, tem;
|
|
793
|
4304 window = wrap_window (w);
|
|
428
|
4305 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4306 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4307 if (!UNBOUNDP (tem))
|
|
|
4308 {
|
|
|
4309 elt = tem;
|
|
|
4310 goto tail_recurse;
|
|
|
4311 }
|
|
|
4312 }
|
|
|
4313 else if (CONSP (elt))
|
|
|
4314 {
|
|
|
4315 /* A cons cell: four distinct cases.
|
|
438
|
4316 * - If first element is a string or a cons, process all the elements
|
|
|
4317 * and effectively concatenate them.
|
|
|
4318 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4319 * at most that many characters. If positive, pad (with spaces)
|
|
|
4320 * to at least that many characters.
|
|
771
|
4321 * - If first element is another symbol or a boolean specifier, process
|
|
|
4322 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4323 * value or specifier's instance is non-nil or nil.
|
|
|
4324 * - If first element is , process the cadr or caddr
|
|
|
4325 * recursively according to whether the instance of the specifier in
|
|
|
4326 * the modeline's window is non-nil or nil.
|
|
442
|
4327 * - If first element is an extent, process the cdr recursively
|
|
|
4328 * and handle the extent's face.
|
|
428
|
4329 */
|
|
438
|
4330
|
|
428
|
4331 Lisp_Object car, tem;
|
|
|
4332
|
|
|
4333 car = XCAR (elt);
|
|
771
|
4334 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4335 {
|
|
|
4336 elt = XCDR (elt);
|
|
|
4337 if (!CONSP (elt))
|
|
|
4338 goto invalid;
|
|
|
4339
|
|
771
|
4340 if (SYMBOLP (car))
|
|
|
4341 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4342 else
|
|
|
4343 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4344 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4345 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4346 Use its car if CAR has a non-nil value. */
|
|
771
|
4347 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4348 {
|
|
771
|
4349 elt = XCAR (elt);
|
|
|
4350 goto tail_recurse;
|
|
438
|
4351 }
|
|
771
|
4352 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4353 * Get the cddr of the original list
|
|
|
4354 * and if possible find the caddr and use that.
|
|
|
4355 */
|
|
|
4356 elt = XCDR (elt);
|
|
|
4357 if (NILP (elt))
|
|
|
4358 ;
|
|
|
4359 else if (!CONSP (elt))
|
|
|
4360 goto invalid;
|
|
|
4361 else
|
|
|
4362 {
|
|
|
4363 elt = XCAR (elt);
|
|
|
4364 goto tail_recurse;
|
|
|
4365 }
|
|
|
4366 }
|
|
428
|
4367 else if (INTP (car))
|
|
|
4368 {
|
|
|
4369 Charcount lim = XINT (car);
|
|
|
4370
|
|
|
4371 elt = XCDR (elt);
|
|
|
4372
|
|
|
4373 if (lim < 0)
|
|
|
4374 {
|
|
|
4375 /* Negative int means reduce maximum width.
|
|
|
4376 * DO NOT change MIN_PIXPOS here!
|
|
|
4377 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4378 * and then pad to 20.
|
|
|
4379 */
|
|
|
4380 if (max_pos == -1)
|
|
|
4381 max_pos = pos - lim;
|
|
|
4382 else
|
|
|
4383 max_pos = min (max_pos, pos - lim);
|
|
|
4384 }
|
|
|
4385 else if (lim > 0)
|
|
|
4386 {
|
|
|
4387 /* Padding specified. Don't let it be more than
|
|
|
4388 * current maximum.
|
|
|
4389 */
|
|
|
4390 lim += pos;
|
|
|
4391 if (max_pos != -1 && lim > max_pos)
|
|
|
4392 lim = max_pos;
|
|
|
4393 /* If that's more padding than already wanted, queue it.
|
|
|
4394 * But don't reduce padding already specified even if
|
|
|
4395 * that is beyond the current truncation point.
|
|
|
4396 */
|
|
|
4397 if (lim > min_pos)
|
|
|
4398 min_pos = lim;
|
|
|
4399 }
|
|
|
4400 goto tail_recurse;
|
|
|
4401 }
|
|
|
4402 else if (STRINGP (car) || CONSP (car))
|
|
|
4403 {
|
|
|
4404 int limit = 50;
|
|
438
|
4405
|
|
428
|
4406 /* LIMIT is to protect against circular lists. */
|
|
|
4407 while (CONSP (elt) && --limit > 0
|
|
|
4408 && (pos < max_pos || max_pos == -1))
|
|
|
4409 {
|
|
|
4410 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4411 XCAR (elt), depth, max_pixsize,
|
|
|
4412 findex, type, offset, cur_ext);
|
|
428
|
4413 elt = XCDR (elt);
|
|
|
4414 }
|
|
|
4415 }
|
|
|
4416 else if (EXTENTP (car))
|
|
|
4417 {
|
|
|
4418 struct extent *ext = XEXTENT (car);
|
|
|
4419
|
|
|
4420 if (EXTENT_LIVE_P (ext))
|
|
|
4421 {
|
|
|
4422 face_index old_findex = data->findex;
|
|
|
4423 Lisp_Object face;
|
|
|
4424 Lisp_Object font_inst;
|
|
|
4425 face_index new_findex;
|
|
|
4426 Bytecount start = data->bytepos;
|
|
|
4427
|
|
|
4428 face = extent_face (ext);
|
|
|
4429 if (FACEP (face))
|
|
|
4430 {
|
|
|
4431 /* #### needs to merge faces, sigh */
|
|
|
4432 /* #### needs to handle list of faces */
|
|
|
4433 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4434 /* !!#### not right; needs to compute the max height of
|
|
|
4435 all the charsets */
|
|
|
4436 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4437 Vcharset_ascii);
|
|
|
4438
|
|
|
4439 data->dl->ascent = max (data->dl->ascent,
|
|
|
4440 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4441 data->dl->descent = max (data->dl->descent,
|
|
|
4442 XFONT_INSTANCE (font_inst)->
|
|
|
4443 descent);
|
|
|
4444 }
|
|
|
4445 else
|
|
|
4446 new_findex = old_findex;
|
|
|
4447
|
|
|
4448 data->findex = new_findex;
|
|
|
4449 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4450 XCDR (elt), depth - 1,
|
|
438
|
4451 max_pixsize, new_findex, type,
|
|
|
4452 offset, car);
|
|
428
|
4453 data->findex = old_findex;
|
|
|
4454 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4455 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4456 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4457 }
|
|
|
4458 }
|
|
|
4459 }
|
|
|
4460 else if (GLYPHP (elt))
|
|
|
4461 {
|
|
438
|
4462 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4463 horizontal scrolling facility. -- dv */
|
|
|
4464 if (*offset > 0)
|
|
|
4465 *offset -= 1;
|
|
|
4466 else
|
|
|
4467 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4468 cur_ext);
|
|
428
|
4469 }
|
|
|
4470 else
|
|
|
4471 {
|
|
|
4472 invalid:
|
|
438
|
4473 {
|
|
|
4474 char *str = GETTEXT ("*invalid*");
|
|
|
4475 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4476
|
|
|
4477 if (size <= *offset)
|
|
|
4478 *offset -= size;
|
|
|
4479 else
|
|
|
4480 {
|
|
867
|
4481 const Ibyte *tmp_str =
|
|
|
4482 itext_n_addr ((const Ibyte *) str, *offset);
|
|
438
|
4483
|
|
440
|
4484 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4485 used here as in the plain string case above. -- dv */
|
|
|
4486 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4487 min_pos, max_pos);
|
|
|
4488 *offset = 0;
|
|
|
4489 }
|
|
|
4490 }
|
|
428
|
4491 }
|
|
|
4492
|
|
|
4493 if (min_pos > pos)
|
|
|
4494 {
|
|
867
|
4495 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
|
|
438
|
4496 min_pos, -1);
|
|
428
|
4497 }
|
|
|
4498
|
|
|
4499 return pos;
|
|
|
4500 }
|
|
|
4501
|
|
|
4502 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4503 they do not have a modeline block, it does nothing. */
|
|
|
4504 static void
|
|
|
4505 regenerate_modeline (struct window *w)
|
|
|
4506 {
|
|
|
4507 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4508
|
|
|
4509 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4510 return;
|
|
|
4511 else
|
|
|
4512 {
|
|
|
4513 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4514 redisplay_update_line (w, 0, 0, 0);
|
|
|
4515 }
|
|
|
4516 }
|
|
|
4517
|
|
|
4518 /* Make sure that modeline display line is present in the given
|
|
|
4519 display structs if the window has a modeline and update that
|
|
|
4520 line. Returns true if a modeline was needed. */
|
|
|
4521 static int
|
|
|
4522 ensure_modeline_generated (struct window *w, int type)
|
|
|
4523 {
|
|
|
4524 int need_modeline;
|
|
|
4525
|
|
|
4526 /* minibuffer windows don't have modelines */
|
|
|
4527 if (MINI_WINDOW_P (w))
|
|
|
4528 need_modeline = 0;
|
|
|
4529 /* windows which haven't had it turned off do */
|
|
|
4530 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4531 need_modeline = 1;
|
|
|
4532 /* windows which have it turned off don't have a divider if there is
|
|
|
4533 a horizontal scrollbar */
|
|
|
4534 else if (window_scrollbar_height (w))
|
|
|
4535 need_modeline = 0;
|
|
|
4536 /* and in this case there is none */
|
|
|
4537 else
|
|
|
4538 need_modeline = 1;
|
|
|
4539
|
|
|
4540 if (need_modeline)
|
|
|
4541 {
|
|
|
4542 display_line_dynarr *dla;
|
|
|
4543
|
|
|
4544 dla = window_display_lines (w, type);
|
|
|
4545
|
|
|
4546 /* We don't care if there is a display line which is not
|
|
|
4547 currently a modeline because it is definitely going to become
|
|
|
4548 one if we have gotten to this point. */
|
|
|
4549 if (Dynarr_length (dla) == 0)
|
|
|
4550 {
|
|
|
4551 if (Dynarr_largest (dla) > 0)
|
|
800
|
4552 Dynarr_increment (dla);
|
|
428
|
4553 else
|
|
|
4554 {
|
|
|
4555 struct display_line modeline;
|
|
|
4556 xzero (modeline);
|
|
|
4557 Dynarr_add (dla, modeline);
|
|
|
4558 }
|
|
|
4559 }
|
|
|
4560
|
|
|
4561 /* If we're adding a new place marker go ahead and generate the
|
|
|
4562 modeline so that it is available for use by
|
|
|
4563 window_modeline_height. */
|
|
|
4564 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4565 }
|
|
|
4566
|
|
|
4567 return need_modeline;
|
|
|
4568 }
|
|
|
4569
|
|
|
4570 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4571 int
|
|
|
4572 real_current_modeline_height (struct window *w)
|
|
|
4573 {
|
|
|
4574 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4575 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4576
|
|
|
4577 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4578 {
|
|
|
4579 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4580
|
|
|
4581 if (Dynarr_length (dla))
|
|
|
4582 {
|
|
|
4583 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4584 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4585 Dynarr_atp (dla, 0)->descent);
|
|
|
4586 }
|
|
|
4587 }
|
|
|
4588 return 0;
|
|
|
4589 }
|
|
|
4590
|
|
|
4591
|
|
|
4592 /***************************************************************************/
|
|
819
|
4593 /* */
|
|
826
|
4594 /* displayable string routines */
|
|
819
|
4595 /* */
|
|
428
|
4596 /***************************************************************************/
|
|
|
4597
|
|
|
4598 /* Given a position for a string in a window, ensure that the given
|
|
|
4599 display line DL accurately represents the text on a line starting
|
|
|
4600 at the given position.
|
|
|
4601
|
|
|
4602 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4603 looked just too hard to change create_text_block to handle strings
|
|
|
4604 *and* buffers. We already make a distinction between the two
|
|
|
4605 elsewhere in the code so I think unifying them would require a
|
|
|
4606 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4607 functions cover text that the user *cannot edit* so we can remove
|
|
|
4608 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4609 modeline routines should be modified to use this code as it copes
|
|
|
4610 with many more types of display situation. */
|
|
|
4611
|
|
665
|
4612 static Charbpos
|
|
428
|
4613 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4614 struct display_line *dl,
|
|
826
|
4615 Charcount start_pos,
|
|
428
|
4616 prop_block_dynarr **prop,
|
|
|
4617 face_index default_face)
|
|
|
4618 {
|
|
|
4619 struct frame *f = XFRAME (w->frame);
|
|
|
4620 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4621 because you might well want to make use of it (selective display
|
|
|
4622 etc), its just the buffer text that we do not use. However, it
|
|
|
4623 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4624 against this case. */
|
|
|
4625 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4626 struct device *d = XDEVICE (f->device);
|
|
|
4627
|
|
|
4628 /* we're working with these a lot so precalculate them */
|
|
|
4629 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
826
|
4630 Bytecount byte_string_zv = slen;
|
|
|
4631 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4632
|
|
|
4633 pos_data data;
|
|
|
4634
|
|
|
4635 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4636
|
|
442
|
4637 /* We're going to ditch selective display for static text, it's an
|
|
|
4638 FSF thing and invisible extents are the way to go here.
|
|
|
4639 Implementing it also relies on a number of buffer-specific
|
|
428
|
4640 functions that we don't have the luxury of being able to use
|
|
|
4641 here. */
|
|
|
4642
|
|
|
4643 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4644 can actually be displayed and which octal should be used for.
|
|
|
4645 #### This variable should probably have some rethought done to
|
|
|
4646 it.
|
|
|
4647
|
|
|
4648 #### It would also be really nice if you could specify that
|
|
|
4649 the characters come out in hex instead of in octal. Mule
|
|
|
4650 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4651 but that's bogus -- we need a more general solution. I
|
|
|
4652 think you need to extend the concept of display tables
|
|
|
4653 into a more general conversion mechanism. Ideally you
|
|
|
4654 could specify a Lisp function that converts characters,
|
|
|
4655 but this violates the Second Golden Rule and besides would
|
|
|
4656 make things way way way way slow.
|
|
|
4657
|
|
|
4658 So instead, we extend the display-table concept, which was
|
|
|
4659 historically limited to 256-byte vectors, to one of the
|
|
|
4660 following:
|
|
|
4661
|
|
|
4662 a) A 256-entry vector, for backward compatibility;
|
|
|
4663 b) char-table, mapping characters to values;
|
|
|
4664 c) range-table, mapping ranges of characters to values;
|
|
|
4665 d) a list of the above.
|
|
|
4666
|
|
|
4667 The (d) option allows you to specify multiple display tables
|
|
|
4668 instead of just one. Each display table can specify conversions
|
|
|
4669 for some characters and leave others unchanged. The way the
|
|
|
4670 character gets displayed is determined by the first display table
|
|
|
4671 with a binding for that character. This way, you could call a
|
|
|
4672 function `enable-hex-display' that adds a hex display-table to
|
|
|
4673 the list of display tables for the current buffer.
|
|
|
4674
|
|
|
4675 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4676 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4677 extended characters show up as hex with a display table like
|
|
|
4678 this:
|
|
|
4679
|
|
|
4680 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4681
|
|
|
4682 Since more than one display table is possible, you have
|
|
|
4683 great flexibility in mapping ranges of characters. */
|
|
867
|
4684 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
428
|
4685 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4686 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4687 ? 255 : 160)) : 255;
|
|
|
4688
|
|
|
4689 Lisp_Object face_dt, window_dt;
|
|
|
4690
|
|
|
4691 /* The text display block for this display line. */
|
|
|
4692 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4693
|
|
|
4694 /* The first time through the main loop we need to force the glyph
|
|
|
4695 data to be updated. */
|
|
|
4696 int initial = 1;
|
|
|
4697
|
|
|
4698 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4699 equal to the position passed in if there are no more runs to be
|
|
|
4700 displayed. */
|
|
|
4701 int no_more_frags = 0;
|
|
|
4702
|
|
|
4703 dl->used_prop_data = 0;
|
|
|
4704 dl->num_chars = 0;
|
|
442
|
4705 dl->line_continuation = 0;
|
|
428
|
4706
|
|
|
4707 /* set up faces to use for clearing areas, used by
|
|
|
4708 output_display_line */
|
|
|
4709 dl->default_findex = default_face;
|
|
|
4710 if (default_face)
|
|
|
4711 {
|
|
|
4712 dl->left_margin_findex = default_face;
|
|
|
4713 dl->right_margin_findex = default_face;
|
|
|
4714 }
|
|
|
4715 else
|
|
|
4716 {
|
|
434
|
4717 dl->left_margin_findex =
|
|
428
|
4718 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4719 dl->right_margin_findex =
|
|
428
|
4720 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4721 }
|
|
|
4722
|
|
|
4723 xzero (data);
|
|
|
4724 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4725
|
|
|
4726 /* These values are used by all of the rune addition routines. We add
|
|
|
4727 them to this structure for ease of passing. */
|
|
|
4728 data.d = d;
|
|
793
|
4729 data.window = wrap_window (w);
|
|
428
|
4730 data.db = db;
|
|
|
4731 data.dl = dl;
|
|
|
4732
|
|
826
|
4733 data.byte_charpos = byte_start_pos;
|
|
428
|
4734 data.pixpos = dl->bounds.left_in;
|
|
|
4735 data.last_charset = Qunbound;
|
|
|
4736 data.last_findex = default_face;
|
|
|
4737 data.result_str = Qnil;
|
|
|
4738 data.string = disp_string;
|
|
|
4739
|
|
|
4740 /* Set the right boundary adjusting it to take into account any end
|
|
|
4741 glyph. Save the width of the end glyph for later use. */
|
|
|
4742 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4743 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4744
|
|
|
4745 data.cursor_type = NO_CURSOR;
|
|
|
4746 data.cursor_x = -1;
|
|
|
4747
|
|
|
4748 data.start_col = 0;
|
|
|
4749 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4750 the window
|
|
428
|
4751 data.start_col = w->hscroll;
|
|
826
|
4752 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
|
|
428
|
4753 */
|
|
826
|
4754 data.byte_start_col_enabled = 0;
|
|
428
|
4755 data.hscroll_glyph_width_adjust = 0;
|
|
|
4756
|
|
|
4757 /* We regenerate the line from the very beginning. */
|
|
|
4758 Dynarr_reset (db->runes);
|
|
|
4759
|
|
|
4760 /* Why is this less than or equal and not just less than? If the
|
|
|
4761 starting position is already equal to the maximum we can't add
|
|
|
4762 anything else, right? Wrong. We might still have a newline to
|
|
|
4763 add. A newline can use the room allocated for an end glyph since
|
|
|
4764 if we add it we know we aren't going to be adding any end
|
|
|
4765 glyph. */
|
|
|
4766
|
|
|
4767 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4768 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4769 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4770 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4771 that the loop terminates only when either (a) there is
|
|
|
4772 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4773
|
|
|
4774 #### Also I think you need to ensure that the operation
|
|
|
4775 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4776 can't get interrupted in the middle. If you run off the end
|
|
|
4777 of the line during that operation, then you keep accumulating
|
|
|
4778 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4779 there's a begin glyph at a particular position and attempting
|
|
|
4780 to display that glyph results in window-end being hit and
|
|
|
4781 propagation data being generated, then the character at that
|
|
|
4782 position won't be displayed.
|
|
|
4783
|
|
|
4784 #### See also the comment after the end of this loop, below.
|
|
|
4785 */
|
|
|
4786 while (data.pixpos <= data.max_pixpos)
|
|
|
4787 {
|
|
|
4788 /* #### This check probably should not be necessary. */
|
|
826
|
4789 if (data.byte_charpos > byte_string_zv)
|
|
428
|
4790 {
|
|
|
4791 /* #### urk! More of this lossage! */
|
|
826
|
4792 data.byte_charpos--;
|
|
428
|
4793 goto done;
|
|
|
4794 }
|
|
|
4795
|
|
|
4796 /* Check for face changes. */
|
|
826
|
4797 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
|
|
428
|
4798 {
|
|
819
|
4799 Lisp_Object last_glyph = Qnil;
|
|
|
4800 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4801 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4802 {
|
|
|
4803 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4804 Dynarr_free (*prop);
|
|
|
4805 *prop = 0;
|
|
|
4806 }
|
|
428
|
4807 /* Now compute the face and begin/end-glyph information. */
|
|
|
4808 data.findex =
|
|
793
|
4809 /* Remember that the extent-fragment routines deal in
|
|
826
|
4810 Bytexpos's. */
|
|
|
4811 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
|
|
428
|
4812 /* This is somewhat cheesy but the alternative is to
|
|
|
4813 propagate default_face into extent_fragment_update. */
|
|
|
4814 if (data.findex == DEFAULT_INDEX)
|
|
|
4815 data.findex = default_face;
|
|
|
4816
|
|
|
4817 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4818
|
|
826
|
4819 if (data.byte_charpos == data.ef->end)
|
|
428
|
4820 no_more_frags = 1;
|
|
|
4821 }
|
|
|
4822 initial = 0;
|
|
|
4823
|
|
|
4824 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4825 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4826 display then we determine what to do based on the character at the
|
|
|
4827 current buffer position. */
|
|
|
4828
|
|
|
4829 /* If the current position is covered by an invisible extent, do
|
|
|
4830 nothing (except maybe add some ellipses).
|
|
|
4831
|
|
|
4832 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4833 invisible extent should be investigated further. This is
|
|
|
4834 fairly low priority though. */
|
|
|
4835 if (data.ef->invisible)
|
|
|
4836 {
|
|
|
4837 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4838 really know what I'm doing. */
|
|
|
4839 if (*prop)
|
|
|
4840 {
|
|
|
4841 Dynarr_free (*prop);
|
|
|
4842 *prop = 0;
|
|
|
4843 }
|
|
|
4844
|
|
|
4845 /* The extent fragment code only sets this when we should
|
|
|
4846 really display the ellipses. It makes sure the ellipses
|
|
|
4847 don't get displayed more than once in a row. */
|
|
|
4848 if (data.ef->invisible_ellipses)
|
|
|
4849 {
|
|
|
4850 struct glyph_block gb;
|
|
|
4851
|
|
|
4852 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4853 data.ef->invisible_ellipses = 0;
|
|
|
4854 gb.extent = Qnil;
|
|
|
4855 gb.glyph = Vinvisible_text_glyph;
|
|
|
4856 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4857 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4858 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4859 is to display a newline (for compatibility with
|
|
|
4860 selective-display-ellipses)? Maybe that's too
|
|
|
4861 abstruse. */
|
|
|
4862 if (*prop)
|
|
|
4863 goto done;
|
|
|
4864 }
|
|
|
4865
|
|
638
|
4866 /* #### What if we're dealing with a display table? */
|
|
428
|
4867 if (data.start_col)
|
|
|
4868 data.start_col--;
|
|
|
4869
|
|
826
|
4870 if (data.byte_charpos == byte_string_zv)
|
|
428
|
4871 goto done;
|
|
|
4872 else
|
|
826
|
4873 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4874 }
|
|
|
4875
|
|
|
4876 /* If there is propagation data, then it represents the current
|
|
|
4877 buffer position being displayed. Add them and advance the
|
|
|
4878 position counter. This might also add the minibuffer
|
|
|
4879 prompt. */
|
|
|
4880 else if (*prop)
|
|
|
4881 {
|
|
|
4882 dl->used_prop_data = 1;
|
|
|
4883 *prop = add_propagation_runes (prop, &data);
|
|
|
4884
|
|
|
4885 if (*prop)
|
|
|
4886 goto done; /* gee, a really narrow window */
|
|
826
|
4887 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4888 goto done;
|
|
826
|
4889 else if (data.byte_charpos < 0)
|
|
428
|
4890 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
826
|
4891 data.byte_charpos = 0;
|
|
428
|
4892 else
|
|
826
|
4893 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
4894 }
|
|
|
4895
|
|
|
4896 /* If there are end glyphs, add them to the line. These are
|
|
|
4897 the end glyphs for the previous run of text. We add them
|
|
|
4898 here rather than doing them at the end of handling the
|
|
|
4899 previous run so that glyphs at the beginning and end of
|
|
|
4900 a line are handled correctly. */
|
|
|
4901 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4902 {
|
|
867
|
4903 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4904 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4905
|
|
|
4906 if (*prop) {
|
|
428
|
4907 goto done;
|
|
819
|
4908 }
|
|
428
|
4909 }
|
|
|
4910
|
|
|
4911 /* If there are begin glyphs, add them to the line. */
|
|
|
4912 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4913 {
|
|
867
|
4914 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4915 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4916
|
|
|
4917 if (*prop) {
|
|
428
|
4918 goto done;
|
|
819
|
4919 }
|
|
428
|
4920 }
|
|
|
4921
|
|
|
4922 /* If at end-of-buffer, we've already processed begin and
|
|
|
4923 end-glyphs at this point and there's no text to process,
|
|
|
4924 so we're done. */
|
|
826
|
4925 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
4926 goto done;
|
|
|
4927
|
|
|
4928 else
|
|
|
4929 {
|
|
|
4930 Lisp_Object entry = Qnil;
|
|
|
4931 /* Get the character at the current buffer position. */
|
|
867
|
4932 data.ch = string_ichar (disp_string, data.byte_charpos);
|
|
428
|
4933 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4934 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4935
|
|
|
4936 /* If there is a display table entry for it, hand it off to
|
|
|
4937 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4938 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4939 {
|
|
|
4940 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4941
|
|
|
4942 if (*prop)
|
|
|
4943 goto done;
|
|
|
4944 }
|
|
|
4945
|
|
|
4946 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4947 to the line and end this loop. */
|
|
|
4948 else if (data.ch == '\n')
|
|
|
4949 {
|
|
|
4950 /* We aren't going to be adding an end glyph so give its
|
|
|
4951 space back in order to make sure that the cursor can
|
|
|
4952 fit. */
|
|
819
|
4953 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4954 goto done;
|
|
|
4955 }
|
|
|
4956
|
|
|
4957 /* If the current character is considered to be printable, then
|
|
|
4958 just add it. */
|
|
|
4959 else if (data.ch >= printable_min)
|
|
|
4960 {
|
|
867
|
4961 *prop = add_ichar_rune (&data);
|
|
428
|
4962 if (*prop)
|
|
|
4963 goto done;
|
|
|
4964 }
|
|
|
4965
|
|
|
4966 /* If the current character is a tab, determine the next tab
|
|
|
4967 starting position and add a blank rune which extends from the
|
|
|
4968 current pixel position to that starting position. */
|
|
|
4969 else if (data.ch == '\t')
|
|
|
4970 {
|
|
|
4971 int tab_start_pixpos = data.pixpos;
|
|
|
4972 int next_tab_start;
|
|
|
4973 int char_tab_width;
|
|
|
4974 int prop_width = 0;
|
|
|
4975
|
|
|
4976 if (data.start_col > 1)
|
|
|
4977 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4978
|
|
|
4979 next_tab_start =
|
|
|
4980 next_tab_position (w, tab_start_pixpos,
|
|
|
4981 dl->bounds.left_in +
|
|
|
4982 data.hscroll_glyph_width_adjust);
|
|
|
4983 if (next_tab_start > data.max_pixpos)
|
|
|
4984 {
|
|
|
4985 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4986 next_tab_start = data.max_pixpos;
|
|
|
4987 }
|
|
|
4988 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4989 char_tab_width =
|
|
|
4990 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4991
|
|
|
4992 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4993
|
|
|
4994 /* add_blank_rune is only supposed to be called with
|
|
819
|
4995 sizes guaranteed to fit in the available space. */
|
|
428
|
4996 assert (!(*prop));
|
|
|
4997
|
|
|
4998 if (prop_width)
|
|
|
4999 {
|
|
|
5000 struct prop_block pb;
|
|
|
5001 *prop = Dynarr_new (prop_block);
|
|
|
5002
|
|
|
5003 pb.type = PROP_BLANK;
|
|
|
5004 pb.data.p_blank.width = prop_width;
|
|
|
5005 pb.data.p_blank.findex = data.findex;
|
|
|
5006 Dynarr_add (*prop, pb);
|
|
|
5007
|
|
|
5008 goto done;
|
|
|
5009 }
|
|
|
5010 }
|
|
|
5011
|
|
|
5012 /* If character is a control character, pass it off to
|
|
|
5013 add_control_char_runes.
|
|
|
5014
|
|
|
5015 The is_*() routines have undefined results on
|
|
|
5016 arguments outside of the range [-1, 255]. (This
|
|
|
5017 often bites people who carelessly use `char' instead
|
|
|
5018 of `unsigned char'.)
|
|
|
5019 */
|
|
867
|
5020 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
|
|
428
|
5021 {
|
|
|
5022 *prop = add_control_char_runes (&data, b);
|
|
|
5023
|
|
|
5024 if (*prop)
|
|
|
5025 goto done;
|
|
|
5026 }
|
|
|
5027
|
|
|
5028 /* If the character is above the ASCII range and we have not
|
|
|
5029 already handled it, then print it as an octal number. */
|
|
|
5030 else if (data.ch >= 0200)
|
|
|
5031 {
|
|
|
5032 *prop = add_octal_runes (&data);
|
|
|
5033
|
|
|
5034 if (*prop)
|
|
|
5035 goto done;
|
|
|
5036 }
|
|
|
5037
|
|
|
5038 /* Assume the current character is considered to be printable,
|
|
|
5039 then just add it. */
|
|
|
5040 else
|
|
|
5041 {
|
|
867
|
5042 *prop = add_ichar_rune (&data);
|
|
428
|
5043 if (*prop)
|
|
|
5044 goto done;
|
|
|
5045 }
|
|
|
5046
|
|
826
|
5047 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
5048 }
|
|
|
5049 }
|
|
|
5050
|
|
819
|
5051 done:
|
|
428
|
5052
|
|
|
5053 /* Determine the starting point of the next line if we did not hit the
|
|
|
5054 end of the buffer. */
|
|
826
|
5055 if (data.byte_charpos < byte_string_zv)
|
|
428
|
5056 {
|
|
|
5057 /* #### This check is not correct. If the line terminated
|
|
|
5058 due to a begin-glyph or end-glyph hitting window-end, then
|
|
826
|
5059 data.ch will not point to the character at data.byte_charpos. If
|
|
428
|
5060 you make the two changes mentioned at the top of this loop,
|
|
|
5061 you should be able to say '(if (*prop))'. That should also
|
|
826
|
5062 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
|
|
428
|
5063 check. */
|
|
|
5064
|
|
|
5065 /* The common case is that the line ended because we hit a newline.
|
|
|
5066 In that case, the next character is just the next buffer
|
|
|
5067 position. */
|
|
|
5068 if (data.ch == '\n')
|
|
|
5069 {
|
|
826
|
5070 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
|
|
428
|
5071 }
|
|
|
5072
|
|
|
5073 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
5074 line. */
|
|
|
5075 else
|
|
|
5076 {
|
|
|
5077 struct glyph_block gb;
|
|
|
5078 struct glyph_cachel *cachel;
|
|
|
5079
|
|
|
5080 /* If the line is to be truncated then we actually have to look
|
|
|
5081 for the next newline. We also add the end-of-line glyph which
|
|
|
5082 we know will fit because we adjusted the right border before
|
|
|
5083 we starting laying out the line. */
|
|
819
|
5084 data.max_pixpos += data.end_glyph_width;
|
|
428
|
5085 data.findex = default_face;
|
|
|
5086 gb.extent = Qnil;
|
|
|
5087
|
|
|
5088 if (truncate_win)
|
|
|
5089 {
|
|
826
|
5090 Bytecount byte_pos;
|
|
428
|
5091
|
|
|
5092 /* Now find the start of the next line. */
|
|
867
|
5093 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
|
|
826
|
5094 data.byte_charpos, 1);
|
|
428
|
5095
|
|
|
5096 data.cursor_type = NO_CURSOR;
|
|
826
|
5097 data.byte_charpos = byte_pos;
|
|
428
|
5098 gb.glyph = Vtruncation_glyph;
|
|
|
5099 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
5100 }
|
|
|
5101 else
|
|
|
5102 {
|
|
|
5103 /* The cursor can never be on the continuation glyph. */
|
|
|
5104 data.cursor_type = NO_CURSOR;
|
|
|
5105
|
|
826
|
5106 /* data.byte_charpos is already at the start of the next line. */
|
|
428
|
5107
|
|
442
|
5108 dl->line_continuation = 1;
|
|
428
|
5109 gb.glyph = Vcontinuation_glyph;
|
|
|
5110 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
5111 }
|
|
|
5112
|
|
819
|
5113 if (data.end_glyph_width)
|
|
428
|
5114 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
5115
|
|
826
|
5116 if (truncate_win && data.byte_charpos == byte_string_zv)
|
|
428
|
5117 {
|
|
867
|
5118 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
|
|
826
|
5119 byte_string_zv);
|
|
867
|
5120 DEC_IBYTEPTR (endb);
|
|
|
5121 if (itext_ichar (endb) != '\n')
|
|
428
|
5122 {
|
|
|
5123 /* #### Damn this losing shit. */
|
|
826
|
5124 data.byte_charpos++;
|
|
428
|
5125 }
|
|
|
5126 }
|
|
|
5127 }
|
|
|
5128 }
|
|
826
|
5129 else if (data.byte_charpos == byte_string_zv)
|
|
428
|
5130 {
|
|
|
5131 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5132 up subwindow display. Since we never have a cursor in the
|
|
|
5133 gutter we can safely ignore it. */
|
|
|
5134 }
|
|
|
5135 /* Calculate left whitespace boundary. */
|
|
|
5136 {
|
|
|
5137 int elt = 0;
|
|
|
5138
|
|
|
5139 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5140 while (elt < Dynarr_length (db->runes))
|
|
|
5141 {
|
|
|
5142 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5143
|
|
|
5144 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5145 || rb->type == RUNE_BLANK)
|
|
|
5146 {
|
|
|
5147 dl->bounds.left_white += rb->width;
|
|
|
5148 elt++;
|
|
|
5149 }
|
|
|
5150 else
|
|
|
5151 elt = Dynarr_length (db->runes);
|
|
|
5152 }
|
|
|
5153 }
|
|
|
5154
|
|
|
5155 /* Calculate right whitespace boundary. */
|
|
|
5156 {
|
|
|
5157 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5158 int done = 0;
|
|
|
5159
|
|
|
5160 while (!done && elt >= 0)
|
|
|
5161 {
|
|
|
5162 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5163
|
|
|
5164 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5165 && isspace (rb->object.chr.ch))
|
|
|
5166 && !rb->type == RUNE_BLANK)
|
|
|
5167 {
|
|
|
5168 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5169 done = 1;
|
|
|
5170 }
|
|
|
5171
|
|
|
5172 elt--;
|
|
|
5173
|
|
|
5174 }
|
|
|
5175
|
|
|
5176 /* The line is blank so everything is considered to be right
|
|
|
5177 whitespace. */
|
|
|
5178 if (!done)
|
|
|
5179 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5180 }
|
|
|
5181
|
|
|
5182 /* Set the display blocks bounds. */
|
|
|
5183 db->start_pos = dl->bounds.left_in;
|
|
|
5184 if (Dynarr_length (db->runes))
|
|
|
5185 {
|
|
|
5186 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5187
|
|
|
5188 db->end_pos = rb->xpos + rb->width;
|
|
|
5189 }
|
|
|
5190 else
|
|
|
5191 db->end_pos = dl->bounds.right_white;
|
|
|
5192
|
|
819
|
5193 calculate_baseline (&data);
|
|
428
|
5194
|
|
|
5195 dl->ascent = data.new_ascent;
|
|
|
5196 dl->descent = data.new_descent;
|
|
|
5197
|
|
|
5198 {
|
|
|
5199 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5200
|
|
|
5201 if (dl->ascent < ascent)
|
|
|
5202 dl->ascent = ascent;
|
|
|
5203 }
|
|
|
5204 {
|
|
|
5205 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5206
|
|
|
5207 if (dl->descent < descent)
|
|
|
5208 dl->descent = descent;
|
|
|
5209 }
|
|
|
5210
|
|
819
|
5211 calculate_yoffset (dl, db);
|
|
|
5212
|
|
428
|
5213 dl->cursor_elt = data.cursor_x;
|
|
|
5214 /* #### lossage lossage lossage! Fix this shit! */
|
|
826
|
5215 if (data.byte_charpos > byte_string_zv)
|
|
|
5216 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5217 byte_string_zv);
|
|
428
|
5218 else
|
|
826
|
5219 dl->end_charpos =
|
|
|
5220 buffer_or_string_bytexpos_to_charxpos (disp_string,
|
|
|
5221 data.byte_charpos) - 1;
|
|
428
|
5222 if (truncate_win)
|
|
434
|
5223 data.dl->num_chars =
|
|
826
|
5224 string_column_at_point (disp_string, dl->end_charpos,
|
|
793
|
5225 b ? XINT (b->tab_width) : 8);
|
|
428
|
5226 else
|
|
|
5227 /* This doesn't correctly take into account tabs and control
|
|
|
5228 characters but if the window isn't being truncated then this
|
|
|
5229 value isn't going to end up being used anyhow. */
|
|
826
|
5230 data.dl->num_chars = dl->end_charpos - dl->charpos;
|
|
428
|
5231
|
|
|
5232 /* #### handle horizontally scrolled line with text none of which
|
|
|
5233 was actually laid out. */
|
|
|
5234
|
|
|
5235 /* #### handle any remainder of overlay arrow */
|
|
|
5236
|
|
|
5237 if (*prop == ADD_FAILED)
|
|
|
5238 *prop = NULL;
|
|
|
5239
|
|
|
5240 if (truncate_win && *prop)
|
|
|
5241 {
|
|
|
5242 Dynarr_free (*prop);
|
|
|
5243 *prop = NULL;
|
|
|
5244 }
|
|
|
5245
|
|
|
5246 extent_fragment_delete (data.ef);
|
|
|
5247
|
|
|
5248 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5249 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5250 The main loop should get fixed so that it isn't necessary to call
|
|
|
5251 this function if we are already at EOB. */
|
|
|
5252
|
|
826
|
5253 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
|
|
793
|
5254 return string_index_byte_to_char (disp_string,
|
|
826
|
5255 data.byte_charpos) + 1; /* Yuck! */
|
|
428
|
5256 else
|
|
826
|
5257 return string_index_byte_to_char (disp_string, data.byte_charpos);
|
|
428
|
5258 }
|
|
|
5259
|
|
|
5260 /* Given a display line and a starting position, ensure that the
|
|
|
5261 contents of the display line accurately represent the visual
|
|
|
5262 representation of the buffer contents starting from the given
|
|
|
5263 position when displayed in the given window. The display line ends
|
|
|
5264 when the contents of the line reach the right boundary of the given
|
|
434
|
5265 window.
|
|
|
5266
|
|
428
|
5267 This is very similar to generate_display_line but with the same
|
|
|
5268 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5269 of fixing the bytebpos stuff though.*/
|
|
|
5270
|
|
|
5271 static Charbpos
|
|
428
|
5272 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5273 struct display_line *dl,
|
|
826
|
5274 Charcount start_pos,
|
|
428
|
5275 prop_block_dynarr **prop,
|
|
|
5276 face_index default_face)
|
|
|
5277 {
|
|
826
|
5278 Charcount ret_charcount;
|
|
428
|
5279
|
|
|
5280 /* you must set bounds before calling this. */
|
|
434
|
5281
|
|
428
|
5282 /* Reset what this line is using. */
|
|
|
5283 if (dl->display_blocks)
|
|
|
5284 Dynarr_reset (dl->display_blocks);
|
|
|
5285 if (dl->left_glyphs)
|
|
|
5286 {
|
|
|
5287 Dynarr_free (dl->left_glyphs);
|
|
|
5288 dl->left_glyphs = 0;
|
|
|
5289 }
|
|
|
5290 if (dl->right_glyphs)
|
|
|
5291 {
|
|
|
5292 Dynarr_free (dl->right_glyphs);
|
|
|
5293 dl->right_glyphs = 0;
|
|
|
5294 }
|
|
|
5295
|
|
|
5296 /* We aren't generating a modeline at the moment. */
|
|
|
5297 dl->modeline = 0;
|
|
|
5298
|
|
|
5299 /* Create a display block for the text region of the line. */
|
|
826
|
5300 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
|
|
|
5301 prop, default_face);
|
|
|
5302 dl->charpos = start_pos;
|
|
|
5303 if (dl->end_charpos < dl->charpos)
|
|
|
5304 dl->end_charpos = dl->charpos;
|
|
428
|
5305
|
|
|
5306 /* If there are left glyphs associated with any character in the
|
|
|
5307 text block, then create a display block to handle them. */
|
|
|
5308 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5309 create_left_glyph_block (w, dl, 0);
|
|
|
5310
|
|
|
5311 /* If there are right glyphs associated with any character in the
|
|
|
5312 text block, then create a display block to handle them. */
|
|
|
5313 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5314 create_right_glyph_block (w, dl);
|
|
|
5315
|
|
826
|
5316 return ret_charcount;
|
|
428
|
5317 }
|
|
|
5318
|
|
1318
|
5319
|
|
|
5320 /* Tricky tricky tricky. generate_displayable_area() can (could) be called reentrantly, and redisplay is not prepared to handle this:
|
|
|
5321
|
|
|
5322 assert_failed(const char * 0x0129c8c8 `string', int 5328, const char * 0x01274068 `string') line 3620
|
|
|
5323 Dynarr_verify_mod_1(void * 0x0250f228, const char * 0x0129c8c8 `string', int 5328) line 1256 + 36 bytes
|
|
|
5324 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
|
|
|
5325 output_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 1) line 409 + 69 bytes
|
|
|
5326 redraw_exposed_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 8, int 23, int 249, int 127) line 687 + 15 bytes
|
|
|
5327 redraw_exposed_gutters(frame * 0x0228ad90, int 8, int 23, int 249, int 127) line 703 + 29 bytes
|
|
|
5328 mswindows_redraw_exposed_area(frame * 0x0228ad90, int 8, int 23, int 249, int 127) line 862 + 25 bytes
|
|
|
5329 mswindows_handle_paint(frame * 0x0228ad90) line 2176 + 25 bytes
|
|
|
5330 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 15, unsigned int 0, long 0) line 3233 + 45 bytes
|
|
|
5331 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 15, unsigned int 0, long 0) line 2488
|
|
|
5332 USER32! 77e3a244()
|
|
|
5333 USER32! 77e14730()
|
|
|
5334 USER32! 77e1558a()
|
|
|
5335 NTDLL! KiUserCallbackDispatcher@12 + 19 bytes
|
|
|
5336 USER32! 77e14680()
|
|
|
5337 USER32! 77e1a792()
|
|
|
5338 qxeIsDialogMessage(HWND__ * 0x001003e2, tagMSG * 0x0082a93c {msg=0x0000000f wp=0x00000000 lp=0x00000000}) line 2298 + 14 bytes
|
|
|
5339 mswindows_is_dialog_msg(tagMSG * 0x0082a93c {msg=0x0000000f wp=0x00000000 lp=0x00000000}) line 165 + 13 bytes
|
|
|
5340 mswindows_drain_windows_queue(int 0) line 1282 + 9 bytes
|
|
|
5341 emacs_mswindows_drain_queue() line 1326 + 7 bytes
|
|
|
5342 event_stream_drain_queue() line 1887
|
|
|
5343 event_stream_quit_p() line 1992
|
|
|
5344 check_quit() line 993
|
|
|
5345 unbind_to_hairy(int 35) line 5963
|
|
|
5346 unbind_to_1(int 35, long 20888208) line 5945 + 200 bytes
|
|
|
5347 specifier_instance_from_inst_list(long 21379344, long 38135616, long 36220304, long 20888208, _error_behavior_struct_ {...}, int 1, long 3) line 2522 + 16 bytes
|
|
|
5348 specifier_instance(long 21379344, long 38135616, long 36220304, _error_behavior_struct_ {...}, int 1, int 0, long 3) line 2625 + 65 bytes
|
|
|
5349 specifier_instance_no_quit(long 21379344, long 38135616, long 36220304, _error_behavior_struct_ {...}, int 0, long 1) line 2658 + 31 bytes
|
|
|
5350 face_property_matching_instance(long 22612340, long 20860632, long 22530956, long 36220304, _error_behavior_struct_ {...}, int 0, long 1) line 565 + 48 bytes
|
|
|
5351 ensure_face_cachel_contains_charset(face_cachel * 0x0082b014, long 36220304, long 22530956) line 1104 + 35 bytes
|
|
|
5352 update_face_cachel_data(face_cachel * 0x0082b014, long 36220304, long 22612340) line 1304 + 19 bytes
|
|
|
5353 query_string_geometry(long 21110576, long 22612340, int * 0x00000000, int * 0x0082b5b4, int * 0x00000000, long 38852960) line 2370 + 23 bytes
|
|
|
5354 mswindows_widget_query_string_geometry(long 21110576, long 22612340, int * 0x0082b5b8, int * 0x0082b5b4, long 38852960) line 2914 + 25 bytes
|
|
|
5355 widget_query_string_geometry(long 21110576, long 22612340, int * 0x0082b5b8, int * 0x0082b5b4, long 38852960) line 514 + 32 bytes
|
|
|
5356 edit_field_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 920 + 390 bytes
|
|
|
5357 widget_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 567 + 26 bytes
|
|
|
5358 image_instance_query_geometry(long 38857648, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 2015 + 26 bytes
|
|
|
5359 glyph_query_geometry(long 38853384, int * 0x0082b7b4, int * 0x0082b7b8, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38852960) line 4197 + 25 bytes
|
|
|
5360 layout_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 1351 + 25 bytes
|
|
|
5361 widget_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 567 + 26 bytes
|
|
|
5362 image_instance_query_geometry(long 38852960, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 2015 + 26 bytes
|
|
|
5363 glyph_query_geometry(long 38537976, int * 0x0082b9cc, int * 0x0082b9d0, image_instance_geometry IMAGE_DESIRED_GEOMETRY, long 38404624) line 4197 + 25 bytes
|
|
|
5364 layout_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 1468 + 23 bytes
|
|
|
5365 widget_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 626 + 30 bytes
|
|
|
5366 image_instance_layout(long 38404624, int 265, int 156, int -2, int -2, long 38273064) line 2102 + 51 bytes
|
|
|
5367 glyph_ascent(long 38404624, long 38273064) line 4009 + 21 bytes
|
|
|
5368 update_glyph_cachel_data(window * 0x02480028, long 36201168, glyph_cachel * 0x0248c3d8) line 4272 + 13 bytes
|
|
|
5369 get_glyph_cachel_index(window * 0x02480028, long 36201168) line 4306 + 17 bytes
|
|
|
5370 add_glyph_rune(position_redisplay_data_type * 0x0082bf2c, glyph_block * 0x024bd028, int 0, int 0, glyph_cachel * 0x00000000) line 1800 + 15 bytes
|
|
|
5371 add_glyph_runes(position_redisplay_data_type * 0x0082bf2c, int 0) line 2085 + 31 bytes
|
|
|
5372 create_string_text_block(window * 0x02480028, long 38776292, display_line * 0x02514500, long 0, prop_block_dynarr * * 0x0082c13c, int 2) line 4907 + 14 bytes
|
|
|
5373 generate_string_display_line(window * 0x02480028, long 38776292, display_line * 0x02514500, long 0, prop_block_dynarr * * 0x0082c13c, int 2) line 5293 + 29 bytes
|
|
|
5374 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
|
|
|
5375 output_gutter(frame * 0x0228ad90, gutter_pos TOP_GUTTER, int 0) line 409 + 69 bytes
|
|
|
5376 update_frame_gutters(frame * 0x0228ad90) line 639 + 15 bytes
|
|
|
5377 redisplay_frame(frame * 0x0228ad90, int 1) line 6792 + 9 bytes
|
|
|
5378 redisplay_device(device * 0x0171df00, int 1) line 6911 + 11 bytes
|
|
|
5379 redisplay_without_hooks() line 6957 + 11 bytes
|
|
|
5380 redisplay_no_pre_idle_hook() line 7029
|
|
|
5381 redisplay() line 7011
|
|
|
5382 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 5, unsigned int 0, long 10223881) line 3424
|
|
|
5383 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 5, unsigned int 0, long 10223881) line 2488
|
|
|
5384 USER32! 77e3a244()
|
|
|
5385 USER32! 77e16362()
|
|
|
5386 USER32! 77e14c1a()
|
|
|
5387 USER32! 77e1dd30()
|
|
|
5388 mswindows_wnd_proc(HWND__ * 0x001003e2, unsigned int 71, unsigned int 0, long 8578308) line 3926 + 21 bytes
|
|
|
5389 intercepted_wnd_proc(HWND__ * 0x001003e2, unsigned int 71, unsigned int 0, long 8578308) line 2488
|
|
|
5390 USER32! 77e3a244()
|
|
|
5391 USER32! 77e14730()
|
|
|
5392 USER32! 77e174b4()
|
|
|
5393 NTDLL! KiUserCallbackDispatcher@12 + 19 bytes
|
|
|
5394 mswindows_set_frame_size(frame * 0x0228ad90, int 265, int 156) line 355
|
|
|
5395 internal_set_frame_size(frame * 0x0228ad90, int 265, int 156, int 0) line 2754 + 24 bytes
|
|
|
5396 Fset_frame_displayable_pixel_size(long 36220304, long 531, long 313, long 20888208) line 3004 + 32 bytes
|
|
|
5397 Ffuncall(int 4, long * 0x0082e778) line 3844 + 168 bytes
|
|
|
5398 execute_optimized_program(const unsigned char * 0x02286e48, int 40, long * 0x01529b80) line 609 + 16 bytes
|
|
|
5399 funcall_compiled_function(long 22433308, int 0, long * 0x0082ec08) line 3452 + 85 bytes
|
|
|
5400 Ffuncall(int 1, long * 0x0082ec04) line 3883 + 17 bytes
|
|
|
5401 execute_optimized_program(const unsigned char * 0x02286d40, int 6, long * 0x01548ddc) line 609 + 16 bytes
|
|
|
5402 funcall_compiled_function(long 22505864, int 11, long * 0x0082f00c) line 3452 + 85 bytes
|
|
|
5403 Ffuncall(int 12, long * 0x0082f008) line 3883 + 17 bytes
|
|
|
5404 execute_optimized_program(const unsigned char * 0x02503e38, int 47, long * 0x0152dc48) line 609 + 16 bytes
|
|
|
5405 funcall_compiled_function(long 22436784, int 0, long * 0x0082f534) line 3452 + 85 bytes
|
|
|
5406 Ffuncall(int 1, long * 0x0082f530) line 3883 + 17 bytes
|
|
|
5407 apply1(long 22436784, long 20888208) line 4458 + 11 bytes
|
|
|
5408 Fcall_interactively(long 20742816, long 20888208, long 20888208) line 460 + 13 bytes
|
|
|
5409 Ffuncall(int 2, long * 0x0082f8ec) line 3844 + 127 bytes
|
|
|
5410 call1(long 20854392, long 20742816) line 4489 + 11 bytes
|
|
|
5411 execute_command_event(command_builder * 0x01798f98, long 24439276) line 4198 + 69 bytes
|
|
|
5412 Fdispatch_event(long 24439276) line 4569 + 13 bytes
|
|
|
5413 Fcommand_loop_1() line 569 + 9 bytes
|
|
|
5414 command_loop_1(long 20888208) line 489
|
|
|
5415 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
|
|
|
5416 command_loop_3() line 251 + 35 bytes
|
|
|
5417 command_loop_2(long 20888208) line 264
|
|
|
5418 internal_catch(long 20650992, long (long)* 0x010952c0 command_loop_2(long), long 20888208, int * volatile 0x00000000, long * volatile 0x00000000) line 1527 + 7 bytes
|
|
|
5419 initial_command_loop(long 20888208) line 300 + 28 bytes
|
|
|
5420 xemacs_21_5_b10_i586_pc_win32(int 1, char * * 0x00e52620, char * * 0x00e52bb0, int 0) line 2356
|
|
|
5421 main(int 1, char * * 0x00e52620, char * * 0x00e52bb0) line 2733
|
|
|
5422 mainCRTStartup() line 338 + 17 bytes
|
|
|
5423 KERNEL32! 77ea847c()
|
|
|
5424
|
|
|
5425 */
|
|
|
5426
|
|
|
5427
|
|
428
|
5428 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5429 loop through elements in the string creating display lines until we
|
|
|
5430 have covered the provided area. Simple really. */
|
|
|
5431 void
|
|
|
5432 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5433 int xpos, int ypos, int width, int height,
|
|
|
5434 display_line_dynarr* dla,
|
|
826
|
5435 Charcount start_pos,
|
|
428
|
5436 face_index default_face)
|
|
|
5437 {
|
|
|
5438 int yend = ypos + height;
|
|
|
5439 Charcount s_zv;
|
|
|
5440
|
|
|
5441 prop_block_dynarr *prop = 0;
|
|
|
5442 layout_bounds bounds;
|
|
|
5443 assert (dla);
|
|
|
5444
|
|
|
5445 Dynarr_reset (dla);
|
|
|
5446 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5447 there is something to do. */
|
|
|
5448 if (NILP (disp_string))
|
|
|
5449 return;
|
|
|
5450
|
|
826
|
5451 s_zv = string_char_length (disp_string);
|
|
428
|
5452
|
|
|
5453 bounds.left_out = xpos;
|
|
|
5454 bounds.right_out = xpos + width;
|
|
|
5455 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5456 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5457 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5458 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5459 depend on the contents of the line being displayed. */
|
|
|
5460 bounds.left_white = bounds.left_in;
|
|
|
5461 bounds.right_white = bounds.right_in;
|
|
|
5462
|
|
|
5463 while (ypos < yend)
|
|
|
5464 {
|
|
|
5465 struct display_line dl;
|
|
|
5466 struct display_line *dlp;
|
|
826
|
5467 Charcount next_pos;
|
|
428
|
5468 int local;
|
|
851
|
5469 int pos_of_dlp = -1;
|
|
428
|
5470
|
|
|
5471 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5472 {
|
|
851
|
5473 pos_of_dlp = Dynarr_length (dla);
|
|
|
5474 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5475 local = 0;
|
|
|
5476 }
|
|
|
5477 else
|
|
|
5478 {
|
|
|
5479
|
|
|
5480 xzero (dl);
|
|
|
5481 dlp = &dl;
|
|
|
5482 local = 1;
|
|
|
5483 }
|
|
|
5484
|
|
|
5485 dlp->bounds = bounds;
|
|
|
5486 dlp->offset = 0;
|
|
1318
|
5487 Dynarr_lock (dla);
|
|
428
|
5488 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5489 &prop, default_face);
|
|
1318
|
5490 Dynarr_unlock (dla);
|
|
428
|
5491 /* we need to make sure that we continue along the line if there
|
|
|
5492 is more left to display otherwise we just end up redisplaying
|
|
|
5493 the same chunk over and over again. */
|
|
|
5494 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5495 start_pos++;
|
|
|
5496 else
|
|
|
5497 start_pos = next_pos;
|
|
|
5498
|
|
|
5499 dlp->ypos = ypos + dlp->ascent;
|
|
|
5500 ypos = dlp->ypos + dlp->descent;
|
|
|
5501
|
|
|
5502 if (ypos > yend)
|
|
|
5503 {
|
|
|
5504 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5505
|
|
|
5506 dlp->clip = (ypos - yend);
|
|
|
5507 visible_height -= dlp->clip;
|
|
|
5508
|
|
|
5509 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5510 {
|
|
|
5511 if (local)
|
|
|
5512 free_display_line (dlp);
|
|
|
5513 break;
|
|
|
5514 }
|
|
|
5515 }
|
|
|
5516 else
|
|
|
5517 dlp->clip = 0;
|
|
|
5518
|
|
851
|
5519 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5520 Dynarr_add (dla, *dlp);
|
|
|
5521
|
|
|
5522 /* #### This type of check needs to be done down in the
|
|
|
5523 generate_display_line call. */
|
|
|
5524 if (start_pos >= s_zv)
|
|
|
5525 break;
|
|
|
5526 }
|
|
|
5527
|
|
|
5528 if (prop)
|
|
|
5529 Dynarr_free (prop);
|
|
|
5530 }
|
|
|
5531
|
|
|
5532
|
|
|
5533 /***************************************************************************/
|
|
|
5534 /* */
|
|
|
5535 /* window-regeneration routines */
|
|
|
5536 /* */
|
|
|
5537 /***************************************************************************/
|
|
|
5538
|
|
|
5539 /* For a given window and starting position in the buffer it contains,
|
|
|
5540 ensure that the TYPE display lines accurately represent the
|
|
|
5541 presentation of the window. We pass the buffer instead of getting
|
|
|
5542 it from the window since redisplay_window may have temporarily
|
|
|
5543 changed it to the echo area buffer. */
|
|
|
5544
|
|
|
5545 static void
|
|
665
|
5546 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5547 {
|
|
|
5548 struct frame *f = XFRAME (w->frame);
|
|
|
5549 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5550 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5551 int yend; /* set farther down */
|
|
|
5552 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5553 int force;
|
|
428
|
5554
|
|
|
5555 prop_block_dynarr *prop;
|
|
|
5556 layout_bounds bounds;
|
|
|
5557 display_line_dynarr *dla;
|
|
|
5558 int need_modeline;
|
|
|
5559
|
|
|
5560 /* The lines had better exist by this point. */
|
|
|
5561 if (!(dla = window_display_lines (w, type)))
|
|
|
5562 abort ();
|
|
|
5563 Dynarr_reset (dla);
|
|
|
5564 w->max_line_len = 0;
|
|
|
5565
|
|
|
5566 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5567 for this function to get called from some other points where that
|
|
|
5568 update may not have occurred. This acts as a safety check. */
|
|
|
5569 if (!Dynarr_length (w->face_cachels))
|
|
|
5570 reset_face_cachels (w);
|
|
|
5571 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5572 reset_glyph_cachels (w);
|
|
|
5573
|
|
|
5574 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5575 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5576 w->last_point_x[type] = -1;
|
|
|
5577 w->last_point_y[type] = -1;
|
|
|
5578
|
|
|
5579 /* Make sure a modeline is in the structs if needed. */
|
|
|
5580 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5581
|
|
|
5582 /* Wait until here to set this so that the structs have a modeline
|
|
|
5583 generated in the case where one didn't exist. */
|
|
|
5584 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5585
|
|
|
5586 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5587
|
|
|
5588 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5589 if (MINI_WINDOW_P (w)
|
|
|
5590 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5591 && !echo_area_active (f)
|
|
|
5592 && start_pos == BUF_BEGV (b))
|
|
|
5593 {
|
|
|
5594 struct prop_block pb;
|
|
|
5595 Lisp_Object string;
|
|
|
5596 prop = Dynarr_new (prop_block);
|
|
|
5597
|
|
|
5598 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5599 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5600 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5601 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5602 Dynarr_add (prop, pb);
|
|
|
5603 }
|
|
|
5604 else
|
|
|
5605 prop = 0;
|
|
|
5606
|
|
442
|
5607 /* When we are computing things for scrolling purposes, make
|
|
|
5608 sure at least one line is always generated */
|
|
|
5609 force = (type == CMOTION_DISP);
|
|
|
5610
|
|
|
5611 /* Make sure this is set always */
|
|
|
5612 /* Note the conversion at end */
|
|
|
5613 w->window_end_pos[type] = start_pos;
|
|
|
5614 while (ypos < yend || force)
|
|
428
|
5615 {
|
|
|
5616 struct display_line dl;
|
|
|
5617 struct display_line *dlp;
|
|
|
5618 int local;
|
|
851
|
5619 int pos_of_dlp = -1;
|
|
428
|
5620
|
|
|
5621 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5622 {
|
|
851
|
5623 pos_of_dlp = Dynarr_length (dla);
|
|
|
5624 dlp = Dynarr_atp (dla, pos_of_dlp);
|
|
428
|
5625 local = 0;
|
|
|
5626 }
|
|
|
5627 else
|
|
|
5628 {
|
|
|
5629
|
|
|
5630 xzero (dl);
|
|
|
5631 dlp = &dl;
|
|
|
5632 local = 1;
|
|
|
5633 }
|
|
|
5634
|
|
|
5635 dlp->bounds = bounds;
|
|
|
5636 dlp->offset = 0;
|
|
1318
|
5637 Dynarr_lock (dla);
|
|
428
|
5638 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
1318
|
5639 Dynarr_unlock (dla);
|
|
428
|
5640
|
|
|
5641 if (yclip > dlp->ascent)
|
|
|
5642 {
|
|
|
5643 /* this should never happen, but if it does just display the
|
|
|
5644 whole line */
|
|
|
5645 yclip = 0;
|
|
|
5646 }
|
|
|
5647
|
|
|
5648 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5649 ypos = dlp->ypos + dlp->descent;
|
|
|
5650
|
|
|
5651 /* See if we've been asked to start midway through a line, for
|
|
|
5652 partial display line scrolling. */
|
|
434
|
5653 if (yclip)
|
|
428
|
5654 {
|
|
|
5655 dlp->top_clip = yclip;
|
|
|
5656 yclip = 0;
|
|
|
5657 }
|
|
|
5658 else
|
|
|
5659 dlp->top_clip = 0;
|
|
|
5660
|
|
|
5661 if (ypos > yend)
|
|
|
5662 {
|
|
|
5663 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5664
|
|
|
5665 dlp->clip = (ypos - yend);
|
|
|
5666 /* Although this seems strange we could have a single very
|
|
|
5667 tall line visible for which we need to account for both
|
|
|
5668 the top clip and the bottom clip. */
|
|
|
5669 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5670
|
|
442
|
5671 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5672 {
|
|
|
5673 if (local)
|
|
|
5674 free_display_line (dlp);
|
|
|
5675 break;
|
|
|
5676 }
|
|
|
5677 }
|
|
|
5678 else
|
|
|
5679 dlp->clip = 0;
|
|
|
5680
|
|
|
5681 if (dlp->cursor_elt != -1)
|
|
|
5682 {
|
|
|
5683 /* #### This check is steaming crap. Have to get things
|
|
|
5684 fixed so when create_text_block hits EOB, we're done,
|
|
|
5685 period. */
|
|
|
5686 if (w->last_point_x[type] == -1)
|
|
|
5687 {
|
|
|
5688 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5689 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5690 }
|
|
|
5691 else
|
|
|
5692 {
|
|
|
5693 /* #### This means that we've added a cursor at EOB
|
|
|
5694 twice. Yuck oh yuck. */
|
|
1318
|
5695 struct display_block *db;
|
|
|
5696
|
|
|
5697 Dynarr_lock (dla);
|
|
|
5698 db = get_display_block_from_line (dlp, TEXT);
|
|
|
5699 Dynarr_unlock (dla);
|
|
428
|
5700
|
|
|
5701 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5702 dlp->cursor_elt = -1;
|
|
|
5703 }
|
|
|
5704 }
|
|
|
5705
|
|
|
5706 if (dlp->num_chars > w->max_line_len)
|
|
|
5707 w->max_line_len = dlp->num_chars;
|
|
|
5708
|
|
851
|
5709 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
|
|
428
|
5710 Dynarr_add (dla, *dlp);
|
|
|
5711
|
|
|
5712 /* #### This isn't right, but it is close enough for now. */
|
|
|
5713 w->window_end_pos[type] = start_pos;
|
|
|
5714
|
|
|
5715 /* #### This type of check needs to be done down in the
|
|
|
5716 generate_display_line call. */
|
|
|
5717 if (start_pos > BUF_ZV (b))
|
|
|
5718 break;
|
|
442
|
5719
|
|
|
5720 force = 0;
|
|
428
|
5721 }
|
|
|
5722
|
|
|
5723 if (prop)
|
|
|
5724 Dynarr_free (prop);
|
|
|
5725
|
|
|
5726 /* #### More not quite right, but close enough. */
|
|
442
|
5727 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5728 as the number of characters between the window end and the
|
|
|
5729 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5730 the justification for this?
|
|
|
5731
|
|
|
5732 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5733 that can change. This representation allows initalizing with 0.
|
|
|
5734 */
|
|
428
|
5735 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5736
|
|
|
5737 if (need_modeline)
|
|
|
5738 {
|
|
|
5739 /* We know that this is the right thing to use because we put it
|
|
|
5740 there when we first started working in this function. */
|
|
|
5741 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5742 }
|
|
|
5743 }
|
|
|
5744
|
|
826
|
5745 #define REGEN_INC_FIND_START_END \
|
|
|
5746 do { \
|
|
|
5747 /* Determine start and end of lines. */ \
|
|
|
5748 if (!Dynarr_length (cdla)) \
|
|
|
5749 return 0; \
|
|
|
5750 else \
|
|
|
5751 { \
|
|
428
|
5752 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
826
|
5753 { \
|
|
|
5754 dla_start = 1; \
|
|
|
5755 } \
|
|
|
5756 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5757 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5758 { \
|
|
|
5759 dla_start = 0; \
|
|
|
5760 } \
|
|
|
5761 else \
|
|
|
5762 abort (); /* structs differ */ \
|
|
|
5763 \
|
|
|
5764 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5765 } \
|
|
|
5766 \
|
|
|
5767 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
|
|
|
5768 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5769 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5770 full regen. */ \
|
|
|
5771 if (startp != start_pos) \
|
|
|
5772 return 0; \
|
|
|
5773 \
|
|
|
5774 /* Point is outside the visible region so give up. */ \
|
|
|
5775 if (pointm < start_pos) \
|
|
|
5776 return 0; \
|
|
|
5777 \
|
|
428
|
5778 } while (0)
|
|
|
5779
|
|
|
5780 /* This attempts to incrementally update the display structures. It
|
|
|
5781 returns a boolean indicating success or failure. This function is
|
|
|
5782 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5783 called from that function. However, because of the nature of the
|
|
|
5784 changes it deals with it sometimes makes different assumptions
|
|
|
5785 which can lead to success which are much more difficult to make
|
|
|
5786 when dealing with buffer changes. */
|
|
|
5787
|
|
|
5788 static int
|
|
665
|
5789 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5790 Charbpos pointm,
|
|
428
|
5791 Charcount beg_unchanged,
|
|
|
5792 Charcount end_unchanged)
|
|
|
5793 {
|
|
|
5794 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5795 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5796 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5797
|
|
|
5798 int dla_start = 0;
|
|
|
5799 int dla_end, line;
|
|
|
5800 int first_line, last_line;
|
|
665
|
5801 Charbpos start_pos;
|
|
428
|
5802 /* Don't define this in the loop where it is used because we
|
|
|
5803 definitely want its value to survive between passes. */
|
|
|
5804 prop_block_dynarr *prop = NULL;
|
|
|
5805
|
|
|
5806 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5807 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5808 under which this can happen, but I believe that it is probably a
|
|
|
5809 reasonable happening. */
|
|
|
5810 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5811 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5812 return 0;
|
|
|
5813
|
|
|
5814 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5815 go ahead and proceed with the optimization attempt. */
|
|
|
5816 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5817 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5818 {
|
|
|
5819 struct frame *f = XFRAME (w->frame);
|
|
|
5820 struct device *d = XDEVICE (f->device);
|
|
|
5821 struct frame *sel_f = device_selected_frame (d);
|
|
|
5822 int success = 0;
|
|
|
5823
|
|
|
5824 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5825 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5826 {
|
|
|
5827
|
|
|
5828 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5829 {
|
|
|
5830 /* Always regenerate the modeline in case it is
|
|
|
5831 displaying the current line or column. */
|
|
|
5832 regenerate_modeline (w);
|
|
|
5833 success = 1;
|
|
|
5834 }
|
|
|
5835 }
|
|
|
5836 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5837 {
|
|
|
5838 if (f->modeline_changed)
|
|
|
5839 regenerate_modeline (w);
|
|
|
5840 success = 1;
|
|
|
5841 }
|
|
|
5842
|
|
|
5843 if (!success)
|
|
|
5844 return 0;
|
|
|
5845 }
|
|
|
5846
|
|
|
5847 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5848 return 1;
|
|
|
5849
|
|
|
5850 /* assert: There are no buffer modifications or they are all below the
|
|
|
5851 visible region. We assume that regenerate_window_incrementally has
|
|
|
5852 not called us unless this is true. */
|
|
|
5853
|
|
|
5854 REGEN_INC_FIND_START_END;
|
|
|
5855
|
|
|
5856 /* If the changed are starts before the visible area, give up. */
|
|
|
5857 if (beg_unchanged < startp)
|
|
|
5858 return 0;
|
|
|
5859
|
|
|
5860 /* Find what display line the extent changes first affect. */
|
|
|
5861 line = dla_start;
|
|
|
5862 while (line <= dla_end)
|
|
|
5863 {
|
|
|
5864 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
5865 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
5866 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
5867
|
|
|
5868 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5869 break;
|
|
|
5870
|
|
|
5871 line++;
|
|
|
5872 }
|
|
|
5873
|
|
|
5874 /* If the changes are below the visible area then if point hasn't
|
|
|
5875 moved return success otherwise fail in order to be safe. */
|
|
|
5876 if (line > dla_end)
|
|
|
5877 {
|
|
|
5878 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5879 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5880 return 1;
|
|
|
5881 else
|
|
|
5882 return 0;
|
|
|
5883 }
|
|
|
5884
|
|
|
5885 /* At this point we know what line the changes first affect. We now
|
|
|
5886 begin redrawing lines as long as we are still in the affected
|
|
|
5887 region and the line's size and positioning don't change.
|
|
|
5888 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5889 structs which could lead to an assertion failure. However, if we
|
|
|
5890 fail the next thing that is going to happen is a full regen so we
|
|
|
5891 will actually end up being safe. */
|
|
|
5892 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5893 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5894 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5895 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5896
|
|
|
5897 first_line = last_line = line;
|
|
|
5898 while (line <= dla_end)
|
|
|
5899 {
|
|
665
|
5900 Charbpos old_start, old_end, new_start;
|
|
428
|
5901 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5902 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5903 struct display_block *db;
|
|
|
5904 int initial_size;
|
|
|
5905
|
|
826
|
5906 assert (cdl->charpos == ddl->charpos);
|
|
|
5907 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
5908 assert (cdl->offset == ddl->offset);
|
|
|
5909
|
|
|
5910 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5911 initial_size = Dynarr_length (db->runes);
|
|
826
|
5912 old_start = ddl->charpos + ddl->offset;
|
|
|
5913 old_end = ddl->end_charpos + ddl->offset;
|
|
428
|
5914
|
|
|
5915 /* If this is the first line being updated and it used
|
|
|
5916 propagation data, fail. Otherwise we'll be okay because
|
|
|
5917 we'll have the necessary propagation data. */
|
|
|
5918 if (line == first_line && ddl->used_prop_data)
|
|
|
5919 return 0;
|
|
|
5920
|
|
826
|
5921 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
5922 &prop, DESIRED_DISP);
|
|
|
5923 ddl->offset = 0;
|
|
|
5924
|
|
|
5925 /* #### If there is propagated stuff the fail. We could
|
|
|
5926 probably actually deal with this if the line had propagated
|
|
|
5927 information when originally created by a full
|
|
|
5928 regeneration. */
|
|
|
5929 if (prop)
|
|
|
5930 {
|
|
|
5931 Dynarr_free (prop);
|
|
|
5932 return 0;
|
|
|
5933 }
|
|
|
5934
|
|
|
5935 /* If any line position parameters have changed or a
|
|
|
5936 cursor has disappeared or disappeared, fail. */
|
|
|
5937 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5938 if (cdl->ypos != ddl->ypos
|
|
|
5939 || cdl->ascent != ddl->ascent
|
|
|
5940 || cdl->descent != ddl->descent
|
|
|
5941 || cdl->top_clip != ddl->top_clip
|
|
|
5942 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5943 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
826
|
5944 || old_start != ddl->charpos
|
|
|
5945 || old_end != ddl->end_charpos
|
|
428
|
5946 || initial_size != Dynarr_length (db->runes))
|
|
|
5947 {
|
|
|
5948 return 0;
|
|
|
5949 }
|
|
|
5950
|
|
|
5951 if (ddl->cursor_elt != -1)
|
|
|
5952 {
|
|
|
5953 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5954 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5955 }
|
|
|
5956
|
|
|
5957 last_line = line;
|
|
|
5958
|
|
|
5959 /* If the extent changes end on the line we just updated then
|
|
|
5960 we're done. Otherwise go on to the next line. */
|
|
826
|
5961 if (end_unchanged <= ddl->end_charpos)
|
|
428
|
5962 break;
|
|
|
5963 else
|
|
|
5964 line++;
|
|
|
5965 }
|
|
|
5966
|
|
|
5967 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5968 return 1;
|
|
|
5969 }
|
|
|
5970
|
|
|
5971 /* Attempt to update the display data structures based on knowledge of
|
|
|
5972 the changed region in the buffer. Returns a boolean indicating
|
|
|
5973 success or failure. If this function returns a failure then a
|
|
|
5974 regenerate_window _must_ be performed next in order to maintain
|
|
|
5975 invariants located here. */
|
|
|
5976
|
|
|
5977 static int
|
|
665
|
5978 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5979 Charbpos pointm)
|
|
428
|
5980 {
|
|
|
5981 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5982 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5983 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5984 Charcount beg_unchanged, end_unchanged;
|
|
|
5985 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5986
|
|
|
5987 int dla_start = 0;
|
|
|
5988 int dla_end, line;
|
|
665
|
5989 Charbpos start_pos;
|
|
428
|
5990
|
|
|
5991 /* If this function is called, the current and desired structures
|
|
|
5992 had better be identical. If they are not, then that is a bug. */
|
|
|
5993 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5994
|
|
|
5995 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5996 screws us up. */
|
|
|
5997 if (MINI_WINDOW_P (w))
|
|
|
5998 return 0;
|
|
|
5999
|
|
|
6000 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
6001 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
6002 ? -1
|
|
|
6003 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
6004
|
|
|
6005 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
6006 and succeed. */
|
|
|
6007 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
6008 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
6009 extent_beg_unchanged,
|
|
|
6010 extent_end_unchanged);
|
|
|
6011
|
|
|
6012 /* We can't deal with deleted newlines. */
|
|
|
6013 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
6014 return 0;
|
|
|
6015
|
|
|
6016 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
6017 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
6018 ? -1
|
|
|
6019 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
6020
|
|
|
6021 REGEN_INC_FIND_START_END;
|
|
|
6022
|
|
|
6023 /* If the changed area starts before the visible area, give up. */
|
|
|
6024 if (beg_unchanged < startp)
|
|
|
6025 return 0;
|
|
|
6026
|
|
|
6027 /* Find what display line the buffer changes first affect. */
|
|
|
6028 line = dla_start;
|
|
|
6029 while (line <= dla_end)
|
|
|
6030 {
|
|
|
6031 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
826
|
6032 Charbpos lstart = dl->charpos + dl->offset;
|
|
|
6033 Charbpos lend = dl->end_charpos + dl->offset;
|
|
428
|
6034
|
|
|
6035 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
6036 break;
|
|
|
6037
|
|
|
6038 line++;
|
|
|
6039 }
|
|
|
6040
|
|
|
6041 /* If the changes are below the visible area then if point hasn't
|
|
|
6042 moved return success otherwise fail in order to be safe. */
|
|
|
6043 if (line > dla_end)
|
|
|
6044 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
6045 extent_beg_unchanged,
|
|
|
6046 extent_end_unchanged);
|
|
|
6047 else
|
|
|
6048 /* At this point we know what line the changes first affect. We
|
|
|
6049 now redraw that line. If the changes are contained within it
|
|
|
6050 we are going to succeed and can update just that one line.
|
|
|
6051 Otherwise we fail. If we fail we will have altered the desired
|
|
|
6052 structs which could lead to an assertion failure. However, if
|
|
|
6053 we fail the next thing that is going to happen is a full regen
|
|
|
6054 so we will actually end up being safe. */
|
|
|
6055 {
|
|
665
|
6056 Charbpos new_start;
|
|
428
|
6057 prop_block_dynarr *prop = NULL;
|
|
|
6058 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
6059 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
6060
|
|
826
|
6061 assert (cdl->charpos == ddl->charpos);
|
|
|
6062 assert (cdl->end_charpos == ddl->end_charpos);
|
|
428
|
6063 assert (cdl->offset == ddl->offset);
|
|
|
6064
|
|
442
|
6065 /* If the line continues to next display line, fail. */
|
|
|
6066 if (ddl->line_continuation)
|
|
|
6067 return 0;
|
|
428
|
6068
|
|
|
6069 /* If the line was generated using propagation data, fail. */
|
|
|
6070 if (ddl->used_prop_data)
|
|
|
6071 return 0;
|
|
|
6072
|
|
826
|
6073 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
|
|
428
|
6074 &prop, DESIRED_DISP);
|
|
|
6075 ddl->offset = 0;
|
|
|
6076
|
|
|
6077 /* If there is propagated stuff then it is pretty much a
|
|
|
6078 guarantee that more than just the one line is affected. */
|
|
|
6079 if (prop)
|
|
|
6080 {
|
|
|
6081 Dynarr_free (prop);
|
|
|
6082 return 0;
|
|
|
6083 }
|
|
|
6084
|
|
442
|
6085 /* If the line continues to next display line, fail. */
|
|
|
6086 if (ddl->line_continuation)
|
|
|
6087 return 0;
|
|
428
|
6088
|
|
|
6089 /* If any line position parameters have changed or a
|
|
|
6090 cursor has disappeared or disappeared, fail. */
|
|
|
6091 if (cdl->ypos != ddl->ypos
|
|
|
6092 || cdl->ascent != ddl->ascent
|
|
|
6093 || cdl->descent != ddl->descent
|
|
|
6094 || cdl->top_clip != ddl->top_clip
|
|
|
6095 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
6096 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
6097 {
|
|
|
6098 return 0;
|
|
|
6099 }
|
|
|
6100
|
|
|
6101 /* If the changed area also ends on this line, then we may be in
|
|
|
6102 business. Update everything and return success. */
|
|
826
|
6103 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
|
|
428
|
6104 {
|
|
|
6105 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6106 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6107 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
6108 w->buffer);
|
|
|
6109 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
6110 w->buffer);
|
|
|
6111
|
|
|
6112 if (ddl->cursor_elt != -1)
|
|
|
6113 {
|
|
|
6114 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
6115 w->last_point_y[DESIRED_DISP] = line;
|
|
|
6116 }
|
|
|
6117
|
|
|
6118 redisplay_update_line (w, line, line, 1);
|
|
|
6119 regenerate_modeline (w);
|
|
|
6120
|
|
|
6121 /* #### For now we just flush the cache until this has been
|
|
|
6122 tested. After that is done, this should correct the
|
|
|
6123 cache directly. */
|
|
|
6124 Dynarr_reset (w->line_start_cache);
|
|
|
6125
|
|
|
6126 /* Adjust the extent changed boundaries to remove any
|
|
|
6127 overlap with the buffer changes since we've just
|
|
|
6128 successfully updated that area. */
|
|
|
6129 if (extent_beg_unchanged != -1
|
|
|
6130 && extent_beg_unchanged >= beg_unchanged
|
|
|
6131 && extent_beg_unchanged < end_unchanged)
|
|
|
6132 extent_beg_unchanged = end_unchanged;
|
|
|
6133
|
|
|
6134 if (extent_end_unchanged != -1
|
|
|
6135 && extent_end_unchanged >= beg_unchanged
|
|
|
6136 && extent_end_unchanged < end_unchanged)
|
|
|
6137 extent_end_unchanged = beg_unchanged - 1;
|
|
|
6138
|
|
|
6139 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
6140 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
6141
|
|
|
6142 /* This could lead to odd results if it fails, but since the
|
|
|
6143 buffer changes update succeeded this probably will to.
|
|
|
6144 We already know that the extent changes start at or after
|
|
|
6145 the line because we checked before entering the loop. */
|
|
|
6146 if (extent_beg_unchanged != -1
|
|
|
6147 && extent_end_unchanged != -1
|
|
826
|
6148 && ((extent_beg_unchanged < ddl->charpos)
|
|
|
6149 || (extent_end_unchanged > ddl->end_charpos)))
|
|
428
|
6150 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
6151 extent_beg_unchanged,
|
|
|
6152 extent_end_unchanged);
|
|
|
6153 else
|
|
|
6154 return 1;
|
|
|
6155 }
|
|
|
6156 }
|
|
|
6157
|
|
|
6158 /* Oh, well. */
|
|
|
6159 return 0;
|
|
|
6160 }
|
|
|
6161
|
|
|
6162 /* Given a window and a point, update the given display lines such
|
|
|
6163 that point is displayed in the middle of the window.
|
|
|
6164 Return the window's new start position. */
|
|
|
6165
|
|
665
|
6166 static Charbpos
|
|
|
6167 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
6168 {
|
|
665
|
6169 Charbpos startp;
|
|
428
|
6170
|
|
|
6171 /* We need to make sure that the modeline is generated so that the
|
|
|
6172 window height can be calculated correctly. */
|
|
|
6173 ensure_modeline_generated (w, type);
|
|
|
6174
|
|
|
6175 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
6176 regenerate_window (w, startp, point, type);
|
|
|
6177 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
6178
|
|
|
6179 return startp;
|
|
|
6180 }
|
|
|
6181
|
|
|
6182 /* Given a window and a set of display lines, return a boolean
|
|
|
6183 indicating whether the given point is contained within. */
|
|
|
6184
|
|
|
6185 static int
|
|
665
|
6186 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
6187 {
|
|
|
6188 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6189 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6190 int first_line;
|
|
|
6191
|
|
|
6192 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
6193 first_line = 1;
|
|
|
6194 else
|
|
|
6195 first_line = 0;
|
|
|
6196
|
|
|
6197 if (Dynarr_length (dla) > first_line)
|
|
|
6198 {
|
|
665
|
6199 Charbpos start, end;
|
|
428
|
6200 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
6201
|
|
826
|
6202 start = dl->charpos;
|
|
428
|
6203 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
6204
|
|
|
6205 if (point >= start && point <= end)
|
|
|
6206 {
|
|
|
6207 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
6208 {
|
|
|
6209 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
6210
|
|
826
|
6211 if (point >= (dl->charpos + dl->offset)
|
|
|
6212 && point <= (dl->end_charpos + dl->offset))
|
|
428
|
6213 return !dl->clip;
|
|
|
6214 else
|
|
|
6215 return 1;
|
|
|
6216 }
|
|
|
6217 else
|
|
|
6218 return 1;
|
|
|
6219 }
|
|
|
6220 else
|
|
|
6221 return 0;
|
|
|
6222 }
|
|
|
6223 else
|
|
|
6224 return 0;
|
|
|
6225 }
|
|
|
6226
|
|
|
6227 /* Return pixel position the middle of the window, not including the
|
|
|
6228 modeline and any potential horizontal scrollbar. */
|
|
|
6229
|
|
|
6230 int
|
|
|
6231 window_half_pixpos (struct window *w)
|
|
|
6232 {
|
|
|
6233 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
6234 }
|
|
|
6235
|
|
|
6236 /* Return the display line which is currently in the middle of the
|
|
|
6237 window W for display lines TYPE. */
|
|
|
6238
|
|
|
6239 int
|
|
665
|
6240 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6241 {
|
|
|
6242 display_line_dynarr *dla;
|
|
|
6243 int half;
|
|
|
6244 int elt;
|
|
|
6245 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
6246
|
|
|
6247 if (type == CMOTION_DISP)
|
|
|
6248 regenerate_window (w, start, point, type);
|
|
|
6249
|
|
|
6250 dla = window_display_lines (w, type);
|
|
|
6251 half = window_half_pixpos (w);
|
|
|
6252
|
|
|
6253 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6254 {
|
|
|
6255 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6256 int line_bot = dl->ypos + dl->descent;
|
|
|
6257
|
|
|
6258 if (line_bot > half)
|
|
|
6259 return elt;
|
|
|
6260 }
|
|
|
6261
|
|
|
6262 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6263 being displayed. */
|
|
|
6264 return -1;
|
|
|
6265 }
|
|
|
6266
|
|
|
6267 /* Return a value for point that would place it at the beginning of
|
|
|
6268 the line which is in the middle of the window. */
|
|
|
6269
|
|
665
|
6270 Charbpos
|
|
|
6271 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6272 {
|
|
|
6273 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6274 int line = line_at_center (w, type, start, point);
|
|
|
6275
|
|
|
6276 if (line == -1)
|
|
|
6277 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6278 else
|
|
|
6279 {
|
|
|
6280 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6281 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6282
|
|
826
|
6283 return dl->charpos;
|
|
428
|
6284 }
|
|
|
6285 }
|
|
|
6286
|
|
|
6287 /* For a given window, ensure that the current visual representation
|
|
|
6288 is accurate. */
|
|
|
6289
|
|
|
6290 static void
|
|
|
6291 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6292 {
|
|
|
6293 struct window *w = XWINDOW (window);
|
|
|
6294 struct frame *f = XFRAME (w->frame);
|
|
|
6295 struct device *d = XDEVICE (f->device);
|
|
|
6296 Lisp_Object old_buffer = w->buffer;
|
|
|
6297 Lisp_Object the_buffer = w->buffer;
|
|
|
6298 struct buffer *b;
|
|
|
6299 int echo_active = 0;
|
|
|
6300 int startp = 1;
|
|
|
6301 int pointm;
|
|
|
6302 int old_startp = 1;
|
|
|
6303 int old_pointm = 1;
|
|
|
6304 int selected_in_its_frame;
|
|
|
6305 int selected_globally;
|
|
|
6306 int skip_output = 0;
|
|
|
6307 int truncation_changed;
|
|
|
6308 int inactive_minibuffer =
|
|
|
6309 (MINI_WINDOW_P (w) &&
|
|
|
6310 (f != device_selected_frame (d)) &&
|
|
|
6311 !is_surrogate_for_selected_frame (f));
|
|
|
6312
|
|
|
6313 /* #### In the new world this function actually does a bunch of
|
|
|
6314 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6315 implemented yet. */
|
|
|
6316
|
|
|
6317 /* If this is a combination window, do its children; that's all.
|
|
|
6318 The selected window is always a leaf so we don't check for
|
|
|
6319 skip_selected here. */
|
|
|
6320 if (!NILP (w->vchild))
|
|
|
6321 {
|
|
|
6322 redisplay_windows (w->vchild, skip_selected);
|
|
|
6323 return;
|
|
|
6324 }
|
|
|
6325 if (!NILP (w->hchild))
|
|
|
6326 {
|
|
|
6327 redisplay_windows (w->hchild, skip_selected);
|
|
|
6328 return;
|
|
|
6329 }
|
|
|
6330
|
|
|
6331 /* Is this window the selected window on its frame? */
|
|
|
6332 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6333 selected_globally =
|
|
|
6334 selected_in_its_frame &&
|
|
|
6335 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6336 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6337 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6338 if (skip_selected && selected_in_its_frame)
|
|
|
6339 return;
|
|
|
6340
|
|
|
6341 /* It is possible that the window is not fully initialized yet. */
|
|
|
6342 if (NILP (w->buffer))
|
|
|
6343 return;
|
|
|
6344
|
|
|
6345 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6346 {
|
|
|
6347 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6348 echo_active = 1;
|
|
|
6349 }
|
|
|
6350
|
|
|
6351 b = XBUFFER (w->buffer);
|
|
|
6352
|
|
|
6353 if (echo_active)
|
|
|
6354 {
|
|
|
6355 old_pointm = selected_globally
|
|
|
6356 ? BUF_PT (b)
|
|
|
6357 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6358 pointm = 1;
|
|
|
6359 }
|
|
|
6360 else
|
|
|
6361 {
|
|
|
6362 if (selected_globally)
|
|
|
6363 {
|
|
|
6364 pointm = BUF_PT (b);
|
|
|
6365 }
|
|
|
6366 else
|
|
|
6367 {
|
|
|
6368 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6369
|
|
|
6370 if (pointm < BUF_BEGV (b))
|
|
|
6371 pointm = BUF_BEGV (b);
|
|
|
6372 else if (pointm > BUF_ZV (b))
|
|
|
6373 pointm = BUF_ZV (b);
|
|
|
6374 }
|
|
|
6375 }
|
|
|
6376 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6377
|
|
|
6378 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6379 cache elements. */
|
|
|
6380 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6381 || !Dynarr_length (w->face_cachels)
|
|
|
6382 || f->faces_changed)
|
|
|
6383 reset_face_cachels (w);
|
|
|
6384 else
|
|
|
6385 mark_face_cachels_as_not_updated (w);
|
|
|
6386
|
|
|
6387 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6388 the cache purely because glyphs have changed - this is now
|
|
|
6389 handled by the dirty flag.*/
|
|
|
6390 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6391 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6392 reset_glyph_cachels (w);
|
|
|
6393 else
|
|
|
6394 mark_glyph_cachels_as_not_updated (w);
|
|
|
6395
|
|
|
6396 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6397 to find a new starting position. */
|
|
|
6398 if (!MINI_WINDOW_P (w)
|
|
|
6399 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6400 {
|
|
|
6401 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6402
|
|
|
6403 goto regeneration_done;
|
|
|
6404 }
|
|
|
6405
|
|
|
6406 if (echo_active)
|
|
|
6407 {
|
|
|
6408 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6409 startp = 1;
|
|
|
6410 }
|
|
|
6411 else
|
|
|
6412 {
|
|
|
6413 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6414 if (startp < BUF_BEGV (b))
|
|
|
6415 startp = BUF_BEGV (b);
|
|
|
6416 else if (startp > BUF_ZV (b))
|
|
|
6417 startp = BUF_ZV (b);
|
|
|
6418 }
|
|
|
6419 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6420
|
|
|
6421 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6422 (unsigned int) window_truncation_on (w));
|
|
428
|
6423
|
|
|
6424 /* If w->force_start is set, then some function set w->start and we
|
|
|
6425 should display from there and change point, if necessary, to
|
|
|
6426 ensure that it is visible. */
|
|
|
6427 if (w->force_start || inactive_minibuffer)
|
|
|
6428 {
|
|
|
6429 w->force_start = 0;
|
|
|
6430 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6431 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6432
|
|
|
6433 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6434
|
|
|
6435 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6436 {
|
|
|
6437 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6438
|
|
|
6439 if (selected_globally)
|
|
|
6440 BUF_SET_PT (b, pointm);
|
|
|
6441
|
|
|
6442 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6443 the_buffer);
|
|
|
6444
|
|
|
6445 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6446 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6447 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6448 }
|
|
|
6449
|
|
|
6450 goto regeneration_done;
|
|
|
6451 }
|
|
|
6452
|
|
|
6453 /* If nothing has changed since the last redisplay, then we just
|
|
|
6454 need to make sure that point is still visible. */
|
|
|
6455 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6456 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6457 && pointm >= startp
|
|
|
6458 /* This check is to make sure we restore the minibuffer after a
|
|
|
6459 temporary change to the echo area. */
|
|
|
6460 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6461 && !f->frame_changed
|
|
|
6462 && !truncation_changed
|
|
442
|
6463 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6464 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6465 )
|
|
|
6466 {
|
|
|
6467 /* Check if the cursor has actually moved. */
|
|
|
6468 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6469 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6470 && selected_globally
|
|
|
6471 && !w->windows_changed
|
|
|
6472 && !f->clip_changed
|
|
|
6473 && !f->extents_changed
|
|
|
6474 && !f->faces_changed
|
|
|
6475 && !f->glyphs_changed
|
|
|
6476 && !f->subwindows_changed
|
|
442
|
6477 /* && !f->subwindows_state_changed*/
|
|
428
|
6478 && !f->point_changed
|
|
|
6479 && !f->windows_structure_changed)
|
|
|
6480 {
|
|
|
6481 /* If not, we're done. */
|
|
|
6482 if (f->modeline_changed)
|
|
|
6483 regenerate_modeline (w);
|
|
|
6484
|
|
|
6485 skip_output = 1;
|
|
|
6486 goto regeneration_done;
|
|
|
6487 }
|
|
|
6488 else
|
|
|
6489 {
|
|
|
6490 /* If the new point is visible in the redisplay structures,
|
|
|
6491 then let the output update routines handle it, otherwise
|
|
|
6492 do things the hard way. */
|
|
|
6493 if (!w->windows_changed
|
|
|
6494 && !f->clip_changed
|
|
|
6495 && !f->extents_changed
|
|
|
6496 && !f->faces_changed
|
|
|
6497 && !f->glyphs_changed
|
|
|
6498 && !f->subwindows_changed
|
|
442
|
6499 /* && !f->subwindows_state_changed*/
|
|
428
|
6500 && !f->windows_structure_changed)
|
|
|
6501 {
|
|
|
6502 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6503 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6504 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6505 {
|
|
|
6506 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6507 {
|
|
|
6508 /* Always regenerate in case it is displaying
|
|
|
6509 the current line or column. */
|
|
|
6510 regenerate_modeline (w);
|
|
|
6511
|
|
|
6512 skip_output = 1;
|
|
|
6513 goto regeneration_done;
|
|
|
6514 }
|
|
|
6515 }
|
|
|
6516 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6517 {
|
|
|
6518 if (f->modeline_changed)
|
|
|
6519 regenerate_modeline (w);
|
|
|
6520
|
|
|
6521 skip_output = 1;
|
|
|
6522 goto regeneration_done;
|
|
|
6523 }
|
|
|
6524 }
|
|
|
6525
|
|
|
6526 /* If we weren't able to take the shortcut method, then use
|
|
|
6527 the brute force method. */
|
|
|
6528 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6529
|
|
|
6530 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6531 goto regeneration_done;
|
|
|
6532 }
|
|
|
6533 }
|
|
|
6534
|
|
|
6535 /* Check if the starting point is no longer at the beginning of a
|
|
|
6536 line, in which case find a new starting point. We also recenter
|
|
|
6537 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6538 up with a blank window. */
|
|
|
6539 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6540 && !(startp == BUF_BEGV (b)
|
|
|
6541 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6542 || (pointm == startp &&
|
|
|
6543 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6544 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6545 || (startp == BUF_ZV (b)))
|
|
|
6546 {
|
|
|
6547 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6548
|
|
|
6549 goto regeneration_done;
|
|
|
6550 }
|
|
|
6551 /* See if we can update the data structures locally based on
|
|
|
6552 knowledge of what changed in the buffer. */
|
|
|
6553 else if (!w->windows_changed
|
|
|
6554 && !f->clip_changed
|
|
|
6555 && !f->faces_changed
|
|
|
6556 && !f->glyphs_changed
|
|
|
6557 && !f->subwindows_changed
|
|
442
|
6558 /* && !f->subwindows_state_changed*/
|
|
428
|
6559 && !f->windows_structure_changed
|
|
|
6560 && !f->frame_changed
|
|
|
6561 && !truncation_changed
|
|
|
6562 && pointm >= startp
|
|
|
6563 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6564 {
|
|
|
6565 if (f->modeline_changed
|
|
|
6566 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6567 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6568 regenerate_modeline (w);
|
|
|
6569
|
|
|
6570 skip_output = 1;
|
|
|
6571 goto regeneration_done;
|
|
|
6572 }
|
|
|
6573 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6574 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6575 else
|
|
|
6576 {
|
|
|
6577 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6578
|
|
|
6579 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6580 goto regeneration_done;
|
|
|
6581 }
|
|
|
6582
|
|
|
6583 /* We still haven't gotten the window regenerated with point
|
|
|
6584 visible. Next we try scrolling a little and see if point comes
|
|
|
6585 back onto the screen. */
|
|
|
6586 if (scroll_step > 0)
|
|
|
6587 {
|
|
|
6588 int scrolled = scroll_conservatively;
|
|
|
6589 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6590 {
|
|
|
6591 startp = vmotion (w, startp,
|
|
|
6592 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6593 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6594
|
|
|
6595 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6596 goto regeneration_done;
|
|
|
6597 }
|
|
|
6598 }
|
|
|
6599
|
|
|
6600 /* We still haven't managed to get the screen drawn with point on
|
|
|
6601 the screen, so just center it and be done with it. */
|
|
|
6602 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6603
|
|
|
6604
|
|
|
6605 regeneration_done:
|
|
|
6606
|
|
|
6607 /* If the window's frame is changed then reset the current display
|
|
|
6608 lines in order to force a full repaint. */
|
|
|
6609 if (f->frame_changed)
|
|
|
6610 {
|
|
|
6611 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6612
|
|
|
6613 Dynarr_reset (cla);
|
|
|
6614 }
|
|
|
6615
|
|
|
6616 /* Must do this before calling redisplay_output_window because it
|
|
|
6617 sets some markers on the window. */
|
|
|
6618 if (echo_active)
|
|
|
6619 {
|
|
|
6620 w->buffer = old_buffer;
|
|
|
6621 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6622 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6623 }
|
|
|
6624
|
|
|
6625 /* These also have to be set before calling redisplay_output_window
|
|
|
6626 since it sets the CURRENT_DISP values based on them. */
|
|
|
6627 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6628 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6629 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6630 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6631
|
|
|
6632 if (!skip_output)
|
|
|
6633 {
|
|
665
|
6634 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6635 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6636 ? BUF_ZV (b)
|
|
|
6637 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6638 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6639 if (w->start_at_line_beg)
|
|
|
6640 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6641 redisplay_output_window (w);
|
|
|
6642 /*
|
|
|
6643 * If we just displayed the echo area, the line start cache is
|
|
|
6644 * no longer valid, because the minibuffer window is associated
|
|
|
6645 * with the window now.
|
|
|
6646 */
|
|
|
6647 if (echo_active)
|
|
|
6648 w->line_cache_last_updated = make_int (-1);
|
|
|
6649 }
|
|
|
6650
|
|
|
6651 /* #### This should be dependent on face changes and will need to be
|
|
|
6652 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6653 mark_face_cachels_as_clean (w);
|
|
|
6654
|
|
438
|
6655 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6656 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6657 flag since everything must be up-to-date. */
|
|
428
|
6658 if (glyphs_changed)
|
|
|
6659 mark_glyph_cachels_as_clean (w);
|
|
|
6660
|
|
|
6661 w->windows_changed = 0;
|
|
|
6662 }
|
|
|
6663
|
|
|
6664 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6665 currently visible in all frames on all devices. #### There has to
|
|
|
6666 be a better way to do this. */
|
|
|
6667
|
|
|
6668 static int
|
|
|
6669 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
6670 {
|
|
|
6671 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6672 return 0;
|
|
|
6673 }
|
|
|
6674
|
|
|
6675 static void
|
|
|
6676 reset_buffer_changes (void)
|
|
|
6677 {
|
|
|
6678 Lisp_Object frmcons, devcons, concons;
|
|
|
6679
|
|
|
6680 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6681 {
|
|
|
6682 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6683
|
|
|
6684 if (FRAME_REPAINT_P (f))
|
|
|
6685 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6686 }
|
|
|
6687 }
|
|
|
6688
|
|
|
6689 /* Ensure that all windows underneath the given window in the window
|
|
|
6690 hierarchy are correctly displayed. */
|
|
|
6691
|
|
|
6692 static void
|
|
|
6693 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6694 {
|
|
|
6695 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6696 {
|
|
|
6697 redisplay_window (window, skip_selected);
|
|
|
6698 }
|
|
|
6699 }
|
|
|
6700
|
|
1318
|
6701 /* Register an action to be called at the end of redisplay.
|
|
|
6702 in_display is 0 when this is called.
|
|
|
6703 This is used when it is discovered that an action needs to be taken,
|
|
|
6704 but it's during redisplay, so it's not safe. (Typically, it's an action
|
|
|
6705 that needs to enter redisplay, which can't happen reentrantly.)
|
|
|
6706
|
|
|
6707 NEVER signal an error in these functions.
|
|
|
6708 */
|
|
|
6709
|
|
|
6710 void
|
|
|
6711 register_post_redisplay_action (void (*fun) (Lisp_Object), Lisp_Object arg)
|
|
|
6712 {
|
|
|
6713 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions,
|
|
|
6714 list1 (Fcons (make_opaque_ptr
|
|
|
6715 ((void *) fun), arg)));
|
|
|
6716 }
|
|
|
6717
|
|
1320
|
6718 static int running_post_redisplay_actions;
|
|
|
6719
|
|
1318
|
6720 static void
|
|
|
6721 run_post_redisplay_actions (void)
|
|
|
6722 {
|
|
1320
|
6723 int depth;
|
|
|
6724
|
|
|
6725 if (running_post_redisplay_actions)
|
|
|
6726 return;
|
|
|
6727
|
|
|
6728 depth = internal_bind_int (&running_post_redisplay_actions, 1);
|
|
|
6729 /* If the function pushes further actions, they will be tacked onto
|
|
|
6730 the end of the list, and we'll run them when we're done with the
|
|
|
6731 current ones. */
|
|
1318
|
6732 while (!NILP (Vpost_redisplay_actions))
|
|
|
6733 {
|
|
|
6734 Lisp_Object car = XCAR (Vpost_redisplay_actions);
|
|
|
6735 void (*fun) (Lisp_Object) =
|
|
|
6736 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car));
|
|
|
6737 (*fun) (XCDR (car));
|
|
|
6738 free_opaque_ptr (XCAR (car));
|
|
|
6739 free_cons (car);
|
|
|
6740 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
|
|
|
6741 }
|
|
1320
|
6742 unbind_to (depth);
|
|
1318
|
6743 }
|
|
|
6744
|
|
|
6745 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
|
|
|
6746
|
|
|
6747 static Lisp_Object
|
|
|
6748 commit_ritual_suicide (Lisp_Object ceci_nest_pas_une_pipe)
|
|
|
6749 {
|
|
|
6750 assert (!in_display);
|
|
|
6751 return Qnil;
|
|
|
6752 }
|
|
|
6753
|
|
|
6754 #endif
|
|
|
6755
|
|
|
6756 /* Within the guts of redisplay, we are defenseless and cannot allow any of
|
|
|
6757 the following to happen:
|
|
|
6758
|
|
|
6759 1) garbage collection
|
|
|
6760 2) QUIT
|
|
|
6761 3) any non-local exits
|
|
|
6762 4) frame size changes
|
|
|
6763 5) deletion of any buffers, windows, frames, etc.
|
|
|
6764 6) modification of buffer text
|
|
|
6765 7) reentrant entry of redisplay (see the stack trace above
|
|
|
6766 generate_displayable_area())
|
|
|
6767
|
|
|
6768 The general reason is that the redisplay code is written to assume that
|
|
|
6769 it is the only code running, and thus (a) cannot tolerate structures
|
|
|
6770 changed out from under it (hence 1, 4, 5, 6, 7) and (b) at various points
|
|
|
6771 within redisplay the redisplay structures may be in an inconsistent
|
|
|
6772 state and there are no unwind-protects to clean the structures up in
|
|
|
6773 case of non-local exit (hence 2, 3). Fixing redisplay to address these
|
|
|
6774 issues is hard and perhaps not worth it (and might slow things down a
|
|
|
6775 fair amount). We address 1, 4, 5 and 6 ourselves inside of
|
|
|
6776 enter_redisplay_critical_section() by simply inhibiting them, but we
|
|
|
6777 cannot handle 2 and 3, which must be handled at the actual point where
|
|
|
6778 they may occur (especially, internal_equal() or any place that may call
|
|
|
6779 Lisp), by wrapping the code in call_trapping_problems() or
|
|
|
6780 call_with_suspended_errors(). [[ NOTE: We could address QUIT by inhibiting
|
|
|
6781 it but this would be anti-social because it would prevent the user from
|
|
|
6782 interrupting any Lisp code called within the critical section. With the
|
|
|
6783 call_*() wrapping, C-g will interrupt the Lisp code and throw back to
|
|
|
6784 the innermost wrapping. ]] In fact we do turn off QUIT handling, since
|
|
|
6785 it's just too dangerous otherwise. See below.
|
|
|
6786
|
|
|
6787 Code calling enter_redisplay_critical_section() must check for reentrancy
|
|
|
6788 (#7) and take appropriate corrective action.
|
|
|
6789
|
|
|
6790 To help debug potential problems, we arrange (when
|
|
|
6791 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every time
|
|
|
6792 we execute QUIT or call Lisp code unless proper wrapping is in place, as
|
|
|
6793 well as further checks when we actually Fsignal(), Fthrow(),
|
|
|
6794 garbage_collect_1().
|
|
|
6795
|
|
|
6796 #### If a frame-size change does occur we should probably actually be
|
|
|
6797 preempting redisplay. */
|
|
|
6798
|
|
|
6799 /* Count of number of recursive times we call
|
|
|
6800 enter_redisplay_critical_section() or
|
|
|
6801 enter_redisplay_critical_section_maybe().
|
|
|
6802 enter_redisplay_critical_section() cannot occur reentrantly but we have
|
|
|
6803 to know in the *maybe() version whether to exit the section when we're
|
|
|
6804 done. */
|
|
|
6805 static int in_display_nesting;
|
|
|
6806
|
|
|
6807 static Lisp_Object
|
|
|
6808 end_hold_frame_size_changes (Lisp_Object obj)
|
|
|
6809 {
|
|
|
6810 if (!hold_frame_size_changes)
|
|
|
6811 {
|
|
|
6812 /* we used to have a function to do this for only one frame, and
|
|
|
6813 it was typical to call it at the end of a critical section
|
|
|
6814 (which occurs once per frame); but what then happens if multiple
|
|
|
6815 frames have frame changes held up?
|
|
|
6816
|
|
|
6817 This means we are O(N^2) over frames. I seriously doubt it matters.
|
|
|
6818 --ben */
|
|
|
6819 Lisp_Object frmcons, devcons, concons;
|
|
|
6820
|
|
|
6821 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6822 {
|
|
|
6823 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6824 if (f->size_change_pending)
|
|
|
6825 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6826 }
|
|
|
6827 }
|
|
|
6828 return Qnil;
|
|
|
6829 }
|
|
|
6830
|
|
|
6831 /* Call this to temporarily prevent frame-size changes from being processed.
|
|
|
6832 To undo, use unbind_to(), passing it the value returned by this function.
|
|
|
6833 */
|
|
|
6834
|
|
|
6835 int
|
|
|
6836 begin_hold_frame_size_changes (void)
|
|
|
6837 {
|
|
|
6838 int depth = specpdl_depth ();
|
|
|
6839 record_unwind_protect (end_hold_frame_size_changes, Qnil);
|
|
|
6840 internal_bind_int (&hold_frame_size_changes, 1 + hold_frame_size_changes);
|
|
|
6841 return depth;
|
|
|
6842 }
|
|
|
6843
|
|
|
6844 int
|
|
|
6845 enter_redisplay_critical_section (void)
|
|
|
6846 {
|
|
|
6847 int depth = specpdl_depth ();
|
|
|
6848
|
|
|
6849 /* Reentrant entry is deadly. The calling function must check for this. */
|
|
|
6850 assert (!in_display);
|
|
|
6851 begin_hold_frame_size_changes ();
|
|
|
6852 /* Make sure in_display gets reset, but don't set it yet so that
|
|
|
6853 commit_ritual_suicide() can be used. */
|
|
|
6854 internal_bind_int (&in_display, 0);
|
|
|
6855 internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
|
|
|
6856 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
|
|
|
6857 /* Force every call to QUIT to check for in_displayness. This will
|
|
|
6858 verify proper wrapping, as in the previous comment, aborting if not. */
|
|
|
6859 something_happened++;
|
|
|
6860 /* Verify that no nonlocal exits blow past us. */
|
|
|
6861 record_unwind_protect (commit_ritual_suicide, Qnil);
|
|
|
6862 #endif
|
|
|
6863 in_display++;
|
|
|
6864
|
|
|
6865 set_trapping_problems_flags (INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
|
|
|
6866 /* Even checking for QUIT can cause arbitrary Lisp code to be executed,
|
|
|
6867 e.g. through a menu handler. We really don't want that happening
|
|
|
6868 inside of redisplay. Code that we `eval' is at least written with the
|
|
|
6869 expectation that it's inside of redisplay, and shouldn't try anything
|
|
|
6870 weird; but that's not the case for menu code (e.g. custom loads huge
|
|
|
6871 amounts of LISP FILES from a menu handler! FMH!). Safest just to turn
|
|
|
6872 this off. We could turn it on using UNINHIBIT_QUIT or
|
|
|
6873 begin_do_check_for_quit() in certain places if we want, if we know
|
|
|
6874 it's not in an especially tricky place. */
|
|
|
6875 begin_dont_check_for_quit ();
|
|
|
6876 return depth;
|
|
|
6877 }
|
|
|
6878
|
|
|
6879 void
|
|
|
6880 exit_redisplay_critical_section (int depth)
|
|
|
6881 {
|
|
|
6882 in_display--;
|
|
|
6883 assert (!in_display);
|
|
|
6884 unbind_to (depth);
|
|
|
6885
|
|
|
6886 run_post_redisplay_actions ();
|
|
|
6887 }
|
|
|
6888
|
|
|
6889 /* Enter the redisplay critical section if we're not already in it. This
|
|
|
6890 is for code that needs frame changes held up and other protections from
|
|
|
6891 being inside, but doesn't modify the redisplay structures, and doesn't
|
|
|
6892 look at them in a way that they will be confused by inconsistencies. */
|
|
|
6893
|
|
|
6894 int
|
|
|
6895 enter_redisplay_critical_section_maybe (void)
|
|
|
6896 {
|
|
|
6897 if (!in_display)
|
|
|
6898 return enter_redisplay_critical_section ();
|
|
|
6899 else
|
|
|
6900 return internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
|
|
|
6901 }
|
|
|
6902
|
|
|
6903 void
|
|
|
6904 exit_redisplay_critical_section_maybe (int depth)
|
|
|
6905 {
|
|
|
6906 if (in_display_nesting == 1)
|
|
|
6907 exit_redisplay_critical_section (depth);
|
|
|
6908 else
|
|
|
6909 unbind_to (depth);
|
|
|
6910 }
|
|
|
6911
|
|
1279
|
6912 /* Ensure that all windows on the given frame are correctly displayed.
|
|
|
6913 Return non-zero if pre-empted. */
|
|
428
|
6914
|
|
442
|
6915 int
|
|
428
|
6916 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6917 {
|
|
|
6918 struct device *d = XDEVICE (f->device);
|
|
853
|
6919 int depth;
|
|
428
|
6920
|
|
1279
|
6921 assert (f->init_finished);
|
|
|
6922
|
|
1318
|
6923 /* NOTE: Without sufficient checks for stream frames, we got weird
|
|
|
6924 crashes in pdump. These came and went very easily -- adding the
|
|
|
6925 critical-section code for redisplay was enough to trigger them.
|
|
|
6926 Perhaps I should have debugged them but there didn't seem to be any
|
|
|
6927 point. --ben */
|
|
1279
|
6928 if (FRAME_STREAM_P (f)) /* nothing to do */
|
|
|
6929 return 0;
|
|
|
6930
|
|
1318
|
6931 /* Reentrancy into redisplay can be deadly. See stack trace above
|
|
|
6932 generate_displayable_area(). */
|
|
|
6933 if (in_display)
|
|
|
6934 return 1;
|
|
|
6935
|
|
545
|
6936 if (preemption_check
|
|
|
6937 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6938 {
|
|
|
6939 /* The preemption check itself takes a lot of time,
|
|
|
6940 so normally don't do it here. We do it if called
|
|
|
6941 from Lisp, though (`redisplay-frame'). */
|
|
|
6942 int preempted;
|
|
|
6943
|
|
|
6944 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6945 if (preempted)
|
|
|
6946 return 1;
|
|
|
6947 }
|
|
|
6948
|
|
442
|
6949 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6950 {
|
|
|
6951 Lisp_Object frame;
|
|
|
6952
|
|
|
6953 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6954 f->buffer_alist);
|
|
793
|
6955 frame = wrap_frame (f);
|
|
442
|
6956 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6957 }
|
|
|
6958
|
|
428
|
6959 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6960 any which are already pending. */
|
|
|
6961 if (f->size_change_pending)
|
|
|
6962 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6963
|
|
|
6964 /* If frame size might need to be changed, due to changed size
|
|
|
6965 of toolbars, scrollbars etc, change it now */
|
|
|
6966 if (f->size_slipped)
|
|
|
6967 {
|
|
|
6968 adjust_frame_size (f);
|
|
|
6969 assert (!f->size_slipped);
|
|
|
6970 }
|
|
|
6971
|
|
1318
|
6972 /* The menubar, toolbar, and icon updates should be done before
|
|
853
|
6973 enter_redisplay_critical_section is called and we are officially
|
|
1318
|
6974 'in_display'. They is because they tend to eval Lisp code, which
|
|
|
6975 needs to be carefully wrapped within the critical section (and hence
|
|
|
6976 is difficult to debug). */
|
|
428
|
6977
|
|
|
6978 #ifdef HAVE_MENUBARS
|
|
|
6979 /* Update the menubar. It is done first since it could change
|
|
|
6980 the menubar's visibility. This way we avoid having flashing
|
|
|
6981 caused by an Expose event generated by the visibility change
|
|
|
6982 being handled. */
|
|
|
6983 update_frame_menubars (f);
|
|
|
6984 #endif /* HAVE_MENUBARS */
|
|
|
6985 #ifdef HAVE_TOOLBARS
|
|
905
|
6986 /* Update the toolbars geometry. We don't update the toolbars
|
|
|
6987 themselves at this point since the space they are trying to
|
|
|
6988 occupy may currently by occupied by gutter elements. Instead we
|
|
|
6989 update the geometry, then update the gutter geometry, then update
|
|
|
6990 the gutters - which will cause mapped windows to be repositioned
|
|
|
6991 - and finally update the toolbars. */
|
|
|
6992 update_frame_toolbars_geometry (f);
|
|
428
|
6993 #endif /* HAVE_TOOLBARS */
|
|
442
|
6994 /* Gutter update proper has to be done inside display when no frame
|
|
|
6995 size changes can occur, thus we separately update the gutter
|
|
|
6996 geometry here if it needs it. */
|
|
|
6997 update_frame_gutter_geometry (f);
|
|
428
|
6998
|
|
|
6999 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
7000 if (f->clear)
|
|
|
7001 f->frame_changed = 1;
|
|
|
7002
|
|
442
|
7003 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
7004 to cause subwindows to get instantiated. This is because
|
|
428
|
7005 subwindows_state_changed is less strict - dealing with things
|
|
|
7006 like the clicked state of button. We have to do this before
|
|
|
7007 redisplaying the gutters as subwindows get unmapped in the
|
|
|
7008 process.*/
|
|
442
|
7009 if (f->frame_changed)
|
|
|
7010 reset_frame_subwindow_instance_cache (f);
|
|
|
7011
|
|
|
7012 if (f->frame_changed || f->subwindows_changed)
|
|
|
7013 {
|
|
428
|
7014 /* we have to do this so the gutter gets regenerated. */
|
|
|
7015 reset_gutter_display_lines (f);
|
|
|
7016 }
|
|
|
7017
|
|
853
|
7018 depth = enter_redisplay_critical_section ();
|
|
428
|
7019
|
|
|
7020 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
1318
|
7021
|
|
|
7022 /* See comments in enter_redisplay_critical_section() */
|
|
428
|
7023
|
|
442
|
7024 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
7025
|
|
|
7026 /* We can now update the gutters, safe in the knowledge that our
|
|
|
7027 efforts won't get undone. */
|
|
|
7028
|
|
|
7029 /* This can call lisp, but redisplay is protected by binding
|
|
|
7030 inhibit_quit. More importantly the code involving display lines
|
|
|
7031 *assumes* that GC will not happen and so does not GCPRO
|
|
|
7032 anything. Since we use this code the whole time with the gutters
|
|
1318
|
7033 we cannot allow GC to happen when manipulating the gutters.
|
|
|
7034
|
|
|
7035 This must be inside of the critical section for various reasons.
|
|
|
7036 For example, it messes with display structures, which be left in
|
|
|
7037 an inconsistent state. */
|
|
442
|
7038 update_frame_gutters (f);
|
|
|
7039
|
|
428
|
7040 /* Erase the frame before outputting its contents. */
|
|
|
7041 if (f->clear)
|
|
|
7042 {
|
|
442
|
7043 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
7044 }
|
|
|
7045
|
|
|
7046 /* Do the selected window first. */
|
|
|
7047 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
7048
|
|
|
7049 /* Then do the rest. */
|
|
|
7050 redisplay_windows (f->root_window, 1);
|
|
|
7051
|
|
442
|
7052 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
7053
|
|
|
7054 update_frame_title (f);
|
|
|
7055
|
|
905
|
7056 #ifdef HAVE_TOOLBARS
|
|
|
7057 /* Finally update the toolbars. It seems its possible to get in a
|
|
|
7058 cycle between updating the gutter and the toolbars. Basically we
|
|
|
7059 want to end up with both being up-to-date and this doesn't seem
|
|
|
7060 possible in a single pass. */
|
|
|
7061 update_frame_toolbars (f);
|
|
|
7062 #endif /* HAVE_TOOLBARS */
|
|
|
7063
|
|
428
|
7064 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
7065 f->window_face_cache_reset = 0;
|
|
|
7066 f->echo_area_garbaged = 0;
|
|
|
7067 f->clear = 0;
|
|
|
7068
|
|
|
7069 if (!f->size_change_pending)
|
|
|
7070 f->size_changed = 0;
|
|
|
7071
|
|
|
7072 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
7073
|
|
853
|
7074 /* Allow frame size changes to occur again. */
|
|
|
7075 exit_redisplay_critical_section (depth);
|
|
428
|
7076
|
|
|
7077 return 0;
|
|
|
7078 }
|
|
|
7079
|
|
440
|
7080 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
7081 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
7082 no automatic redisplay, as printers do, then the device is not
|
|
|
7083 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
7084 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
7085 when called from "lazy" redisplay();
|
|
|
7086 */
|
|
428
|
7087
|
|
|
7088 static int
|
|
440
|
7089 redisplay_device (struct device *d, int automatic)
|
|
428
|
7090 {
|
|
|
7091 Lisp_Object frame, frmcons;
|
|
|
7092 int size_change_failed = 0;
|
|
|
7093 struct frame *f;
|
|
|
7094
|
|
545
|
7095 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
7096 return 0;
|
|
|
7097
|
|
428
|
7098 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
7099 return 0;
|
|
|
7100
|
|
|
7101 /* It is possible that redisplay has been called before the
|
|
545
|
7102 device is fully initialized, or that the console implementation
|
|
|
7103 allows frameless devices. If so then continue with the next
|
|
|
7104 device. */
|
|
428
|
7105 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
7106 return 0;
|
|
|
7107
|
|
545
|
7108 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
7109 {
|
|
|
7110 int preempted;
|
|
|
7111 REDISPLAY_PREEMPTION_CHECK;
|
|
|
7112 if (preempted)
|
|
|
7113 return 1;
|
|
|
7114 }
|
|
428
|
7115
|
|
|
7116 /* Always do the selected frame first. */
|
|
|
7117 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
7118
|
|
|
7119 f = XFRAME (frame);
|
|
|
7120
|
|
|
7121 if (f->icon_changed || f->windows_changed)
|
|
|
7122 update_frame_icon (f);
|
|
|
7123
|
|
|
7124 if (FRAME_REPAINT_P (f))
|
|
|
7125 {
|
|
|
7126 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
7127 {
|
|
588
|
7128 int preempted = redisplay_frame (f, 1);
|
|
545
|
7129 if (preempted)
|
|
|
7130 return 1;
|
|
|
7131 }
|
|
428
|
7132
|
|
|
7133 /* If the frame redisplay did not get preempted, then this flag
|
|
|
7134 should have gotten set to 0. It might be possible for that
|
|
|
7135 not to happen if a size change event were to occur at an odd
|
|
|
7136 time. To make sure we don't miss anything we simply don't
|
|
|
7137 reset the top level flags until the condition ends up being
|
|
|
7138 in the right state. */
|
|
|
7139 if (f->size_changed)
|
|
|
7140 size_change_failed = 1;
|
|
|
7141 }
|
|
|
7142
|
|
|
7143 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
7144 {
|
|
|
7145 f = XFRAME (XCAR (frmcons));
|
|
|
7146
|
|
|
7147 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
7148 continue;
|
|
|
7149
|
|
|
7150 if (f->icon_changed || f->windows_changed)
|
|
|
7151 update_frame_icon (f);
|
|
|
7152
|
|
|
7153 if (FRAME_REPAINT_P (f))
|
|
|
7154 {
|
|
430
|
7155 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
7156 {
|
|
588
|
7157 int preempted = redisplay_frame (f, 1);
|
|
545
|
7158 if (preempted)
|
|
|
7159 return 1;
|
|
428
|
7160 }
|
|
|
7161
|
|
|
7162 if (f->size_change_pending)
|
|
|
7163 size_change_failed = 1;
|
|
|
7164 }
|
|
|
7165 }
|
|
|
7166
|
|
|
7167 /* If we get here then we redisplayed all of our frames without
|
|
|
7168 getting preempted so mark ourselves as clean. */
|
|
|
7169 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
7170
|
|
|
7171 if (!size_change_failed)
|
|
|
7172 d->size_changed = 0;
|
|
|
7173
|
|
|
7174 return 0;
|
|
|
7175 }
|
|
|
7176
|
|
|
7177 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
7178 the current contents of their respective buffers. */
|
|
|
7179
|
|
|
7180 static void
|
|
|
7181 redisplay_without_hooks (void)
|
|
|
7182 {
|
|
|
7183 Lisp_Object devcons, concons;
|
|
|
7184 int size_change_failed = 0;
|
|
1292
|
7185 PROFILE_DECLARE ();
|
|
|
7186
|
|
|
7187 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay);
|
|
428
|
7188
|
|
|
7189 if (asynch_device_change_pending)
|
|
|
7190 handle_asynch_device_change ();
|
|
|
7191
|
|
|
7192 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
7193 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
7194 goto done;
|
|
|
7195
|
|
|
7196 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
7197 {
|
|
|
7198 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
7199 int preempted;
|
|
|
7200
|
|
430
|
7201 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
7202 {
|
|
440
|
7203 preempted = redisplay_device (d, 1);
|
|
428
|
7204
|
|
|
7205 if (preempted)
|
|
|
7206 {
|
|
|
7207 preemption_count++;
|
|
|
7208 RESET_CHANGED_SET_FLAGS;
|
|
|
7209 goto done;
|
|
|
7210 }
|
|
|
7211
|
|
|
7212 /* See comment in redisplay_device. */
|
|
|
7213 if (d->size_changed)
|
|
|
7214 size_change_failed = 1;
|
|
|
7215 }
|
|
|
7216 }
|
|
|
7217 preemption_count = 0;
|
|
|
7218
|
|
|
7219 /* Mark redisplay as accurate */
|
|
|
7220 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
7221 RESET_CHANGED_SET_FLAGS;
|
|
|
7222
|
|
|
7223 if (faces_changed)
|
|
|
7224 {
|
|
|
7225 mark_all_faces_as_clean ();
|
|
|
7226 faces_changed = 0;
|
|
|
7227 }
|
|
|
7228
|
|
|
7229 if (!size_change_failed)
|
|
|
7230 size_changed = 0;
|
|
|
7231
|
|
|
7232 reset_buffer_changes ();
|
|
|
7233
|
|
|
7234 done:
|
|
800
|
7235 #ifdef ERROR_CHECK_DISPLAY
|
|
|
7236 sledgehammer_check_redisplay_structs ();
|
|
|
7237 #endif /* ERROR_CHECK_DISPLAY */
|
|
1292
|
7238
|
|
|
7239 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay);
|
|
428
|
7240 }
|
|
|
7241
|
|
1318
|
7242 /* Note: All places in the C code that call redisplay() are prepared to
|
|
|
7243 handle GCing, which can happen from run_pre_idle_hook(). However, we
|
|
|
7244 can't currently handle GC inside the guts of redisplay; see
|
|
|
7245 enter_redisplay_critical_section().
|
|
853
|
7246
|
|
|
7247 (#### What about other external entry points to the redisplay code?
|
|
|
7248 Someone should go through and make sure that all callers can handle
|
|
|
7249 GC there, too.)
|
|
|
7250 */
|
|
|
7251
|
|
428
|
7252 void
|
|
|
7253 redisplay (void)
|
|
|
7254 {
|
|
853
|
7255 run_pre_idle_hook ();
|
|
|
7256 redisplay_no_pre_idle_hook ();
|
|
|
7257 }
|
|
|
7258
|
|
|
7259 void
|
|
|
7260 redisplay_no_pre_idle_hook (void)
|
|
|
7261 {
|
|
428
|
7262 if (last_display_warning_tick != display_warning_tick &&
|
|
|
7263 !inhibit_warning_display)
|
|
|
7264 {
|
|
|
7265 /* If an error occurs during this function, oh well.
|
|
|
7266 If we report another warning, we could get stuck in an
|
|
|
7267 infinite loop reporting warnings. */
|
|
853
|
7268 call0_trapping_problems
|
|
|
7269 (0, Qdisplay_warning_buffer,
|
|
|
7270 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
|
|
428
|
7271 last_display_warning_tick = display_warning_tick;
|
|
|
7272 }
|
|
|
7273
|
|
|
7274 redisplay_without_hooks ();
|
|
|
7275 }
|
|
|
7276
|
|
853
|
7277 Lisp_Object
|
|
|
7278 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker)
|
|
|
7279 {
|
|
|
7280 return
|
|
|
7281 eval_in_buffer_trapping_problems
|
|
|
7282 ("Error calling function within redisplay", current_buffer,
|
|
1318
|
7283 dont_trust_this_damn_sucker, 0);
|
|
853
|
7284 }
|
|
428
|
7285
|
|
|
7286 /* Efficiently determine the window line number, and return a pointer
|
|
|
7287 to its printed representation. Do this regardless of whether
|
|
|
7288 line-number-mode is on. The first line in the buffer is counted as
|
|
|
7289 1. If narrowing is in effect, the lines are counted from the
|
|
|
7290 beginning of the visible portion of the buffer. */
|
|
|
7291 static char *
|
|
|
7292 window_line_number (struct window *w, int type)
|
|
|
7293 {
|
|
|
7294 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
7295 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7296 /* Be careful in the order of these tests. The first clause will
|
|
|
7297 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
7298 This can occur when the frame title is computed really early */
|
|
665
|
7299 Charbpos pos =
|
|
428
|
7300 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
7301 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
7302 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
7303 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
7304 ? BUF_PT (b)
|
|
|
7305 : marker_position (w->pointm[type]));
|
|
|
7306 EMACS_INT line;
|
|
|
7307
|
|
|
7308 line = buffer_line_number (b, pos, 1);
|
|
|
7309
|
|
603
|
7310 {
|
|
|
7311 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
7312
|
|
|
7313 long_to_string (window_line_number_buf, line + 1);
|
|
|
7314
|
|
|
7315 return window_line_number_buf;
|
|
|
7316 }
|
|
428
|
7317 }
|
|
|
7318
|
|
|
7319
|
|
|
7320 /* Given a character representing an object in a modeline
|
|
|
7321 specification, return a string (stored into the global array
|
|
867
|
7322 `mode_spec_ibyte_string') with the information that object
|
|
428
|
7323 represents.
|
|
|
7324
|
|
|
7325 This function is largely unchanged from previous versions of the
|
|
|
7326 redisplay engine.
|
|
|
7327
|
|
|
7328 Warning! This code is also used for frame titles and can be called
|
|
|
7329 very early in the device/frame update process! JV
|
|
|
7330 */
|
|
|
7331
|
|
|
7332 static void
|
|
867
|
7333 decode_mode_spec (struct window *w, Ichar spec, int type)
|
|
428
|
7334 {
|
|
|
7335 Lisp_Object obj = Qnil;
|
|
442
|
7336 const char *str = NULL;
|
|
428
|
7337 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7338
|
|
867
|
7339 Dynarr_reset (mode_spec_ibyte_string);
|
|
428
|
7340
|
|
|
7341 switch (spec)
|
|
|
7342 {
|
|
|
7343 /* print buffer name */
|
|
|
7344 case 'b':
|
|
|
7345 obj = b->name;
|
|
|
7346 break;
|
|
|
7347
|
|
|
7348 /* print visited file name */
|
|
|
7349 case 'f':
|
|
|
7350 obj = b->filename;
|
|
|
7351 break;
|
|
|
7352
|
|
|
7353 /* print the current column */
|
|
|
7354 case 'c':
|
|
|
7355 {
|
|
665
|
7356 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
7357 ? BUF_PT (b)
|
|
|
7358 : marker_position (w->pointm[type]);
|
|
|
7359 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
7360 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
7361
|
|
|
7362 long_to_string (buf, col);
|
|
|
7363
|
|
867
|
7364 Dynarr_add_many (mode_spec_ibyte_string,
|
|
|
7365 (const Ibyte *) buf, strlen (buf));
|
|
428
|
7366
|
|
|
7367 goto decode_mode_spec_done;
|
|
|
7368 }
|
|
|
7369 /* print the file coding system */
|
|
|
7370 case 'C':
|
|
|
7371 {
|
|
|
7372 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
7373 /* Be very careful here not to get an error. */
|
|
|
7374 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
7375 {
|
|
771
|
7376 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
7377 if (CODING_SYSTEMP (codesys))
|
|
|
7378 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
7379 }
|
|
|
7380 }
|
|
|
7381 break;
|
|
|
7382
|
|
|
7383 /* print the current line number */
|
|
|
7384 case 'l':
|
|
|
7385 str = window_line_number (w, type);
|
|
|
7386 break;
|
|
|
7387
|
|
|
7388 /* print value of mode-name (obsolete) */
|
|
|
7389 case 'm':
|
|
|
7390 obj = b->mode_name;
|
|
|
7391 break;
|
|
|
7392
|
|
|
7393 /* print hyphen and frame number, if != 1 */
|
|
|
7394 case 'N':
|
|
|
7395 #ifdef HAVE_TTY
|
|
|
7396 {
|
|
|
7397 struct frame *f = XFRAME (w->frame);
|
|
|
7398 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
7399 {
|
|
|
7400 /* Naughty, naughty */
|
|
|
7401 char * writable_str = alloca_array (char, 10);
|
|
|
7402 sprintf (writable_str, "-%d", f->order_count);
|
|
|
7403 str = writable_str;
|
|
|
7404 }
|
|
|
7405 }
|
|
|
7406 #endif /* HAVE_TTY */
|
|
|
7407 break;
|
|
|
7408
|
|
|
7409 /* print Narrow if appropriate */
|
|
|
7410 case 'n':
|
|
|
7411 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
7412 || BUF_ZV (b) < BUF_Z (b))
|
|
|
7413 str = " Narrow";
|
|
|
7414 break;
|
|
|
7415
|
|
|
7416 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
7417 case '*':
|
|
|
7418 str = (!NILP (b->read_only)
|
|
|
7419 ? "%"
|
|
|
7420 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7421 ? "*"
|
|
|
7422 : "-"));
|
|
|
7423 break;
|
|
|
7424
|
|
|
7425 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
7426 read-only but still indicate whether it is modified. */
|
|
|
7427 case '+':
|
|
|
7428 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7429 ? "*"
|
|
|
7430 : (!NILP (b->read_only)
|
|
|
7431 ? "%"
|
|
|
7432 : "-"));
|
|
|
7433 break;
|
|
|
7434
|
|
|
7435 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
7436 modeline-format doc string. */
|
|
|
7437 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
7438 case '&':
|
|
|
7439 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7440 ? "*"
|
|
|
7441 : "-");
|
|
|
7442 break;
|
|
|
7443
|
|
|
7444 /* print process status */
|
|
|
7445 case 's':
|
|
|
7446 obj = Fget_buffer_process (w->buffer);
|
|
|
7447 if (NILP (obj))
|
|
|
7448 str = GETTEXT ("no process");
|
|
|
7449 else
|
|
|
7450 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7451 break;
|
|
|
7452
|
|
|
7453 /* Print name of selected frame. */
|
|
|
7454 case 'S':
|
|
|
7455 obj = XFRAME (w->frame)->name;
|
|
|
7456 break;
|
|
|
7457
|
|
|
7458 /* indicate TEXT or BINARY */
|
|
|
7459 case 't':
|
|
|
7460 /* #### NT does not use this any more. Now what? */
|
|
|
7461 str = "T";
|
|
|
7462 break;
|
|
|
7463
|
|
|
7464 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7465 case 'p':
|
|
|
7466 {
|
|
665
|
7467 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7468
|
|
|
7469 /* This had better be while the desired lines are being done. */
|
|
|
7470 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7471 {
|
|
|
7472 if (pos <= BUF_BEGV (b))
|
|
|
7473 str = "All";
|
|
|
7474 else
|
|
|
7475 str = "Bottom";
|
|
|
7476 }
|
|
|
7477 else if (pos <= BUF_BEGV (b))
|
|
|
7478 str = "Top";
|
|
|
7479 else
|
|
|
7480 {
|
|
|
7481 /* This hard limit is ok since the string it will hold has a
|
|
|
7482 fixed maximum length of 3. But just to be safe... */
|
|
|
7483 char buf[10];
|
|
|
7484 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7485 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7486
|
|
|
7487 /* Avoid overflow on big buffers */
|
|
|
7488 int percent = total > LONG_MAX/200 ?
|
|
|
7489 (chars + total/200) / (total / 100) :
|
|
|
7490 (chars * 100 + total/2) / total;
|
|
|
7491
|
|
|
7492 /* We can't normally display a 3-digit number, so get us a
|
|
|
7493 2-digit number that is close. */
|
|
|
7494 if (percent == 100)
|
|
|
7495 percent = 99;
|
|
|
7496
|
|
|
7497 sprintf (buf, "%d%%", percent);
|
|
867
|
7498 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7499 strlen (buf));
|
|
|
7500
|
|
|
7501 goto decode_mode_spec_done;
|
|
|
7502 }
|
|
|
7503 break;
|
|
|
7504 }
|
|
|
7505
|
|
|
7506 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7507 Top, or print Bottom or All */
|
|
|
7508 case 'P':
|
|
|
7509 {
|
|
665
|
7510 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7511 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7512
|
|
|
7513 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7514 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7515 botpos may be negative. */
|
|
|
7516 if (botpos < toppos)
|
|
|
7517 botpos = toppos;
|
|
|
7518
|
|
|
7519 if (botpos >= BUF_ZV (b))
|
|
|
7520 {
|
|
|
7521 if (toppos <= BUF_BEGV (b))
|
|
|
7522 str = "All";
|
|
|
7523 else
|
|
|
7524 str = "Bottom";
|
|
|
7525 }
|
|
|
7526 else
|
|
|
7527 {
|
|
|
7528 /* This hard limit is ok since the string it will hold has a
|
|
|
7529 fixed maximum length of around 6. But just to be safe... */
|
|
|
7530 char buf[10];
|
|
|
7531 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7532 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7533
|
|
|
7534 /* Avoid overflow on big buffers */
|
|
|
7535 int percent = total > LONG_MAX/200 ?
|
|
|
7536 (chars + total/200) / (total / 100) :
|
|
|
7537 (chars * 100 + total/2) / max (total, 1);
|
|
|
7538
|
|
|
7539 /* We can't normally display a 3-digit number, so get us a
|
|
|
7540 2-digit number that is close. */
|
|
|
7541 if (percent == 100)
|
|
|
7542 percent = 99;
|
|
|
7543
|
|
|
7544 if (toppos <= BUF_BEGV (b))
|
|
|
7545 sprintf (buf, "Top%d%%", percent);
|
|
|
7546 else
|
|
|
7547 sprintf (buf, "%d%%", percent);
|
|
|
7548
|
|
867
|
7549 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
|
|
428
|
7550 strlen (buf));
|
|
|
7551
|
|
|
7552 goto decode_mode_spec_done;
|
|
|
7553 }
|
|
|
7554 break;
|
|
|
7555 }
|
|
|
7556
|
|
|
7557 /* print % */
|
|
|
7558 case '%':
|
|
|
7559 str = "%";
|
|
|
7560 break;
|
|
|
7561
|
|
|
7562 /* print one [ for each recursive editing level. */
|
|
|
7563 case '[':
|
|
|
7564 {
|
|
|
7565 int i;
|
|
|
7566
|
|
|
7567 if (command_loop_level > 5)
|
|
|
7568 {
|
|
|
7569 str = "[[[... ";
|
|
|
7570 break;
|
|
|
7571 }
|
|
|
7572
|
|
|
7573 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7574 Dynarr_add (mode_spec_ibyte_string, '[');
|
|
428
|
7575
|
|
|
7576 goto decode_mode_spec_done;
|
|
|
7577 }
|
|
|
7578
|
|
|
7579 /* print one ] for each recursive editing level. */
|
|
|
7580 case ']':
|
|
|
7581 {
|
|
|
7582 int i;
|
|
|
7583
|
|
|
7584 if (command_loop_level > 5)
|
|
|
7585 {
|
|
|
7586 str = "...]]]";
|
|
|
7587 break;
|
|
|
7588 }
|
|
|
7589
|
|
|
7590 for (i = 0; i < command_loop_level; i++)
|
|
867
|
7591 Dynarr_add (mode_spec_ibyte_string, ']');
|
|
428
|
7592
|
|
|
7593 goto decode_mode_spec_done;
|
|
|
7594 }
|
|
|
7595
|
|
|
7596 /* print infinitely many dashes -- handle at top level now */
|
|
|
7597 case '-':
|
|
|
7598 break;
|
|
|
7599
|
|
|
7600 }
|
|
|
7601
|
|
|
7602 if (STRINGP (obj))
|
|
867
|
7603 Dynarr_add_many (mode_spec_ibyte_string,
|
|
428
|
7604 XSTRING_DATA (obj),
|
|
|
7605 XSTRING_LENGTH (obj));
|
|
|
7606 else if (str)
|
|
867
|
7607 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
|
|
428
|
7608
|
|
|
7609 decode_mode_spec_done:
|
|
867
|
7610 Dynarr_add (mode_spec_ibyte_string, '\0');
|
|
428
|
7611 }
|
|
|
7612
|
|
|
7613 /* Given a display line, free all of its data structures. */
|
|
|
7614
|
|
|
7615 static void
|
|
|
7616 free_display_line (struct display_line *dl)
|
|
|
7617 {
|
|
|
7618 int block;
|
|
|
7619
|
|
|
7620 if (dl->display_blocks)
|
|
|
7621 {
|
|
|
7622 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
1318
|
7623 {
|
|
428
|
7624 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7625
|
|
|
7626 Dynarr_free (db->runes);
|
|
|
7627 }
|
|
|
7628
|
|
|
7629 Dynarr_free (dl->display_blocks);
|
|
|
7630 dl->display_blocks = NULL;
|
|
|
7631 }
|
|
|
7632
|
|
|
7633 if (dl->left_glyphs)
|
|
|
7634 {
|
|
|
7635 Dynarr_free (dl->left_glyphs);
|
|
|
7636 dl->left_glyphs = NULL;
|
|
|
7637 }
|
|
|
7638
|
|
|
7639 if (dl->right_glyphs)
|
|
|
7640 {
|
|
|
7641 Dynarr_free (dl->right_glyphs);
|
|
|
7642 dl->right_glyphs = NULL;
|
|
|
7643 }
|
|
|
7644 }
|
|
|
7645
|
|
|
7646
|
|
|
7647 /* Given an array of display lines, free them and all data structures
|
|
|
7648 contained within them. */
|
|
|
7649
|
|
|
7650 void
|
|
|
7651 free_display_lines (display_line_dynarr *dla)
|
|
|
7652 {
|
|
|
7653 int line;
|
|
|
7654
|
|
|
7655 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7656 {
|
|
|
7657 free_display_line (Dynarr_atp (dla, line));
|
|
|
7658 }
|
|
|
7659
|
|
|
7660 Dynarr_free (dla);
|
|
|
7661 }
|
|
|
7662
|
|
|
7663 /* Call internal free routine for each set of display lines. */
|
|
|
7664
|
|
|
7665 void
|
|
|
7666 free_display_structs (struct window_mirror *mir)
|
|
|
7667 {
|
|
|
7668 if (mir->current_display_lines)
|
|
|
7669 {
|
|
|
7670 free_display_lines (mir->current_display_lines);
|
|
|
7671 mir->current_display_lines = 0;
|
|
|
7672 }
|
|
|
7673
|
|
|
7674 if (mir->desired_display_lines)
|
|
|
7675 {
|
|
|
7676 free_display_lines (mir->desired_display_lines);
|
|
|
7677 mir->desired_display_lines = 0;
|
|
|
7678 }
|
|
|
7679 }
|
|
|
7680
|
|
|
7681
|
|
|
7682 static void
|
|
|
7683 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7684 {
|
|
|
7685 if (gba)
|
|
|
7686 {
|
|
|
7687 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7688 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7689
|
|
|
7690 for (; gb < gb_last; gb++)
|
|
|
7691 {
|
|
|
7692 if (!NILP (gb->glyph))
|
|
|
7693 mark_object (gb->glyph);
|
|
|
7694 if (!NILP (gb->extent))
|
|
|
7695 mark_object (gb->extent);
|
|
|
7696 }
|
|
|
7697 }
|
|
|
7698 }
|
|
|
7699
|
|
442
|
7700 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7701 the glyph will also mark the image_instance. */
|
|
|
7702 void
|
|
428
|
7703 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7704 {
|
|
|
7705 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7706 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7707
|
|
|
7708 for (; dl < dl_last; dl++)
|
|
|
7709 {
|
|
|
7710 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7711 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7712 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7713
|
|
|
7714 for (; db < db_last; db++)
|
|
|
7715 {
|
|
|
7716 rune_dynarr *ra = db->runes;
|
|
|
7717 rune *r = Dynarr_atp (ra, 0);
|
|
|
7718 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7719
|
|
|
7720 for (; r < r_last; r++)
|
|
|
7721 {
|
|
|
7722 if (r->type == RUNE_DGLYPH)
|
|
|
7723 {
|
|
|
7724 if (!NILP (r->object.dglyph.glyph))
|
|
|
7725 mark_object (r->object.dglyph.glyph);
|
|
|
7726 if (!NILP (r->object.dglyph.extent))
|
|
|
7727 mark_object (r->object.dglyph.extent);
|
|
|
7728 }
|
|
|
7729 }
|
|
|
7730 }
|
|
|
7731
|
|
|
7732 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7733 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7734 }
|
|
|
7735 }
|
|
|
7736
|
|
|
7737
|
|
|
7738 /*****************************************************************************
|
|
|
7739 Line Start Cache Description and Rationale
|
|
|
7740
|
|
|
7741 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
7742 It depends on the key assumption that the number of lines that can be
|
|
|
7743 displayed at any given time is fixed. This led to a complete separation
|
|
|
7744 of the scrolling code from the redisplay code. In order to fully support
|
|
|
7745 variable height lines, the scrolling code must actually be tightly
|
|
|
7746 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
7747 will be displayed on a screen for any given starting point.
|
|
|
7748
|
|
|
7749 What is ideally wanted is a complete list of the starting buffer position
|
|
|
7750 for every possible display line of a buffer along with the height of that
|
|
|
7751 display line. Maintaining such a full list would be very expensive. We
|
|
|
7752 settle for having it include information for all areas which we happen to
|
|
|
7753 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
7754 areas we need to work with.
|
|
|
7755
|
|
|
7756 In order to ensure that the cache accurately represents what redisplay
|
|
|
7757 would actually show, it is necessary to invalidate it in many situations.
|
|
|
7758 If the buffer changes, the starting positions may no longer be correct.
|
|
|
7759 If a face or an extent has changed then the line heights may have altered.
|
|
|
7760 These events happen frequently enough that the cache can end up being
|
|
|
7761 constantly disabled. With this potentially constant invalidation when is
|
|
|
7762 the cache ever useful?
|
|
|
7763
|
|
|
7764 Even if the cache is invalidated before every single usage, it is
|
|
|
7765 necessary. Scrolling often requires knowledge about display lines which
|
|
|
7766 are actually above or below the visible region. The cache provides a
|
|
|
7767 convenient light-weight method of storing this information for multiple
|
|
|
7768 display regions. This knowledge is necessary for the scrolling code to
|
|
|
7769 always obey the First Golden Rule of Redisplay.
|
|
|
7770
|
|
|
7771 If the cache already contains all of the information that the scrolling
|
|
|
7772 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
7773 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
7774 do to help out the cache is to always add the displayed region. This
|
|
|
7775 region had to be generated anyway, so the cache ends up getting the
|
|
|
7776 information basically for free. In those cases where a user is simply
|
|
|
7777 scrolling around viewing a buffer there is a high probability that this is
|
|
|
7778 sufficient to always provide the needed information. The second thing we
|
|
|
7779 can do is be smart about invalidating the cache.
|
|
|
7780
|
|
|
7781 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
7782
|
|
|
7783 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
7784 starting positions of any display lines. These types of buffer
|
|
|
7785 modifications should not invalidate the cache. This is actually a large
|
|
|
7786 optimization for redisplay speed as well.
|
|
|
7787
|
|
|
7788 + Buffer modifications frequently only affect the display of lines at and
|
|
|
7789 below where they occur. In these situations we should only invalidate
|
|
|
7790 the part of the cache starting at where the modification occurs.
|
|
|
7791
|
|
|
7792 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
7793 applicable.
|
|
|
7794 ****************************************************************************/
|
|
|
7795
|
|
|
7796 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7797 allocating and freeing it. */
|
|
|
7798 static line_start_cache_dynarr *internal_cache;
|
|
|
7799
|
|
|
7800 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7801 the TYPE display structs. */
|
|
|
7802
|
|
|
7803 static void
|
|
|
7804 update_internal_cache_list (struct window *w, int type)
|
|
|
7805 {
|
|
|
7806 int line;
|
|
|
7807 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7808
|
|
|
7809 Dynarr_reset (internal_cache);
|
|
|
7810 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7811 {
|
|
|
7812 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7813
|
|
|
7814 if (dl->modeline)
|
|
|
7815 continue;
|
|
|
7816 else
|
|
|
7817 {
|
|
|
7818 struct line_start_cache lsc;
|
|
434
|
7819
|
|
826
|
7820 lsc.start = dl->charpos;
|
|
|
7821 lsc.end = dl->end_charpos;
|
|
428
|
7822 lsc.height = dl->ascent + dl->descent;
|
|
|
7823
|
|
|
7824 Dynarr_add (internal_cache, lsc);
|
|
|
7825 }
|
|
|
7826 }
|
|
|
7827 }
|
|
|
7828
|
|
|
7829 /* Reset the line cache if necessary. This should be run at the
|
|
|
7830 beginning of any function which access the cache. */
|
|
|
7831
|
|
|
7832 static void
|
|
|
7833 validate_line_start_cache (struct window *w)
|
|
|
7834 {
|
|
|
7835 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7836 struct frame *f = XFRAME (w->frame);
|
|
|
7837
|
|
|
7838 if (!w->line_cache_validation_override)
|
|
|
7839 {
|
|
|
7840 /* f->extents_changed used to be in here because extent face and
|
|
|
7841 size changes can cause text shifting. However, the extent
|
|
|
7842 covering the region is constantly having its face set and
|
|
|
7843 priority altered by the mouse code. This means that the line
|
|
|
7844 start cache is constantly being invalidated. This is bad
|
|
|
7845 since the mouse code also triggers heavy usage of the cache.
|
|
|
7846 Since it is an unlikely that f->extents being changed
|
|
|
7847 indicates that the cache really needs to be updated and if it
|
|
|
7848 does redisplay will catch it pretty quickly we no longer
|
|
|
7849 invalidate the cache if it is set. This greatly speeds up
|
|
|
7850 dragging out regions with the mouse. */
|
|
|
7851 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7852 || f->faces_changed
|
|
|
7853 || f->clip_changed)
|
|
|
7854 {
|
|
|
7855 Dynarr_reset (w->line_start_cache);
|
|
|
7856 }
|
|
|
7857 }
|
|
|
7858 }
|
|
|
7859
|
|
|
7860 /* Return the very first buffer position contained in the given
|
|
|
7861 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7862 cache is valid. */
|
|
|
7863
|
|
665
|
7864 static Charbpos
|
|
428
|
7865 line_start_cache_start (struct window *w)
|
|
|
7866 {
|
|
|
7867 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7868
|
|
|
7869 if (!Dynarr_length (cache))
|
|
|
7870 return -1;
|
|
|
7871 else
|
|
|
7872 return Dynarr_atp (cache, 0)->start;
|
|
|
7873 }
|
|
|
7874
|
|
|
7875 /* Return the very last buffer position contained in the given
|
|
|
7876 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7877 cache is valid. */
|
|
|
7878
|
|
665
|
7879 static Charbpos
|
|
428
|
7880 line_start_cache_end (struct window *w)
|
|
|
7881 {
|
|
|
7882 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7883
|
|
|
7884 if (!Dynarr_length (cache))
|
|
|
7885 return -1;
|
|
|
7886 else
|
|
|
7887 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7888 }
|
|
|
7889
|
|
|
7890 /* Return the index of the line POINT is contained within in window
|
|
|
7891 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7892 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7893 a guarantee of the number of entries in the cache present on either
|
|
|
7894 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7895 then it will be treated as 0, but the cache window will not be
|
|
|
7896 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7897 for any reason. */
|
|
|
7898
|
|
|
7899 int
|
|
665
|
7900 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7901 {
|
|
|
7902 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7903 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7904 int top, bottom, pos;
|
|
428
|
7905
|
|
|
7906 validate_line_start_cache (w);
|
|
|
7907 w->line_cache_validation_override++;
|
|
|
7908
|
|
|
7909 /* Let functions pass in negative values, but we still treat -1
|
|
|
7910 specially. */
|
|
|
7911 /* #### bogosity alert */
|
|
|
7912 if (min_past < 0 && min_past != -1)
|
|
|
7913 min_past = -min_past;
|
|
|
7914
|
|
|
7915 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7916 || line_start_cache_end (w) < point)
|
|
|
7917 {
|
|
|
7918 int loop;
|
|
|
7919 int win_char_height = window_char_height (w, 1);
|
|
|
7920
|
|
|
7921 /* Occasionally we get here with a 0 height
|
|
|
7922 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7923 count of 0 so handle that case. */
|
|
|
7924 if (!win_char_height)
|
|
|
7925 win_char_height = 1;
|
|
|
7926
|
|
|
7927 if (!Dynarr_length (cache))
|
|
|
7928 {
|
|
665
|
7929 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7930 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7931
|
|
|
7932 update_line_start_cache (w, from, to, point, 0);
|
|
|
7933
|
|
|
7934 if (!Dynarr_length (cache))
|
|
|
7935 {
|
|
|
7936 w->line_cache_validation_override--;
|
|
|
7937 return -1;
|
|
|
7938 }
|
|
|
7939 }
|
|
|
7940
|
|
|
7941 assert (Dynarr_length (cache));
|
|
|
7942
|
|
|
7943 loop = 0;
|
|
|
7944 while (line_start_cache_start (w) > point
|
|
|
7945 && (loop < cache_adjustment || min_past == -1))
|
|
|
7946 {
|
|
665
|
7947 Charbpos from, to;
|
|
428
|
7948
|
|
|
7949 from = line_start_cache_start (w);
|
|
|
7950 if (from <= BUF_BEGV (b))
|
|
|
7951 break;
|
|
|
7952
|
|
|
7953 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7954 to = line_start_cache_end (w);
|
|
|
7955
|
|
|
7956 update_line_start_cache (w, from, to, point, 0);
|
|
|
7957 loop++;
|
|
|
7958 }
|
|
|
7959
|
|
|
7960 if (line_start_cache_start (w) > point)
|
|
|
7961 {
|
|
665
|
7962 Charbpos from, to;
|
|
428
|
7963
|
|
|
7964 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7965 if (from >= BUF_ZV (b))
|
|
|
7966 {
|
|
|
7967 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7968 from = to;
|
|
|
7969 to = BUF_ZV (b);
|
|
|
7970 }
|
|
|
7971 else
|
|
|
7972 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7973
|
|
|
7974 update_line_start_cache (w, from, to, point, 0);
|
|
|
7975 }
|
|
|
7976
|
|
|
7977 loop = 0;
|
|
|
7978 while (line_start_cache_end (w) < point
|
|
|
7979 && (loop < cache_adjustment || min_past == -1))
|
|
|
7980 {
|
|
665
|
7981 Charbpos from, to;
|
|
428
|
7982
|
|
|
7983 to = line_start_cache_end (w);
|
|
|
7984 if (to >= BUF_ZV (b))
|
|
|
7985 break;
|
|
|
7986
|
|
|
7987 from = line_start_cache_end (w);
|
|
|
7988 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7989
|
|
|
7990 update_line_start_cache (w, from, to, point, 0);
|
|
|
7991 loop++;
|
|
|
7992 }
|
|
|
7993
|
|
|
7994 if (line_start_cache_end (w) < point)
|
|
|
7995 {
|
|
665
|
7996 Charbpos from, to;
|
|
428
|
7997
|
|
|
7998 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7999 if (from >= BUF_ZV (b))
|
|
|
8000 {
|
|
|
8001 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
8002 from = to;
|
|
|
8003 to = BUF_ZV (b);
|
|
|
8004 }
|
|
|
8005 else
|
|
|
8006 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
8007
|
|
|
8008 update_line_start_cache (w, from, to, point, 0);
|
|
|
8009 }
|
|
|
8010 }
|
|
|
8011
|
|
|
8012 assert (Dynarr_length (cache));
|
|
|
8013
|
|
|
8014 if (min_past == -1)
|
|
|
8015 min_past = 0;
|
|
|
8016
|
|
|
8017 /* This could happen if the buffer is narrowed. */
|
|
|
8018 if (line_start_cache_start (w) > point
|
|
|
8019 || line_start_cache_end (w) < point)
|
|
|
8020 {
|
|
|
8021 w->line_cache_validation_override--;
|
|
|
8022 return -1;
|
|
|
8023 }
|
|
|
8024
|
|
|
8025 find_point_loop:
|
|
|
8026
|
|
|
8027 top = Dynarr_length (cache) - 1;
|
|
|
8028 bottom = 0;
|
|
|
8029
|
|
|
8030 while (1)
|
|
|
8031 {
|
|
647
|
8032 int new_pos;
|
|
665
|
8033 Charbpos start, end;
|
|
428
|
8034
|
|
|
8035 pos = (bottom + top + 1) >> 1;
|
|
|
8036 start = Dynarr_atp (cache, pos)->start;
|
|
|
8037 end = Dynarr_atp (cache, pos)->end;
|
|
|
8038
|
|
|
8039 if (point >= start && point <= end)
|
|
|
8040 {
|
|
|
8041 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
8042 {
|
|
665
|
8043 Charbpos from =
|
|
428
|
8044 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
8045 -min_past - 1);
|
|
665
|
8046 Charbpos to = line_start_cache_end (w);
|
|
428
|
8047
|
|
|
8048 update_line_start_cache (w, from, to, point, 0);
|
|
|
8049 goto find_point_loop;
|
|
|
8050 }
|
|
|
8051 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
8052 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
8053 {
|
|
665
|
8054 Charbpos from = line_start_cache_end (w);
|
|
|
8055 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
8056 (min_past
|
|
|
8057 ? min_past
|
|
|
8058 : 1));
|
|
|
8059
|
|
|
8060 update_line_start_cache (w, from, to, point, 0);
|
|
|
8061 goto find_point_loop;
|
|
|
8062 }
|
|
|
8063 else
|
|
|
8064 {
|
|
|
8065 w->line_cache_validation_override--;
|
|
|
8066 return pos;
|
|
|
8067 }
|
|
|
8068 }
|
|
|
8069 else if (point > end)
|
|
|
8070 bottom = pos + 1;
|
|
|
8071 else if (point < start)
|
|
|
8072 top = pos - 1;
|
|
|
8073 else
|
|
|
8074 abort ();
|
|
|
8075
|
|
|
8076 new_pos = (bottom + top + 1) >> 1;
|
|
|
8077 if (pos == new_pos)
|
|
|
8078 {
|
|
|
8079 w->line_cache_validation_override--;
|
|
|
8080 return -1;
|
|
|
8081 }
|
|
|
8082 }
|
|
|
8083 }
|
|
|
8084
|
|
|
8085 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
8086 if display of the window was to begin at STARTP. */
|
|
|
8087
|
|
|
8088 int
|
|
665
|
8089 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
|
|
428
|
8090 {
|
|
|
8091 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
8092 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
8093 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
8094 int start_elt;
|
|
|
8095
|
|
|
8096 /* If point is before the intended start it obviously can't be visible. */
|
|
|
8097 if (point < startp)
|
|
|
8098 return 0;
|
|
|
8099
|
|
|
8100 /* If point or start are not in the accessible buffer range, then
|
|
|
8101 fail. */
|
|
|
8102 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
8103 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
8104 return 0;
|
|
|
8105
|
|
|
8106 validate_line_start_cache (w);
|
|
|
8107 w->line_cache_validation_override++;
|
|
|
8108
|
|
|
8109 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
8110 if (start_elt == -1)
|
|
|
8111 {
|
|
|
8112 w->line_cache_validation_override--;
|
|
|
8113 return 0;
|
|
|
8114 }
|
|
|
8115
|
|
|
8116 assert (line_start_cache_start (w) <= startp
|
|
|
8117 && line_start_cache_end (w) >= startp);
|
|
|
8118
|
|
|
8119 while (1)
|
|
|
8120 {
|
|
|
8121 int height;
|
|
|
8122
|
|
|
8123 /* Expand the cache if necessary. */
|
|
|
8124 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
8125 {
|
|
665
|
8126 Charbpos old_startp =
|
|
428
|
8127 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
8128
|
|
|
8129 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
8130 window_char_height (w, 0));
|
|
|
8131
|
|
|
8132 /* We've already actually processed old_startp, so increment
|
|
|
8133 immediately. */
|
|
|
8134 start_elt++;
|
|
|
8135
|
|
|
8136 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
8137 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
8138 {
|
|
|
8139 w->line_cache_validation_override--;
|
|
|
8140 return 0;
|
|
|
8141 }
|
|
|
8142 }
|
|
|
8143
|
|
|
8144 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
8145
|
|
|
8146 if (pixpos + height > bottom)
|
|
|
8147 {
|
|
|
8148 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
8149 {
|
|
|
8150 w->line_cache_validation_override--;
|
|
|
8151 return 0;
|
|
|
8152 }
|
|
|
8153 }
|
|
|
8154
|
|
|
8155 pixpos += height;
|
|
|
8156 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
8157 {
|
|
|
8158 w->line_cache_validation_override--;
|
|
|
8159 return 1;
|
|
|
8160 }
|
|
|
8161
|
|
|
8162 start_elt++;
|
|
|
8163 }
|
|
|
8164 }
|
|
|
8165
|
|
|
8166 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8167 the buffer position at the beginning or end of the last line
|
|
|
8168 displayed. The end of the last line is also know as the window end
|
|
|
8169 position.
|
|
|
8170
|
|
442
|
8171 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
8172 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
8173 does occur in the following situation: A mouse event has come in and we
|
|
|
8174 need to compute its location in a window. That code (in
|
|
|
8175 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
8176
|
|
428
|
8177 #### With a little work this could probably be reworked as just a
|
|
|
8178 call to start_with_line_at_pixpos. */
|
|
|
8179
|
|
665
|
8180 static Charbpos
|
|
|
8181 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
8182 int may_error)
|
|
428
|
8183 {
|
|
|
8184 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8185 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
8186 int pixpos = 0;
|
|
|
8187 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
8188 Charbpos cur_start;
|
|
428
|
8189 int start_elt;
|
|
|
8190
|
|
|
8191 validate_line_start_cache (w);
|
|
|
8192 w->line_cache_validation_override++;
|
|
|
8193
|
|
|
8194 if (startp < BUF_BEGV (b))
|
|
|
8195 startp = BUF_BEGV (b);
|
|
|
8196 else if (startp > BUF_ZV (b))
|
|
|
8197 startp = BUF_ZV (b);
|
|
|
8198 cur_start = startp;
|
|
|
8199
|
|
|
8200 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
8201 if (start_elt == -1)
|
|
442
|
8202 return may_error ? 0 : startp;
|
|
428
|
8203
|
|
|
8204 while (1)
|
|
|
8205 {
|
|
|
8206 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
8207
|
|
|
8208 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
8209
|
|
|
8210 if (pixpos + height > bottom)
|
|
|
8211 {
|
|
|
8212 /* Adjust for any possible clip. */
|
|
|
8213 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
8214 start_elt--;
|
|
|
8215
|
|
|
8216 if (start_elt < 0)
|
|
|
8217 {
|
|
|
8218 w->line_cache_validation_override--;
|
|
|
8219 if (end)
|
|
|
8220 return BUF_ZV (b);
|
|
|
8221 else
|
|
|
8222 return BUF_BEGV (b);
|
|
|
8223 }
|
|
|
8224 else
|
|
|
8225 {
|
|
|
8226 w->line_cache_validation_override--;
|
|
|
8227 if (end)
|
|
|
8228 return Dynarr_atp (cache, start_elt)->end;
|
|
|
8229 else
|
|
|
8230 return Dynarr_atp (cache, start_elt)->start;
|
|
|
8231 }
|
|
|
8232 }
|
|
|
8233
|
|
|
8234 pixpos += height;
|
|
|
8235 start_elt++;
|
|
|
8236 if (start_elt == Dynarr_length (cache))
|
|
|
8237 {
|
|
665
|
8238 Charbpos from = line_start_cache_end (w);
|
|
428
|
8239 int win_char_height = window_char_height (w, 0);
|
|
665
|
8240 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
8241 (win_char_height
|
|
|
8242 ? win_char_height
|
|
|
8243 : 1));
|
|
|
8244
|
|
|
8245 /* We've hit the end of the bottom so that's what it is. */
|
|
|
8246 if (from >= BUF_ZV (b))
|
|
|
8247 {
|
|
|
8248 w->line_cache_validation_override--;
|
|
|
8249 return BUF_ZV (b);
|
|
|
8250 }
|
|
|
8251
|
|
|
8252 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
8253
|
|
|
8254 /* Updating the cache invalidates any current indexes. */
|
|
|
8255 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
8256 }
|
|
|
8257 }
|
|
|
8258 }
|
|
|
8259
|
|
|
8260 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8261 the buffer position at the beginning of the last line displayed. */
|
|
|
8262
|
|
665
|
8263 Charbpos
|
|
|
8264 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
8265 {
|
|
442
|
8266 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
8267 }
|
|
|
8268
|
|
|
8269 /* For the given window W, if display starts at STARTP, what will be
|
|
|
8270 the buffer position at the end of the last line displayed. This is
|
|
|
8271 also know as the window end position. */
|
|
|
8272
|
|
665
|
8273 Charbpos
|
|
|
8274 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
8275 {
|
|
442
|
8276 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
8277 }
|
|
|
8278
|
|
665
|
8279 static Charbpos
|
|
|
8280 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
8281 {
|
|
|
8282 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
8283 }
|
|
|
8284
|
|
|
8285
|
|
428
|
8286 /* For window W, what does the starting position have to be so that
|
|
|
8287 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
8288
|
|
665
|
8289 Charbpos
|
|
|
8290 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
8291 {
|
|
|
8292 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8293 int cur_elt;
|
|
665
|
8294 Charbpos cur_pos, prev_pos = point;
|
|
428
|
8295 int point_line_height;
|
|
|
8296 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
8297
|
|
|
8298 validate_line_start_cache (w);
|
|
|
8299 w->line_cache_validation_override++;
|
|
|
8300
|
|
|
8301 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
8302 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
8303 if (cur_elt < 0)
|
|
|
8304 {
|
|
|
8305 w->line_cache_validation_override--;
|
|
|
8306 return point;
|
|
|
8307 }
|
|
|
8308
|
|
|
8309 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8310
|
|
|
8311 while (1)
|
|
|
8312 {
|
|
|
8313 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8314
|
|
|
8315 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8316
|
|
|
8317 /* Do not take into account the value of vertical_clip here.
|
|
|
8318 That is the responsibility of the calling functions. */
|
|
|
8319 if (pixheight < 0)
|
|
|
8320 {
|
|
|
8321 w->line_cache_validation_override--;
|
|
|
8322 if (-pixheight > point_line_height)
|
|
|
8323 /* We can't make the target line cover pixpos, so put it
|
|
|
8324 above pixpos. That way it will at least be visible. */
|
|
|
8325 return prev_pos;
|
|
|
8326 else
|
|
|
8327 return cur_pos;
|
|
|
8328 }
|
|
|
8329
|
|
|
8330 cur_elt--;
|
|
|
8331 while (cur_elt < 0)
|
|
|
8332 {
|
|
665
|
8333 Charbpos from, to;
|
|
428
|
8334 int win_char_height;
|
|
|
8335
|
|
|
8336 if (cur_pos <= BUF_BEGV (b))
|
|
|
8337 {
|
|
|
8338 w->line_cache_validation_override--;
|
|
|
8339 return BUF_BEGV (b);
|
|
|
8340 }
|
|
|
8341
|
|
|
8342 win_char_height = window_char_height (w, 0);
|
|
|
8343 if (!win_char_height)
|
|
|
8344 win_char_height = 1;
|
|
|
8345
|
|
|
8346 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
8347 to = line_start_cache_end (w);
|
|
|
8348 update_line_start_cache (w, from, to, point, 0);
|
|
|
8349
|
|
|
8350 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
8351 assert (cur_elt >= -1);
|
|
|
8352 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
8353 point is in the top line and not at BUF_BEGV, then
|
|
434
|
8354 setting the window_start to a newline before the start of
|
|
428
|
8355 the first line will always cause scrolling.
|
|
|
8356
|
|
|
8357 However in my (jv) opinion this is wrong. That new line
|
|
|
8358 can be hidden in various ways: invisible extents, an
|
|
|
8359 explicit window-start not at a newline character etc.
|
|
|
8360 The existence of those are indeed known to create crashes
|
|
|
8361 on that assert. So we have no option but to continue the
|
|
|
8362 search if we found point at the top of the line_start_cache
|
|
|
8363 again. */
|
|
434
|
8364 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
8365 }
|
|
|
8366 prev_pos = cur_pos;
|
|
|
8367 }
|
|
|
8368 }
|
|
|
8369
|
|
|
8370 /* For window W, what does the starting position have to be so that
|
|
|
8371 the line containing point is on display line LINE. If LINE is
|
|
|
8372 positive it is considered to be the number of lines from the top of
|
|
|
8373 the window (0 is the top line). If it is negative the number is
|
|
|
8374 considered to be the number of lines from the bottom (-1 is the
|
|
|
8375 bottom line). */
|
|
|
8376
|
|
665
|
8377 Charbpos
|
|
|
8378 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
8379 {
|
|
|
8380 validate_line_start_cache (w);
|
|
|
8381 w->line_cache_validation_override++;
|
|
|
8382
|
|
|
8383 if (line >= 0)
|
|
|
8384 {
|
|
|
8385 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
8386
|
|
|
8387 if (cur_elt - line < 0)
|
|
|
8388 cur_elt = 0; /* Hit the top */
|
|
|
8389 else
|
|
|
8390 cur_elt -= line;
|
|
|
8391
|
|
|
8392 w->line_cache_validation_override--;
|
|
|
8393 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8394 }
|
|
|
8395 else
|
|
|
8396 {
|
|
|
8397 /* The calculated value of pixpos is correct for the bottom line
|
|
|
8398 or what we want when line is -1. Therefore we subtract one
|
|
|
8399 because we have already handled one line. */
|
|
|
8400 int new_line = -line - 1;
|
|
|
8401 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
8402 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
8403 Charbpos retval, search_point;
|
|
428
|
8404
|
|
|
8405 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
8406 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
8407 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
8408 line, so back up from the bottom by the height of the line
|
|
|
8409 containing point. */
|
|
|
8410 if (scroll_on_clipped_lines)
|
|
|
8411 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
8412 else
|
|
|
8413 pixpos -= 1;
|
|
|
8414
|
|
|
8415 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
8416 {
|
|
|
8417 /* Hit the bottom of the buffer. */
|
|
|
8418 int adjustment =
|
|
|
8419 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
8420 Lisp_Object window;
|
|
|
8421 int defheight;
|
|
|
8422
|
|
793
|
8423 window = wrap_window (w);
|
|
428
|
8424 default_face_height_and_width (window, &defheight, 0);
|
|
|
8425
|
|
|
8426 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
8427
|
|
|
8428 pixpos -= (adjustment * defheight);
|
|
|
8429 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
8430 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
8431 }
|
|
|
8432 else
|
|
|
8433 cur_elt = cur_elt + new_line;
|
|
|
8434
|
|
|
8435 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
8436
|
|
|
8437 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
8438 w->line_cache_validation_override--;
|
|
|
8439 return retval;
|
|
|
8440 }
|
|
|
8441 }
|
|
|
8442
|
|
|
8443 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8444 buffer starting positions for display lines. This allows the
|
|
|
8445 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8446 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8447 display structs which are in the given range.
|
|
|
8448
|
|
|
8449 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8450 that this function will actually add information outside of the
|
|
|
8451 lines containing those positions. This can't hurt but it could
|
|
|
8452 possibly help.
|
|
|
8453
|
|
|
8454 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8455 It might help to make the cache a dynarr of caches so that we can
|
|
|
8456 cover more areas. This might, however, turn out to be a lot of
|
|
|
8457 overhead for too little gain. */
|
|
|
8458
|
|
|
8459 static void
|
|
665
|
8460 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8461 Charbpos point, int no_regen)
|
|
428
|
8462 {
|
|
|
8463 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8464 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8465 Charbpos low_bound, high_bound;
|
|
428
|
8466
|
|
|
8467 validate_line_start_cache (w);
|
|
|
8468 w->line_cache_validation_override++;
|
|
|
8469
|
|
|
8470 if (from < BUF_BEGV (b))
|
|
|
8471 from = BUF_BEGV (b);
|
|
|
8472 if (to > BUF_ZV (b))
|
|
|
8473 to = BUF_ZV (b);
|
|
|
8474
|
|
|
8475 if (from > to)
|
|
|
8476 {
|
|
|
8477 w->line_cache_validation_override--;
|
|
|
8478 return;
|
|
|
8479 }
|
|
|
8480
|
|
|
8481 if (Dynarr_length (cache))
|
|
|
8482 {
|
|
|
8483 low_bound = line_start_cache_start (w);
|
|
|
8484 high_bound = line_start_cache_end (w);
|
|
|
8485
|
|
|
8486 /* Check to see if the desired range is already in the cache. */
|
|
|
8487 if (from >= low_bound && to <= high_bound)
|
|
|
8488 {
|
|
|
8489 w->line_cache_validation_override--;
|
|
|
8490 return;
|
|
|
8491 }
|
|
|
8492
|
|
|
8493 /* Check to make sure that the desired range is adjacent to the
|
|
|
8494 current cache. If not, invalidate the cache. */
|
|
|
8495 if (to < low_bound || from > high_bound)
|
|
|
8496 {
|
|
|
8497 Dynarr_reset (cache);
|
|
|
8498 low_bound = high_bound = -1;
|
|
|
8499 }
|
|
|
8500 }
|
|
|
8501 else
|
|
|
8502 {
|
|
|
8503 low_bound = high_bound = -1;
|
|
|
8504 }
|
|
|
8505
|
|
|
8506 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8507
|
|
|
8508 /* This could be integrated into the next two sections, but it is easier
|
|
|
8509 to follow what's going on by having it separate. */
|
|
|
8510 if (no_regen)
|
|
|
8511 {
|
|
665
|
8512 Charbpos start, end;
|
|
428
|
8513
|
|
|
8514 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8515 if (!Dynarr_length (internal_cache))
|
|
|
8516 {
|
|
|
8517 w->line_cache_validation_override--;
|
|
|
8518 return;
|
|
|
8519 }
|
|
|
8520
|
|
|
8521 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8522 end =
|
|
|
8523 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8524
|
|
|
8525 /* We aren't allowed to generate additional information to fill in
|
|
|
8526 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8527 cache. */
|
|
|
8528 if (Dynarr_length (cache))
|
|
|
8529 {
|
|
|
8530 if (end < low_bound || start > high_bound)
|
|
|
8531 Dynarr_reset (cache);
|
|
|
8532
|
|
|
8533 /* #### What should really happen if what we are doing is
|
|
|
8534 extending a line (the last line)? */
|
|
|
8535 if (Dynarr_length (cache) == 1
|
|
|
8536 && Dynarr_length (internal_cache) == 1)
|
|
|
8537 Dynarr_reset (cache);
|
|
|
8538 }
|
|
|
8539
|
|
|
8540 if (!Dynarr_length (cache))
|
|
|
8541 {
|
|
|
8542 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8543 Dynarr_length (internal_cache));
|
|
|
8544 w->line_cache_validation_override--;
|
|
|
8545 return;
|
|
|
8546 }
|
|
|
8547
|
|
|
8548 /* An extra check just in case the calling function didn't pass in
|
|
|
8549 the bounds of the DESIRED structs in the first place. */
|
|
|
8550 if (start >= low_bound && end <= high_bound)
|
|
|
8551 {
|
|
|
8552 w->line_cache_validation_override--;
|
|
|
8553 return;
|
|
|
8554 }
|
|
|
8555
|
|
|
8556 /* At this point we know that the internal cache partially overlaps
|
|
|
8557 the main cache. */
|
|
|
8558 if (start < low_bound)
|
|
|
8559 {
|
|
|
8560 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8561 while (ic_elt >= 0)
|
|
|
8562 {
|
|
|
8563 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8564 break;
|
|
|
8565 else
|
|
|
8566 ic_elt--;
|
|
|
8567 }
|
|
|
8568
|
|
|
8569 if (!(ic_elt >= 0))
|
|
|
8570 {
|
|
|
8571 Dynarr_reset (cache);
|
|
|
8572 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8573 Dynarr_length (internal_cache));
|
|
|
8574 w->line_cache_validation_override--;
|
|
|
8575 return;
|
|
|
8576 }
|
|
|
8577
|
|
|
8578 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8579 ic_elt + 1);
|
|
|
8580 }
|
|
|
8581
|
|
|
8582 if (end > high_bound)
|
|
|
8583 {
|
|
|
8584 int ic_elt = 0;
|
|
|
8585
|
|
|
8586 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8587 {
|
|
|
8588 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8589 break;
|
|
|
8590 else
|
|
|
8591 ic_elt++;
|
|
|
8592 }
|
|
|
8593
|
|
|
8594 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8595 {
|
|
|
8596 Dynarr_reset (cache);
|
|
|
8597 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8598 Dynarr_length (internal_cache));
|
|
|
8599 w->line_cache_validation_override--;
|
|
|
8600 return;
|
|
|
8601 }
|
|
|
8602
|
|
|
8603 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8604 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8605 }
|
|
|
8606
|
|
|
8607 w->line_cache_validation_override--;
|
|
|
8608 return;
|
|
|
8609 }
|
|
|
8610
|
|
|
8611 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8612 {
|
|
665
|
8613 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8614 int marker = 0;
|
|
|
8615 int old_lb = low_bound;
|
|
|
8616
|
|
|
8617 while (startp < old_lb || low_bound == -1)
|
|
|
8618 {
|
|
|
8619 int ic_elt;
|
|
665
|
8620 Charbpos new_startp;
|
|
428
|
8621
|
|
|
8622 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8623 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8624
|
|
|
8625 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8626 to layout a single line. This is not possible since we
|
|
|
8627 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8628 assert (Dynarr_length (internal_cache));
|
|
428
|
8629 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8630
|
|
|
8631 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8632 if (low_bound != -1)
|
|
|
8633 {
|
|
|
8634 while (ic_elt >= 0)
|
|
|
8635 {
|
|
|
8636 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8637 break;
|
|
|
8638 else
|
|
|
8639 ic_elt--;
|
|
|
8640 }
|
|
|
8641 }
|
|
|
8642 assert (ic_elt >= 0);
|
|
|
8643
|
|
|
8644 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8645
|
|
|
8646 /*
|
|
|
8647 * Handle invisible text properly:
|
|
|
8648 * If the last line we're inserting has the same end as the
|
|
|
8649 * line before which it will be added, merge the two lines.
|
|
|
8650 */
|
|
|
8651 if (Dynarr_length (cache) &&
|
|
|
8652 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8653 Dynarr_atp (cache, marker)->end)
|
|
|
8654 {
|
|
|
8655 Dynarr_atp (cache, marker)->start
|
|
|
8656 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8657 Dynarr_atp (cache, marker)->height
|
|
|
8658 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8659 ic_elt--;
|
|
|
8660 }
|
|
|
8661
|
|
|
8662 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8663 {
|
|
|
8664 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8665 ic_elt + 1, marker);
|
|
|
8666 marker += (ic_elt + 1);
|
|
|
8667 }
|
|
|
8668
|
|
|
8669 if (startp < low_bound || low_bound == -1)
|
|
|
8670 low_bound = startp;
|
|
|
8671 startp = new_startp;
|
|
|
8672 if (startp > BUF_ZV (b))
|
|
|
8673 {
|
|
|
8674 w->line_cache_validation_override--;
|
|
|
8675 return;
|
|
|
8676 }
|
|
|
8677 }
|
|
|
8678 }
|
|
|
8679
|
|
|
8680 assert (Dynarr_length (cache));
|
|
|
8681 assert (from >= low_bound);
|
|
|
8682
|
|
|
8683 /* Readjust the high_bound to account for any changes made while
|
|
|
8684 correcting the low_bound. */
|
|
|
8685 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8686
|
|
|
8687 if (to > high_bound)
|
|
|
8688 {
|
|
665
|
8689 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8690
|
|
|
8691 do
|
|
|
8692 {
|
|
|
8693 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8694 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8695
|
|
|
8696 /* See comment above about regenerate_window failing. */
|
|
|
8697 assert (Dynarr_length (internal_cache));
|
|
|
8698
|
|
|
8699 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8700 Dynarr_length (internal_cache));
|
|
|
8701 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8702 startp = high_bound + 1;
|
|
|
8703 }
|
|
|
8704 while (to > high_bound);
|
|
|
8705 }
|
|
|
8706
|
|
|
8707 w->line_cache_validation_override--;
|
|
|
8708 assert (to <= high_bound);
|
|
|
8709 }
|
|
|
8710
|
|
|
8711
|
|
|
8712 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8713 return the pixel location corresponding to those coordinates. The
|
|
|
8714 pixel location returned is the center of the given character
|
|
|
8715 position. The pixel values are generated relative to the window,
|
|
|
8716 not the frame.
|
|
|
8717
|
|
|
8718 The modeline is considered to be part of the window. */
|
|
|
8719
|
|
|
8720 void
|
|
|
8721 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8722 int *pix_x, int *pix_y)
|
|
|
8723 {
|
|
|
8724 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8725 int num_disp_lines, modeline;
|
|
|
8726 Lisp_Object window;
|
|
|
8727 int defheight, defwidth;
|
|
|
8728
|
|
793
|
8729 window = wrap_window (w);
|
|
428
|
8730 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8731
|
|
|
8732 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8733 the window, use the first window line or character position
|
|
|
8734 instead. */
|
|
|
8735 if (char_y < 0)
|
|
|
8736 char_y = 0;
|
|
|
8737 if (char_x < 0)
|
|
|
8738 char_x = 0;
|
|
|
8739
|
|
|
8740 num_disp_lines = Dynarr_length (dla);
|
|
|
8741 modeline = 0;
|
|
|
8742 if (num_disp_lines)
|
|
|
8743 {
|
|
|
8744 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8745 {
|
|
|
8746 num_disp_lines--;
|
|
|
8747 modeline = 1;
|
|
|
8748 }
|
|
|
8749 }
|
|
|
8750
|
|
|
8751 /* First check if the y position intersects the display lines. */
|
|
|
8752 if (char_y < num_disp_lines)
|
|
|
8753 {
|
|
|
8754 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8755 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8756
|
|
|
8757 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8758 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8759
|
|
|
8760 if (char_x < Dynarr_length (db->runes))
|
|
|
8761 {
|
|
|
8762 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8763
|
|
|
8764 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8765 }
|
|
|
8766 else
|
|
|
8767 {
|
|
|
8768 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8769 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8770
|
|
|
8771 char_x -= last_rune;
|
|
|
8772
|
|
|
8773 *pix_x = rb->xpos + rb->width;
|
|
|
8774 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8775 *pix_x += (defwidth >> 1);
|
|
|
8776 }
|
|
|
8777 }
|
|
|
8778 else
|
|
|
8779 {
|
|
|
8780 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8781 modeline in this since we don't have true character positions in
|
|
|
8782 it. */
|
|
|
8783
|
|
|
8784 if (!Dynarr_length (w->face_cachels))
|
|
|
8785 reset_face_cachels (w);
|
|
|
8786
|
|
|
8787 char_y -= num_disp_lines;
|
|
|
8788
|
|
|
8789 if (Dynarr_length (dla))
|
|
|
8790 {
|
|
|
8791 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8792 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8793 }
|
|
|
8794 else
|
|
|
8795 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8796
|
|
|
8797 *pix_y += (char_y * defheight);
|
|
|
8798 *pix_y += (defheight >> 1);
|
|
|
8799
|
|
|
8800 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8801 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8802 *pix_x += (char_x * defwidth);
|
|
|
8803 *pix_x += (defwidth >> 1);
|
|
|
8804 }
|
|
|
8805
|
|
|
8806 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8807 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8808 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8809 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8810
|
|
|
8811 *pix_x -= w->pixel_left;
|
|
|
8812 *pix_y -= w->pixel_top;
|
|
|
8813 }
|
|
|
8814
|
|
|
8815 /* Given a display line and a position, determine if there is a glyph
|
|
|
8816 there and return information about it if there is. */
|
|
|
8817
|
|
|
8818 static void
|
|
|
8819 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8820 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8821 int *high_x_coord)
|
|
|
8822 {
|
|
|
8823 struct display_block *db;
|
|
|
8824 int elt;
|
|
|
8825 int block =
|
|
|
8826 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8827
|
|
|
8828 /* We use get_next_display_block to get the actual display block
|
|
|
8829 that would be displayed at x_coord. */
|
|
|
8830
|
|
|
8831 if (block == NO_BLOCK)
|
|
|
8832 return;
|
|
|
8833 else
|
|
|
8834 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8835
|
|
|
8836 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8837 {
|
|
|
8838 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8839
|
|
|
8840 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8841 {
|
|
|
8842 if (rb->type == RUNE_DGLYPH)
|
|
|
8843 {
|
|
|
8844 *obj1 = rb->object.dglyph.glyph;
|
|
|
8845 *obj2 = rb->object.dglyph.extent;
|
|
|
8846 }
|
|
|
8847 else
|
|
|
8848 {
|
|
|
8849 *obj1 = Qnil;
|
|
|
8850 *obj2 = Qnil;
|
|
|
8851 }
|
|
|
8852
|
|
|
8853 if (low_x_coord)
|
|
|
8854 *low_x_coord = rb->xpos;
|
|
|
8855 if (high_x_coord)
|
|
|
8856 *high_x_coord = rb->xpos + rb->width;
|
|
|
8857
|
|
|
8858 return;
|
|
|
8859 }
|
|
|
8860 }
|
|
|
8861 }
|
|
|
8862
|
|
|
8863 #define UPDATE_CACHE_RETURN \
|
|
|
8864 do { \
|
|
|
8865 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8866 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8867 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8868 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8869 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8870 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8871 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8872 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8873 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8874 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8875 d->pixel_to_glyph_cache.w = *w; \
|
|
826
|
8876 d->pixel_to_glyph_cache.charpos = *charpos; \
|
|
428
|
8877 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8878 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8879 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8880 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8881 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8882 RETURN_SANS_WARNINGS position; \
|
|
|
8883 } while (0)
|
|
|
8884
|
|
|
8885 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8886 information about what is located under those coordinates.
|
|
|
8887
|
|
|
8888 The return value will be one of:
|
|
|
8889
|
|
|
8890 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8891 OVER_MODELINE: over a modeline
|
|
|
8892 OVER_BORDER: over an internal border
|
|
|
8893 OVER_NOTHING: over the text area, but not over text
|
|
|
8894 OVER_OUTSIDE: outside of the frame border
|
|
|
8895 OVER_TEXT: over text in the text area
|
|
|
8896
|
|
|
8897 OBJ1 is one of
|
|
|
8898
|
|
|
8899 -- a toolbar button
|
|
|
8900 -- a glyph
|
|
|
8901 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8902
|
|
|
8903 OBJ2 is one of
|
|
|
8904
|
|
|
8905 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8906 -- nil otherwise.
|
|
|
8907
|
|
|
8908 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8909 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8910
|
|
|
8911 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8912 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8913
|
|
|
8914 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8915 */
|
|
|
8916
|
|
|
8917 int
|
|
|
8918 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8919 int *col, int *row, int *obj_x, int *obj_y,
|
|
826
|
8920 struct window **w, Charbpos *charpos,
|
|
665
|
8921 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8922 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8923 {
|
|
|
8924 struct device *d;
|
|
|
8925 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8926 Lisp_Object window;
|
|
|
8927 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8928 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8929 int position = OVER_NOTHING;
|
|
|
8930 int device_check_failed = 0;
|
|
|
8931 display_line_dynarr *dla;
|
|
|
8932
|
|
|
8933 /* This is a safety valve in case this got called with a frame in
|
|
|
8934 the middle of being deleted. */
|
|
|
8935 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8936 {
|
|
|
8937 device_check_failed = 1;
|
|
|
8938 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8939 }
|
|
|
8940 else
|
|
|
8941 {
|
|
|
8942 d = XDEVICE (f->device);
|
|
|
8943 cache = &d->pixel_to_glyph_cache;
|
|
|
8944 }
|
|
|
8945
|
|
|
8946 if (!device_check_failed
|
|
|
8947 && cache->valid
|
|
|
8948 && cache->frame == f
|
|
|
8949 && cache->low_x_coord <= x_coord
|
|
|
8950 && cache->high_x_coord > x_coord
|
|
|
8951 && cache->low_y_coord <= y_coord
|
|
|
8952 && cache->high_y_coord > y_coord)
|
|
|
8953 {
|
|
|
8954 *col = cache->col;
|
|
|
8955 *row = cache->row;
|
|
|
8956 *obj_x = cache->obj_x;
|
|
|
8957 *obj_y = cache->obj_y;
|
|
|
8958 *w = cache->w;
|
|
826
|
8959 *charpos = cache->charpos;
|
|
428
|
8960 *closest = cache->closest;
|
|
|
8961 *modeline_closest = cache->modeline_closest;
|
|
|
8962 *obj1 = cache->obj1;
|
|
|
8963 *obj2 = cache->obj2;
|
|
|
8964
|
|
|
8965 return cache->retval;
|
|
|
8966 }
|
|
|
8967 else
|
|
|
8968 {
|
|
|
8969 *col = 0;
|
|
|
8970 *row = 0;
|
|
|
8971 *obj_x = 0;
|
|
|
8972 *obj_y = 0;
|
|
|
8973 *w = 0;
|
|
826
|
8974 *charpos = 0;
|
|
428
|
8975 *closest = 0;
|
|
|
8976 *modeline_closest = -1;
|
|
|
8977 *obj1 = Qnil;
|
|
|
8978 *obj2 = Qnil;
|
|
|
8979
|
|
|
8980 low_x_coord = x_coord;
|
|
|
8981 high_x_coord = x_coord + 1;
|
|
|
8982 low_y_coord = y_coord;
|
|
|
8983 high_y_coord = y_coord + 1;
|
|
|
8984 }
|
|
|
8985
|
|
|
8986 if (device_check_failed)
|
|
|
8987 return OVER_NOTHING;
|
|
|
8988
|
|
|
8989 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8990 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8991 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8992 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8993
|
|
|
8994 /* Check if the mouse is outside of the text area actually used by
|
|
|
8995 redisplay. */
|
|
|
8996 if (y_coord < frm_top)
|
|
|
8997 {
|
|
|
8998 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8999 {
|
|
|
9000 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
9001 high_y_coord = frm_top;
|
|
|
9002 position = OVER_BORDER;
|
|
|
9003 }
|
|
|
9004 else if (y_coord >= 0)
|
|
|
9005 {
|
|
|
9006 low_y_coord = 0;
|
|
|
9007 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
9008 position = OVER_TOOLBAR;
|
|
|
9009 }
|
|
|
9010 else
|
|
|
9011 {
|
|
|
9012 low_y_coord = y_coord;
|
|
|
9013 high_y_coord = 0;
|
|
|
9014 position = OVER_OUTSIDE;
|
|
|
9015 }
|
|
|
9016 }
|
|
|
9017 else if (y_coord >= frm_bottom)
|
|
|
9018 {
|
|
|
9019 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
9020 {
|
|
|
9021 low_y_coord = frm_bottom;
|
|
|
9022 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
9023 position = OVER_BORDER;
|
|
|
9024 }
|
|
|
9025 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
9026 {
|
|
|
9027 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
9028 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
9029 position = OVER_TOOLBAR;
|
|
|
9030 }
|
|
|
9031 else
|
|
|
9032 {
|
|
|
9033 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
9034 high_y_coord = y_coord;
|
|
|
9035 position = OVER_OUTSIDE;
|
|
|
9036 }
|
|
|
9037 }
|
|
|
9038
|
|
|
9039 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
9040 {
|
|
|
9041 if (x_coord < frm_left)
|
|
|
9042 {
|
|
|
9043 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
9044 {
|
|
|
9045 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
9046 high_x_coord = frm_left;
|
|
|
9047 position = OVER_BORDER;
|
|
|
9048 }
|
|
|
9049 else if (x_coord >= 0)
|
|
|
9050 {
|
|
|
9051 low_x_coord = 0;
|
|
|
9052 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
9053 position = OVER_TOOLBAR;
|
|
|
9054 }
|
|
|
9055 else
|
|
|
9056 {
|
|
|
9057 low_x_coord = x_coord;
|
|
|
9058 high_x_coord = 0;
|
|
|
9059 position = OVER_OUTSIDE;
|
|
|
9060 }
|
|
|
9061 }
|
|
|
9062 else if (x_coord >= frm_right)
|
|
|
9063 {
|
|
|
9064 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
9065 {
|
|
|
9066 low_x_coord = frm_right;
|
|
|
9067 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
9068 position = OVER_BORDER;
|
|
|
9069 }
|
|
|
9070 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
9071 {
|
|
|
9072 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
9073 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
9074 position = OVER_TOOLBAR;
|
|
|
9075 }
|
|
|
9076 else
|
|
|
9077 {
|
|
|
9078 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
9079 high_x_coord = x_coord;
|
|
|
9080 position = OVER_OUTSIDE;
|
|
|
9081 }
|
|
|
9082 }
|
|
|
9083 }
|
|
|
9084
|
|
|
9085 #ifdef HAVE_TOOLBARS
|
|
|
9086 if (position == OVER_TOOLBAR)
|
|
|
9087 {
|
|
|
9088 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
9089 *obj2 = Qnil;
|
|
|
9090 *w = 0;
|
|
|
9091 UPDATE_CACHE_RETURN;
|
|
|
9092 }
|
|
|
9093 #endif /* HAVE_TOOLBARS */
|
|
|
9094
|
|
|
9095 /* We still have to return the window the pointer is next to and its
|
|
|
9096 relative y position even if it is outside the x boundary. */
|
|
|
9097 if (x_coord < frm_left)
|
|
|
9098 x_coord = frm_left;
|
|
|
9099 else if (x_coord > frm_right)
|
|
|
9100 x_coord = frm_right;
|
|
|
9101
|
|
|
9102 /* Same in reverse. */
|
|
|
9103 if (y_coord < frm_top)
|
|
|
9104 y_coord = frm_top;
|
|
|
9105 else if (y_coord > frm_bottom)
|
|
|
9106 y_coord = frm_bottom;
|
|
|
9107
|
|
|
9108 /* Find what window the given coordinates are actually in. */
|
|
|
9109 window = f->root_window;
|
|
|
9110 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
9111
|
|
|
9112 /* If we didn't find a window, we're done. */
|
|
|
9113 if (!*w)
|
|
|
9114 {
|
|
|
9115 UPDATE_CACHE_RETURN;
|
|
|
9116 }
|
|
|
9117 else if (position != OVER_NOTHING)
|
|
|
9118 {
|
|
|
9119 *closest = 0;
|
|
|
9120 *modeline_closest = -1;
|
|
|
9121
|
|
|
9122 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
9123 {
|
|
|
9124 *w = 0;
|
|
|
9125 UPDATE_CACHE_RETURN;
|
|
|
9126 }
|
|
|
9127 }
|
|
|
9128
|
|
|
9129 /* Check if the window is a minibuffer but isn't active. */
|
|
|
9130 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
9131 {
|
|
|
9132 /* Must reset the window value since some callers will ignore
|
|
|
9133 the return value if it is set. */
|
|
|
9134 *w = 0;
|
|
|
9135 UPDATE_CACHE_RETURN;
|
|
|
9136 }
|
|
|
9137
|
|
|
9138 /* See if the point is over window vertical divider */
|
|
|
9139 if (window_needs_vertical_divider (*w))
|
|
|
9140 {
|
|
|
9141 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
9142 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
9143 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
9144 int div_y_low = WINDOW_TOP (*w);
|
|
|
9145
|
|
|
9146 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
9147 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
9148 {
|
|
|
9149 low_x_coord = div_x_low;
|
|
|
9150 high_x_coord = div_x_high;
|
|
|
9151 low_y_coord = div_y_low;
|
|
|
9152 high_y_coord = div_y_high;
|
|
|
9153 position = OVER_V_DIVIDER;
|
|
|
9154 UPDATE_CACHE_RETURN;
|
|
|
9155 }
|
|
|
9156 }
|
|
|
9157
|
|
|
9158 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
9159
|
|
|
9160 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
9161 {
|
|
|
9162 int really_over_nothing = 0;
|
|
|
9163 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
9164
|
|
|
9165 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
9166 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
9167 {
|
|
|
9168 int check_margin_glyphs = 0;
|
|
|
9169 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
9170 struct rune *rb = 0;
|
|
|
9171
|
|
|
9172 if (x_coord < dl->bounds.left_white
|
|
|
9173 || x_coord >= dl->bounds.right_white)
|
|
|
9174 check_margin_glyphs = 1;
|
|
|
9175
|
|
|
9176 low_y_coord = dl->ypos - dl->ascent;
|
|
|
9177 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
9178
|
|
|
9179 if (position == OVER_BORDER
|
|
|
9180 || position == OVER_OUTSIDE
|
|
|
9181 || check_margin_glyphs)
|
|
|
9182 {
|
|
|
9183 int x_check, left_bound;
|
|
|
9184
|
|
|
9185 if (check_margin_glyphs)
|
|
|
9186 {
|
|
|
9187 x_check = x_coord;
|
|
|
9188 left_bound = dl->bounds.left_white;
|
|
|
9189 }
|
|
|
9190 else
|
|
|
9191 {
|
|
|
9192 x_check = high_x_coord;
|
|
|
9193 left_bound = frm_left;
|
|
|
9194 }
|
|
|
9195
|
|
|
9196 if (Dynarr_length (db->runes))
|
|
|
9197 {
|
|
|
9198 if (x_check <= left_bound)
|
|
|
9199 {
|
|
|
9200 if (dl->modeline)
|
|
826
|
9201 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
9202 else
|
|
826
|
9203 *closest = Dynarr_atp (db->runes, 0)->charpos;
|
|
428
|
9204 }
|
|
|
9205 else
|
|
|
9206 {
|
|
|
9207 if (dl->modeline)
|
|
|
9208 *modeline_closest =
|
|
|
9209 Dynarr_atp (db->runes,
|
|
826
|
9210 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
9211 else
|
|
|
9212 *closest =
|
|
|
9213 Dynarr_atp (db->runes,
|
|
826
|
9214 Dynarr_length (db->runes) - 1)->charpos;
|
|
428
|
9215 }
|
|
|
9216
|
|
|
9217 if (dl->modeline)
|
|
|
9218 *modeline_closest += dl->offset;
|
|
|
9219 else
|
|
|
9220 *closest += dl->offset;
|
|
|
9221 }
|
|
|
9222 else
|
|
|
9223 {
|
|
|
9224 /* #### What should be here. */
|
|
|
9225 if (dl->modeline)
|
|
|
9226 *modeline_closest = 0;
|
|
|
9227 else
|
|
|
9228 *closest = 0;
|
|
|
9229 }
|
|
|
9230
|
|
|
9231 if (check_margin_glyphs)
|
|
|
9232 {
|
|
|
9233 if (x_coord < dl->bounds.left_in
|
|
|
9234 || x_coord >= dl->bounds.right_in)
|
|
|
9235 {
|
|
|
9236 /* If we are over the outside margins then we
|
|
|
9237 know the loop over the text block isn't going
|
|
|
9238 to accomplish anything. So we go ahead and
|
|
|
9239 set what information we can right here and
|
|
|
9240 return. */
|
|
|
9241 (*row)--;
|
|
|
9242 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
9243 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
9244 &low_x_coord, &high_x_coord);
|
|
|
9245
|
|
|
9246 UPDATE_CACHE_RETURN;
|
|
|
9247 }
|
|
|
9248 }
|
|
|
9249 else
|
|
|
9250 UPDATE_CACHE_RETURN;
|
|
|
9251 }
|
|
|
9252
|
|
|
9253 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
9254 {
|
|
|
9255 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
9256
|
|
|
9257 if (!past_end)
|
|
|
9258 rb = Dynarr_atp (db->runes, *col);
|
|
|
9259
|
|
|
9260 if (past_end ||
|
|
|
9261 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
9262 {
|
|
|
9263 if (past_end)
|
|
|
9264 {
|
|
|
9265 (*col)--;
|
|
|
9266 rb = Dynarr_atp (db->runes, *col);
|
|
|
9267 }
|
|
|
9268
|
|
826
|
9269 *charpos = rb->charpos + dl->offset;
|
|
428
|
9270 low_x_coord = rb->xpos;
|
|
|
9271 high_x_coord = rb->xpos + rb->width;
|
|
|
9272
|
|
|
9273 if (rb->type == RUNE_DGLYPH)
|
|
|
9274 {
|
|
|
9275 int elt = *col + 1;
|
|
|
9276
|
|
|
9277 /* Find the first character after the glyph. */
|
|
|
9278 while (elt < Dynarr_length (db->runes))
|
|
|
9279 {
|
|
|
9280 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
9281 {
|
|
|
9282 if (dl->modeline)
|
|
|
9283 *modeline_closest =
|
|
826
|
9284 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
9285 dl->offset);
|
|
|
9286 else
|
|
|
9287 *closest =
|
|
826
|
9288 (Dynarr_atp (db->runes, elt)->charpos +
|
|
428
|
9289 dl->offset);
|
|
|
9290 break;
|
|
|
9291 }
|
|
|
9292
|
|
|
9293 elt++;
|
|
|
9294 }
|
|
|
9295
|
|
|
9296 /* In this case we failed to find a non-glyph
|
|
|
9297 character so we return the last position
|
|
|
9298 displayed on the line. */
|
|
|
9299 if (elt == Dynarr_length (db->runes))
|
|
|
9300 {
|
|
|
9301 if (dl->modeline)
|
|
826
|
9302 *modeline_closest = dl->end_charpos + dl->offset;
|
|
428
|
9303 else
|
|
826
|
9304 *closest = dl->end_charpos + dl->offset;
|
|
428
|
9305 really_over_nothing = 1;
|
|
|
9306 }
|
|
|
9307 }
|
|
|
9308 else
|
|
|
9309 {
|
|
|
9310 if (dl->modeline)
|
|
826
|
9311 *modeline_closest = rb->charpos + dl->offset;
|
|
428
|
9312 else
|
|
826
|
9313 *closest = rb->charpos + dl->offset;
|
|
428
|
9314 }
|
|
|
9315
|
|
|
9316 if (dl->modeline)
|
|
|
9317 {
|
|
|
9318 *row = window_displayed_height (*w);
|
|
|
9319
|
|
|
9320 if (position == OVER_NOTHING)
|
|
|
9321 position = OVER_MODELINE;
|
|
|
9322
|
|
|
9323 if (rb->type == RUNE_DGLYPH)
|
|
|
9324 {
|
|
|
9325 *obj1 = rb->object.dglyph.glyph;
|
|
|
9326 *obj2 = rb->object.dglyph.extent;
|
|
|
9327 }
|
|
|
9328 else if (rb->type == RUNE_CHAR)
|
|
|
9329 {
|
|
|
9330 *obj1 = Qnil;
|
|
|
9331 *obj2 = Qnil;
|
|
|
9332 }
|
|
|
9333 else
|
|
|
9334 {
|
|
|
9335 *obj1 = Qnil;
|
|
|
9336 *obj2 = Qnil;
|
|
|
9337 }
|
|
|
9338
|
|
|
9339 UPDATE_CACHE_RETURN;
|
|
|
9340 }
|
|
|
9341 else if (past_end
|
|
|
9342 || (rb->type == RUNE_CHAR
|
|
|
9343 && rb->object.chr.ch == '\n'))
|
|
|
9344 {
|
|
|
9345 (*row)--;
|
|
|
9346 /* At this point we may have glyphs in the right
|
|
|
9347 inside margin. */
|
|
|
9348 if (check_margin_glyphs)
|
|
|
9349 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
9350 &low_x_coord, &high_x_coord);
|
|
|
9351 UPDATE_CACHE_RETURN;
|
|
|
9352 }
|
|
|
9353 else
|
|
|
9354 {
|
|
|
9355 (*row)--;
|
|
|
9356 if (rb->type == RUNE_DGLYPH)
|
|
|
9357 {
|
|
|
9358 *obj1 = rb->object.dglyph.glyph;
|
|
|
9359 *obj2 = rb->object.dglyph.extent;
|
|
|
9360 }
|
|
|
9361 else if (rb->type == RUNE_CHAR)
|
|
|
9362 {
|
|
|
9363 *obj1 = Qnil;
|
|
|
9364 *obj2 = Qnil;
|
|
|
9365 }
|
|
|
9366 else
|
|
|
9367 {
|
|
|
9368 *obj1 = Qnil;
|
|
|
9369 *obj2 = Qnil;
|
|
|
9370 }
|
|
|
9371
|
|
|
9372 *obj_x = x_coord - rb->xpos;
|
|
|
9373 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
9374
|
|
|
9375 /* At this point we may have glyphs in the left
|
|
|
9376 inside margin. */
|
|
|
9377 if (check_margin_glyphs)
|
|
|
9378 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
9379
|
|
|
9380 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
9381 position = OVER_TEXT;
|
|
|
9382
|
|
|
9383 UPDATE_CACHE_RETURN;
|
|
|
9384 }
|
|
|
9385 }
|
|
|
9386 }
|
|
|
9387 }
|
|
|
9388 }
|
|
|
9389
|
|
|
9390 *row = Dynarr_length (dla) - 1;
|
|
|
9391 if (FRAME_WIN_P (f))
|
|
|
9392 {
|
|
|
9393 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
9394
|
|
|
9395 if (bot_elt >= 0)
|
|
|
9396 {
|
|
|
9397 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
9398 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
9399 Lisp_Object lwin;
|
|
|
9400 int defheight;
|
|
|
9401
|
|
793
|
9402 lwin = wrap_window (*w);
|
|
428
|
9403 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
9404
|
|
|
9405 *row += (adj_area / defheight);
|
|
|
9406 }
|
|
|
9407 }
|
|
|
9408
|
|
|
9409 /* #### This should be checked out some more to determine what
|
|
|
9410 should really be going on. */
|
|
|
9411 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
9412 *closest = 0;
|
|
|
9413 else
|
|
442
|
9414 *closest = end_of_last_line_may_error (*w,
|
|
428
|
9415 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
9416 *col = 0;
|
|
|
9417 UPDATE_CACHE_RETURN;
|
|
|
9418 }
|
|
|
9419 #undef UPDATE_CACHE_RETURN
|
|
|
9420
|
|
|
9421
|
|
|
9422 /***************************************************************************/
|
|
|
9423 /* */
|
|
|
9424 /* Lisp functions */
|
|
|
9425 /* */
|
|
|
9426 /***************************************************************************/
|
|
|
9427
|
|
|
9428 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
9429 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
9430 */
|
|
|
9431 ())
|
|
|
9432 {
|
|
|
9433 Lisp_Object devcons, concons;
|
|
|
9434
|
|
1318
|
9435 if (in_display)
|
|
|
9436 return Qnil;
|
|
|
9437
|
|
428
|
9438 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
9439 {
|
|
|
9440 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
9441 Lisp_Object frmcons;
|
|
|
9442
|
|
1279
|
9443 if (DEVICE_STREAM_P (d))
|
|
|
9444 continue;
|
|
|
9445
|
|
428
|
9446 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9447 {
|
|
|
9448 struct frame *f = XFRAME (XCAR (frmcons));
|
|
853
|
9449 int depth;
|
|
428
|
9450
|
|
|
9451 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9452 {
|
|
|
9453 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9454
|
|
|
9455 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9456
|
|
428
|
9457 /*
|
|
|
9458 * If the frame size has changed, there may be random
|
|
|
9459 * chud on the screen left from previous messages
|
|
|
9460 * because redisplay_frame hasn't been called yet.
|
|
|
9461 * Clear the screen to get rid of the potential mess.
|
|
|
9462 */
|
|
|
9463 if (f->echo_area_garbaged)
|
|
|
9464 {
|
|
442
|
9465 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9466 f->echo_area_garbaged = 0;
|
|
|
9467 }
|
|
853
|
9468 depth = enter_redisplay_critical_section ();
|
|
428
|
9469 redisplay_window (window, 0);
|
|
853
|
9470 exit_redisplay_critical_section (depth);
|
|
442
|
9471 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
9472 }
|
|
|
9473 }
|
|
|
9474 }
|
|
|
9475
|
|
|
9476 return Qnil;
|
|
|
9477 }
|
|
|
9478
|
|
|
9479 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9480 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9481 FRAME defaults to the selected frame if omitted.
|
|
|
9482 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9483 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9484 input and is guaranteed to proceed to completion.
|
|
|
9485 */
|
|
|
9486 (frame, no_preempt))
|
|
|
9487 {
|
|
|
9488 struct frame *f = decode_frame (frame);
|
|
|
9489 int count = specpdl_depth ();
|
|
|
9490
|
|
|
9491 if (!NILP (no_preempt))
|
|
853
|
9492 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9493
|
|
|
9494 f->clear = 1;
|
|
|
9495 redisplay_frame (f, 1);
|
|
|
9496
|
|
442
|
9497 /* See the comment in Fredisplay_frame. */
|
|
|
9498 RESET_CHANGED_SET_FLAGS;
|
|
|
9499
|
|
771
|
9500 return unbind_to (count);
|
|
428
|
9501 }
|
|
|
9502
|
|
|
9503 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9504 Ensure that FRAME's contents are correctly displayed.
|
|
|
9505 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9506 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9507 the frame.
|
|
|
9508 FRAME defaults to the selected frame if omitted.
|
|
|
9509 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9510 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9511 input and is guaranteed to proceed to completion.
|
|
|
9512 */
|
|
|
9513 (frame, no_preempt))
|
|
|
9514 {
|
|
|
9515 struct frame *f = decode_frame (frame);
|
|
|
9516 int count = specpdl_depth ();
|
|
|
9517
|
|
|
9518 if (!NILP (no_preempt))
|
|
853
|
9519 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9520
|
|
|
9521 redisplay_frame (f, 1);
|
|
|
9522
|
|
442
|
9523 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9524 changes to the display will not get registered by redisplay
|
|
|
9525 because it thinks it already has registered changes. If you
|
|
|
9526 really knew what you were doing you could confuse redisplay by
|
|
|
9527 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9528 that if you know what you are doing you will not be that
|
|
|
9529 stupid. */
|
|
|
9530 RESET_CHANGED_SET_FLAGS;
|
|
|
9531
|
|
771
|
9532 return unbind_to (count);
|
|
428
|
9533 }
|
|
|
9534
|
|
|
9535 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9536 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9537 DEVICE defaults to the selected device if omitted.
|
|
|
9538 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9539 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9540 input and is guaranteed to proceed to completion.
|
|
|
9541 */
|
|
|
9542 (device, no_preempt))
|
|
|
9543 {
|
|
|
9544 struct device *d = decode_device (device);
|
|
|
9545 Lisp_Object frmcons;
|
|
|
9546 int count = specpdl_depth ();
|
|
|
9547
|
|
|
9548 if (!NILP (no_preempt))
|
|
853
|
9549 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9550
|
|
|
9551 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9552 {
|
|
|
9553 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9554 }
|
|
440
|
9555 redisplay_device (d, 0);
|
|
428
|
9556
|
|
442
|
9557 /* See the comment in Fredisplay_frame. */
|
|
|
9558 RESET_CHANGED_SET_FLAGS;
|
|
|
9559
|
|
771
|
9560 return unbind_to (count);
|
|
428
|
9561 }
|
|
|
9562
|
|
|
9563 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9564 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9565 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9566 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9567 the device.
|
|
|
9568 DEVICE defaults to the selected device if omitted.
|
|
|
9569 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9570 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9571 input and is guaranteed to proceed to completion.
|
|
853
|
9572
|
|
|
9573 Note: If you simply want everything redisplayed, the current idiom is
|
|
|
9574 `(sit-for 0)'.
|
|
428
|
9575 */
|
|
|
9576 (device, no_preempt))
|
|
|
9577 {
|
|
|
9578 struct device *d = decode_device (device);
|
|
|
9579 int count = specpdl_depth ();
|
|
|
9580
|
|
|
9581 if (!NILP (no_preempt))
|
|
853
|
9582 internal_bind_int (&disable_preemption, 1 + disable_preemption);
|
|
428
|
9583
|
|
440
|
9584 redisplay_device (d, 0);
|
|
428
|
9585
|
|
442
|
9586 /* See the comment in Fredisplay_frame. */
|
|
|
9587 RESET_CHANGED_SET_FLAGS;
|
|
|
9588
|
|
771
|
9589 return unbind_to (count);
|
|
428
|
9590 }
|
|
|
9591
|
|
|
9592 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9593 regardless if the all flag is set or not. It remains in existence
|
|
|
9594 solely for backwards compatibility. */
|
|
|
9595 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9596 Force the modeline of the current buffer to be redisplayed.
|
|
|
9597 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9598 */
|
|
|
9599 (all))
|
|
|
9600 {
|
|
|
9601 MARK_MODELINE_CHANGED;
|
|
|
9602 return Qnil;
|
|
|
9603 }
|
|
|
9604
|
|
|
9605 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9606 Force an immediate update of the cursor on FRAME.
|
|
|
9607 FRAME defaults to the selected frame if omitted.
|
|
|
9608 */
|
|
|
9609 (frame))
|
|
|
9610 {
|
|
1279
|
9611 struct frame *f = decode_frame (frame);
|
|
|
9612
|
|
|
9613 if (!FRAME_STREAM_P (f))
|
|
|
9614 redisplay_redraw_cursor (f, 1);
|
|
428
|
9615 return Qnil;
|
|
|
9616 }
|
|
|
9617
|
|
|
9618
|
|
|
9619 /***************************************************************************/
|
|
|
9620 /* */
|
|
872
|
9621 /* Change flags */
|
|
428
|
9622 /* */
|
|
|
9623 /***************************************************************************/
|
|
|
9624
|
|
|
9625 static void
|
|
|
9626 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
9627 Lisp_Object oldval)
|
|
|
9628 {
|
|
|
9629 /* Nothing to be done? */
|
|
|
9630 }
|
|
|
9631
|
|
|
9632 int
|
|
|
9633 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
9634 Lisp_Object in_object, int flags)
|
|
|
9635 {
|
|
|
9636 /* #### clip_changed should really be renamed something like
|
|
|
9637 global_redisplay_change. */
|
|
|
9638 MARK_CLIP_CHANGED;
|
|
|
9639 return 0;
|
|
|
9640 }
|
|
|
9641
|
|
|
9642 /* This is called if the built-in glyphs have their properties
|
|
|
9643 changed. */
|
|
|
9644 void
|
|
|
9645 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
9646 Lisp_Object locale)
|
|
|
9647 {
|
|
|
9648 if (WINDOWP (locale))
|
|
|
9649 {
|
|
|
9650 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9651 }
|
|
|
9652 else if (FRAMEP (locale))
|
|
|
9653 {
|
|
|
9654 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9655 }
|
|
|
9656 else if (DEVICEP (locale))
|
|
|
9657 {
|
|
|
9658 Lisp_Object frmcons;
|
|
|
9659 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9660 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9661 }
|
|
|
9662 else if (CONSOLEP (locale))
|
|
|
9663 {
|
|
|
9664 Lisp_Object frmcons, devcons;
|
|
|
9665 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9666 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9667 }
|
|
|
9668 else /* global or buffer */
|
|
|
9669 {
|
|
|
9670 Lisp_Object frmcons, devcons, concons;
|
|
|
9671 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9672 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9673 }
|
|
|
9674 }
|
|
|
9675
|
|
|
9676 static void
|
|
|
9677 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
9678 Lisp_Object oldval)
|
|
|
9679 {
|
|
|
9680 if (XFRAME (w->frame)->init_finished)
|
|
|
9681 Fforce_cursor_redisplay (w->frame);
|
|
|
9682 }
|
|
|
9683
|
|
872
|
9684 void
|
|
|
9685 mark_buffers_changed (void)
|
|
|
9686 {
|
|
|
9687 MARK_TYPE_CHANGED (buffers);
|
|
|
9688 }
|
|
|
9689
|
|
|
9690 void
|
|
|
9691 mark_clip_changed (void)
|
|
|
9692 {
|
|
|
9693 MARK_TYPE_CHANGED (clip);
|
|
|
9694 }
|
|
|
9695
|
|
|
9696 void
|
|
|
9697 mark_extents_changed (void)
|
|
|
9698 {
|
|
|
9699 MARK_TYPE_CHANGED (extents);
|
|
|
9700 }
|
|
|
9701
|
|
|
9702 void
|
|
|
9703 mark_icon_changed (void)
|
|
|
9704 {
|
|
|
9705 MARK_TYPE_CHANGED (icon);
|
|
|
9706 }
|
|
|
9707
|
|
|
9708 void
|
|
|
9709 mark_menubar_changed (void)
|
|
|
9710 {
|
|
|
9711 MARK_TYPE_CHANGED (menubar);
|
|
|
9712 }
|
|
|
9713
|
|
|
9714 void
|
|
|
9715 mark_modeline_changed (void)
|
|
|
9716 {
|
|
|
9717 MARK_TYPE_CHANGED (modeline);
|
|
|
9718 }
|
|
|
9719
|
|
|
9720 void
|
|
|
9721 mark_point_changed (void)
|
|
|
9722 {
|
|
|
9723 MARK_TYPE_CHANGED (point);
|
|
|
9724 }
|
|
|
9725
|
|
|
9726 void
|
|
|
9727 mark_toolbar_changed (void)
|
|
|
9728 {
|
|
|
9729 MARK_TYPE_CHANGED (toolbar);
|
|
|
9730 }
|
|
|
9731
|
|
|
9732 void
|
|
|
9733 mark_gutter_changed (void)
|
|
|
9734 {
|
|
|
9735 MARK_TYPE_CHANGED (gutter);
|
|
|
9736 }
|
|
|
9737
|
|
|
9738 void
|
|
|
9739 mark_glyphs_changed (void)
|
|
|
9740 {
|
|
|
9741 MARK_TYPE_CHANGED (glyphs);
|
|
|
9742 }
|
|
|
9743
|
|
|
9744 void
|
|
|
9745 mark_subwindows_changed (void)
|
|
|
9746 {
|
|
|
9747 MARK_TYPE_CHANGED (subwindows);
|
|
|
9748 }
|
|
|
9749
|
|
|
9750 void
|
|
|
9751 mark_subwindows_state_changed (void)
|
|
|
9752 {
|
|
|
9753 MARK_TYPE_CHANGED (subwindows_state);
|
|
|
9754 }
|
|
|
9755
|
|
428
|
9756 #ifdef MEMORY_USAGE_STATS
|
|
|
9757
|
|
|
9758
|
|
|
9759 /***************************************************************************/
|
|
|
9760 /* */
|
|
|
9761 /* memory usage computation */
|
|
|
9762 /* */
|
|
|
9763 /***************************************************************************/
|
|
|
9764
|
|
|
9765 static int
|
|
|
9766 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9767 {
|
|
|
9768 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9769 }
|
|
|
9770
|
|
|
9771 static int
|
|
|
9772 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9773 struct overhead_stats *ovstats)
|
|
|
9774 {
|
|
|
9775 int total, i;
|
|
|
9776
|
|
|
9777 if (!dyn)
|
|
|
9778 return 0;
|
|
|
9779
|
|
|
9780 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9781 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9782 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9783
|
|
|
9784 return total;
|
|
|
9785 }
|
|
|
9786
|
|
|
9787 static int
|
|
|
9788 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9789 struct overhead_stats *ovstats)
|
|
|
9790 {
|
|
|
9791 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9792 }
|
|
|
9793
|
|
|
9794 int
|
|
|
9795 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9796 struct overhead_stats *ovstats)
|
|
|
9797 {
|
|
|
9798 int total, i;
|
|
|
9799
|
|
|
9800 if (!dyn)
|
|
|
9801 return 0;
|
|
|
9802
|
|
|
9803 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9804 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9805 {
|
|
|
9806 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9807 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9808 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9809 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9810 }
|
|
|
9811
|
|
|
9812 return total;
|
|
|
9813 }
|
|
|
9814
|
|
|
9815 int
|
|
|
9816 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9817 struct overhead_stats *ovstats)
|
|
|
9818 {
|
|
|
9819 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9820 }
|
|
|
9821
|
|
|
9822 #endif /* MEMORY_USAGE_STATS */
|
|
|
9823
|
|
1204
|
9824 #ifdef ERROR_CHECK_DISPLAY
|
|
|
9825
|
|
800
|
9826 static int
|
|
|
9827 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
|
|
|
9828 {
|
|
|
9829 int i, j;
|
|
|
9830 display_line_dynarr *dl;
|
|
|
9831
|
|
|
9832 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9833
|
|
|
9834 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9835 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9836 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9837 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9838
|
|
|
9839 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9840
|
|
|
9841 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9842 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9843 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9844 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9845
|
|
|
9846 return 0;
|
|
|
9847 }
|
|
|
9848
|
|
|
9849 static void
|
|
|
9850 sledgehammer_check_redisplay_structs (void)
|
|
|
9851 {
|
|
|
9852 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9853 }
|
|
|
9854
|
|
1204
|
9855 #endif /* ERROR_CHECK_DISPLAY */
|
|
|
9856
|
|
428
|
9857
|
|
|
9858 /***************************************************************************/
|
|
|
9859 /* */
|
|
|
9860 /* initialization */
|
|
|
9861 /* */
|
|
|
9862 /***************************************************************************/
|
|
|
9863
|
|
|
9864 void
|
|
|
9865 init_redisplay (void)
|
|
|
9866 {
|
|
|
9867 disable_preemption = 0;
|
|
|
9868 preemption_count = 0;
|
|
|
9869
|
|
|
9870 #ifndef PDUMP
|
|
|
9871 if (!initialized)
|
|
|
9872 #endif
|
|
|
9873 {
|
|
440
|
9874 if (!cmotion_display_lines)
|
|
|
9875 cmotion_display_lines = Dynarr_new (display_line);
|
|
867
|
9876 if (!mode_spec_ibyte_string)
|
|
|
9877 mode_spec_ibyte_string = Dynarr_new (Ibyte);
|
|
440
|
9878 if (!formatted_string_extent_dynarr)
|
|
|
9879 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9880 if (!formatted_string_extent_start_dynarr)
|
|
|
9881 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9882 if (!formatted_string_extent_end_dynarr)
|
|
|
9883 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9884 if (!internal_cache)
|
|
|
9885 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9886 }
|
|
|
9887
|
|
|
9888 /* window system is nil when in -batch mode */
|
|
|
9889 if (!initialized || noninteractive)
|
|
|
9890 return;
|
|
|
9891
|
|
|
9892 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9893 initializing the terminal. This is especially important when the
|
|
|
9894 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9895 using the window system.
|
|
|
9896
|
|
|
9897 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9898 with an error message if that doesn't work. */
|
|
|
9899
|
|
|
9900 #ifdef HAVE_X_WINDOWS
|
|
|
9901 if (!strcmp (display_use, "x"))
|
|
|
9902 {
|
|
|
9903 /* Some stuff checks this way early. */
|
|
|
9904 Vwindow_system = Qx;
|
|
|
9905 Vinitial_window_system = Qx;
|
|
|
9906 return;
|
|
|
9907 }
|
|
|
9908 #endif /* HAVE_X_WINDOWS */
|
|
|
9909
|
|
462
|
9910 #ifdef HAVE_GTK
|
|
|
9911 if (!strcmp (display_use, "gtk"))
|
|
|
9912 {
|
|
|
9913 Vwindow_system = Qgtk;
|
|
|
9914 Vinitial_window_system = Qgtk;
|
|
|
9915 return;
|
|
|
9916 }
|
|
|
9917 #endif
|
|
|
9918
|
|
428
|
9919 #ifdef HAVE_MS_WINDOWS
|
|
|
9920 if (!strcmp (display_use, "mswindows"))
|
|
|
9921 {
|
|
|
9922 /* Some stuff checks this way early. */
|
|
|
9923 Vwindow_system = Qmswindows;
|
|
|
9924 Vinitial_window_system = Qmswindows;
|
|
|
9925 return;
|
|
|
9926 }
|
|
|
9927 #endif /* HAVE_MS_WINDOWS */
|
|
|
9928
|
|
|
9929 #ifdef HAVE_TTY
|
|
|
9930 /* If no window system has been specified, try to use the terminal. */
|
|
|
9931 if (!isatty (0))
|
|
|
9932 {
|
|
|
9933 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9934 exit (1);
|
|
|
9935 }
|
|
|
9936
|
|
|
9937 /* Look at the TERM variable */
|
|
771
|
9938 if (!egetenv ("TERM"))
|
|
428
|
9939 {
|
|
|
9940 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9941 exit (1);
|
|
|
9942 }
|
|
|
9943
|
|
|
9944 Vinitial_window_system = Qtty;
|
|
|
9945 return;
|
|
|
9946 #else /* not HAVE_TTY */
|
|
|
9947 /* No DISPLAY specified, and no TTY support. */
|
|
|
9948 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9949 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9950 exit (1);
|
|
|
9951 #endif
|
|
|
9952 /* Unreached. */
|
|
|
9953 }
|
|
|
9954
|
|
|
9955 void
|
|
|
9956 syms_of_redisplay (void)
|
|
|
9957 {
|
|
563
|
9958 DEFSYMBOL (Qcursor_in_echo_area);
|
|
|
9959 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9960 DEFSYMBOL (Qbar_cursor);
|
|
|
9961 DEFSYMBOL (Qtop_bottom);
|
|
|
9962 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9963
|
|
|
9964 DEFSUBR (Fredisplay_echo_area);
|
|
|
9965 DEFSUBR (Fredraw_frame);
|
|
|
9966 DEFSUBR (Fredisplay_frame);
|
|
|
9967 DEFSUBR (Fredraw_device);
|
|
|
9968 DEFSUBR (Fredisplay_device);
|
|
|
9969 DEFSUBR (Fredraw_modeline);
|
|
|
9970 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9971 }
|
|
|
9972
|
|
|
9973 void
|
|
|
9974 vars_of_redisplay (void)
|
|
|
9975 {
|
|
1292
|
9976 QSin_redisplay = build_msg_string ("(in redisplay)");
|
|
|
9977 staticpro (&QSin_redisplay);
|
|
428
|
9978
|
|
1318
|
9979 Vpost_redisplay_actions = Qnil;
|
|
|
9980 staticpro (&Vpost_redisplay_actions);
|
|
|
9981
|
|
428
|
9982 #if 0
|
|
|
9983 staticpro (&last_arrow_position);
|
|
|
9984 staticpro (&last_arrow_string);
|
|
|
9985 last_arrow_position = Qnil;
|
|
|
9986 last_arrow_string = Qnil;
|
|
|
9987 #endif /* 0 */
|
|
|
9988
|
|
|
9989 /* #### Probably temporary */
|
|
|
9990 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9991 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9992 line start cache.
|
|
|
9993 */ );
|
|
|
9994 cache_adjustment = 2;
|
|
|
9995
|
|
1268
|
9996 DEFVAR_INT ("maximum-preempts", &max_preempts /*
|
|
|
9997 Maximum number of times redisplay can be preempted by user input.
|
|
|
9998 */ );
|
|
|
9999 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
10000
|
|
428
|
10001 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
10002 Minimum pixel height for clipped bottom display line.
|
|
|
10003 A clipped line shorter than this won't be displayed.
|
|
|
10004 */ ,
|
|
|
10005 redisplay_variable_changed);
|
|
|
10006 vertical_clip = 5;
|
|
|
10007
|
|
|
10008 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
10009 Minimum visible area for clipped glyphs at right boundary.
|
|
|
10010 Clipped glyphs shorter than this won't be displayed.
|
|
|
10011 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
10012 */ ,
|
|
|
10013 redisplay_variable_changed);
|
|
|
10014 horizontal_clip = 5;
|
|
|
10015
|
|
|
10016 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
10017 String displayed by modeline-format's "%m" specification.
|
|
|
10018 */ );
|
|
|
10019 Vglobal_mode_string = Qnil;
|
|
|
10020
|
|
|
10021 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
10022 Marker for where to display an arrow on top of the buffer text.
|
|
|
10023 This must be the beginning of a line in order to work.
|
|
|
10024 See also `overlay-arrow-string'.
|
|
|
10025 */ ,
|
|
|
10026 redisplay_variable_changed);
|
|
|
10027 Voverlay_arrow_position = Qnil;
|
|
|
10028
|
|
|
10029 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
10030 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
10031 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
10032 well as a string.)
|
|
428
|
10033 */ ,
|
|
|
10034 redisplay_variable_changed);
|
|
|
10035 Voverlay_arrow_string = Qnil;
|
|
|
10036
|
|
|
10037 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
10038 *The number of lines to try scrolling a window by when point moves out.
|
|
|
10039 If that fails to bring point back on frame, point is centered instead.
|
|
|
10040 If this is zero, point is always centered after it moves off screen.
|
|
|
10041 */ );
|
|
|
10042 scroll_step = 0;
|
|
|
10043
|
|
|
10044 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
10045 *Scroll up to this many lines, to bring point back on screen.
|
|
|
10046 */ );
|
|
|
10047 scroll_conservatively = 0;
|
|
|
10048
|
|
|
10049 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
10050 &truncate_partial_width_windows /*
|
|
|
10051 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
10052 */ ,
|
|
|
10053 redisplay_variable_changed);
|
|
|
10054 truncate_partial_width_windows = 1;
|
|
|
10055
|
|
442
|
10056 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
10057 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
10058
|
|
|
10059 Default behavior is to flash the whole screen. On some platforms,
|
|
|
10060 special effects are available using the following values:
|
|
|
10061
|
|
|
10062 'display Flash the whole screen (ie, the default behavior).
|
|
|
10063 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
10064
|
|
|
10065 When effects are unavailable on a platform, the visual bell is the
|
|
|
10066 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
10067 */ );
|
|
442
|
10068 Vvisible_bell = Qnil;
|
|
428
|
10069
|
|
|
10070 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
10071 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
10072 A non-nil value is useful if the terminal can automatically preserve
|
|
|
10073 Emacs's frame display when you reenter Emacs.
|
|
|
10074 It is up to you to set this variable if your terminal can do that.
|
|
|
10075 */ );
|
|
|
10076 no_redraw_on_reenter = 0;
|
|
|
10077
|
|
|
10078 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
10079 A symbol naming the window-system under which Emacs is running,
|
|
|
10080 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
10081
|
|
|
10082 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
10083 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
10084 instead.
|
|
|
10085 */ );
|
|
|
10086 Vwindow_system = Qnil;
|
|
|
10087
|
|
|
10088 /* #### Temporary shit until window-system is eliminated. */
|
|
|
10089 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
10090 DON'T TOUCH
|
|
|
10091 */ );
|
|
|
10092 Vinitial_window_system = Qnil;
|
|
|
10093
|
|
|
10094 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
10095 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
10096 */ );
|
|
|
10097 cursor_in_echo_area = 0;
|
|
|
10098
|
|
|
10099 /* #### Shouldn't this be generalized as follows:
|
|
|
10100
|
|
|
10101 if nil, use block cursor.
|
|
|
10102 if a number, use a bar cursor of that width.
|
|
|
10103 Otherwise, use a 1-pixel bar cursor.
|
|
|
10104
|
|
|
10105 #### Or better yet, this variable should be trashed entirely
|
|
|
10106 (use a Lisp-magic variable to maintain compatibility)
|
|
|
10107 and a specifier `cursor-shape' added, which allows a block
|
|
|
10108 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
10109 maybe a caret cursor, etc. */
|
|
|
10110
|
|
|
10111 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
10112 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
10113 */ );
|
|
|
10114 Vbar_cursor = Qnil;
|
|
|
10115
|
|
442
|
10116 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
10117 Function or functions to call when a frame's buffer list has changed.
|
|
|
10118 This is called during redisplay, before redisplaying each frame.
|
|
|
10119 Functions on this hook are called with one argument, the frame.
|
|
|
10120 */ );
|
|
|
10121 Vbuffer_list_changed_hook = Qnil;
|
|
|
10122
|
|
428
|
10123 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
10124 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
10125 at next redisplay. You should not normally change this; the function
|
|
|
10126 `display-warning' automatically does this at appropriate times.
|
|
|
10127 */ );
|
|
|
10128 display_warning_tick = 0;
|
|
|
10129
|
|
|
10130 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
10131 Non-nil means inhibit display of warning messages.
|
|
|
10132 You should *bind* this, not set it. Any pending warning messages
|
|
|
10133 will be displayed when the binding no longer applies.
|
|
|
10134 */ );
|
|
|
10135 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
10136 This way, the warnings don't obliterate the splash screen. */
|
|
|
10137 inhibit_warning_display = 1;
|
|
|
10138
|
|
|
10139 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
10140 *Non-nil means column display number starts at 1.
|
|
|
10141 */ );
|
|
|
10142 column_number_start_at_one = 0;
|
|
|
10143 }
|
|
|
10144
|
|
|
10145 void
|
|
|
10146 specifier_vars_of_redisplay (void)
|
|
|
10147 {
|
|
|
10148 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
10149 *Width of left margin.
|
|
|
10150 This is a specifier; use `set-specifier' to change it.
|
|
|
10151 */ );
|
|
|
10152 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
10153 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
10154 set_specifier_caching (Vleft_margin_width,
|
|
438
|
10155 offsetof (struct window, left_margin_width),
|
|
428
|
10156 some_window_value_changed,
|
|
438
|
10157 offsetof (struct frame, left_margin_width),
|
|
444
|
10158 margin_width_changed_in_frame, 0);
|
|
428
|
10159
|
|
|
10160 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
10161 *Width of right margin.
|
|
|
10162 This is a specifier; use `set-specifier' to change it.
|
|
|
10163 */ );
|
|
|
10164 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
10165 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
10166 set_specifier_caching (Vright_margin_width,
|
|
438
|
10167 offsetof (struct window, right_margin_width),
|
|
428
|
10168 some_window_value_changed,
|
|
438
|
10169 offsetof (struct frame, right_margin_width),
|
|
444
|
10170 margin_width_changed_in_frame, 0);
|
|
428
|
10171
|
|
|
10172 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
10173 *Minimum ascent height of lines.
|
|
|
10174 This is a specifier; use `set-specifier' to change it.
|
|
|
10175 */ );
|
|
|
10176 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
10177 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
10178 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
10179 offsetof (struct window, minimum_line_ascent),
|
|
428
|
10180 some_window_value_changed,
|
|
444
|
10181 0, 0, 0);
|
|
428
|
10182
|
|
|
10183 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
10184 *Minimum descent height of lines.
|
|
|
10185 This is a specifier; use `set-specifier' to change it.
|
|
|
10186 */ );
|
|
|
10187 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
10188 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
10189 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
10190 offsetof (struct window, minimum_line_descent),
|
|
428
|
10191 some_window_value_changed,
|
|
444
|
10192 0, 0, 0);
|
|
428
|
10193
|
|
|
10194 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
10195 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
10196 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
10197 This is a specifier; use `set-specifier' to change it.
|
|
|
10198 */ );
|
|
|
10199 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
10200 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
10201 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
10202 offsetof (struct window, use_left_overflow),
|
|
428
|
10203 some_window_value_changed,
|
|
444
|
10204 0, 0, 0);
|
|
428
|
10205
|
|
|
10206 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
10207 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
10208 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
10209 This is a specifier; use `set-specifier' to change it.
|
|
|
10210 */ );
|
|
|
10211 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
10212 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
10213 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
10214 offsetof (struct window, use_right_overflow),
|
|
428
|
10215 some_window_value_changed,
|
|
444
|
10216 0, 0, 0);
|
|
428
|
10217
|
|
|
10218 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
10219 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
10220 This is a specifier; use `set-specifier' to change it.
|
|
|
10221 */ );
|
|
|
10222 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
10223 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
10224 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
10225 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
10226 text_cursor_visible_p_changed,
|
|
444
|
10227 0, 0, 0);
|
|
428
|
10228
|
|
|
10229 }
|
