|
428
|
1 /* Display generation from window structure and buffer text.
|
|
|
2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
|
|
|
3 Copyright (C) 1995 Free Software Foundation, Inc.
|
|
771
|
4 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
|
|
428
|
5 Copyright (C) 1995 Sun Microsystems, Inc.
|
|
|
6 Copyright (C) 1996 Chuck Thompson.
|
|
|
7
|
|
|
8 This file is part of XEmacs.
|
|
|
9
|
|
|
10 XEmacs is free software; you can redistribute it and/or modify it
|
|
|
11 under the terms of the GNU General Public License as published by the
|
|
|
12 Free Software Foundation; either version 2, or (at your option) any
|
|
|
13 later version.
|
|
|
14
|
|
|
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
|
|
|
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
18 for more details.
|
|
|
19
|
|
|
20 You should have received a copy of the GNU General Public License
|
|
|
21 along with XEmacs; see the file COPYING. If not, write to
|
|
|
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
23 Boston, MA 02111-1307, USA. */
|
|
|
24
|
|
|
25 /* Synched up with: Not in FSF. */
|
|
|
26
|
|
|
27 /* Author: Chuck Thompson */
|
|
|
28
|
|
|
29 /* Fixed up by Ben Wing for Mule */
|
|
|
30
|
|
|
31 /* This file has been Mule-ized. */
|
|
|
32
|
|
|
33 /*****************************************************************************
|
|
|
34 The Golden Rules of Redisplay
|
|
|
35
|
|
|
36 First: It Is Better To Be Correct Than Fast
|
|
|
37 Second: Thou Shalt Not Run Elisp From Within Redisplay
|
|
|
38 Third: It Is Better To Be Fast Than Not To Be
|
|
|
39 ****************************************************************************/
|
|
|
40
|
|
|
41 #include <config.h>
|
|
|
42 #include "lisp.h"
|
|
|
43
|
|
|
44 #include "buffer.h"
|
|
|
45 #include "commands.h"
|
|
|
46 #include "debug.h"
|
|
|
47 #include "device.h"
|
|
|
48 #include "elhash.h"
|
|
|
49 #include "extents.h"
|
|
|
50 #include "faces.h"
|
|
|
51 #include "frame.h"
|
|
|
52 #include "glyphs.h"
|
|
|
53 #include "gutter.h"
|
|
|
54 #include "insdel.h"
|
|
|
55 #include "menubar.h"
|
|
|
56 #include "objects.h"
|
|
|
57 #include "process.h"
|
|
|
58 #include "redisplay.h"
|
|
|
59 #include "toolbar.h"
|
|
|
60 #include "window.h"
|
|
|
61 #include "line-number.h"
|
|
|
62 #include "file-coding.h"
|
|
|
63
|
|
442
|
64 #include "sysfile.h"
|
|
|
65
|
|
428
|
66 #ifdef HAVE_TTY
|
|
|
67 #include "console-tty.h"
|
|
|
68 #endif /* HAVE_TTY */
|
|
|
69
|
|
|
70 /* Note: We have to be careful throughout this code to properly handle
|
|
665
|
71 and differentiate between Intbytes and Emchars.
|
|
|
72
|
|
|
73 Since strings are generally composed of Intbytes, I've taken the tack
|
|
|
74 that any contiguous set of Intbytes is called a "string", while
|
|
428
|
75 any contiguous set of Emchars is called an "array". */
|
|
|
76
|
|
|
77 /* Return value to indicate a failure by an add_*_rune routine to add
|
|
|
78 a rune, but no propagation information needs to be returned. */
|
|
|
79 #define ADD_FAILED (prop_block_dynarr *) 1
|
|
|
80
|
|
|
81 #define BEGIN_GLYPHS 0
|
|
|
82 #define END_GLYPHS 1
|
|
|
83 #define LEFT_GLYPHS 2
|
|
|
84 #define RIGHT_GLYPHS 3
|
|
|
85
|
|
|
86 #define VERTICAL_CLIP(w, display) \
|
|
442
|
87 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
|
|
428
|
88 ? INT_MAX \
|
|
442
|
89 : vertical_clip)
|
|
428
|
90
|
|
|
91 /* The following structures are completely private to redisplay.c so
|
|
|
92 we put them here instead of in a header file, for modularity. */
|
|
|
93
|
|
793
|
94 /* NOTE: Bytebpos's not Charbpos's in this structure. */
|
|
428
|
95
|
|
|
96 typedef struct position_redisplay_data_type
|
|
|
97 {
|
|
|
98 /* This information is normally filled in by the create_*_block
|
|
|
99 routines and is used by the add_*_rune routines. */
|
|
|
100 Lisp_Object window;
|
|
|
101 /* if we are working with strings rather than buffers we need a
|
|
|
102 handle to the string */
|
|
|
103 Lisp_Object string;
|
|
|
104 struct device *d;
|
|
|
105 struct display_block *db;
|
|
|
106 struct display_line *dl;
|
|
|
107 Emchar ch; /* Character that is to be added. This is
|
|
|
108 used to communicate this information to
|
|
|
109 add_emchar_rune(). */
|
|
|
110 Lisp_Object last_charset; /* The charset of the previous character.
|
|
|
111 Used to optimize some lookups -- we
|
|
|
112 only have to do some things when
|
|
|
113 the charset changes. */
|
|
|
114 face_index last_findex; /* The face index of the previous character.
|
|
|
115 Needed to ensure the validity of the
|
|
|
116 last_charset optimization. */
|
|
|
117
|
|
|
118 int last_char_width; /* The width of the previous character. */
|
|
|
119 int font_is_bogus; /* If true, it means we couldn't instantiate
|
|
|
120 the font for this charset, so we substitute
|
|
|
121 ~'s from the ASCII charset. */
|
|
665
|
122 Bytebpos bi_charbpos;
|
|
|
123 Bytebpos bi_endpos;
|
|
428
|
124 int pixpos;
|
|
|
125 int max_pixpos;
|
|
|
126 int blank_width; /* Width of the blank that is to be added.
|
|
|
127 This is used to communicate this information
|
|
|
128 to add_blank_rune().
|
|
|
129
|
|
|
130 This is also used rather cheesily to
|
|
|
131 communicate the width of the eol-cursor-size
|
|
|
132 blank that exists at the end of the line.
|
|
|
133 add_emchar_rune() is called cheesily with
|
|
|
134 the non-printing char '\n', which is stuck
|
|
|
135 in the output routines with its width being
|
|
|
136 BLANK_WIDTH. */
|
|
665
|
137 Bytebpos bi_cursor_charbpos;/* This stores the buffer position of the cursor. */
|
|
428
|
138 unsigned int cursor_type :3;
|
|
|
139 int cursor_x; /* rune block cursor is at */
|
|
|
140 int start_col; /* Number of character columns (each column has
|
|
|
141 a width of the default char width) that still
|
|
|
142 need to be skipped. This is used for horizontal
|
|
|
143 scrolling, where a certain number of columns
|
|
|
144 (those off the left side of the screen) need
|
|
|
145 to be skipped before anything is displayed. */
|
|
665
|
146 Bytebpos bi_start_col_enabled;
|
|
428
|
147 int start_col_xoffset; /* Number of pixels that still need to
|
|
819
|
148 be skipped. This is used for
|
|
|
149 horizontal scrolling of glyphs, where we want
|
|
|
150 to be able to scroll over part of the glyph. */
|
|
428
|
151
|
|
|
152 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
|
|
|
153 glyph differs from space_width (w).
|
|
|
154 0 if no hscroll glyph was used,
|
|
|
155 i.e. the window is not scrolled
|
|
|
156 horizontally. Used in tab
|
|
|
157 calculations. */
|
|
|
158
|
|
|
159 /* Information about the face the text should be displayed in and
|
|
|
160 any begin-glyphs and end-glyphs. */
|
|
|
161 struct extent_fragment *ef;
|
|
|
162 face_index findex;
|
|
|
163
|
|
819
|
164 /* The height of a pixmap may either be predetermined if the user has set a
|
|
|
165 baseline value, or it may be dependent on whatever the line ascent and
|
|
|
166 descent values end up being, based just on font and pixmap-ascent
|
|
|
167 information. In the first case we can immediately update the values, thus
|
|
|
168 their inclusion here. In the last case we cannot determine the actual
|
|
|
169 contribution to the line height until we have finished laying out all text
|
|
|
170 on the line. Thus we propagate the max height of such pixmaps and do a
|
|
|
171 final calculation (in calculate_baseline()) after all text has been added
|
|
|
172 to the line. */
|
|
428
|
173 int new_ascent;
|
|
|
174 int new_descent;
|
|
|
175 int max_pixmap_height;
|
|
819
|
176 int need_baseline_computation;
|
|
|
177 int end_glyph_width; /* Well, it is the kitchen sink after all ... */
|
|
428
|
178
|
|
|
179 Lisp_Object result_str; /* String where we put the result of
|
|
|
180 generating a formatted string in the modeline. */
|
|
|
181 int is_modeline; /* Non-zero if we're generating the modeline. */
|
|
|
182 Charcount modeline_charpos; /* Number of chars used in result_str so far;
|
|
|
183 corresponds to bytepos. */
|
|
|
184 Bytecount bytepos; /* Number of bytes used in result_str so far.
|
|
|
185 We don't actually copy the bytes into result_str
|
|
|
186 until the end because we don't know how big the
|
|
|
187 string is going to be until then. */
|
|
|
188 } pos_data;
|
|
|
189
|
|
|
190 enum prop_type
|
|
|
191 {
|
|
|
192 PROP_STRING,
|
|
|
193 PROP_CHAR,
|
|
|
194 PROP_MINIBUF_PROMPT,
|
|
819
|
195 PROP_BLANK,
|
|
|
196 PROP_GLYPH
|
|
428
|
197 };
|
|
|
198
|
|
|
199 /* Data that should be propagated to the next line. Either a single
|
|
819
|
200 Emchar, a string of Intbyte's or a glyph.
|
|
428
|
201
|
|
|
202 The actual data that is propagated ends up as a Dynarr of these
|
|
|
203 blocks.
|
|
|
204
|
|
819
|
205 prop_blocks are used to indicate that data that was supposed to go
|
|
|
206 on the previous line couldn't actually be displayed. Generally this
|
|
|
207 shouldn't happen if we are clipping the end of lines. If we are
|
|
|
208 wrapping then we need to display the propagation data before moving
|
|
|
209 on. Its questionable whether we should wrap or clip glyphs in this
|
|
|
210 instance. Most e-lisp relies on clipping so we preserve this
|
|
|
211 behavior.
|
|
|
212
|
|
665
|
213 #### It's unclean that both Emchars and Intbytes are here.
|
|
428
|
214 */
|
|
|
215
|
|
|
216 typedef struct prop_block prop_block;
|
|
|
217 struct prop_block
|
|
|
218 {
|
|
|
219 enum prop_type type;
|
|
|
220
|
|
|
221 union data
|
|
|
222 {
|
|
|
223 struct
|
|
|
224 {
|
|
665
|
225 Intbyte *str;
|
|
428
|
226 Bytecount len; /* length of the string. */
|
|
|
227 } p_string;
|
|
|
228
|
|
|
229 struct
|
|
|
230 {
|
|
|
231 Emchar ch;
|
|
665
|
232 Bytebpos bi_cursor_charbpos; /* NOTE: is in Bytebposs */
|
|
428
|
233 unsigned int cursor_type :3;
|
|
|
234 } p_char;
|
|
|
235
|
|
|
236 struct
|
|
|
237 {
|
|
|
238 int width;
|
|
|
239 face_index findex;
|
|
|
240 } p_blank;
|
|
819
|
241
|
|
|
242 struct
|
|
|
243 {
|
|
|
244 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
|
|
|
245 int width;
|
|
|
246 Lisp_Object glyph;
|
|
|
247 } p_glyph;
|
|
|
248
|
|
428
|
249 } data;
|
|
|
250 };
|
|
|
251
|
|
|
252 typedef struct
|
|
|
253 {
|
|
|
254 Dynarr_declare (prop_block);
|
|
|
255 } prop_block_dynarr;
|
|
|
256
|
|
|
257
|
|
|
258 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
|
|
|
259 Charcount pos, Charcount min_pos,
|
|
|
260 Charcount max_pos, Lisp_Object elt,
|
|
|
261 int depth, int max_pixsize,
|
|
438
|
262 face_index findex, int type,
|
|
|
263 Charcount *offset,
|
|
|
264 Lisp_Object cur_ext);
|
|
428
|
265 static prop_block_dynarr *add_glyph_rune (pos_data *data,
|
|
|
266 struct glyph_block *gb,
|
|
|
267 int pos_type, int allow_cursor,
|
|
|
268 struct glyph_cachel *cachel);
|
|
665
|
269 static Bytebpos create_text_block (struct window *w, struct display_line *dl,
|
|
|
270 Bytebpos bi_start_pos, prop_block_dynarr **prop,
|
|
428
|
271 int type);
|
|
|
272 static int create_overlay_glyph_block (struct window *w,
|
|
|
273 struct display_line *dl);
|
|
|
274 static void create_left_glyph_block (struct window *w,
|
|
|
275 struct display_line *dl,
|
|
|
276 int overlay_width);
|
|
|
277 static void create_right_glyph_block (struct window *w,
|
|
|
278 struct display_line *dl);
|
|
|
279 static void redisplay_windows (Lisp_Object window, int skip_selected);
|
|
|
280 static void decode_mode_spec (struct window *w, Emchar spec, int type);
|
|
|
281 static void free_display_line (struct display_line *dl);
|
|
665
|
282 static void update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
283 Charbpos point, int no_regen);
|
|
|
284 static int point_visible (struct window *w, Charbpos point, int type);
|
|
819
|
285 static void calculate_yoffset (struct display_line *dl,
|
|
|
286 struct display_block *fixup);
|
|
|
287 static void calculate_baseline (pos_data *data);
|
|
428
|
288
|
|
800
|
289 static void sledgehammer_check_redisplay_structs (void);
|
|
|
290
|
|
428
|
291 /* This used to be 10 but 30 seems to give much better performance. */
|
|
|
292 #define INIT_MAX_PREEMPTS 30
|
|
|
293 static int max_preempts;
|
|
|
294
|
|
|
295 #define REDISPLAY_PREEMPTION_CHECK \
|
|
|
296 ((void) \
|
|
|
297 (preempted = \
|
|
|
298 (!disable_preemption && \
|
|
|
299 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
|
|
|
300 (!INTERACTIVE || detect_input_pending ()))))
|
|
|
301
|
|
|
302 /*
|
|
|
303 * Redisplay global variables.
|
|
|
304 */
|
|
|
305
|
|
|
306 /* We need a third set of display structures for the cursor motion
|
|
|
307 routines. We used to just give each window a third set. However,
|
|
|
308 we always fully regenerate the structures when needed so there
|
|
|
309 isn't any reason we need more than a single set. */
|
|
|
310 display_line_dynarr *cmotion_display_lines;
|
|
|
311
|
|
|
312 /* We store the extents that we need to generate in a Dynarr and then
|
|
|
313 frob them all on at the end of generating the string. We do it
|
|
|
314 this way rather than adding them as we generate the string because
|
|
|
315 we don't store the text into the resulting string until we're done
|
|
|
316 (to avoid having to resize the string multiple times), and we don't
|
|
|
317 want to go around adding extents to a string when the extents might
|
|
|
318 stretch off the end of the string. */
|
|
|
319 static EXTENT_dynarr *formatted_string_extent_dynarr;
|
|
|
320 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
|
|
|
321 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
|
|
|
322
|
|
|
323
|
|
|
324 /* #### probably temporary */
|
|
458
|
325 Fixnum cache_adjustment;
|
|
428
|
326
|
|
|
327 /* This holds a string representing the text corresponding to a single
|
|
|
328 modeline % spec. */
|
|
665
|
329 static Intbyte_dynarr *mode_spec_intbyte_string;
|
|
428
|
330
|
|
|
331 int in_display; /* 1 if in redisplay. */
|
|
|
332
|
|
|
333 int disable_preemption; /* Used for debugging redisplay and for
|
|
|
334 force-redisplay. */
|
|
|
335
|
|
|
336 /* We only allow max_preempts preemptions before we force a redisplay. */
|
|
|
337 static int preemption_count;
|
|
|
338
|
|
|
339 /* Minimum pixel height of clipped bottom display line. */
|
|
458
|
340 Fixnum vertical_clip;
|
|
428
|
341
|
|
|
342 /* Minimum visible pixel width of clipped glyphs at right margin. */
|
|
458
|
343 Fixnum horizontal_clip;
|
|
428
|
344
|
|
|
345 /* Nonzero means reading single-character input with prompt
|
|
|
346 so put cursor on minibuffer after the prompt. */
|
|
|
347 int cursor_in_echo_area;
|
|
|
348 Lisp_Object Qcursor_in_echo_area;
|
|
|
349
|
|
|
350 /* Nonzero means truncate lines in all windows less wide than the frame */
|
|
|
351 int truncate_partial_width_windows;
|
|
|
352
|
|
|
353 /* non-nil if a buffer has changed since the last time redisplay completed */
|
|
|
354 int buffers_changed;
|
|
|
355 int buffers_changed_set;
|
|
|
356
|
|
|
357 /* non-nil if hscroll has changed somewhere or a buffer has been
|
|
|
358 narrowed or widened */
|
|
|
359 int clip_changed;
|
|
|
360 int clip_changed_set;
|
|
|
361
|
|
|
362 /* non-nil if any extent has changed since the last time redisplay completed */
|
|
|
363 int extents_changed;
|
|
|
364 int extents_changed_set;
|
|
|
365
|
|
|
366 /* non-nil if any face has changed since the last time redisplay completed */
|
|
|
367 int faces_changed;
|
|
|
368
|
|
|
369 /* Nonzero means some frames have been marked as garbaged */
|
|
|
370 int frame_changed;
|
|
|
371
|
|
|
372 /* non-zero if any of the builtin display glyphs (continuation,
|
|
|
373 hscroll, control-arrow, etc) is in need of updating
|
|
|
374 somewhere. */
|
|
|
375 int glyphs_changed;
|
|
|
376 int glyphs_changed_set;
|
|
|
377
|
|
442
|
378 /* non-zero if any subwindow has been deleted. */
|
|
428
|
379 int subwindows_changed;
|
|
|
380 int subwindows_changed_set;
|
|
|
381
|
|
|
382 /* non-zero if any displayed subwindow is in need of updating
|
|
|
383 somewhere. */
|
|
|
384 int subwindows_state_changed;
|
|
|
385 int subwindows_state_changed_set;
|
|
|
386
|
|
|
387 /* This variable is 1 if the icon has to be updated.
|
|
|
388 It is set to 1 when `frame-icon-glyph' changes. */
|
|
|
389 int icon_changed;
|
|
|
390 int icon_changed_set;
|
|
|
391
|
|
|
392 /* This variable is 1 if the menubar widget has to be updated.
|
|
|
393 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
|
|
|
394 has been updated. */
|
|
|
395 int menubar_changed;
|
|
|
396 int menubar_changed_set;
|
|
|
397
|
|
|
398 /* true iff we should redraw the modelines on the next redisplay */
|
|
|
399 int modeline_changed;
|
|
|
400 int modeline_changed_set;
|
|
|
401
|
|
|
402 /* non-nil if point has changed in some buffer since the last time
|
|
|
403 redisplay completed */
|
|
|
404 int point_changed;
|
|
|
405 int point_changed_set;
|
|
|
406
|
|
|
407 /* non-nil if some frame has changed its size */
|
|
|
408 int size_changed;
|
|
|
409
|
|
|
410 /* non-nil if some device has signaled that it wants to change size */
|
|
|
411 int asynch_device_change_pending;
|
|
|
412
|
|
|
413 /* non-nil if any toolbar has changed */
|
|
|
414 int toolbar_changed;
|
|
|
415 int toolbar_changed_set;
|
|
|
416
|
|
|
417 /* non-nil if any gutter has changed */
|
|
|
418 int gutter_changed;
|
|
|
419 int gutter_changed_set;
|
|
|
420
|
|
|
421 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
422 int windows_changed;
|
|
|
423
|
|
|
424 /* non-nil if any frame's window structure has changed since the last
|
|
|
425 time redisplay completed */
|
|
|
426 int windows_structure_changed;
|
|
|
427
|
|
|
428 /* If non-nil, use vertical bar cursor. */
|
|
|
429 Lisp_Object Vbar_cursor;
|
|
|
430 Lisp_Object Qbar_cursor;
|
|
|
431
|
|
442
|
432 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
|
|
|
433 then the frame will flash instead of
|
|
|
434 beeping when an error occurs */
|
|
428
|
435
|
|
|
436 /* Nonzero means no need to redraw the entire frame on resuming
|
|
|
437 a suspended Emacs. This is useful on terminals with multiple pages,
|
|
|
438 where one page is used for Emacs and another for all else. */
|
|
|
439 int no_redraw_on_reenter;
|
|
|
440
|
|
|
441 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
|
|
|
442 under which emacs is running
|
|
|
443 ('x is the only current possibility) */
|
|
|
444 Lisp_Object Vinitial_window_system;
|
|
|
445
|
|
|
446 Lisp_Object Vglobal_mode_string;
|
|
|
447
|
|
|
448 /* The number of lines scroll a window by when point leaves the window; if
|
|
|
449 it is <=0 then point is centered in the window */
|
|
458
|
450 Fixnum scroll_step;
|
|
428
|
451
|
|
|
452 /* Scroll up to this many lines, to bring point back on screen. */
|
|
458
|
453 Fixnum scroll_conservatively;
|
|
428
|
454
|
|
|
455 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
456 Lisp_Object Voverlay_arrow_position;
|
|
|
457 /* String to display for the arrow. */
|
|
|
458 Lisp_Object Voverlay_arrow_string;
|
|
|
459
|
|
|
460 Lisp_Object Vwindow_size_change_functions;
|
|
|
461 Lisp_Object Vwindow_scroll_functions;
|
|
|
462 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
|
|
|
463
|
|
442
|
464 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
|
|
|
465
|
|
|
466
|
|
428
|
467 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
|
|
|
468 this more. */
|
|
|
469 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
470 /* #### Chuck says: I think this needs more thought.
|
|
|
471 Think about this for 19.14. */
|
|
|
472 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
|
|
|
473 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
|
|
|
474 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
475
|
|
458
|
476 static Fixnum last_display_warning_tick;
|
|
|
477 static Fixnum display_warning_tick;
|
|
428
|
478 Lisp_Object Qdisplay_warning_buffer;
|
|
|
479 int inhibit_warning_display;
|
|
|
480
|
|
|
481 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
482 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
483 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
484 Lisp_Object Vtext_cursor_visible_p;
|
|
|
485
|
|
|
486 int column_number_start_at_one;
|
|
|
487
|
|
442
|
488 Lisp_Object Qtop_bottom;
|
|
|
489
|
|
444
|
490 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
|
|
428
|
491
|
|
|
492
|
|
|
493 /***************************************************************************/
|
|
|
494 /* */
|
|
|
495 /* low-level interfaces onto device routines */
|
|
|
496 /* */
|
|
|
497 /***************************************************************************/
|
|
|
498
|
|
|
499 static int
|
|
|
500 redisplay_text_width_emchar_string (struct window *w, int findex,
|
|
|
501 Emchar *str, Charcount len)
|
|
|
502 {
|
|
|
503 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
504 Lisp_Object window;
|
|
|
505
|
|
|
506 find_charsets_in_emchar_string (charsets, str, len);
|
|
793
|
507 window = wrap_window (w);
|
|
428
|
508 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
509 charsets);
|
|
|
510 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
511 text_width, (XFRAME (WINDOW_FRAME (w)),
|
|
|
512 WINDOW_FACE_CACHEL (w, findex), str, len));
|
|
|
513 }
|
|
|
514
|
|
|
515 static Emchar_dynarr *rtw_emchar_dynarr;
|
|
|
516
|
|
|
517 int
|
|
|
518 redisplay_text_width_string (struct window *w, int findex,
|
|
665
|
519 Intbyte *nonreloc, Lisp_Object reloc,
|
|
428
|
520 Bytecount offset, Bytecount len)
|
|
|
521 {
|
|
|
522 if (!rtw_emchar_dynarr)
|
|
|
523 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
524 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
525
|
|
|
526 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
527 if (STRINGP (reloc))
|
|
|
528 nonreloc = XSTRING_DATA (reloc);
|
|
665
|
529 convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
428
|
530 return redisplay_text_width_emchar_string
|
|
|
531 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
532 Dynarr_length (rtw_emchar_dynarr));
|
|
|
533 }
|
|
|
534
|
|
|
535 int
|
|
|
536 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
665
|
537 Intbyte *nonreloc, Lisp_Object reloc,
|
|
428
|
538 Bytecount offset, Bytecount len)
|
|
|
539 {
|
|
|
540 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
541 Lisp_Object frame;
|
|
|
542 struct face_cachel cachel;
|
|
|
543
|
|
|
544 if (!rtw_emchar_dynarr)
|
|
|
545 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
546 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
547
|
|
|
548 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
549 if (STRINGP (reloc))
|
|
|
550 nonreloc = XSTRING_DATA (reloc);
|
|
665
|
551 convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
|
552 find_charsets_in_intbyte_string (charsets, nonreloc, len);
|
|
428
|
553 reset_face_cachel (&cachel);
|
|
|
554 cachel.face = face;
|
|
793
|
555 frame = wrap_frame (f);
|
|
428
|
556 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
557 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
|
558 text_width, (f, &cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
559 Dynarr_length (rtw_emchar_dynarr)));
|
|
|
560 }
|
|
|
561
|
|
|
562 /* Return the display block from DL of the given TYPE. A display line
|
|
|
563 can have only one display block of each possible type. If DL does
|
|
|
564 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
565
|
|
|
566 struct display_block *
|
|
|
567 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
568 {
|
|
|
569 int elt;
|
|
|
570 struct display_block db;
|
|
|
571
|
|
|
572 /* Check if this display line already has a block of the desired type and
|
|
|
573 if so, return it. */
|
|
|
574 if (dl->display_blocks)
|
|
|
575 {
|
|
|
576 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
577 {
|
|
|
578 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
579 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
580 }
|
|
|
581
|
|
|
582 /* There isn't an active block of the desired type, but there
|
|
|
583 might still be allocated blocks we need to reuse. */
|
|
|
584 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
585 {
|
|
|
586 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
587
|
|
|
588 /* 'add' the block to the list */
|
|
|
589 Dynarr_increment (dl->display_blocks);
|
|
|
590
|
|
|
591 /* initialize and return */
|
|
|
592 dbp->type = type;
|
|
|
593 return dbp;
|
|
|
594 }
|
|
|
595 }
|
|
|
596 else
|
|
|
597 {
|
|
|
598 /* This line doesn't have any display blocks, so initialize the display
|
|
|
599 bock array. */
|
|
|
600 dl->display_blocks = Dynarr_new (display_block);
|
|
|
601 }
|
|
|
602
|
|
|
603 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
604 one and add it to the line. */
|
|
|
605 xzero (db);
|
|
|
606 db.type = type;
|
|
|
607 db.runes = Dynarr_new (rune);
|
|
|
608 Dynarr_add (dl->display_blocks, db);
|
|
|
609
|
|
|
610 /* Return the newly added display block. */
|
|
|
611 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
612
|
|
|
613 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
614 }
|
|
|
615
|
|
|
616 static int
|
|
|
617 tab_char_width (struct window *w)
|
|
|
618 {
|
|
|
619 struct buffer *b = XBUFFER (w->buffer);
|
|
|
620 int char_tab_width = XINT (b->tab_width);
|
|
|
621
|
|
|
622 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
623
|
|
|
624 return char_tab_width;
|
|
|
625 }
|
|
|
626
|
|
|
627 static int
|
|
|
628 space_width (struct window *w)
|
|
|
629 {
|
|
|
630 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
631 fonts the space character tends to give too narrow a value. So
|
|
|
632 we use 'n' instead. Except that we don't. We use the default
|
|
|
633 character width for the default face. If this is actually
|
|
|
634 defined by the font then it is probably the best thing to
|
|
|
635 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
636 already calculated its width. Thus we can avoid a call to
|
|
|
637 XTextWidth on X frames by just querying the default width. */
|
|
|
638 return XFONT_INSTANCE
|
|
|
639 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
640 }
|
|
|
641
|
|
|
642 static int
|
|
|
643 tab_pix_width (struct window *w)
|
|
|
644 {
|
|
|
645 return space_width (w) * tab_char_width (w);
|
|
|
646 }
|
|
|
647
|
|
|
648 /* Given a pixel position in a window, return the pixel location of
|
|
|
649 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
650 terms of spaces displayed in the default face. Formerly the space
|
|
|
651 width was determined using the currently active face. That method
|
|
|
652 leads to tabstops which do not line up. */
|
|
|
653
|
|
|
654 static int
|
|
|
655 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
656 {
|
|
|
657 int n_pos = left_pixpos;
|
|
|
658 int pix_tab_width = tab_pix_width (w);
|
|
|
659
|
|
|
660 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
661 if (WINDOW_SCROLLED (w))
|
|
|
662 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
|
|
|
663
|
|
|
664 while (n_pos <= start_pixpos)
|
|
|
665 n_pos += pix_tab_width;
|
|
|
666
|
|
|
667 return n_pos;
|
|
|
668 }
|
|
|
669
|
|
|
670 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
671 display line. The whitespace boundaries must be calculated by the text
|
|
|
672 layout routines. */
|
|
|
673
|
|
|
674 layout_bounds
|
|
|
675 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
676 {
|
|
|
677 layout_bounds bounds;
|
|
|
678
|
|
|
679 /* Set the outermost boundaries which are the boundaries of the
|
|
|
680 window itself minus the gutters (and minus the scrollbars if this
|
|
|
681 is for the modeline). */
|
|
|
682 if (!modeline)
|
|
|
683 {
|
|
|
684 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
685 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
686 }
|
|
|
687 else
|
|
|
688 {
|
|
|
689 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
690 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
691 }
|
|
|
692
|
|
|
693 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
694 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
695 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
696
|
|
|
697 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
698 depend on the contents of the line being displayed. */
|
|
|
699 bounds.left_white = bounds.left_in;
|
|
|
700 bounds.right_white = bounds.right_in;
|
|
|
701
|
|
|
702 return bounds;
|
|
|
703 }
|
|
|
704
|
|
819
|
705 /* This takes a display_block and its containing line and corrects the yoffset
|
|
|
706 of each glyph in the block to cater for the ascent of the line as a
|
|
|
707 whole. Must be called *after* the line-ascent is known! */
|
|
|
708
|
|
|
709 static void
|
|
|
710 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
|
|
|
711 {
|
|
|
712 int i;
|
|
|
713 for (i=0; i<Dynarr_length (fixup->runes); i++)
|
|
|
714 {
|
|
|
715 struct rune *r = Dynarr_atp (fixup->runes,i);
|
|
|
716 if (r->type == RUNE_DGLYPH)
|
|
|
717 {
|
|
|
718 if (r->object.dglyph.ascent < dl->ascent)
|
|
|
719 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
|
|
|
720 r->object.dglyph.descent;
|
|
|
721 }
|
|
|
722 }
|
|
|
723 }
|
|
|
724
|
|
|
725 /* Calculate the textual baseline (the ascent and descent values for the
|
|
|
726 display_line as a whole).
|
|
|
727
|
|
|
728 If the baseline is completely blank, or contains no manually positioned
|
|
|
729 glyphs, then the textual baseline is simply the baseline of the default font.
|
|
|
730 (The `contains no manually positioned glyphs' part is actually done for
|
|
|
731 us by `add_emchar_rune'.)
|
|
|
732
|
|
|
733 If the baseline contains pixmaps, and they're all manually positioned, then
|
|
|
734 the textual baseline location is constrained that way, and we need do no
|
|
|
735 work.
|
|
|
736
|
|
|
737 If the baseline contains pixmaps, and at least one is automatically
|
|
|
738 positioned, then the textual ascent is the largest ascent on the line, and
|
|
|
739 the textual descent is the largest descent (which is how things are set up at
|
|
|
740 entry to this function anyway): except that if the max_ascent + max_descent
|
|
|
741 is too small for the height of the line (say you've adjusted the baseline of
|
|
|
742 a short glyph, and there's a tall one next to it), then take the ascent and
|
|
|
743 descent for the line individually from the largest of the explicitly set
|
|
|
744 ascent/descent, and the rescaled ascent/descent of the default font, scaled
|
|
|
745 such that the largest glyph will fit.
|
|
|
746
|
|
|
747 This means that if you have a short glyph (but taller than the default
|
|
|
748 font's descent) forced right under the baseline, and a really tall
|
|
|
749 automatically positioned glyph, that the descent for the line is just big
|
|
|
750 enough for the manually positioned short glyph, and the tall one uses as
|
|
|
751 much of that space as the default font would were it as tall as the tall
|
|
|
752 glyph; but that the ascent is big enough for the tall glyph to fit.
|
|
|
753
|
|
|
754 This behaviour means that under no circumstances will changing the baseline
|
|
|
755 of a short glyph cause a tall glyph to move around; nor will it move the
|
|
|
756 textual baseline more than necessary. (Changing a tall glyph's baseline
|
|
|
757 might move the text's baseline arbitrarily, of course.) */
|
|
|
758
|
|
|
759 static void
|
|
|
760 calculate_baseline (pos_data *data)
|
|
|
761 {
|
|
|
762 /* Blank line: baseline is default font's baseline. */
|
|
|
763
|
|
|
764 if (!data->new_ascent && !data->new_descent)
|
|
|
765 {
|
|
|
766 /* We've got a blank line so initialize these values from the default
|
|
|
767 face. */
|
|
|
768 default_face_font_info (data->window, &data->new_ascent,
|
|
|
769 &data->new_descent, 0, 0, 0);
|
|
|
770 }
|
|
|
771
|
|
|
772 /* No automatically positioned glyphs? Return at once. */
|
|
|
773 if (!data->need_baseline_computation)
|
|
|
774 return;
|
|
|
775
|
|
|
776 /* Is the tallest glyph on the line automatically positioned?
|
|
|
777 If it's manually positioned, or it's automatically positioned
|
|
|
778 and there's enough room for it anyway, we need do no more work. */
|
|
|
779 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
780 {
|
|
|
781 int default_font_ascent, default_font_descent, default_font_height;
|
|
|
782 int scaled_default_font_ascent, scaled_default_font_descent;
|
|
|
783
|
|
|
784 default_face_font_info (data->window, &default_font_ascent,
|
|
|
785 &default_font_descent, &default_font_height,
|
|
|
786 0, 0);
|
|
|
787
|
|
|
788 scaled_default_font_ascent = data->max_pixmap_height *
|
|
|
789 default_font_ascent / default_font_height;
|
|
|
790
|
|
|
791 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
|
|
|
792
|
|
|
793 /* The ascent may have expanded now. Do we still need to grow the descent,
|
|
|
794 or are things big enough?
|
|
|
795
|
|
|
796 The +1 caters for the baseline row itself. */
|
|
|
797 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
|
|
|
798 {
|
|
|
799 scaled_default_font_descent = (data->max_pixmap_height *
|
|
|
800 default_font_descent / default_font_height) + 1;
|
|
|
801
|
|
|
802 data->new_descent = max (data->new_descent, scaled_default_font_descent);
|
|
|
803 }
|
|
|
804 }
|
|
|
805 }
|
|
|
806
|
|
428
|
807 /* Given a display line and a starting position, ensure that the
|
|
|
808 contents of the display line accurately represent the visual
|
|
|
809 representation of the buffer contents starting from the given
|
|
|
810 position when displayed in the given window. The display line ends
|
|
|
811 when the contents of the line reach the right boundary of the given
|
|
|
812 window. */
|
|
|
813
|
|
665
|
814 static Charbpos
|
|
428
|
815 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
665
|
816 Charbpos start_pos, prop_block_dynarr **prop,
|
|
428
|
817 int type)
|
|
|
818 {
|
|
665
|
819 Charbpos ret_charbpos;
|
|
428
|
820 int overlay_width;
|
|
|
821 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
822
|
|
|
823 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
824 if (!bounds)
|
|
|
825 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
826
|
|
|
827 /* Reset what this line is using. */
|
|
|
828 if (dl->display_blocks)
|
|
|
829 Dynarr_reset (dl->display_blocks);
|
|
|
830 if (dl->left_glyphs)
|
|
|
831 {
|
|
|
832 Dynarr_free (dl->left_glyphs);
|
|
|
833 dl->left_glyphs = 0;
|
|
|
834 }
|
|
|
835 if (dl->right_glyphs)
|
|
|
836 {
|
|
|
837 Dynarr_free (dl->right_glyphs);
|
|
|
838 dl->right_glyphs = 0;
|
|
|
839 }
|
|
|
840
|
|
|
841 /* We aren't generating a modeline at the moment. */
|
|
|
842 dl->modeline = 0;
|
|
|
843
|
|
|
844 /* Create a display block for the text region of the line. */
|
|
|
845 {
|
|
|
846 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
665
|
847 Bytebpos hacked_up_bytebpos =
|
|
|
848 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
|
|
428
|
849 prop, type);
|
|
665
|
850 if (hacked_up_bytebpos > BI_BUF_ZV (b))
|
|
|
851 ret_charbpos = BUF_ZV (b) + 1;
|
|
428
|
852 else
|
|
665
|
853 ret_charbpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
|
|
428
|
854 }
|
|
665
|
855 dl->charbpos = start_pos;
|
|
|
856 if (dl->end_charbpos < dl->charbpos)
|
|
|
857 dl->end_charbpos = dl->charbpos;
|
|
428
|
858
|
|
|
859 if (MARKERP (Voverlay_arrow_position)
|
|
|
860 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
861 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
862 && (STRINGP (Voverlay_arrow_string)
|
|
|
863 || GLYPHP (Voverlay_arrow_string)))
|
|
|
864 {
|
|
|
865 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
866 }
|
|
|
867 else
|
|
|
868 overlay_width = 0;
|
|
|
869
|
|
|
870 /* If there are left glyphs associated with any character in the
|
|
|
871 text block, then create a display block to handle them. */
|
|
|
872 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
873 create_left_glyph_block (w, dl, overlay_width);
|
|
|
874
|
|
|
875 /* If there are right glyphs associated with any character in the
|
|
|
876 text block, then create a display block to handle them. */
|
|
|
877 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
878 create_right_glyph_block (w, dl);
|
|
|
879
|
|
|
880 /* In the future additional types of display blocks may be generated
|
|
|
881 here. */
|
|
|
882
|
|
665
|
883 w->last_redisplay_pos = ret_charbpos;
|
|
|
884
|
|
|
885 return ret_charbpos;
|
|
428
|
886 }
|
|
|
887
|
|
|
888 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
889 the block had better be empty.
|
|
|
890
|
|
|
891 Yes, there are multiple places where this function is called but
|
|
|
892 that is the way it has to be. Each calling function has to deal
|
|
|
893 with bi_start_col_enabled a little differently depending on the
|
|
|
894 object being worked with. */
|
|
|
895
|
|
|
896 static prop_block_dynarr *
|
|
|
897 add_hscroll_rune (pos_data *data)
|
|
|
898 {
|
|
|
899 struct glyph_block gb;
|
|
|
900 prop_block_dynarr *retval;
|
|
665
|
901 Bytebpos bi_old_cursor_charbpos = data->bi_cursor_charbpos;
|
|
647
|
902 int old_cursor_type = data->cursor_type;
|
|
665
|
903 Bytebpos bi_old_charbpos = data->bi_charbpos;
|
|
428
|
904
|
|
|
905 if (data->cursor_type == CURSOR_ON
|
|
665
|
906 && data->bi_cursor_charbpos >= data->bi_start_col_enabled
|
|
|
907 && data->bi_cursor_charbpos <= data->bi_charbpos)
|
|
|
908 {
|
|
|
909 data->bi_cursor_charbpos = data->bi_start_col_enabled;
|
|
428
|
910 }
|
|
|
911 else
|
|
|
912 {
|
|
|
913 data->cursor_type = NO_CURSOR;
|
|
|
914 }
|
|
|
915
|
|
665
|
916 data->bi_endpos = data->bi_charbpos;
|
|
|
917 data->bi_charbpos = data->bi_start_col_enabled;
|
|
428
|
918
|
|
|
919 gb.extent = Qnil;
|
|
|
920 gb.glyph = Vhscroll_glyph;
|
|
|
921 {
|
|
|
922 int oldpixpos = data->pixpos;
|
|
442
|
923 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
|
|
428
|
924 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
925 HSCROLL_GLYPH_INDEX));
|
|
|
926 data->hscroll_glyph_width_adjust =
|
|
|
927 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
|
|
|
928 }
|
|
|
929 data->bi_endpos = 0;
|
|
665
|
930 data->bi_cursor_charbpos = bi_old_cursor_charbpos;
|
|
428
|
931 data->cursor_type = old_cursor_type;
|
|
665
|
932 data->bi_charbpos = bi_old_charbpos;
|
|
428
|
933
|
|
|
934 data->bi_start_col_enabled = 0;
|
|
|
935 return retval;
|
|
|
936 }
|
|
|
937
|
|
793
|
938 /* Adds a character rune to a display block. If there is not enough room
|
|
|
939 to fit the rune on the display block (as determined by the MAX_PIXPOS)
|
|
|
940 then it adds nothing and returns ADD_FAILED. If
|
|
|
941 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
|
|
|
942 to affect the total line height. (See add_intbyte_string_runes()). */
|
|
428
|
943
|
|
|
944 static prop_block_dynarr *
|
|
793
|
945 add_emchar_rune_1 (pos_data *data, int no_contribute_to_line_height)
|
|
428
|
946 {
|
|
|
947 struct rune rb, *crb;
|
|
|
948 int width, local;
|
|
|
949
|
|
|
950 if (data->start_col)
|
|
|
951 {
|
|
|
952 data->start_col--;
|
|
|
953
|
|
|
954 if (data->start_col)
|
|
|
955 return NULL;
|
|
|
956 }
|
|
|
957
|
|
|
958 if (data->bi_start_col_enabled)
|
|
|
959 {
|
|
|
960 return add_hscroll_rune (data);
|
|
|
961 }
|
|
|
962
|
|
|
963 if (data->ch == '\n')
|
|
|
964 {
|
|
|
965 data->font_is_bogus = 0;
|
|
|
966 /* Cheesy end-of-line pseudo-character. */
|
|
|
967 width = data->blank_width;
|
|
|
968 }
|
|
|
969 else
|
|
|
970 {
|
|
|
971 Lisp_Object charset = CHAR_CHARSET (data->ch);
|
|
|
972 if (!EQ (charset, data->last_charset) ||
|
|
|
973 data->findex != data->last_findex)
|
|
|
974 {
|
|
|
975 /* OK, we need to do things the hard way. */
|
|
|
976 struct window *w = XWINDOW (data->window);
|
|
|
977 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
978 Lisp_Object font_instance =
|
|
|
979 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
980 charset);
|
|
440
|
981 Lisp_Font_Instance *fi;
|
|
428
|
982
|
|
|
983 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
984 {
|
|
|
985 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
986 data->font_is_bogus = 1;
|
|
|
987 }
|
|
|
988 else
|
|
|
989 data->font_is_bogus = 0;
|
|
|
990
|
|
|
991 fi = XFONT_INSTANCE (font_instance);
|
|
771
|
992 if (!fi->proportional_p || data->font_is_bogus)
|
|
|
993 {
|
|
|
994 Emchar ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
995
|
|
|
996 data->last_char_width =
|
|
|
997 redisplay_text_width_emchar_string (XWINDOW (data->window),
|
|
|
998 data->findex, &ch, 1);
|
|
|
999 }
|
|
428
|
1000 else
|
|
|
1001 data->last_char_width = -1;
|
|
819
|
1002
|
|
793
|
1003 if (!no_contribute_to_line_height)
|
|
|
1004 {
|
|
|
1005 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
|
1006 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
1007 }
|
|
819
|
1008
|
|
428
|
1009 data->last_charset = charset;
|
|
|
1010 data->last_findex = data->findex;
|
|
|
1011 }
|
|
|
1012
|
|
|
1013 width = data->last_char_width;
|
|
771
|
1014 if (width < 0) /* proportional fonts */
|
|
|
1015 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
|
|
|
1016 data->findex,
|
|
|
1017 &data->ch, 1);
|
|
428
|
1018 }
|
|
|
1019
|
|
|
1020 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
1021 {
|
|
|
1022 return ADD_FAILED;
|
|
|
1023 }
|
|
|
1024
|
|
|
1025 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
1026 {
|
|
|
1027 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
1028 local = 0;
|
|
|
1029 }
|
|
|
1030 else
|
|
|
1031 {
|
|
|
1032 crb = &rb;
|
|
|
1033 local = 1;
|
|
|
1034 }
|
|
|
1035
|
|
|
1036 crb->findex = data->findex;
|
|
|
1037 crb->xpos = data->pixpos;
|
|
|
1038 crb->width = width;
|
|
665
|
1039 if (data->bi_charbpos)
|
|
428
|
1040 {
|
|
|
1041 if (NILP (data->string))
|
|
665
|
1042 crb->charbpos =
|
|
793
|
1043 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
|
|
|
1044 (XWINDOW (data->window))),
|
|
|
1045 data->bi_charbpos);
|
|
428
|
1046 else
|
|
665
|
1047 crb->charbpos =
|
|
793
|
1048 string_index_byte_to_char (data->string, data->bi_charbpos);
|
|
428
|
1049 }
|
|
|
1050 else if (data->is_modeline)
|
|
665
|
1051 crb->charbpos = data->modeline_charpos;
|
|
428
|
1052 else
|
|
442
|
1053 /* Text but not in buffer */
|
|
665
|
1054 crb->charbpos = 0;
|
|
428
|
1055 crb->type = RUNE_CHAR;
|
|
|
1056 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
1057 crb->endpos = 0;
|
|
|
1058
|
|
|
1059 if (data->cursor_type == CURSOR_ON)
|
|
|
1060 {
|
|
665
|
1061 if (data->bi_charbpos == data->bi_cursor_charbpos)
|
|
428
|
1062 {
|
|
|
1063 crb->cursor_type = CURSOR_ON;
|
|
|
1064 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1065 }
|
|
|
1066 else
|
|
|
1067 crb->cursor_type = CURSOR_OFF;
|
|
|
1068 }
|
|
|
1069 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1070 {
|
|
|
1071 crb->cursor_type = CURSOR_ON;
|
|
|
1072 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1073 data->cursor_type = NO_CURSOR;
|
|
|
1074 }
|
|
|
1075 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1076 crb->cursor_type = IGNORE_CURSOR;
|
|
|
1077 else
|
|
|
1078 crb->cursor_type = CURSOR_OFF;
|
|
|
1079
|
|
|
1080 if (local)
|
|
|
1081 Dynarr_add (data->db->runes, *crb);
|
|
|
1082 else
|
|
|
1083 Dynarr_increment (data->db->runes);
|
|
|
1084
|
|
|
1085 data->pixpos += width;
|
|
|
1086
|
|
|
1087 return NULL;
|
|
|
1088 }
|
|
|
1089
|
|
793
|
1090 static prop_block_dynarr *
|
|
|
1091 add_emchar_rune (pos_data *data)
|
|
|
1092 {
|
|
|
1093 return add_emchar_rune_1 (data, 0);
|
|
|
1094 }
|
|
|
1095
|
|
|
1096 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune for
|
|
|
1097 each character in the string. Propagate any left-over data unless
|
|
|
1098 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
|
|
|
1099 allow this character to increase the total height of the line. (This is
|
|
|
1100 used when the character is part of a text glyph. In that case, the
|
|
|
1101 glyph code itself adjusts the line height as necessary, depending on
|
|
|
1102 whether glyph-contrib-p is true.) */
|
|
428
|
1103
|
|
|
1104 static prop_block_dynarr *
|
|
665
|
1105 add_intbyte_string_runes (pos_data *data, Intbyte *c_string,
|
|
793
|
1106 Bytecount c_length, int no_prop,
|
|
|
1107 int no_contribute_to_line_height)
|
|
428
|
1108 {
|
|
665
|
1109 Intbyte *pos, *end = c_string + c_length;
|
|
428
|
1110 prop_block_dynarr *prop;
|
|
|
1111
|
|
|
1112 /* #### This function is too simplistic. It needs to do the same
|
|
|
1113 sort of character interpretation (display-table lookup,
|
|
|
1114 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
1115 The functionality to do this in that routine needs to be
|
|
|
1116 modularized. */
|
|
|
1117
|
|
|
1118 for (pos = c_string; pos < end;)
|
|
|
1119 {
|
|
665
|
1120 Intbyte *old_pos = pos;
|
|
464
|
1121
|
|
428
|
1122 data->ch = charptr_emchar (pos);
|
|
|
1123
|
|
793
|
1124 prop = add_emchar_rune_1 (data, no_contribute_to_line_height);
|
|
428
|
1125
|
|
|
1126 if (prop)
|
|
|
1127 {
|
|
|
1128 if (no_prop)
|
|
|
1129 return ADD_FAILED;
|
|
|
1130 else
|
|
|
1131 {
|
|
|
1132 struct prop_block pb;
|
|
|
1133 Bytecount len = end - pos;
|
|
|
1134 prop = Dynarr_new (prop_block);
|
|
|
1135
|
|
|
1136 pb.type = PROP_STRING;
|
|
665
|
1137 pb.data.p_string.str = xnew_array (Intbyte, len);
|
|
428
|
1138 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
1139 pb.data.p_string.len = len;
|
|
|
1140
|
|
|
1141 Dynarr_add (prop, pb);
|
|
|
1142 return prop;
|
|
|
1143 }
|
|
|
1144 }
|
|
|
1145 INC_CHARPTR (pos);
|
|
|
1146 assert (pos <= end);
|
|
464
|
1147 /* #### Duplicate code from add_string_to_fstring_db_runes
|
|
|
1148 should we do more?*/
|
|
|
1149 data->bytepos += pos - old_pos;
|
|
428
|
1150 }
|
|
|
1151
|
|
|
1152 return NULL;
|
|
|
1153 }
|
|
|
1154
|
|
|
1155 /* Add a single rune of the specified width. The area covered by this
|
|
|
1156 rune will be displayed in the foreground color of the associated
|
|
|
1157 face. */
|
|
|
1158
|
|
|
1159 static prop_block_dynarr *
|
|
|
1160 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1161 {
|
|
|
1162 struct rune rb;
|
|
|
1163
|
|
|
1164 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1165 been to add it as a tab. */
|
|
|
1166 if (data->start_col)
|
|
|
1167 {
|
|
|
1168 /* assert (w != NULL) */
|
|
|
1169 prop_block_dynarr *retval;
|
|
|
1170
|
|
|
1171 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1172 the width of this tab and return. */
|
|
|
1173 if (char_tab_width < data->start_col)
|
|
|
1174 {
|
|
|
1175 data->start_col -= char_tab_width;
|
|
|
1176 return NULL;
|
|
|
1177 }
|
|
|
1178 else if (char_tab_width == data->start_col)
|
|
|
1179 data->blank_width = 0;
|
|
|
1180 else
|
|
|
1181 {
|
|
|
1182 int spcwid = space_width (w);
|
|
|
1183
|
|
|
1184 if (spcwid >= data->blank_width)
|
|
|
1185 data->blank_width = 0;
|
|
|
1186 else
|
|
|
1187 data->blank_width -= spcwid;
|
|
|
1188 }
|
|
|
1189
|
|
|
1190 data->start_col = 0;
|
|
|
1191 retval = add_hscroll_rune (data);
|
|
|
1192
|
|
|
1193 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1194 if (retval != NULL || !data->blank_width)
|
|
|
1195 return retval;
|
|
|
1196 }
|
|
|
1197
|
|
|
1198 /* Blank runes are always calculated to fit. */
|
|
|
1199 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1200
|
|
|
1201 rb.findex = data->findex;
|
|
|
1202 rb.xpos = data->pixpos;
|
|
|
1203 rb.width = data->blank_width;
|
|
665
|
1204 if (data->bi_charbpos)
|
|
|
1205 rb.charbpos =
|
|
|
1206 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
|
|
|
1207 data->bi_charbpos);
|
|
428
|
1208 else
|
|
|
1209 /* #### and this is really correct too? */
|
|
665
|
1210 rb.charbpos = 0;
|
|
428
|
1211 rb.endpos = 0;
|
|
|
1212 rb.type = RUNE_BLANK;
|
|
|
1213
|
|
|
1214 if (data->cursor_type == CURSOR_ON)
|
|
|
1215 {
|
|
665
|
1216 if (data->bi_charbpos == data->bi_cursor_charbpos)
|
|
428
|
1217 {
|
|
|
1218 rb.cursor_type = CURSOR_ON;
|
|
|
1219 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1220 }
|
|
|
1221 else
|
|
|
1222 rb.cursor_type = CURSOR_OFF;
|
|
|
1223 }
|
|
|
1224 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1225 {
|
|
|
1226 rb.cursor_type = CURSOR_ON;
|
|
|
1227 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1228 data->cursor_type = NO_CURSOR;
|
|
|
1229 }
|
|
|
1230 else
|
|
|
1231 rb.cursor_type = CURSOR_OFF;
|
|
|
1232
|
|
|
1233 Dynarr_add (data->db->runes, rb);
|
|
|
1234 data->pixpos += data->blank_width;
|
|
|
1235
|
|
|
1236 return NULL;
|
|
|
1237 }
|
|
|
1238
|
|
|
1239 /* Add runes representing a character in octal. */
|
|
|
1240
|
|
|
1241 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1242 { \
|
|
|
1243 if (add_failed || (add_failed = add_emchar_rune (data))) \
|
|
|
1244 { \
|
|
|
1245 struct prop_block pb; \
|
|
|
1246 if (!prop) \
|
|
|
1247 prop = Dynarr_new (prop_block); \
|
|
|
1248 \
|
|
|
1249 pb.type = PROP_CHAR; \
|
|
|
1250 pb.data.p_char.ch = data->ch; \
|
|
|
1251 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1252 Dynarr_add (prop, pb); \
|
|
|
1253 } \
|
|
|
1254 } while (0)
|
|
|
1255
|
|
|
1256 static prop_block_dynarr *
|
|
|
1257 add_octal_runes (pos_data *data)
|
|
|
1258 {
|
|
819
|
1259 prop_block_dynarr *add_failed, *prop = 0;
|
|
428
|
1260 Emchar orig_char = data->ch;
|
|
647
|
1261 int orig_cursor_type = data->cursor_type;
|
|
428
|
1262
|
|
|
1263 /* Initialize */
|
|
|
1264 add_failed = NULL;
|
|
|
1265
|
|
|
1266 if (data->start_col)
|
|
|
1267 data->start_col--;
|
|
|
1268
|
|
|
1269 if (!data->start_col)
|
|
|
1270 {
|
|
|
1271 if (data->bi_start_col_enabled)
|
|
|
1272 {
|
|
|
1273 add_failed = add_hscroll_rune (data);
|
|
|
1274 }
|
|
|
1275 else
|
|
|
1276 {
|
|
|
1277 struct glyph_block gb;
|
|
|
1278 struct window *w = XWINDOW (data->window);
|
|
|
1279
|
|
|
1280 gb.extent = Qnil;
|
|
|
1281 gb.glyph = Voctal_escape_glyph;
|
|
|
1282 add_failed =
|
|
|
1283 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1284 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1285 }
|
|
|
1286 }
|
|
|
1287
|
|
|
1288 /* We only propagate information if the glyph was partially
|
|
|
1289 added. */
|
|
|
1290 if (add_failed)
|
|
|
1291 return add_failed;
|
|
|
1292
|
|
|
1293 data->cursor_type = IGNORE_CURSOR;
|
|
|
1294
|
|
|
1295 if (data->ch >= 0x100)
|
|
|
1296 {
|
|
|
1297 /* If the character is an extended Mule character, it could have
|
|
|
1298 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1299 octal number. This is not that pretty, but whatever. */
|
|
|
1300 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1301 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1302
|
|
|
1303 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1304 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1305
|
|
|
1306 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1307 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1308
|
|
|
1309 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1310 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1311 }
|
|
|
1312
|
|
|
1313 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1314 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1315
|
|
|
1316 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1317 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1318
|
|
|
1319 data->ch = (7 & orig_char) + '0';
|
|
|
1320 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1321
|
|
|
1322 data->cursor_type = orig_cursor_type;
|
|
819
|
1323 return NULL;
|
|
428
|
1324 }
|
|
|
1325
|
|
|
1326 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1327
|
|
|
1328 /* Add runes representing a control character to a display block. */
|
|
|
1329
|
|
|
1330 static prop_block_dynarr *
|
|
|
1331 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1332 {
|
|
|
1333 if (!NILP (b->ctl_arrow))
|
|
|
1334 {
|
|
|
1335 prop_block_dynarr *prop;
|
|
|
1336 Emchar orig_char = data->ch;
|
|
647
|
1337 int old_cursor_type = data->cursor_type;
|
|
428
|
1338
|
|
|
1339 /* Initialize */
|
|
|
1340 prop = NULL;
|
|
|
1341
|
|
|
1342 if (data->start_col)
|
|
|
1343 data->start_col--;
|
|
|
1344
|
|
|
1345 if (!data->start_col)
|
|
|
1346 {
|
|
|
1347 if (data->bi_start_col_enabled)
|
|
|
1348 {
|
|
|
1349 prop_block_dynarr *retval;
|
|
|
1350
|
|
|
1351 retval = add_hscroll_rune (data);
|
|
|
1352 if (retval)
|
|
|
1353 return retval;
|
|
|
1354 }
|
|
|
1355 else
|
|
|
1356 {
|
|
|
1357 struct glyph_block gb;
|
|
|
1358 struct window *w = XWINDOW (data->window);
|
|
|
1359
|
|
|
1360 gb.extent = Qnil;
|
|
|
1361 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1362
|
|
|
1363 /* We only propagate information if the glyph was partially
|
|
|
1364 added. */
|
|
|
1365 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1366 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1367 return ADD_FAILED;
|
|
|
1368 }
|
|
|
1369 }
|
|
|
1370
|
|
|
1371 if (orig_char == 0177)
|
|
|
1372 data->ch = '?';
|
|
|
1373 else
|
|
|
1374 data->ch = orig_char ^ 0100;
|
|
|
1375 data->cursor_type = IGNORE_CURSOR;
|
|
|
1376
|
|
|
1377 if (add_emchar_rune (data))
|
|
|
1378 {
|
|
|
1379 struct prop_block pb;
|
|
|
1380 if (!prop)
|
|
|
1381 prop = Dynarr_new (prop_block);
|
|
|
1382
|
|
|
1383 pb.type = PROP_CHAR;
|
|
|
1384 pb.data.p_char.ch = data->ch;
|
|
|
1385 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1386 Dynarr_add (prop, pb);
|
|
|
1387 }
|
|
|
1388
|
|
|
1389 data->cursor_type = old_cursor_type;
|
|
|
1390 return prop;
|
|
|
1391 }
|
|
|
1392 else
|
|
|
1393 {
|
|
|
1394 return add_octal_runes (data);
|
|
|
1395 }
|
|
|
1396 }
|
|
|
1397
|
|
|
1398 static prop_block_dynarr *
|
|
|
1399 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
|
|
|
1400 {
|
|
|
1401 prop_block_dynarr *prop = NULL;
|
|
|
1402
|
|
|
1403 if (STRINGP (entry))
|
|
|
1404 {
|
|
665
|
1405 prop = add_intbyte_string_runes (data,
|
|
428
|
1406 XSTRING_DATA (entry),
|
|
|
1407 XSTRING_LENGTH (entry),
|
|
793
|
1408 0, 0);
|
|
428
|
1409 }
|
|
|
1410 else if (GLYPHP (entry))
|
|
|
1411 {
|
|
|
1412 if (data->start_col)
|
|
|
1413 data->start_col--;
|
|
|
1414
|
|
|
1415 if (!data->start_col && data->bi_start_col_enabled)
|
|
|
1416 {
|
|
|
1417 prop = add_hscroll_rune (data);
|
|
|
1418 }
|
|
|
1419 else
|
|
|
1420 {
|
|
|
1421 struct glyph_block gb;
|
|
|
1422
|
|
|
1423 gb.glyph = entry;
|
|
|
1424 gb.extent = Qnil;
|
|
|
1425 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1426 }
|
|
|
1427 }
|
|
|
1428 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1429 {
|
|
|
1430 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
|
1431 prop = add_emchar_rune (data);
|
|
|
1432 }
|
|
|
1433 else if (CONSP (entry))
|
|
|
1434 {
|
|
|
1435 if (EQ (XCAR (entry), Qformat)
|
|
|
1436 && CONSP (XCDR (entry))
|
|
|
1437 && STRINGP (XCAR (XCDR (entry))))
|
|
|
1438 {
|
|
|
1439 Lisp_Object format = XCAR (XCDR (entry));
|
|
665
|
1440 Bytebpos len = XSTRING_LENGTH (format);
|
|
|
1441 Intbyte *src = XSTRING_DATA (format), *end = src + len;
|
|
|
1442 Intbyte *result = alloca_array (Intbyte, len);
|
|
|
1443 Intbyte *dst = result;
|
|
428
|
1444
|
|
|
1445 while (src < end)
|
|
|
1446 {
|
|
|
1447 Emchar c = charptr_emchar (src);
|
|
|
1448 INC_CHARPTR (src);
|
|
|
1449 if (c != '%' || src == end)
|
|
|
1450 dst += set_charptr_emchar (dst, c);
|
|
|
1451 else
|
|
|
1452 {
|
|
|
1453 c = charptr_emchar (src);
|
|
|
1454 INC_CHARPTR (src);
|
|
|
1455 switch (c)
|
|
|
1456 {
|
|
|
1457 /*case 'x':
|
|
|
1458 dst += long_to_string_base ((char *)dst, data->ch, 16);
|
|
|
1459 break;*/
|
|
|
1460 case '%':
|
|
|
1461 dst += set_charptr_emchar (dst, '%');
|
|
|
1462 break;
|
|
442
|
1463 /* #### unimplemented */
|
|
428
|
1464 }
|
|
|
1465 }
|
|
|
1466 }
|
|
793
|
1467 prop = add_intbyte_string_runes (data, result, dst - result, 0, 0);
|
|
428
|
1468 }
|
|
|
1469 }
|
|
|
1470
|
|
|
1471 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1472 have any safe way of signaling an error. */
|
|
|
1473 return prop;
|
|
|
1474 }
|
|
|
1475
|
|
|
1476 /* Given a display table entry, call the appropriate functions to
|
|
|
1477 display each element of the entry. */
|
|
|
1478
|
|
|
1479 static prop_block_dynarr *
|
|
|
1480 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1481 {
|
|
|
1482 prop_block_dynarr *prop = NULL;
|
|
|
1483 if (VECTORP (entry))
|
|
|
1484 {
|
|
440
|
1485 Lisp_Vector *de = XVECTOR (entry);
|
|
428
|
1486 EMACS_INT len = vector_length (de);
|
|
|
1487 int elt;
|
|
|
1488
|
|
|
1489 for (elt = 0; elt < len; elt++)
|
|
|
1490 {
|
|
|
1491 if (NILP (vector_data (de)[elt]))
|
|
|
1492 continue;
|
|
|
1493 else
|
|
|
1494 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
|
|
|
1495 /* Else blow it off because someone added a bad entry and we
|
|
|
1496 don't have any safe way of signaling an error. Hey, this
|
|
|
1497 comment sounds familiar. */
|
|
|
1498
|
|
|
1499 /* #### Still need to add any remaining elements to the
|
|
|
1500 propagation information. */
|
|
|
1501 if (prop)
|
|
|
1502 return prop;
|
|
|
1503 }
|
|
|
1504 }
|
|
|
1505 else
|
|
|
1506 prop = add_disp_table_entry_runes_1 (data, entry);
|
|
|
1507 return prop;
|
|
|
1508 }
|
|
|
1509
|
|
|
1510 /* Add runes which were propagated from the previous line. */
|
|
|
1511
|
|
|
1512 static prop_block_dynarr *
|
|
|
1513 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1514 {
|
|
|
1515 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1516 this is finished. */
|
|
|
1517 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1518 case of not all the propagation blocks being added was not handled
|
|
|
1519 well. */
|
|
|
1520 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1521 of bogus. A cleaner solution is just to check for
|
|
|
1522 Dynarr_length (prop) > 0. */
|
|
|
1523 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1524 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1525 record? */
|
|
|
1526 int elt;
|
|
|
1527 prop_block_dynarr *add_failed;
|
|
665
|
1528 Bytebpos bi_old_cursor_charbpos = data->bi_cursor_charbpos;
|
|
647
|
1529 int old_cursor_type = data->cursor_type;
|
|
428
|
1530
|
|
|
1531 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1532 {
|
|
|
1533 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1534
|
|
|
1535 switch (pb->type)
|
|
|
1536 {
|
|
|
1537 case PROP_CHAR:
|
|
|
1538 data->ch = pb->data.p_char.ch;
|
|
665
|
1539 data->bi_cursor_charbpos = pb->data.p_char.bi_cursor_charbpos;
|
|
428
|
1540 data->cursor_type = pb->data.p_char.cursor_type;
|
|
|
1541 add_failed = add_emchar_rune (data);
|
|
|
1542
|
|
|
1543 if (add_failed)
|
|
|
1544 goto oops_no_more_space;
|
|
|
1545 break;
|
|
|
1546 case PROP_STRING:
|
|
|
1547 if (pb->data.p_string.str)
|
|
|
1548 xfree (pb->data.p_string.str);
|
|
|
1549 /* #### bogus bogus -- this doesn't do anything!
|
|
665
|
1550 Should probably call add_intbyte_string_runes(),
|
|
428
|
1551 once that function is fixed. */
|
|
|
1552 break;
|
|
|
1553 case PROP_MINIBUF_PROMPT:
|
|
|
1554 {
|
|
|
1555 face_index old_findex = data->findex;
|
|
665
|
1556 Bytebpos bi_old_charbpos = data->bi_charbpos;
|
|
428
|
1557
|
|
|
1558 data->findex = DEFAULT_INDEX;
|
|
665
|
1559 data->bi_charbpos = 0;
|
|
428
|
1560 data->cursor_type = NO_CURSOR;
|
|
|
1561
|
|
|
1562 while (pb->data.p_string.len > 0)
|
|
|
1563 {
|
|
|
1564 data->ch = charptr_emchar (pb->data.p_string.str);
|
|
|
1565 add_failed = add_emchar_rune (data);
|
|
|
1566
|
|
|
1567 if (add_failed)
|
|
|
1568 {
|
|
|
1569 data->findex = old_findex;
|
|
665
|
1570 data->bi_charbpos = bi_old_charbpos;
|
|
428
|
1571 goto oops_no_more_space;
|
|
|
1572 }
|
|
|
1573 else
|
|
|
1574 {
|
|
|
1575 /* Complicated equivalent of ptr++, len-- */
|
|
665
|
1576 Intbyte *oldpos = pb->data.p_string.str;
|
|
428
|
1577 INC_CHARPTR (pb->data.p_string.str);
|
|
|
1578 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1579 }
|
|
|
1580 }
|
|
|
1581
|
|
|
1582 data->findex = old_findex;
|
|
|
1583 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
665
|
1584 this function, data->bi_charbpos is automatically incremented.
|
|
428
|
1585 However, we don't want that to happen if we were adding
|
|
|
1586 the minibuffer prompt. */
|
|
|
1587 {
|
|
|
1588 struct buffer *buf =
|
|
|
1589 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1590 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
665
|
1591 if (bi_old_charbpos > BI_BUF_BEGV (buf))
|
|
|
1592 data->bi_charbpos = prev_bytebpos (buf, bi_old_charbpos);
|
|
428
|
1593 else
|
|
|
1594 /* #### is this correct? Does anyone know?
|
|
|
1595 Does anyone care? Is this a cheesy hack or what? */
|
|
665
|
1596 data->bi_charbpos = BI_BUF_BEGV (buf) - 1;
|
|
428
|
1597 }
|
|
|
1598 }
|
|
|
1599 break;
|
|
|
1600 case PROP_BLANK:
|
|
|
1601 {
|
|
|
1602 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1603 the blank_width, as it implies that the value carries
|
|
|
1604 over from one rune to the next, which is wrong. */
|
|
|
1605 int old_width = data->blank_width;
|
|
|
1606 face_index old_findex = data->findex;
|
|
|
1607
|
|
|
1608 data->findex = pb->data.p_blank.findex;
|
|
|
1609 data->blank_width = pb->data.p_blank.width;
|
|
665
|
1610 data->bi_cursor_charbpos = 0;
|
|
428
|
1611 data->cursor_type = IGNORE_CURSOR;
|
|
|
1612
|
|
|
1613 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1614 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1615
|
|
|
1616 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1617 matter because unless something is really screwed up
|
|
|
1618 this call won't cause that arg to be used. */
|
|
|
1619 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1620
|
|
|
1621 /* This can happen in the case where we have a tab which
|
|
|
1622 is wider than the window. */
|
|
|
1623 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1624 {
|
|
|
1625 pb->data.p_blank.width -= data->blank_width;
|
|
|
1626 add_failed = ADD_FAILED;
|
|
|
1627 }
|
|
|
1628
|
|
|
1629 data->findex = old_findex;
|
|
|
1630 data->blank_width = old_width;
|
|
|
1631
|
|
|
1632 if (add_failed)
|
|
|
1633 goto oops_no_more_space;
|
|
|
1634 }
|
|
|
1635 break;
|
|
|
1636 default:
|
|
|
1637 abort ();
|
|
|
1638 }
|
|
|
1639 }
|
|
|
1640
|
|
|
1641 oops_no_more_space:
|
|
|
1642
|
|
665
|
1643 data->bi_cursor_charbpos = bi_old_cursor_charbpos;
|
|
428
|
1644 data->cursor_type = old_cursor_type;
|
|
|
1645 if (elt < Dynarr_length (*prop))
|
|
|
1646 {
|
|
|
1647 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1648 return *prop;
|
|
|
1649 }
|
|
|
1650 else
|
|
|
1651 {
|
|
|
1652 Dynarr_free (*prop);
|
|
|
1653 return NULL;
|
|
|
1654 }
|
|
|
1655 }
|
|
|
1656
|
|
|
1657 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1658 the display block, but add all other types to the appropriate list
|
|
|
1659 of the display line. They will be added later by different
|
|
|
1660 routines. */
|
|
|
1661
|
|
|
1662 static prop_block_dynarr *
|
|
|
1663 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1664 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1665 {
|
|
|
1666 struct window *w = XWINDOW (data->window);
|
|
|
1667
|
|
440
|
1668 /* If window faces changed, and glyph instance is text, then
|
|
|
1669 glyph sizes might have changed too */
|
|
|
1670 invalidate_glyph_geometry_maybe (gb->glyph, w);
|
|
|
1671
|
|
442
|
1672 /* This makes sure the glyph is in the cachels.
|
|
|
1673
|
|
|
1674 #### We do this to make sure the glyph is in the glyph cachels,
|
|
|
1675 so that the dirty flag can be reset after redisplay has
|
|
|
1676 finished. We should do this some other way, maybe by iterating
|
|
|
1677 over the window cache of subwindows. */
|
|
|
1678 get_glyph_cachel_index (w, gb->glyph);
|
|
|
1679
|
|
428
|
1680 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1681 if (NILP (gb->extent)
|
|
|
1682 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1683 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1684 || (pos_type == END_GLYPHS &&
|
|
442
|
1685 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1686 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
|
|
428
|
1687 {
|
|
|
1688 struct rune rb;
|
|
|
1689 int width;
|
|
|
1690 int xoffset = 0;
|
|
|
1691 int ascent, descent;
|
|
|
1692 Lisp_Object baseline;
|
|
|
1693 Lisp_Object face;
|
|
442
|
1694 Lisp_Object instance;
|
|
|
1695 face_index findex;
|
|
819
|
1696 prop_block_dynarr *retval = 0;
|
|
428
|
1697
|
|
|
1698 if (cachel)
|
|
|
1699 width = cachel->width;
|
|
|
1700 else
|
|
438
|
1701 width = glyph_width (gb->glyph, data->window);
|
|
428
|
1702
|
|
|
1703 if (!width)
|
|
|
1704 return NULL;
|
|
|
1705
|
|
|
1706 if (data->start_col || data->start_col_xoffset)
|
|
|
1707 {
|
|
|
1708 int glyph_char_width = width / space_width (w);
|
|
|
1709
|
|
|
1710 /* If we still have not fully scrolled horizontally after
|
|
|
1711 taking into account the width of the glyph, subtract its
|
|
|
1712 width and return. */
|
|
|
1713 if (glyph_char_width < data->start_col)
|
|
|
1714 {
|
|
|
1715 data->start_col -= glyph_char_width;
|
|
|
1716 return NULL;
|
|
|
1717 }
|
|
|
1718 else if (glyph_char_width == data->start_col)
|
|
|
1719 width = 0;
|
|
|
1720 else
|
|
|
1721 {
|
|
|
1722 xoffset = space_width (w) * data->start_col;
|
|
|
1723 width -= xoffset;
|
|
|
1724
|
|
|
1725 /* #### Can this happen? */
|
|
|
1726 if (width < 0)
|
|
|
1727 width = 0;
|
|
|
1728 }
|
|
|
1729
|
|
|
1730 data->start_col = 0;
|
|
|
1731 retval = add_hscroll_rune (data);
|
|
|
1732
|
|
|
1733 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1734 if (retval != NULL || !width)
|
|
|
1735 return retval;
|
|
|
1736 }
|
|
|
1737 else
|
|
|
1738 xoffset = 0;
|
|
|
1739
|
|
|
1740 if (data->pixpos + width > data->max_pixpos)
|
|
|
1741 {
|
|
|
1742 /* If this is the first object we are attempting to add to
|
|
819
|
1743 the line then we ignore the horizontal_clip threshold.
|
|
|
1744 Otherwise we will loop until the bottom of the window
|
|
|
1745 continually failing to add this glyph because it is wider
|
|
|
1746 than the window. We could alternatively just completely
|
|
|
1747 ignore the glyph and proceed from there but I think that
|
|
|
1748 this is a better solution.
|
|
|
1749
|
|
|
1750 This does, however, create a different problem in that we
|
|
|
1751 can end up adding the object to every single line, never
|
|
|
1752 getting any further - for instance an extent with a long
|
|
|
1753 start-glyph that covers multitple following
|
|
|
1754 characters. */
|
|
428
|
1755 if (Dynarr_length (data->db->runes)
|
|
|
1756 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1757 return ADD_FAILED;
|
|
819
|
1758 else {
|
|
|
1759 struct prop_block pb;
|
|
|
1760
|
|
|
1761 /* We need to account for the width of the end-of-line
|
|
|
1762 glyph if there is nothing more in the line to display,
|
|
|
1763 since we will not display it in this instance. It seems
|
|
|
1764 kind of gross doing it here, but otherwise we have to
|
|
|
1765 search the runes in create_text_block(). */
|
|
|
1766 if (data->ch == '\n')
|
|
|
1767 data->max_pixpos += data->end_glyph_width;
|
|
428
|
1768 width = data->max_pixpos - data->pixpos;
|
|
819
|
1769 /* Add the glyph we are displaying, but clipping, to the
|
|
|
1770 propagation data so that we don't try and do it
|
|
|
1771 again. */
|
|
|
1772 retval = Dynarr_new (prop_block);
|
|
|
1773 pb.type = PROP_GLYPH;
|
|
|
1774 pb.data.p_glyph.glyph = gb->glyph;
|
|
|
1775 pb.data.p_glyph.width = width;
|
|
|
1776 Dynarr_add (retval, pb);
|
|
|
1777 }
|
|
428
|
1778 }
|
|
|
1779
|
|
|
1780 if (cachel)
|
|
|
1781 {
|
|
|
1782 ascent = cachel->ascent;
|
|
|
1783 descent = cachel->descent;
|
|
|
1784 }
|
|
|
1785 else
|
|
|
1786 {
|
|
438
|
1787 ascent = glyph_ascent (gb->glyph, data->window);
|
|
|
1788 descent = glyph_descent (gb->glyph, data->window);
|
|
428
|
1789 }
|
|
|
1790
|
|
|
1791 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1792
|
|
819
|
1793 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
|
|
|
1794
|
|
428
|
1795 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1796 {
|
|
|
1797 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1798 contribution will be determined later. */
|
|
|
1799 if (NILP (baseline))
|
|
|
1800 {
|
|
|
1801 int height = ascent + descent;
|
|
819
|
1802 data->need_baseline_computation = 1;
|
|
428
|
1803 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1804 }
|
|
|
1805
|
|
|
1806 /* A string so determine contribution normally. */
|
|
|
1807 else if (EQ (baseline, Qt))
|
|
|
1808 {
|
|
|
1809 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1810 data->new_descent = max (data->new_descent, descent);
|
|
|
1811 }
|
|
|
1812
|
|
|
1813 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1814 contribution here. */
|
|
|
1815 else if (INTP (baseline))
|
|
|
1816 {
|
|
|
1817 int height = ascent + descent;
|
|
|
1818 int pix_ascent, pix_descent;
|
|
|
1819
|
|
|
1820 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1821 pix_descent = height - pix_ascent;
|
|
|
1822
|
|
|
1823 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1824 data->new_descent = max (data->new_descent, pix_descent);
|
|
819
|
1825 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1826
|
|
|
1827 rb.object.dglyph.descent = pix_descent;
|
|
428
|
1828 }
|
|
|
1829
|
|
|
1830 /* Otherwise something is screwed up. */
|
|
|
1831 else
|
|
|
1832 abort ();
|
|
|
1833 }
|
|
|
1834
|
|
|
1835 face = glyph_face (gb->glyph, data->window);
|
|
|
1836 if (NILP (face))
|
|
442
|
1837 findex = data->findex;
|
|
428
|
1838 else
|
|
442
|
1839 findex = get_builtin_face_cache_index (w, face);
|
|
|
1840
|
|
|
1841 instance = glyph_image_instance (gb->glyph, data->window,
|
|
793
|
1842 ERROR_ME_DEBUG_WARN, 1);
|
|
442
|
1843 if (TEXT_IMAGE_INSTANCEP (instance))
|
|
|
1844 {
|
|
|
1845 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
|
|
|
1846 face_index orig_findex = data->findex;
|
|
665
|
1847 Bytebpos orig_charbpos = data->bi_charbpos;
|
|
|
1848 Bytebpos orig_start_col_enabled = data->bi_start_col_enabled;
|
|
442
|
1849
|
|
|
1850 data->findex = findex;
|
|
|
1851 data->bi_start_col_enabled = 0;
|
|
|
1852 if (!allow_cursor)
|
|
665
|
1853 data->bi_charbpos = 0;
|
|
|
1854 add_intbyte_string_runes (data, XSTRING_DATA (string),
|
|
793
|
1855 XSTRING_LENGTH (string), 0, 1);
|
|
442
|
1856 data->findex = orig_findex;
|
|
665
|
1857 data->bi_charbpos = orig_charbpos;
|
|
442
|
1858 data->bi_start_col_enabled = orig_start_col_enabled;
|
|
819
|
1859 return retval;
|
|
442
|
1860 }
|
|
|
1861
|
|
|
1862 rb.findex = findex;
|
|
428
|
1863 rb.xpos = data->pixpos;
|
|
|
1864 rb.width = width;
|
|
665
|
1865 rb.charbpos = 0; /* glyphs are never "at" anywhere */
|
|
428
|
1866 if (data->bi_endpos)
|
|
|
1867 /* #### is this necessary at all? */
|
|
665
|
1868 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
428
|
1869 data->bi_endpos);
|
|
|
1870 else
|
|
|
1871 rb.endpos = 0;
|
|
|
1872 rb.type = RUNE_DGLYPH;
|
|
|
1873 rb.object.dglyph.glyph = gb->glyph;
|
|
|
1874 rb.object.dglyph.extent = gb->extent;
|
|
|
1875 rb.object.dglyph.xoffset = xoffset;
|
|
819
|
1876 rb.object.dglyph.ascent = ascent;
|
|
|
1877 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
|
|
|
1878 a normal (textual) baseline. */
|
|
428
|
1879
|
|
|
1880 if (allow_cursor)
|
|
|
1881 {
|
|
665
|
1882 rb.charbpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
|
|
|
1883 data->bi_charbpos);
|
|
428
|
1884
|
|
|
1885 if (data->cursor_type == CURSOR_ON)
|
|
|
1886 {
|
|
665
|
1887 if (data->bi_charbpos == data->bi_cursor_charbpos)
|
|
428
|
1888 {
|
|
|
1889 rb.cursor_type = CURSOR_ON;
|
|
|
1890 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1891 }
|
|
|
1892 else
|
|
|
1893 rb.cursor_type = CURSOR_OFF;
|
|
|
1894 }
|
|
|
1895 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1896 {
|
|
|
1897 rb.cursor_type = CURSOR_ON;
|
|
|
1898 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1899 data->cursor_type = NO_CURSOR;
|
|
|
1900 }
|
|
|
1901 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1902 rb.cursor_type = IGNORE_CURSOR;
|
|
|
1903 else if (data->cursor_type == NO_CURSOR)
|
|
|
1904 rb.cursor_type = NO_CURSOR;
|
|
|
1905 else
|
|
|
1906 rb.cursor_type = CURSOR_OFF;
|
|
|
1907 }
|
|
|
1908 else
|
|
|
1909 rb.cursor_type = CURSOR_OFF;
|
|
|
1910
|
|
|
1911 Dynarr_add (data->db->runes, rb);
|
|
|
1912 data->pixpos += width;
|
|
|
1913
|
|
819
|
1914 return retval;
|
|
428
|
1915 }
|
|
|
1916 else
|
|
|
1917 {
|
|
|
1918 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
1919 gb->findex =
|
|
|
1920 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
1921 data->window));
|
|
|
1922 else
|
|
|
1923 gb->findex = data->findex;
|
|
|
1924
|
|
|
1925 if (pos_type == BEGIN_GLYPHS)
|
|
|
1926 {
|
|
|
1927 if (!data->dl->left_glyphs)
|
|
|
1928 data->dl->left_glyphs = Dynarr_new (glyph_block);
|
|
|
1929 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
1930 return NULL;
|
|
|
1931 }
|
|
|
1932 else if (pos_type == END_GLYPHS)
|
|
|
1933 {
|
|
|
1934 if (!data->dl->right_glyphs)
|
|
|
1935 data->dl->right_glyphs = Dynarr_new (glyph_block);
|
|
|
1936 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
1937 return NULL;
|
|
|
1938 }
|
|
|
1939 else
|
|
|
1940 abort (); /* there are no unknown types */
|
|
|
1941 }
|
|
|
1942
|
|
819
|
1943 return NULL;
|
|
428
|
1944 }
|
|
|
1945
|
|
|
1946 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
1947 data. */
|
|
|
1948
|
|
|
1949 static prop_block_dynarr *
|
|
|
1950 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
1951 {
|
|
|
1952 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
1953 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
1954 int elt;
|
|
|
1955 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
1956 ? data->ef->begin_glyphs
|
|
|
1957 : data->ef->end_glyphs);
|
|
|
1958 prop_block_dynarr *prop;
|
|
|
1959
|
|
|
1960 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
1961 {
|
|
|
1962 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
1963 0);
|
|
|
1964
|
|
|
1965 if (prop)
|
|
|
1966 {
|
|
|
1967 /* #### Add some propagation information. */
|
|
|
1968 return prop;
|
|
|
1969 }
|
|
|
1970 }
|
|
|
1971
|
|
|
1972 Dynarr_reset (glyph_arr);
|
|
|
1973
|
|
|
1974 return NULL;
|
|
|
1975 }
|
|
|
1976
|
|
|
1977 /* Given a position for a buffer in a window, ensure that the given
|
|
|
1978 display line DL accurately represents the text on a line starting
|
|
|
1979 at the given position.
|
|
|
1980
|
|
665
|
1981 NOTE NOTE NOTE NOTE: This function works with and returns Bytebposs.
|
|
428
|
1982 You must do appropriate conversion. */
|
|
|
1983
|
|
665
|
1984 static Bytebpos
|
|
428
|
1985 create_text_block (struct window *w, struct display_line *dl,
|
|
665
|
1986 Bytebpos bi_start_pos, prop_block_dynarr **prop,
|
|
428
|
1987 int type)
|
|
|
1988 {
|
|
|
1989 struct frame *f = XFRAME (w->frame);
|
|
|
1990 struct buffer *b = XBUFFER (w->buffer);
|
|
|
1991 struct device *d = XDEVICE (f->device);
|
|
|
1992
|
|
|
1993 pos_data data;
|
|
|
1994
|
|
|
1995 /* Don't display anything in the minibuffer if this window is not on
|
|
|
1996 a selected frame. We consider all other windows to be active
|
|
|
1997 minibuffers as it simplifies the coding. */
|
|
|
1998 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
1999 (f == device_selected_frame (d)) ||
|
|
|
2000 is_surrogate_for_selected_frame (f));
|
|
|
2001
|
|
|
2002 int truncate_win = window_truncation_on (w);
|
|
|
2003
|
|
|
2004 /* If the buffer's value of selective_display is an integer then
|
|
|
2005 only lines that start with less than selective_display columns of
|
|
|
2006 space will be displayed. If selective_display is t then all text
|
|
|
2007 after a ^M is invisible. */
|
|
|
2008 int selective = (INTP (b->selective_display)
|
|
|
2009 ? XINT (b->selective_display)
|
|
434
|
2010 : (!NILP (b->selective_display) ? -1 : 0));
|
|
428
|
2011
|
|
|
2012 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
2013 can actually be displayed and which octal should be used for.
|
|
|
2014 #### This variable should probably have some rethought done to
|
|
|
2015 it.
|
|
|
2016
|
|
|
2017 #### It would also be really nice if you could specify that
|
|
|
2018 the characters come out in hex instead of in octal. Mule
|
|
|
2019 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
2020 but that's bogus -- we need a more general solution. I
|
|
|
2021 think you need to extend the concept of display tables
|
|
|
2022 into a more general conversion mechanism. Ideally you
|
|
|
2023 could specify a Lisp function that converts characters,
|
|
|
2024 but this violates the Second Golden Rule and besides would
|
|
|
2025 make things way way way way slow.
|
|
|
2026
|
|
|
2027 So instead, we extend the display-table concept, which was
|
|
|
2028 historically limited to 256-byte vectors, to one of the
|
|
|
2029 following:
|
|
|
2030
|
|
|
2031 a) A 256-entry vector, for backward compatibility;
|
|
|
2032 b) char-table, mapping characters to values;
|
|
|
2033 c) range-table, mapping ranges of characters to values;
|
|
|
2034 d) a list of the above.
|
|
|
2035
|
|
|
2036 The (d) option allows you to specify multiple display tables
|
|
|
2037 instead of just one. Each display table can specify conversions
|
|
|
2038 for some characters and leave others unchanged. The way the
|
|
|
2039 character gets displayed is determined by the first display table
|
|
|
2040 with a binding for that character. This way, you could call a
|
|
|
2041 function `enable-hex-display' that adds a hex display-table to
|
|
|
2042 the list of display tables for the current buffer.
|
|
|
2043
|
|
|
2044 #### ...not yet implemented... Also, we extend the concept of
|
|
|
2045 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
2046 extended characters show up as hex with a display table like
|
|
|
2047 this:
|
|
|
2048
|
|
|
2049 #s(range-table data ((256 524288) (format "%x")))
|
|
|
2050
|
|
|
2051 Since more than one display table is possible, you have
|
|
|
2052 great flexibility in mapping ranges of characters. */
|
|
|
2053 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
|
2054 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
2055 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
2056 ? 255 : 160));
|
|
|
2057
|
|
|
2058 Lisp_Object face_dt, window_dt;
|
|
|
2059
|
|
|
2060 /* The text display block for this display line. */
|
|
|
2061 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
2062
|
|
|
2063 /* The first time through the main loop we need to force the glyph
|
|
|
2064 data to be updated. */
|
|
|
2065 int initial = 1;
|
|
|
2066
|
|
|
2067 /* Apparently the new extent_fragment_update returns an end position
|
|
|
2068 equal to the position passed in if there are no more runs to be
|
|
|
2069 displayed. */
|
|
|
2070 int no_more_frags = 0;
|
|
|
2071
|
|
|
2072 Lisp_Object synch_minibuffers_value =
|
|
|
2073 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
2074
|
|
|
2075 dl->used_prop_data = 0;
|
|
|
2076 dl->num_chars = 0;
|
|
442
|
2077 dl->line_continuation = 0;
|
|
428
|
2078
|
|
|
2079 xzero (data);
|
|
|
2080 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
2081
|
|
|
2082 /* These values are used by all of the rune addition routines. We add
|
|
|
2083 them to this structure for ease of passing. */
|
|
|
2084 data.d = d;
|
|
793
|
2085 data.window = wrap_window (w);
|
|
428
|
2086 data.string = Qnil;
|
|
|
2087 data.db = db;
|
|
|
2088 data.dl = dl;
|
|
|
2089
|
|
665
|
2090 data.bi_charbpos = bi_start_pos;
|
|
428
|
2091 data.pixpos = dl->bounds.left_in;
|
|
|
2092 data.last_charset = Qunbound;
|
|
|
2093 data.last_findex = DEFAULT_INDEX;
|
|
|
2094 data.result_str = Qnil;
|
|
|
2095
|
|
|
2096 /* Set the right boundary adjusting it to take into account any end
|
|
|
2097 glyph. Save the width of the end glyph for later use. */
|
|
|
2098 data.max_pixpos = dl->bounds.right_in;
|
|
|
2099 if (truncate_win)
|
|
819
|
2100 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
428
|
2101 else
|
|
819
|
2102 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
2103 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
2104
|
|
|
2105 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
2106 {
|
|
665
|
2107 data.bi_cursor_charbpos = BI_BUF_ZV (b);
|
|
428
|
2108 data.cursor_type = CURSOR_ON;
|
|
|
2109 }
|
|
|
2110 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
2111 data.cursor_type = NO_CURSOR;
|
|
|
2112 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
|
|
|
2113 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
2114 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
|
|
|
2115 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
|
|
|
2116 {
|
|
665
|
2117 data.bi_cursor_charbpos = BI_BUF_PT (b);
|
|
428
|
2118 data.cursor_type = CURSOR_ON;
|
|
|
2119 }
|
|
|
2120 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
2121 {
|
|
665
|
2122 data.bi_cursor_charbpos = bi_marker_position (w->pointm[type]);
|
|
428
|
2123 data.cursor_type = CURSOR_ON;
|
|
|
2124 }
|
|
|
2125 else
|
|
|
2126 data.cursor_type = NO_CURSOR;
|
|
|
2127 data.cursor_x = -1;
|
|
|
2128
|
|
|
2129 data.start_col = w->hscroll;
|
|
|
2130 data.start_col_xoffset = w->left_xoffset;
|
|
|
2131 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
|
|
|
2132 data.hscroll_glyph_width_adjust = 0;
|
|
|
2133
|
|
|
2134 /* We regenerate the line from the very beginning. */
|
|
|
2135 Dynarr_reset (db->runes);
|
|
|
2136
|
|
|
2137 /* Why is this less than or equal and not just less than? If the
|
|
|
2138 starting position is already equal to the maximum we can't add
|
|
|
2139 anything else, right? Wrong. We might still have a newline to
|
|
|
2140 add. A newline can use the room allocated for an end glyph since
|
|
|
2141 if we add it we know we aren't going to be adding any end
|
|
|
2142 glyph. */
|
|
|
2143
|
|
|
2144 /* #### Chuck -- I think this condition should be while (1).
|
|
|
2145 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
2146 and the begin-glyph ends exactly at the end of the window, the
|
|
|
2147 end-glyph and text might not be displayed. while (1) ensures
|
|
|
2148 that the loop terminates only when either (a) there is
|
|
|
2149 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
2150
|
|
|
2151 #### Also I think you need to ensure that the operation
|
|
|
2152 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
2153 can't get interrupted in the middle. If you run off the end
|
|
|
2154 of the line during that operation, then you keep accumulating
|
|
|
2155 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
2156 there's a begin glyph at a particular position and attempting
|
|
|
2157 to display that glyph results in window-end being hit and
|
|
|
2158 propagation data being generated, then the character at that
|
|
|
2159 position won't be displayed.
|
|
|
2160
|
|
|
2161 #### See also the comment after the end of this loop, below.
|
|
|
2162 */
|
|
|
2163 while (data.pixpos <= data.max_pixpos
|
|
|
2164 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2165 {
|
|
|
2166 /* #### This check probably should not be necessary. */
|
|
665
|
2167 if (data.bi_charbpos > BI_BUF_ZV (b))
|
|
428
|
2168 {
|
|
|
2169 /* #### urk! More of this lossage! */
|
|
665
|
2170 data.bi_charbpos--;
|
|
428
|
2171 goto done;
|
|
|
2172 }
|
|
|
2173
|
|
|
2174 /* If selective display was an integer and we aren't working on
|
|
|
2175 a continuation line then find the next line we are actually
|
|
|
2176 supposed to display. */
|
|
|
2177 if (selective > 0
|
|
665
|
2178 && (data.bi_charbpos == BI_BUF_BEGV (b)
|
|
|
2179 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.bi_charbpos)) == '\n'))
|
|
|
2180 {
|
|
|
2181 while (bi_spaces_at_point (b, data.bi_charbpos) >= selective)
|
|
428
|
2182 {
|
|
665
|
2183 data.bi_charbpos =
|
|
|
2184 bi_find_next_newline_no_quit (b, data.bi_charbpos, 1);
|
|
|
2185 if (data.bi_charbpos >= BI_BUF_ZV (b))
|
|
428
|
2186 {
|
|
665
|
2187 data.bi_charbpos = BI_BUF_ZV (b);
|
|
428
|
2188 goto done;
|
|
|
2189 }
|
|
|
2190 }
|
|
|
2191 }
|
|
|
2192
|
|
|
2193 /* Check for face changes. */
|
|
665
|
2194 if (initial || (!no_more_frags && data.bi_charbpos == data.ef->end))
|
|
428
|
2195 {
|
|
819
|
2196 Lisp_Object last_glyph = Qnil;
|
|
|
2197
|
|
|
2198 /* Deal with glyphs that we have already displayed. The
|
|
|
2199 theory is that if we end up with a PROP_GLYPH in the
|
|
|
2200 propagation data then we are clipping the glyph and there
|
|
|
2201 can be no propagation data before that point. The theory
|
|
|
2202 works because we always recalculate the extent-fragments
|
|
|
2203 for propagated data, we never actually propagate the
|
|
|
2204 fragments that still need to be displayed. */
|
|
|
2205 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
2206 {
|
|
|
2207 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
2208 Dynarr_free (*prop);
|
|
|
2209 *prop = 0;
|
|
|
2210 }
|
|
428
|
2211 /* Now compute the face and begin/end-glyph information. */
|
|
|
2212 data.findex =
|
|
665
|
2213 /* Remember that the extent-fragment routines deal in Bytebpos's. */
|
|
819
|
2214 extent_fragment_update (w, data.ef, data.bi_charbpos, last_glyph);
|
|
428
|
2215
|
|
|
2216 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
2217
|
|
665
|
2218 if (data.bi_charbpos == data.ef->end)
|
|
428
|
2219 no_more_frags = 1;
|
|
|
2220 }
|
|
|
2221 initial = 0;
|
|
|
2222
|
|
|
2223 /* Determine what is next to be displayed. We first handle any
|
|
665
|
2224 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
2225 display then we determine what to do based on the character at the
|
|
|
2226 current buffer position. */
|
|
|
2227
|
|
|
2228 /* If the current position is covered by an invisible extent, do
|
|
|
2229 nothing (except maybe add some ellipses).
|
|
|
2230
|
|
|
2231 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2232 invisible extent should be investigated further. This is
|
|
|
2233 fairly low priority though. */
|
|
|
2234 if (data.ef->invisible)
|
|
|
2235 {
|
|
|
2236 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2237 really know what I'm doing. */
|
|
|
2238 if (*prop)
|
|
|
2239 {
|
|
|
2240 Dynarr_free (*prop);
|
|
|
2241 *prop = 0;
|
|
|
2242 }
|
|
|
2243
|
|
|
2244 /* The extent fragment code only sets this when we should
|
|
|
2245 really display the ellipses. It makes sure the ellipses
|
|
|
2246 don't get displayed more than once in a row. */
|
|
|
2247 if (data.ef->invisible_ellipses)
|
|
|
2248 {
|
|
|
2249 struct glyph_block gb;
|
|
|
2250
|
|
|
2251 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2252 data.ef->invisible_ellipses = 0;
|
|
|
2253 gb.extent = Qnil;
|
|
|
2254 gb.glyph = Vinvisible_text_glyph;
|
|
|
2255 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2256 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2257 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2258 is to display a newline (for compatibility with
|
|
|
2259 selective-display-ellipses)? Maybe that's too
|
|
|
2260 abstruse. */
|
|
|
2261 if (*prop)
|
|
|
2262 goto done;
|
|
|
2263 }
|
|
|
2264
|
|
|
2265 /* If point is in an invisible region we place it on the
|
|
|
2266 next visible character. */
|
|
|
2267 if (data.cursor_type == CURSOR_ON
|
|
665
|
2268 && data.bi_charbpos == data.bi_cursor_charbpos)
|
|
428
|
2269 {
|
|
|
2270 data.cursor_type = NEXT_CURSOR;
|
|
|
2271 }
|
|
|
2272
|
|
|
2273 /* #### What if we we're dealing with a display table? */
|
|
|
2274 if (data.start_col)
|
|
|
2275 data.start_col--;
|
|
|
2276
|
|
665
|
2277 if (data.bi_charbpos == BI_BUF_ZV (b))
|
|
428
|
2278 goto done;
|
|
|
2279 else
|
|
665
|
2280 INC_BYTEBPOS (b, data.bi_charbpos);
|
|
428
|
2281 }
|
|
|
2282
|
|
|
2283 /* If there is propagation data, then it represents the current
|
|
819
|
2284 buffer position being displayed. Add them and advance the
|
|
|
2285 position counter. This might also add the minibuffer
|
|
|
2286 prompt. */
|
|
428
|
2287 else if (*prop)
|
|
|
2288 {
|
|
|
2289 dl->used_prop_data = 1;
|
|
|
2290 *prop = add_propagation_runes (prop, &data);
|
|
|
2291
|
|
|
2292 if (*prop)
|
|
|
2293 goto done; /* gee, a really narrow window */
|
|
665
|
2294 else if (data.bi_charbpos == BI_BUF_ZV (b))
|
|
428
|
2295 goto done;
|
|
665
|
2296 else if (data.bi_charbpos < BI_BUF_BEGV (b))
|
|
428
|
2297 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
665
|
2298 data.bi_charbpos = BI_BUF_BEGV (b);
|
|
428
|
2299 else
|
|
665
|
2300 INC_BYTEBPOS (b, data.bi_charbpos);
|
|
428
|
2301 }
|
|
|
2302
|
|
|
2303 /* If there are end glyphs, add them to the line. These are
|
|
|
2304 the end glyphs for the previous run of text. We add them
|
|
|
2305 here rather than doing them at the end of handling the
|
|
|
2306 previous run so that glyphs at the beginning and end of
|
|
|
2307 a line are handled correctly. */
|
|
819
|
2308 else if (Dynarr_length (data.ef->end_glyphs) > 0
|
|
|
2309 || Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2310 {
|
|
|
2311 glyph_block_dynarr* tmpglyphs = 0;
|
|
|
2312 /* #### I think this is safe, but could be wrong. */
|
|
|
2313 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_charbpos);
|
|
|
2314
|
|
|
2315 if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2316 {
|
|
|
2317 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2318 tmpglyphs = data.ef->end_glyphs;
|
|
|
2319 }
|
|
|
2320
|
|
|
2321 /* If there are begin glyphs, add them to the line. */
|
|
|
2322 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2323 {
|
|
|
2324 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2325 tmpglyphs = data.ef->begin_glyphs;
|
|
|
2326 }
|
|
|
2327
|
|
|
2328 if (*prop)
|
|
|
2329 {
|
|
|
2330 /* If we just clipped a glyph and we are at the end of a
|
|
|
2331 line and there are more glyphs to display then do
|
|
|
2332 appropriate processing to not get a continuation
|
|
|
2333 glyph. */
|
|
|
2334 if (*prop != ADD_FAILED
|
|
|
2335 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
|
|
|
2336 && data.ch == '\n')
|
|
|
2337 {
|
|
|
2338 /* If there are no more glyphs then do the normal
|
|
|
2339 processing.
|
|
|
2340
|
|
|
2341 #### This doesn't actually work if the same glyph is
|
|
|
2342 present more than once in the block. To solve
|
|
|
2343 this we would have to carry the index around
|
|
|
2344 which might be problematic since the fragment is
|
|
|
2345 recalculated for each line. */
|
|
|
2346 if (EQ (Dynarr_end (tmpglyphs)->glyph,
|
|
|
2347 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
|
|
|
2348 {
|
|
|
2349 Dynarr_free (*prop);
|
|
|
2350 *prop = 0;
|
|
|
2351 }
|
|
|
2352 else {
|
|
|
2353 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2354 add_emchar_rune (&data); /* discard prop data. */
|
|
|
2355 goto done;
|
|
|
2356 }
|
|
|
2357 }
|
|
|
2358 else
|
|
|
2359 goto done;
|
|
|
2360 }
|
|
428
|
2361 }
|
|
|
2362
|
|
|
2363 /* If at end-of-buffer, we've already processed begin and
|
|
|
2364 end-glyphs at this point and there's no text to process,
|
|
|
2365 so we're done. */
|
|
665
|
2366 else if (data.bi_charbpos == BI_BUF_ZV (b))
|
|
428
|
2367 goto done;
|
|
|
2368
|
|
|
2369 else
|
|
|
2370 {
|
|
|
2371 Lisp_Object entry = Qnil;
|
|
|
2372 /* Get the character at the current buffer position. */
|
|
665
|
2373 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_charbpos);
|
|
428
|
2374 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
2375 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
2376
|
|
|
2377 /* If there is a display table entry for it, hand it off to
|
|
|
2378 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2379 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
2380 {
|
|
|
2381 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
2382
|
|
|
2383 if (*prop)
|
|
|
2384 goto done;
|
|
|
2385 }
|
|
|
2386
|
|
|
2387 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2388 to the line and end this loop. */
|
|
|
2389 else if (data.ch == '\n')
|
|
|
2390 {
|
|
|
2391 /* We aren't going to be adding an end glyph so give its
|
|
|
2392 space back in order to make sure that the cursor can
|
|
|
2393 fit. */
|
|
819
|
2394 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2395
|
|
|
2396 if (selective > 0
|
|
|
2397 && (bi_spaces_at_point
|
|
665
|
2398 (b, next_bytebpos (b, data.bi_charbpos))
|
|
428
|
2399 >= selective))
|
|
|
2400 {
|
|
|
2401 if (!NILP (b->selective_display_ellipses))
|
|
|
2402 {
|
|
|
2403 struct glyph_block gb;
|
|
|
2404
|
|
|
2405 gb.extent = Qnil;
|
|
|
2406 gb.glyph = Vinvisible_text_glyph;
|
|
|
2407 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2408 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2409 }
|
|
|
2410 else
|
|
|
2411 {
|
|
|
2412 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2413 line with a special "character rune" whose width
|
|
|
2414 is the EOL cursor width and whose character is
|
|
|
2415 the non-printing character '\n'. */
|
|
|
2416 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2417 *prop = add_emchar_rune (&data);
|
|
|
2418 }
|
|
|
2419
|
|
665
|
2420 /* We need to set data.bi_charbpos to the start of the
|
|
428
|
2421 next visible region in order to make this line
|
|
|
2422 appear to contain all of the invisible area.
|
|
|
2423 Otherwise, the line cache won't work
|
|
|
2424 correctly. */
|
|
665
|
2425 INC_BYTEBPOS (b, data.bi_charbpos);
|
|
|
2426 while (bi_spaces_at_point (b, data.bi_charbpos) >= selective)
|
|
428
|
2427 {
|
|
665
|
2428 data.bi_charbpos =
|
|
|
2429 bi_find_next_newline_no_quit (b, data.bi_charbpos, 1);
|
|
|
2430 if (data.bi_charbpos >= BI_BUF_ZV (b))
|
|
428
|
2431 {
|
|
665
|
2432 data.bi_charbpos = BI_BUF_ZV (b);
|
|
428
|
2433 break;
|
|
|
2434 }
|
|
|
2435 }
|
|
|
2436 if (BI_BUF_FETCH_CHAR
|
|
665
|
2437 (b, prev_bytebpos (b, data.bi_charbpos)) == '\n')
|
|
|
2438 DEC_BYTEBPOS (b, data.bi_charbpos);
|
|
428
|
2439 }
|
|
|
2440 else
|
|
|
2441 {
|
|
|
2442 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2443 *prop = add_emchar_rune (&data);
|
|
|
2444 }
|
|
|
2445
|
|
|
2446 goto done;
|
|
|
2447 }
|
|
|
2448
|
|
|
2449 /* If the current character is ^M, and selective display is
|
|
|
2450 enabled, then add the invisible-text-glyph if
|
|
|
2451 selective-display-ellipses is set. In any case, this
|
|
|
2452 line is done. */
|
|
|
2453 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2454 {
|
|
665
|
2455 Bytebpos bi_next_charbpos;
|
|
428
|
2456
|
|
|
2457 /* Find the buffer position at the end of the line. */
|
|
665
|
2458 bi_next_charbpos =
|
|
|
2459 bi_find_next_newline_no_quit (b, data.bi_charbpos, 1);
|
|
|
2460 if (BI_BUF_FETCH_CHAR (b, prev_bytebpos (b, bi_next_charbpos))
|
|
428
|
2461 == '\n')
|
|
665
|
2462 DEC_BYTEBPOS (b, bi_next_charbpos);
|
|
428
|
2463
|
|
|
2464 /* If the cursor is somewhere in the elided text make
|
|
|
2465 sure that the cursor gets drawn appropriately. */
|
|
|
2466 if (data.cursor_type == CURSOR_ON
|
|
665
|
2467 && (data.bi_cursor_charbpos >= data.bi_charbpos &&
|
|
|
2468 data.bi_cursor_charbpos < bi_next_charbpos))
|
|
428
|
2469 {
|
|
|
2470 data.cursor_type = NEXT_CURSOR;
|
|
|
2471 }
|
|
|
2472
|
|
|
2473 /* We won't be adding a truncation or continuation glyph
|
|
|
2474 so give up the room allocated for them. */
|
|
819
|
2475 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2476
|
|
|
2477 if (!NILP (b->selective_display_ellipses))
|
|
|
2478 {
|
|
|
2479 /* We don't propagate anything from the invisible
|
|
|
2480 text glyph if it fails to fit. This is
|
|
|
2481 intentional. */
|
|
|
2482 struct glyph_block gb;
|
|
|
2483
|
|
|
2484 gb.extent = Qnil;
|
|
|
2485 gb.glyph = Vinvisible_text_glyph;
|
|
|
2486 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2487 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2488 }
|
|
|
2489
|
|
|
2490 /* Set the buffer position to the end of the line. We
|
|
|
2491 need to do this before potentially adding a newline
|
|
|
2492 so that the cursor flag will get set correctly (if
|
|
|
2493 needed). */
|
|
665
|
2494 data.bi_charbpos = bi_next_charbpos;
|
|
428
|
2495
|
|
|
2496 if (NILP (b->selective_display_ellipses)
|
|
665
|
2497 || data.bi_cursor_charbpos == bi_next_charbpos)
|
|
428
|
2498 {
|
|
|
2499 /* We have to at least add a newline character so
|
|
|
2500 that the cursor shows up properly. */
|
|
|
2501 data.ch = '\n';
|
|
|
2502 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2503 data.findex = DEFAULT_INDEX;
|
|
|
2504 data.start_col = 0;
|
|
|
2505 data.start_col_xoffset = 0;
|
|
|
2506 data.bi_start_col_enabled = 0;
|
|
|
2507
|
|
|
2508 add_emchar_rune (&data);
|
|
|
2509 }
|
|
|
2510
|
|
|
2511 /* This had better be a newline but doing it this way
|
|
|
2512 we'll see obvious incorrect results if it isn't. No
|
|
|
2513 need to abort here. */
|
|
665
|
2514 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_charbpos);
|
|
428
|
2515
|
|
|
2516 goto done;
|
|
|
2517 }
|
|
|
2518
|
|
|
2519 /* If the current character is considered to be printable, then
|
|
|
2520 just add it. */
|
|
|
2521 else if (data.ch >= printable_min)
|
|
|
2522 {
|
|
|
2523 *prop = add_emchar_rune (&data);
|
|
|
2524 if (*prop)
|
|
|
2525 goto done;
|
|
|
2526 }
|
|
|
2527
|
|
|
2528 /* If the current character is a tab, determine the next tab
|
|
|
2529 starting position and add a blank rune which extends from the
|
|
|
2530 current pixel position to that starting position. */
|
|
|
2531 else if (data.ch == '\t')
|
|
|
2532 {
|
|
|
2533 int tab_start_pixpos = data.pixpos;
|
|
|
2534 int next_tab_start;
|
|
|
2535 int char_tab_width;
|
|
|
2536 int prop_width = 0;
|
|
|
2537
|
|
|
2538 if (data.start_col > 1)
|
|
434
|
2539 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
|
|
428
|
2540 + data.start_col_xoffset;
|
|
|
2541
|
|
|
2542 next_tab_start =
|
|
|
2543 next_tab_position (w, tab_start_pixpos,
|
|
|
2544 dl->bounds.left_in +
|
|
|
2545 data.hscroll_glyph_width_adjust);
|
|
|
2546 if (next_tab_start > data.max_pixpos)
|
|
|
2547 {
|
|
|
2548 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2549 next_tab_start = data.max_pixpos;
|
|
|
2550 }
|
|
|
2551 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2552 char_tab_width =
|
|
|
2553 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2554
|
|
|
2555 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2556
|
|
|
2557 /* add_blank_rune is only supposed to be called with
|
|
|
2558 sizes guaranteed to fit in the available space. */
|
|
|
2559 assert (!(*prop));
|
|
|
2560
|
|
|
2561 if (prop_width)
|
|
|
2562 {
|
|
|
2563 struct prop_block pb;
|
|
|
2564 *prop = Dynarr_new (prop_block);
|
|
|
2565
|
|
|
2566 pb.type = PROP_BLANK;
|
|
|
2567 pb.data.p_blank.width = prop_width;
|
|
|
2568 pb.data.p_blank.findex = data.findex;
|
|
|
2569 Dynarr_add (*prop, pb);
|
|
|
2570
|
|
|
2571 goto done;
|
|
|
2572 }
|
|
|
2573 }
|
|
|
2574
|
|
|
2575 /* If character is a control character, pass it off to
|
|
|
2576 add_control_char_runes.
|
|
|
2577
|
|
|
2578 The is_*() routines have undefined results on
|
|
|
2579 arguments outside of the range [-1, 255]. (This
|
|
|
2580 often bites people who carelessly use `char' instead
|
|
|
2581 of `unsigned char'.)
|
|
|
2582 */
|
|
665
|
2583 else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
|
|
428
|
2584 {
|
|
|
2585 *prop = add_control_char_runes (&data, b);
|
|
|
2586
|
|
|
2587 if (*prop)
|
|
|
2588 goto done;
|
|
|
2589 }
|
|
|
2590
|
|
|
2591 /* If the character is above the ASCII range and we have not
|
|
|
2592 already handled it, then print it as an octal number. */
|
|
|
2593 else if (data.ch >= 0200)
|
|
|
2594 {
|
|
|
2595 *prop = add_octal_runes (&data);
|
|
|
2596
|
|
|
2597 if (*prop)
|
|
|
2598 goto done;
|
|
|
2599 }
|
|
|
2600
|
|
|
2601 /* Assume the current character is considered to be printable,
|
|
|
2602 then just add it. */
|
|
|
2603 else
|
|
|
2604 {
|
|
|
2605 *prop = add_emchar_rune (&data);
|
|
|
2606 if (*prop)
|
|
|
2607 goto done;
|
|
|
2608 }
|
|
|
2609
|
|
665
|
2610 INC_BYTEBPOS (b, data.bi_charbpos);
|
|
428
|
2611 }
|
|
|
2612 }
|
|
|
2613
|
|
|
2614 done:
|
|
|
2615
|
|
|
2616 /* Determine the starting point of the next line if we did not hit the
|
|
|
2617 end of the buffer. */
|
|
665
|
2618 if (data.bi_charbpos < BI_BUF_ZV (b)
|
|
428
|
2619 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2620 {
|
|
|
2621 /* #### This check is not correct. If the line terminated
|
|
|
2622 due to a begin-glyph or end-glyph hitting window-end, then
|
|
665
|
2623 data.ch will not point to the character at data.bi_charbpos. If
|
|
428
|
2624 you make the two changes mentioned at the top of this loop,
|
|
|
2625 you should be able to say '(if (*prop))'. That should also
|
|
665
|
2626 make it possible to eliminate the data.bi_charbpos < BI_BUF_ZV (b)
|
|
428
|
2627 check. */
|
|
|
2628
|
|
|
2629 /* The common case is that the line ended because we hit a newline.
|
|
|
2630 In that case, the next character is just the next buffer
|
|
|
2631 position. */
|
|
|
2632 if (data.ch == '\n')
|
|
|
2633 {
|
|
|
2634 /* If data.start_col_enabled is still true, then the window is
|
|
|
2635 scrolled far enough so that nothing on this line is visible.
|
|
|
2636 We need to stick a truncation glyph at the beginning of the
|
|
|
2637 line in that case unless the line is completely blank. */
|
|
|
2638 if (data.bi_start_col_enabled)
|
|
|
2639 {
|
|
|
2640 if (data.cursor_type == CURSOR_ON)
|
|
|
2641 {
|
|
665
|
2642 if (data.bi_cursor_charbpos >= bi_start_pos
|
|
|
2643 && data.bi_cursor_charbpos <= data.bi_charbpos)
|
|
|
2644 data.bi_cursor_charbpos = data.bi_charbpos;
|
|
428
|
2645 }
|
|
|
2646 data.findex = DEFAULT_INDEX;
|
|
|
2647 data.start_col = 0;
|
|
|
2648 data.bi_start_col_enabled = 0;
|
|
|
2649
|
|
665
|
2650 if (data.bi_charbpos != bi_start_pos)
|
|
428
|
2651 {
|
|
|
2652 struct glyph_block gb;
|
|
|
2653
|
|
|
2654 gb.extent = Qnil;
|
|
|
2655 gb.glyph = Vhscroll_glyph;
|
|
|
2656 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2657 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2658 }
|
|
|
2659 else
|
|
|
2660 {
|
|
|
2661 /* This duplicates code down below to add a newline to
|
|
|
2662 the end of an otherwise empty line.*/
|
|
|
2663 data.ch = '\n';
|
|
|
2664 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2665
|
|
|
2666 add_emchar_rune (&data);
|
|
|
2667 }
|
|
|
2668 }
|
|
|
2669
|
|
665
|
2670 INC_BYTEBPOS (b, data.bi_charbpos);
|
|
428
|
2671 }
|
|
|
2672
|
|
|
2673 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2674 line. */
|
|
|
2675 else
|
|
|
2676 {
|
|
|
2677 struct glyph_block gb;
|
|
|
2678 struct glyph_cachel *cachel;
|
|
|
2679
|
|
|
2680 /* If the line is to be truncated then we actually have to look
|
|
|
2681 for the next newline. We also add the end-of-line glyph which
|
|
|
2682 we know will fit because we adjusted the right border before
|
|
|
2683 we starting laying out the line. */
|
|
819
|
2684 data.max_pixpos += data.end_glyph_width;
|
|
428
|
2685 data.findex = DEFAULT_INDEX;
|
|
|
2686 gb.extent = Qnil;
|
|
|
2687
|
|
|
2688 if (truncate_win)
|
|
|
2689 {
|
|
665
|
2690 Bytebpos bi_pos;
|
|
428
|
2691
|
|
|
2692 /* Now find the start of the next line. */
|
|
665
|
2693 bi_pos = bi_find_next_newline_no_quit (b, data.bi_charbpos, 1);
|
|
428
|
2694
|
|
|
2695 /* If the cursor is past the truncation line then we
|
|
|
2696 make it appear on the truncation glyph. If we've hit
|
|
|
2697 the end of the buffer then we also make the cursor
|
|
|
2698 appear unless eob is immediately preceded by a
|
|
|
2699 newline. In that case the cursor should actually
|
|
|
2700 appear on the next line. */
|
|
|
2701 if (data.cursor_type == CURSOR_ON
|
|
665
|
2702 && data.bi_cursor_charbpos >= data.bi_charbpos
|
|
|
2703 && (data.bi_cursor_charbpos < bi_pos ||
|
|
428
|
2704 (bi_pos == BI_BUF_ZV (b)
|
|
|
2705 && (bi_pos == BI_BUF_BEGV (b)
|
|
665
|
2706 || (BI_BUF_FETCH_CHAR (b, prev_bytebpos (b, bi_pos))
|
|
428
|
2707 != '\n')))))
|
|
665
|
2708 data.bi_cursor_charbpos = bi_pos;
|
|
428
|
2709 else
|
|
|
2710 data.cursor_type = NO_CURSOR;
|
|
|
2711
|
|
665
|
2712 data.bi_charbpos = bi_pos;
|
|
428
|
2713 gb.glyph = Vtruncation_glyph;
|
|
|
2714 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2715 }
|
|
|
2716 else
|
|
|
2717 {
|
|
|
2718 /* The cursor can never be on the continuation glyph. */
|
|
|
2719 data.cursor_type = NO_CURSOR;
|
|
|
2720
|
|
665
|
2721 /* data.bi_charbpos is already at the start of the next line. */
|
|
428
|
2722
|
|
442
|
2723 dl->line_continuation = 1;
|
|
428
|
2724 gb.glyph = Vcontinuation_glyph;
|
|
|
2725 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2726 }
|
|
|
2727
|
|
442
|
2728 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
428
|
2729
|
|
665
|
2730 if (truncate_win && data.bi_charbpos == BI_BUF_ZV (b)
|
|
|
2731 && BI_BUF_FETCH_CHAR (b, prev_bytebpos (b, BI_BUF_ZV (b))) != '\n')
|
|
428
|
2732 /* #### Damn this losing shit. */
|
|
665
|
2733 data.bi_charbpos++;
|
|
428
|
2734 }
|
|
|
2735 }
|
|
|
2736 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
665
|
2737 && (!echo_area_active (f) || data.bi_charbpos == BI_BUF_ZV (b)))
|
|
428
|
2738 {
|
|
|
2739 /* We need to add a marker to the end of the line since there is no
|
|
|
2740 newline character in order for the cursor to get drawn. We label
|
|
|
2741 it as a newline so that it gets handled correctly by the
|
|
|
2742 whitespace routines below. */
|
|
|
2743
|
|
|
2744 data.ch = '\n';
|
|
|
2745 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2746 data.findex = DEFAULT_INDEX;
|
|
|
2747 data.start_col = 0;
|
|
|
2748 data.start_col_xoffset = 0;
|
|
|
2749 data.bi_start_col_enabled = 0;
|
|
|
2750
|
|
|
2751 data.max_pixpos += data.blank_width;
|
|
|
2752 add_emchar_rune (&data);
|
|
|
2753 data.max_pixpos -= data.blank_width;
|
|
|
2754
|
|
|
2755 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2756 manipulating invalid positions is guaranteed to result in
|
|
|
2757 trouble sooner or later. */
|
|
665
|
2758 data.bi_charbpos = BI_BUF_ZV (b) + 1;
|
|
428
|
2759 }
|
|
|
2760
|
|
|
2761 /* Calculate left whitespace boundary. */
|
|
|
2762 {
|
|
|
2763 int elt = 0;
|
|
|
2764
|
|
|
2765 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2766 while (elt < Dynarr_length (db->runes))
|
|
|
2767 {
|
|
|
2768 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2769
|
|
|
2770 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2771 || rb->type == RUNE_BLANK)
|
|
|
2772 {
|
|
|
2773 dl->bounds.left_white += rb->width;
|
|
|
2774 elt++;
|
|
|
2775 }
|
|
|
2776 else
|
|
|
2777 elt = Dynarr_length (db->runes);
|
|
|
2778 }
|
|
|
2779 }
|
|
|
2780
|
|
|
2781 /* Calculate right whitespace boundary. */
|
|
|
2782 {
|
|
|
2783 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2784 int done = 0;
|
|
|
2785
|
|
|
2786 while (!done && elt >= 0)
|
|
|
2787 {
|
|
|
2788 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2789
|
|
|
2790 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2791 && isspace (rb->object.chr.ch))
|
|
|
2792 && !rb->type == RUNE_BLANK)
|
|
|
2793 {
|
|
|
2794 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2795 done = 1;
|
|
|
2796 }
|
|
|
2797
|
|
|
2798 elt--;
|
|
|
2799
|
|
|
2800 }
|
|
|
2801
|
|
|
2802 /* The line is blank so everything is considered to be right
|
|
|
2803 whitespace. */
|
|
|
2804 if (!done)
|
|
|
2805 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2806 }
|
|
|
2807
|
|
|
2808 /* Set the display blocks bounds. */
|
|
|
2809 db->start_pos = dl->bounds.left_in;
|
|
|
2810 if (Dynarr_length (db->runes))
|
|
|
2811 {
|
|
|
2812 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2813
|
|
|
2814 db->end_pos = rb->xpos + rb->width;
|
|
|
2815 }
|
|
|
2816 else
|
|
|
2817 db->end_pos = dl->bounds.right_white;
|
|
|
2818
|
|
819
|
2819 calculate_baseline (&data);
|
|
428
|
2820
|
|
|
2821 dl->ascent = data.new_ascent;
|
|
|
2822 dl->descent = data.new_descent;
|
|
|
2823
|
|
|
2824 {
|
|
|
2825 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2826
|
|
|
2827 if (dl->ascent < ascent)
|
|
|
2828 dl->ascent = ascent;
|
|
|
2829 }
|
|
|
2830 {
|
|
|
2831 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2832
|
|
|
2833 if (dl->descent < descent)
|
|
|
2834 dl->descent = descent;
|
|
|
2835 }
|
|
|
2836
|
|
819
|
2837 calculate_yoffset (dl, db);
|
|
|
2838
|
|
428
|
2839 dl->cursor_elt = data.cursor_x;
|
|
|
2840 /* #### lossage lossage lossage! Fix this shit! */
|
|
665
|
2841 if (data.bi_charbpos > BI_BUF_ZV (b))
|
|
|
2842 dl->end_charbpos = BUF_ZV (b);
|
|
428
|
2843 else
|
|
665
|
2844 dl->end_charbpos = bytebpos_to_charbpos (b, data.bi_charbpos) - 1;
|
|
428
|
2845 if (truncate_win)
|
|
665
|
2846 data.dl->num_chars = column_at_point (b, dl->end_charbpos, 0);
|
|
428
|
2847 else
|
|
|
2848 /* This doesn't correctly take into account tabs and control
|
|
|
2849 characters but if the window isn't being truncated then this
|
|
|
2850 value isn't going to end up being used anyhow. */
|
|
665
|
2851 data.dl->num_chars = dl->end_charbpos - dl->charbpos;
|
|
428
|
2852
|
|
|
2853 /* #### handle horizontally scrolled line with text none of which
|
|
|
2854 was actually laid out. */
|
|
|
2855
|
|
|
2856 /* #### handle any remainder of overlay arrow */
|
|
|
2857
|
|
|
2858 if (*prop == ADD_FAILED)
|
|
|
2859 *prop = NULL;
|
|
|
2860
|
|
|
2861 if (truncate_win && *prop)
|
|
|
2862 {
|
|
|
2863 Dynarr_free (*prop);
|
|
|
2864 *prop = NULL;
|
|
|
2865 }
|
|
|
2866
|
|
|
2867 extent_fragment_delete (data.ef);
|
|
|
2868
|
|
|
2869 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2870 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2871 The main loop should get fixed so that it isn't necessary to call
|
|
|
2872 this function if we are already at EOB. */
|
|
|
2873
|
|
665
|
2874 if (data.bi_charbpos == BI_BUF_ZV (b) && bi_start_pos == BI_BUF_ZV (b))
|
|
|
2875 return data.bi_charbpos + 1; /* Yuck! */
|
|
428
|
2876 else
|
|
665
|
2877 return data.bi_charbpos;
|
|
428
|
2878 }
|
|
|
2879
|
|
|
2880 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2881
|
|
|
2882 static int
|
|
|
2883 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2884 {
|
|
|
2885 struct frame *f = XFRAME (w->frame);
|
|
|
2886 struct device *d = XDEVICE (f->device);
|
|
|
2887 pos_data data;
|
|
|
2888
|
|
|
2889 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2890 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2891 return 0;
|
|
|
2892
|
|
|
2893 xzero (data);
|
|
|
2894 data.ef = NULL;
|
|
|
2895 data.d = d;
|
|
793
|
2896 data.window = wrap_window (w);
|
|
428
|
2897 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2898 data.dl = dl;
|
|
|
2899 data.pixpos = dl->bounds.left_in;
|
|
|
2900 data.max_pixpos = dl->bounds.right_in;
|
|
|
2901 data.cursor_type = NO_CURSOR;
|
|
|
2902 data.cursor_x = -1;
|
|
|
2903 data.findex = DEFAULT_INDEX;
|
|
|
2904 data.last_charset = Qunbound;
|
|
|
2905 data.last_findex = DEFAULT_INDEX;
|
|
|
2906 data.result_str = Qnil;
|
|
|
2907 data.string = Qnil;
|
|
|
2908
|
|
|
2909 Dynarr_reset (data.db->runes);
|
|
|
2910
|
|
|
2911 if (STRINGP (Voverlay_arrow_string))
|
|
|
2912 {
|
|
665
|
2913 add_intbyte_string_runes
|
|
428
|
2914 (&data,
|
|
|
2915 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
2916 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
793
|
2917 1, 0);
|
|
428
|
2918 }
|
|
|
2919 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
2920 {
|
|
|
2921 struct glyph_block gb;
|
|
|
2922
|
|
|
2923 gb.glyph = Voverlay_arrow_string;
|
|
|
2924 gb.extent = Qnil;
|
|
|
2925 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
2926 }
|
|
819
|
2927
|
|
428
|
2928 if (data.max_pixmap_height)
|
|
|
2929 {
|
|
|
2930 int height = data.new_ascent + data.new_descent;
|
|
|
2931 int pix_ascent, pix_descent;
|
|
819
|
2932
|
|
428
|
2933 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2934 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
819
|
2935 calculate_baseline (&data);
|
|
428
|
2936
|
|
|
2937 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2938 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2939 }
|
|
|
2940
|
|
|
2941 dl->ascent = data.new_ascent;
|
|
|
2942 dl->descent = data.new_descent;
|
|
|
2943
|
|
|
2944 data.db->start_pos = dl->bounds.left_in;
|
|
|
2945 data.db->end_pos = data.pixpos;
|
|
|
2946
|
|
819
|
2947 calculate_yoffset (dl, data.db);
|
|
|
2948
|
|
428
|
2949 return data.pixpos - dl->bounds.left_in;
|
|
|
2950 }
|
|
|
2951
|
|
|
2952 /* Add a type of glyph to a margin display block. */
|
|
|
2953
|
|
|
2954 static int
|
|
|
2955 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
2956 int count, enum glyph_layout layout, int side, Lisp_Object window)
|
|
|
2957 {
|
|
|
2958 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
2959 ? dl->left_glyphs
|
|
|
2960 : dl->right_glyphs);
|
|
|
2961 int elt, end;
|
|
|
2962 int reverse;
|
|
442
|
2963 struct window *w = XWINDOW (window);
|
|
|
2964 struct frame *f = XFRAME (w->frame);
|
|
|
2965 struct device *d = XDEVICE (f->device);
|
|
|
2966 pos_data data;
|
|
|
2967
|
|
|
2968 xzero (data);
|
|
|
2969 data.d = d;
|
|
|
2970 data.window = window;
|
|
|
2971 data.db = db;
|
|
|
2972 data.dl = dl;
|
|
|
2973 data.pixpos = start;
|
|
|
2974 data.cursor_type = NO_CURSOR;
|
|
|
2975 data.cursor_x = -1;
|
|
|
2976 data.last_charset = Qunbound;
|
|
|
2977 data.last_findex = DEFAULT_INDEX;
|
|
|
2978 data.result_str = Qnil;
|
|
|
2979 data.string = Qnil;
|
|
|
2980 data.new_ascent = dl->ascent;
|
|
|
2981 data.new_descent = dl->descent;
|
|
428
|
2982
|
|
|
2983 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
2984 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
2985 {
|
|
|
2986 reverse = 1;
|
|
|
2987 elt = Dynarr_length (gbd) - 1;
|
|
|
2988 end = 0;
|
|
|
2989 }
|
|
|
2990 else
|
|
|
2991 {
|
|
|
2992 reverse = 0;
|
|
|
2993 elt = 0;
|
|
|
2994 end = Dynarr_length (gbd);
|
|
|
2995 }
|
|
|
2996
|
|
|
2997 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
2998 {
|
|
|
2999 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
3000
|
|
|
3001 if (NILP (gb->extent))
|
|
|
3002 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3003
|
|
|
3004 if (gb->active &&
|
|
|
3005 ((side == LEFT_GLYPHS &&
|
|
|
3006 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
|
|
|
3007 || (side == RIGHT_GLYPHS &&
|
|
|
3008 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
|
|
|
3009 {
|
|
442
|
3010 data.findex = gb->findex;
|
|
|
3011 data.max_pixpos = data.pixpos + gb->width;
|
|
|
3012 add_glyph_rune (&data, gb, side, 0, NULL);
|
|
428
|
3013 count--;
|
|
|
3014 gb->active = 0;
|
|
|
3015 }
|
|
|
3016
|
|
|
3017 (reverse ? elt-- : elt++);
|
|
|
3018 }
|
|
|
3019
|
|
819
|
3020 calculate_baseline (&data);
|
|
442
|
3021
|
|
|
3022 dl->ascent = data.new_ascent;
|
|
|
3023 dl->descent = data.new_descent;
|
|
|
3024
|
|
819
|
3025 calculate_yoffset (dl, data.db);
|
|
|
3026
|
|
442
|
3027 return data.pixpos;
|
|
428
|
3028 }
|
|
|
3029
|
|
|
3030 /* Add a blank to a margin display block. */
|
|
|
3031
|
|
|
3032 static void
|
|
|
3033 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
3034 struct window *w, int xpos, int width, int side)
|
|
|
3035 {
|
|
|
3036 struct rune rb;
|
|
|
3037
|
|
|
3038 rb.findex = (side == LEFT_GLYPHS
|
|
|
3039 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
3040 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
3041 rb.xpos = xpos;
|
|
|
3042 rb.width = width;
|
|
665
|
3043 rb.charbpos = -1;
|
|
428
|
3044 rb.endpos = 0;
|
|
|
3045 rb.type = RUNE_BLANK;
|
|
|
3046 rb.cursor_type = CURSOR_OFF;
|
|
|
3047
|
|
|
3048 Dynarr_add (db->runes, rb);
|
|
|
3049 }
|
|
|
3050
|
|
|
3051 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
3052 left whitespace area. */
|
|
|
3053
|
|
|
3054 static void
|
|
|
3055 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
3056 int overlay_width)
|
|
|
3057 {
|
|
|
3058 Lisp_Object window;
|
|
|
3059
|
|
|
3060 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
3061 int elt, end_xpos;
|
|
|
3062 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
3063 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3064 int left_in_start = dl->bounds.left_in;
|
|
|
3065 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
3066
|
|
|
3067 struct display_block *odb, *idb;
|
|
|
3068
|
|
793
|
3069 window = wrap_window (w);
|
|
428
|
3070
|
|
|
3071 /* We have to add the glyphs to the line in the order outside,
|
|
|
3072 inside, whitespace. However the precedence dictates that we
|
|
|
3073 determine how many will fit in the reverse order. */
|
|
|
3074
|
|
|
3075 /* Determine how many whitespace glyphs we can display and where
|
|
|
3076 they should start. */
|
|
|
3077 white_in_start = dl->bounds.left_white;
|
|
|
3078 white_out_start = left_in_start;
|
|
|
3079 white_out_cnt = white_in_cnt = 0;
|
|
|
3080 elt = 0;
|
|
|
3081
|
|
|
3082 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3083 {
|
|
|
3084 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3085
|
|
|
3086 if (NILP (gb->extent))
|
|
|
3087 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3088
|
|
|
3089 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3090 {
|
|
|
3091 int width;
|
|
|
3092
|
|
438
|
3093 width = glyph_width (gb->glyph, window);
|
|
428
|
3094
|
|
|
3095 if (white_in_start - width >= left_in_end)
|
|
|
3096 {
|
|
|
3097 white_in_cnt++;
|
|
|
3098 white_in_start -= width;
|
|
|
3099 gb->width = width;
|
|
|
3100 gb->active = 1;
|
|
|
3101 }
|
|
|
3102 else if (use_overflow
|
|
|
3103 && (white_out_start - width > dl->bounds.left_out))
|
|
|
3104 {
|
|
|
3105 white_out_cnt++;
|
|
|
3106 white_out_start -= width;
|
|
|
3107 gb->width = width;
|
|
|
3108 gb->active = 1;
|
|
|
3109 }
|
|
|
3110 else
|
|
|
3111 gb->active = 0;
|
|
|
3112 }
|
|
|
3113
|
|
|
3114 elt++;
|
|
|
3115 }
|
|
|
3116
|
|
|
3117 /* Determine how many inside margin glyphs we can display and where
|
|
|
3118 they should start. The inside margin glyphs get whatever space
|
|
|
3119 is left after the whitespace glyphs have been displayed. These
|
|
|
3120 are tricky to calculate since if we decide to use the overflow
|
|
|
3121 area we basically have to start over. So for these we build up a
|
|
|
3122 list of just the inside margin glyphs and manipulate it to
|
|
|
3123 determine the needed info. */
|
|
|
3124 {
|
|
|
3125 glyph_block_dynarr *ib;
|
|
|
3126 int avail_in, avail_out;
|
|
|
3127 int done = 0;
|
|
|
3128 int marker = 0;
|
|
|
3129 int used_in, used_out;
|
|
|
3130
|
|
|
3131 elt = 0;
|
|
|
3132 used_in = used_out = 0;
|
|
|
3133 ib = Dynarr_new (glyph_block);
|
|
|
3134 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3135 {
|
|
|
3136 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3137
|
|
|
3138 if (NILP (gb->extent))
|
|
|
3139 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3140
|
|
|
3141 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3142 GL_INSIDE_MARGIN)
|
|
|
3143 {
|
|
438
|
3144 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3145 used_in += gb->width;
|
|
|
3146 Dynarr_add (ib, *gb);
|
|
|
3147 }
|
|
|
3148
|
|
|
3149 elt++;
|
|
|
3150 }
|
|
|
3151
|
|
|
3152 if (white_out_cnt)
|
|
|
3153 avail_in = 0;
|
|
|
3154 else
|
|
|
3155 {
|
|
|
3156 avail_in = white_in_start - left_in_end;
|
|
|
3157 if (avail_in < 0)
|
|
|
3158 avail_in = 0;
|
|
|
3159 }
|
|
|
3160
|
|
|
3161 if (!use_overflow)
|
|
|
3162 avail_out = 0;
|
|
|
3163 else
|
|
|
3164 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
3165
|
|
|
3166 marker = 0;
|
|
|
3167 while (!done && marker < Dynarr_length (ib))
|
|
|
3168 {
|
|
|
3169 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3170
|
|
|
3171 /* If everything now fits in the available inside margin
|
|
|
3172 space, we're done. */
|
|
|
3173 if (used_in <= avail_in)
|
|
|
3174 done = 1;
|
|
|
3175 else
|
|
|
3176 {
|
|
|
3177 /* Otherwise see if we have room to move a glyph to the
|
|
|
3178 outside. */
|
|
|
3179 if (used_out + width <= avail_out)
|
|
|
3180 {
|
|
|
3181 used_out += width;
|
|
|
3182 used_in -= width;
|
|
|
3183 }
|
|
|
3184 else
|
|
|
3185 done = 1;
|
|
|
3186 }
|
|
|
3187
|
|
|
3188 if (!done)
|
|
|
3189 marker++;
|
|
|
3190 }
|
|
|
3191
|
|
|
3192 /* At this point we now know that everything from marker on goes in
|
|
|
3193 the inside margin and everything before it goes in the outside
|
|
|
3194 margin. The stuff going into the outside margin is guaranteed
|
|
|
3195 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3196
|
|
|
3197 in_in_end = left_in_end;
|
|
|
3198 in_out_start = white_out_start;
|
|
|
3199 in_out_cnt = in_in_cnt = 0;
|
|
|
3200
|
|
|
3201 Dynarr_free (ib);
|
|
|
3202 elt = 0;
|
|
|
3203 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3204 {
|
|
|
3205 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3206
|
|
|
3207 if (NILP (gb->extent))
|
|
|
3208 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3209
|
|
|
3210 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3211 GL_INSIDE_MARGIN)
|
|
|
3212 {
|
|
438
|
3213 int width = glyph_width (gb->glyph, window);
|
|
428
|
3214
|
|
|
3215 if (used_out)
|
|
|
3216 {
|
|
|
3217 in_out_cnt++;
|
|
|
3218 in_out_start -= width;
|
|
|
3219 gb->width = width;
|
|
|
3220 gb->active = 1;
|
|
|
3221 used_out -= width;
|
|
|
3222 }
|
|
|
3223 else if (in_in_end + width < white_in_start)
|
|
|
3224 {
|
|
|
3225 in_in_cnt++;
|
|
|
3226 in_in_end += width;
|
|
|
3227 gb->width = width;
|
|
|
3228 gb->active = 1;
|
|
|
3229 }
|
|
|
3230 else
|
|
|
3231 gb->active = 0;
|
|
|
3232 }
|
|
|
3233
|
|
|
3234 elt++;
|
|
|
3235 }
|
|
|
3236 }
|
|
|
3237
|
|
|
3238 /* Determine how many outside margin glyphs we can display. They
|
|
|
3239 always start at the left outside margin and can only use the
|
|
|
3240 outside margin space. */
|
|
|
3241 out_end = dl->bounds.left_out;
|
|
|
3242 out_cnt = 0;
|
|
|
3243 elt = 0;
|
|
|
3244
|
|
|
3245 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3246 {
|
|
|
3247 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3248
|
|
|
3249 if (NILP (gb->extent))
|
|
|
3250 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3251
|
|
|
3252 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3253 GL_OUTSIDE_MARGIN)
|
|
|
3254 {
|
|
438
|
3255 int width = glyph_width (gb->glyph, window);
|
|
428
|
3256
|
|
|
3257 if (out_end + width <= in_out_start)
|
|
|
3258 {
|
|
|
3259 out_cnt++;
|
|
|
3260 out_end += width;
|
|
|
3261 gb->width = width;
|
|
|
3262 gb->active = 1;
|
|
|
3263 }
|
|
|
3264 else
|
|
|
3265 gb->active = 0;
|
|
|
3266 }
|
|
|
3267
|
|
|
3268 elt++;
|
|
|
3269 }
|
|
|
3270
|
|
|
3271 /* Now that we know where everything goes, we add the glyphs as
|
|
|
3272 runes to the appropriate display blocks. */
|
|
|
3273 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3274 {
|
|
|
3275 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3276 odb->start_pos = dl->bounds.left_out;
|
|
|
3277 /* #### We should stop adding a blank to account for the space
|
|
|
3278 between the end of the glyphs and the margin and instead set
|
|
|
3279 this accordingly. */
|
|
|
3280 odb->end_pos = dl->bounds.left_in;
|
|
|
3281 Dynarr_reset (odb->runes);
|
|
|
3282 }
|
|
|
3283 else
|
|
|
3284 odb = 0;
|
|
|
3285
|
|
|
3286 if (in_in_cnt || white_in_cnt)
|
|
|
3287 {
|
|
|
3288 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3289 idb->start_pos = dl->bounds.left_in;
|
|
|
3290 /* #### See above comment for odb->end_pos */
|
|
|
3291 idb->end_pos = dl->bounds.left_white;
|
|
|
3292 Dynarr_reset (idb->runes);
|
|
|
3293 }
|
|
|
3294 else
|
|
|
3295 idb = 0;
|
|
|
3296
|
|
|
3297 /* First add the outside margin glyphs. */
|
|
|
3298 if (out_cnt)
|
|
|
3299 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3300 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3301 else
|
|
|
3302 end_xpos = dl->bounds.left_out;
|
|
|
3303
|
|
|
3304 /* There may be blank space between the outside margin glyphs and
|
|
|
3305 the inside margin glyphs. If so, add a blank. */
|
|
|
3306 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3307 {
|
|
|
3308 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3309 LEFT_GLYPHS);
|
|
|
3310 }
|
|
|
3311
|
|
|
3312 /* Next add the inside margin glyphs which are actually in the
|
|
|
3313 outside margin. */
|
|
|
3314 if (in_out_cnt)
|
|
|
3315 {
|
|
|
3316 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3317 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3318 }
|
|
|
3319
|
|
|
3320 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3321 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3322 here. */
|
|
|
3323 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3324 {
|
|
|
3325 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3326 LEFT_GLYPHS);
|
|
|
3327 }
|
|
|
3328
|
|
|
3329 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3330 outside margin. */
|
|
|
3331 if (white_out_cnt)
|
|
|
3332 {
|
|
|
3333 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3334 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3335 }
|
|
|
3336
|
|
|
3337 /* We take care of clearing between the end of the glyphs and the
|
|
|
3338 start of the inside margin for lines which have glyphs. */
|
|
|
3339 if (odb && (left_in_start - end_xpos))
|
|
|
3340 {
|
|
|
3341 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3342 LEFT_GLYPHS);
|
|
|
3343 }
|
|
|
3344
|
|
|
3345 /* Next add the inside margin glyphs which are actually in the
|
|
|
3346 inside margin. */
|
|
|
3347 if (in_in_cnt)
|
|
|
3348 {
|
|
|
3349 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3350 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3351 }
|
|
|
3352 else
|
|
|
3353 end_xpos = left_in_end;
|
|
|
3354
|
|
|
3355 /* Make sure that the area between the end of the inside margin
|
|
|
3356 glyphs and the whitespace glyphs is cleared. */
|
|
|
3357 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3358 {
|
|
|
3359 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3360 LEFT_GLYPHS);
|
|
|
3361 }
|
|
|
3362
|
|
|
3363 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3364 inside margin. */
|
|
|
3365 if (white_in_cnt)
|
|
|
3366 {
|
|
|
3367 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3368 LEFT_GLYPHS, window);
|
|
|
3369 }
|
|
|
3370
|
|
|
3371 /* Whitespace glyphs always end right next to the text block so
|
|
|
3372 there is nothing we have to make sure is cleared after them. */
|
|
|
3373 }
|
|
|
3374
|
|
|
3375 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3376 right whitespace area. */
|
|
|
3377
|
|
|
3378 static void
|
|
|
3379 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3380 {
|
|
|
3381 Lisp_Object window;
|
|
|
3382
|
|
|
3383 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3384 int elt, end_xpos;
|
|
|
3385 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3386 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3387
|
|
|
3388 struct display_block *odb, *idb;
|
|
|
3389
|
|
793
|
3390 window = wrap_window (w);
|
|
428
|
3391
|
|
|
3392 /* We have to add the glyphs to the line in the order outside,
|
|
|
3393 inside, whitespace. However the precedence dictates that we
|
|
|
3394 determine how many will fit in the reverse order. */
|
|
|
3395
|
|
|
3396 /* Determine how many whitespace glyphs we can display and where
|
|
|
3397 they should start. */
|
|
|
3398 white_in_end = dl->bounds.right_white;
|
|
|
3399 white_out_end = dl->bounds.right_in;
|
|
|
3400 white_out_cnt = white_in_cnt = 0;
|
|
|
3401 elt = 0;
|
|
|
3402
|
|
|
3403 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3404 {
|
|
|
3405 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3406
|
|
|
3407 if (NILP (gb->extent))
|
|
|
3408 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3409
|
|
|
3410 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3411 {
|
|
438
|
3412 int width = glyph_width (gb->glyph, window);
|
|
428
|
3413
|
|
|
3414 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3415 {
|
|
|
3416 white_in_cnt++;
|
|
|
3417 white_in_end += width;
|
|
|
3418 gb->width = width;
|
|
|
3419 gb->active = 1;
|
|
|
3420 }
|
|
|
3421 else if (use_overflow
|
|
|
3422 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3423 {
|
|
|
3424 white_out_cnt++;
|
|
|
3425 white_out_end += width;
|
|
|
3426 gb->width = width;
|
|
|
3427 gb->active = 1;
|
|
|
3428 }
|
|
|
3429 else
|
|
|
3430 gb->active = 0;
|
|
|
3431 }
|
|
|
3432
|
|
|
3433 elt++;
|
|
|
3434 }
|
|
|
3435
|
|
|
3436 /* Determine how many inside margin glyphs we can display and where
|
|
|
3437 they should start. The inside margin glyphs get whatever space
|
|
|
3438 is left after the whitespace glyphs have been displayed. These
|
|
|
3439 are tricky to calculate since if we decide to use the overflow
|
|
|
3440 area we basically have to start over. So for these we build up a
|
|
|
3441 list of just the inside margin glyphs and manipulate it to
|
|
|
3442 determine the needed info. */
|
|
|
3443 {
|
|
|
3444 glyph_block_dynarr *ib;
|
|
|
3445 int avail_in, avail_out;
|
|
|
3446 int done = 0;
|
|
|
3447 int marker = 0;
|
|
|
3448 int used_in, used_out;
|
|
|
3449
|
|
|
3450 elt = 0;
|
|
|
3451 used_in = used_out = 0;
|
|
|
3452 ib = Dynarr_new (glyph_block);
|
|
|
3453 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3454 {
|
|
|
3455 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3456
|
|
|
3457 if (NILP (gb->extent))
|
|
|
3458 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3459
|
|
|
3460 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3461 {
|
|
438
|
3462 gb->width = glyph_width (gb->glyph, window);
|
|
428
|
3463 used_in += gb->width;
|
|
|
3464 Dynarr_add (ib, *gb);
|
|
|
3465 }
|
|
|
3466
|
|
|
3467 elt++;
|
|
|
3468 }
|
|
|
3469
|
|
|
3470 if (white_out_cnt)
|
|
|
3471 avail_in = 0;
|
|
|
3472 else
|
|
|
3473 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3474
|
|
|
3475 if (!use_overflow)
|
|
|
3476 avail_out = 0;
|
|
|
3477 else
|
|
|
3478 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3479
|
|
|
3480 marker = 0;
|
|
|
3481 while (!done && marker < Dynarr_length (ib))
|
|
|
3482 {
|
|
|
3483 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3484
|
|
|
3485 /* If everything now fits in the available inside margin
|
|
|
3486 space, we're done. */
|
|
|
3487 if (used_in <= avail_in)
|
|
|
3488 done = 1;
|
|
|
3489 else
|
|
|
3490 {
|
|
|
3491 /* Otherwise see if we have room to move a glyph to the
|
|
|
3492 outside. */
|
|
|
3493 if (used_out + width <= avail_out)
|
|
|
3494 {
|
|
|
3495 used_out += width;
|
|
|
3496 used_in -= width;
|
|
|
3497 }
|
|
|
3498 else
|
|
|
3499 done = 1;
|
|
|
3500 }
|
|
|
3501
|
|
|
3502 if (!done)
|
|
|
3503 marker++;
|
|
|
3504 }
|
|
|
3505
|
|
|
3506 /* At this point we now know that everything from marker on goes in
|
|
|
3507 the inside margin and everything before it goes in the outside
|
|
|
3508 margin. The stuff going into the outside margin is guaranteed
|
|
|
3509 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3510
|
|
|
3511 in_in_start = dl->bounds.right_in;
|
|
|
3512 in_out_end = dl->bounds.right_in;
|
|
|
3513 in_out_cnt = in_in_cnt = 0;
|
|
|
3514
|
|
|
3515 Dynarr_free (ib);
|
|
|
3516 elt = 0;
|
|
|
3517 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3518 {
|
|
|
3519 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3520
|
|
|
3521 if (NILP (gb->extent))
|
|
|
3522 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3523
|
|
|
3524 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3525 {
|
|
438
|
3526 int width = glyph_width (gb->glyph, window);
|
|
428
|
3527
|
|
|
3528 if (used_out)
|
|
|
3529 {
|
|
|
3530 in_out_cnt++;
|
|
|
3531 in_out_end += width;
|
|
|
3532 gb->width = width;
|
|
|
3533 gb->active = 1;
|
|
|
3534 used_out -= width;
|
|
|
3535 }
|
|
|
3536 else if (in_in_start - width >= white_in_end)
|
|
|
3537 {
|
|
|
3538 in_in_cnt++;
|
|
|
3539 in_in_start -= width;
|
|
|
3540 gb->width = width;
|
|
|
3541 gb->active = 1;
|
|
|
3542 }
|
|
|
3543 else
|
|
|
3544 gb->active = 0;
|
|
|
3545 }
|
|
|
3546
|
|
|
3547 elt++;
|
|
|
3548 }
|
|
|
3549 }
|
|
|
3550
|
|
|
3551 /* Determine how many outside margin glyphs we can display. They
|
|
|
3552 always start at the right outside margin and can only use the
|
|
|
3553 outside margin space. */
|
|
|
3554 out_start = dl->bounds.right_out;
|
|
|
3555 out_cnt = 0;
|
|
|
3556 elt = 0;
|
|
|
3557
|
|
|
3558 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3559 {
|
|
|
3560 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3561
|
|
|
3562 if (NILP (gb->extent))
|
|
|
3563 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3564
|
|
|
3565 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3566 {
|
|
438
|
3567 int width = glyph_width (gb->glyph, window);
|
|
428
|
3568
|
|
|
3569 if (out_start - width >= in_out_end)
|
|
|
3570 {
|
|
|
3571 out_cnt++;
|
|
|
3572 out_start -= width;
|
|
|
3573 gb->width = width;
|
|
|
3574 gb->active = 1;
|
|
|
3575 }
|
|
|
3576 else
|
|
|
3577 gb->active = 0;
|
|
|
3578 }
|
|
|
3579
|
|
|
3580 elt++;
|
|
|
3581 }
|
|
|
3582
|
|
|
3583 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3584 to the appropriate display blocks. */
|
|
|
3585 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3586 {
|
|
|
3587 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3588 /* #### See comments before odb->start_pos init in
|
|
|
3589 create_left_glyph_block */
|
|
|
3590 odb->start_pos = dl->bounds.right_in;
|
|
|
3591 odb->end_pos = dl->bounds.right_out;
|
|
|
3592 Dynarr_reset (odb->runes);
|
|
|
3593 }
|
|
|
3594 else
|
|
|
3595 odb = 0;
|
|
|
3596
|
|
|
3597 if (in_in_cnt || white_in_cnt)
|
|
|
3598 {
|
|
|
3599 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3600 idb->start_pos = dl->bounds.right_white;
|
|
|
3601 /* #### See comments before odb->start_pos init in
|
|
|
3602 create_left_glyph_block */
|
|
|
3603 idb->end_pos = dl->bounds.right_in;
|
|
|
3604 Dynarr_reset (idb->runes);
|
|
|
3605 }
|
|
|
3606 else
|
|
|
3607 idb = 0;
|
|
|
3608
|
|
|
3609 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3610 inside margin. */
|
|
|
3611 if (white_in_cnt)
|
|
|
3612 {
|
|
|
3613 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3614 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3615 window);
|
|
|
3616 }
|
|
|
3617 else
|
|
|
3618 end_xpos = dl->bounds.right_white;
|
|
|
3619
|
|
|
3620 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3621 and the inside margin glyphs is cleared. */
|
|
|
3622 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3623 {
|
|
|
3624 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3625 RIGHT_GLYPHS);
|
|
|
3626 }
|
|
|
3627
|
|
|
3628 /* Next add the inside margin glyphs which are actually in the
|
|
|
3629 inside margin. */
|
|
|
3630 if (in_in_cnt)
|
|
|
3631 {
|
|
|
3632 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3633 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3634 }
|
|
|
3635
|
|
|
3636 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3637 of the inside margin area gets cleared. */
|
|
|
3638 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3639 {
|
|
|
3640 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3641 RIGHT_GLYPHS);
|
|
|
3642 }
|
|
|
3643
|
|
|
3644 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3645 if (white_out_cnt)
|
|
|
3646 {
|
|
|
3647 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3648 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3649 }
|
|
|
3650 else
|
|
|
3651 end_xpos = dl->bounds.right_in;
|
|
|
3652
|
|
|
3653 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3654 if (in_out_cnt)
|
|
|
3655 {
|
|
|
3656 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3657 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3658 }
|
|
|
3659
|
|
|
3660 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3661 in the outside margin and the actual outside margin glyphs. */
|
|
|
3662 if (odb && (out_start - end_xpos))
|
|
|
3663 {
|
|
|
3664 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3665 RIGHT_GLYPHS);
|
|
|
3666 }
|
|
|
3667
|
|
|
3668 /* Finally, add the outside margin glyphs. */
|
|
|
3669 if (out_cnt)
|
|
|
3670 {
|
|
|
3671 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3672 RIGHT_GLYPHS, window);
|
|
|
3673 }
|
|
|
3674 }
|
|
|
3675
|
|
|
3676
|
|
|
3677 /***************************************************************************/
|
|
|
3678 /* */
|
|
|
3679 /* modeline routines */
|
|
|
3680 /* */
|
|
|
3681 /***************************************************************************/
|
|
|
3682
|
|
438
|
3683 /* This function is also used in frame.c by `generate_title_string' */
|
|
|
3684 void
|
|
|
3685 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3686 struct window *w, struct display_line *dl,
|
|
|
3687 struct display_block *db, face_index findex,
|
|
|
3688 int min_pixpos, int max_pixpos, int type)
|
|
|
3689 {
|
|
|
3690 struct frame *f = XFRAME (w->frame);
|
|
|
3691 struct device *d = XDEVICE (f->device);
|
|
|
3692
|
|
|
3693 pos_data data;
|
|
|
3694 int c_pixpos;
|
|
|
3695 Charcount offset = 0;
|
|
|
3696
|
|
|
3697 xzero (data);
|
|
|
3698 data.d = d;
|
|
|
3699 data.db = db;
|
|
|
3700 data.dl = dl;
|
|
|
3701 data.findex = findex;
|
|
|
3702 data.pixpos = min_pixpos;
|
|
|
3703 data.max_pixpos = max_pixpos;
|
|
|
3704 data.cursor_type = NO_CURSOR;
|
|
|
3705 data.last_charset = Qunbound;
|
|
|
3706 data.last_findex = DEFAULT_INDEX;
|
|
|
3707 data.result_str = result_str;
|
|
|
3708 data.is_modeline = 1;
|
|
|
3709 data.string = Qnil;
|
|
793
|
3710 data.window = wrap_window (w);
|
|
438
|
3711
|
|
|
3712 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3713 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3714 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3715
|
|
|
3716 /* result_str is nil when we're building a frame or icon title. Otherwise,
|
|
|
3717 we're building a modeline, so the offset starts at the modeline
|
|
442
|
3718 horizontal scrolling amount */
|
|
438
|
3719 if (! NILP (result_str))
|
|
|
3720 offset = w->modeline_hscroll;
|
|
|
3721 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3722 max_pixpos - min_pixpos, findex, type, &offset,
|
|
|
3723 Qnil);
|
|
|
3724
|
|
|
3725 if (Dynarr_length (db->runes))
|
|
|
3726 {
|
|
|
3727 struct rune *rb =
|
|
|
3728 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3729 c_pixpos = rb->xpos + rb->width;
|
|
|
3730 }
|
|
|
3731 else
|
|
|
3732 c_pixpos = min_pixpos;
|
|
|
3733
|
|
|
3734 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3735 to make up the difference. This usually only occurs if the
|
|
|
3736 modeline face is using a proportional width font or a fixed width
|
|
|
3737 font of a different size from the default face font. */
|
|
|
3738
|
|
|
3739 if (c_pixpos < max_pixpos)
|
|
|
3740 {
|
|
|
3741 data.pixpos = c_pixpos;
|
|
|
3742 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3743
|
|
|
3744 add_blank_rune (&data, NULL, 0);
|
|
|
3745 }
|
|
|
3746
|
|
|
3747 /* Now create the result string and frob the extents into it. */
|
|
|
3748 if (!NILP (result_str))
|
|
|
3749 {
|
|
|
3750 int elt;
|
|
|
3751 Bytecount len;
|
|
665
|
3752 Intbyte *strdata;
|
|
438
|
3753 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3754
|
|
442
|
3755 in_modeline_generation = 1;
|
|
|
3756
|
|
771
|
3757 sledgehammer_check_ascii_begin (result_str);
|
|
438
|
3758 detach_all_extents (result_str);
|
|
793
|
3759 resize_string (result_str, -1,
|
|
438
|
3760 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3761
|
|
|
3762 strdata = XSTRING_DATA (result_str);
|
|
|
3763
|
|
|
3764 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3765 {
|
|
|
3766 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3767 {
|
|
|
3768 len += (set_charptr_emchar
|
|
|
3769 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3770 elt)->object.chr.ch));
|
|
|
3771 }
|
|
|
3772 }
|
|
|
3773
|
|
771
|
3774 init_string_ascii_begin (result_str);
|
|
|
3775 bump_string_modiff (result_str);
|
|
|
3776 sledgehammer_check_ascii_begin (result_str);
|
|
|
3777
|
|
438
|
3778 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3779 elt++)
|
|
|
3780 {
|
|
|
3781 Lisp_Object extent = Qnil;
|
|
|
3782 Lisp_Object child;
|
|
|
3783
|
|
793
|
3784 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
438
|
3785 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3786 if (NILP (child))
|
|
|
3787 {
|
|
|
3788 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3789 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3790 }
|
|
|
3791 Fset_extent_parent (child, extent);
|
|
|
3792 set_extent_endpoints
|
|
|
3793 (XEXTENT (child),
|
|
|
3794 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3795 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3796 result_str);
|
|
|
3797 }
|
|
442
|
3798
|
|
|
3799 in_modeline_generation = 0;
|
|
438
|
3800 }
|
|
|
3801 }
|
|
|
3802
|
|
428
|
3803 /* Ensure that the given display line DL accurately represents the
|
|
|
3804 modeline for the given window. */
|
|
|
3805 static void
|
|
|
3806 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3807 {
|
|
|
3808 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3809 struct frame *f = XFRAME (w->frame);
|
|
|
3810 struct device *d = XDEVICE (f->device);
|
|
|
3811
|
|
|
3812 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3813 our feet. */
|
|
|
3814 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3815 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3816 Lisp_Object font_inst;
|
|
|
3817
|
|
|
3818 /* This will actually determine incorrect inside boundaries for the
|
|
|
3819 modeline since it ignores the margins. However being aware of this fact
|
|
|
3820 we never use those values anywhere so it doesn't matter. */
|
|
|
3821 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3822
|
|
|
3823 /* We are generating a modeline. */
|
|
|
3824 dl->modeline = 1;
|
|
|
3825 dl->cursor_elt = -1;
|
|
|
3826
|
|
|
3827 /* Reset the runes on the modeline. */
|
|
|
3828 Dynarr_reset (db->runes);
|
|
|
3829
|
|
|
3830 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3831 {
|
|
|
3832 struct rune rb;
|
|
|
3833
|
|
|
3834 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3835 if (window_scrollbar_height (w))
|
|
|
3836 return;
|
|
|
3837
|
|
|
3838 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3839 dl->descent = 0;
|
|
|
3840 /* The modeline is at the bottom of the gutters. */
|
|
|
3841 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3842
|
|
|
3843 rb.findex = MODELINE_INDEX;
|
|
|
3844 rb.xpos = dl->bounds.left_out;
|
|
|
3845 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
665
|
3846 rb.charbpos = 0;
|
|
428
|
3847 rb.endpos = 0;
|
|
|
3848 rb.type = RUNE_HLINE;
|
|
|
3849 rb.object.hline.thickness = 1;
|
|
|
3850 rb.object.hline.yoffset = 0;
|
|
|
3851 rb.cursor_type = NO_CURSOR;
|
|
|
3852
|
|
|
3853 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3854 && FRAME_WIN_P (f))
|
|
|
3855 {
|
|
|
3856 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3857
|
|
|
3858 dl->ypos -= shadow_thickness;
|
|
|
3859 rb.xpos += shadow_thickness;
|
|
|
3860 rb.width -= 2 * shadow_thickness;
|
|
|
3861 }
|
|
|
3862
|
|
|
3863 Dynarr_add (db->runes, rb);
|
|
|
3864 return;
|
|
|
3865 }
|
|
|
3866
|
|
|
3867 /* !!#### not right; needs to compute the max height of
|
|
|
3868 all the charsets */
|
|
|
3869 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3870
|
|
|
3871 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3872 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3873
|
|
|
3874 min_pixpos = dl->bounds.left_out;
|
|
|
3875 max_pixpos = dl->bounds.right_out;
|
|
|
3876
|
|
|
3877 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3878 {
|
|
|
3879 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3880
|
|
|
3881 ypos_adj = shadow_thickness;
|
|
|
3882 min_pixpos += shadow_thickness;
|
|
|
3883 max_pixpos -= shadow_thickness;
|
|
|
3884 }
|
|
|
3885 else
|
|
|
3886 ypos_adj = 0;
|
|
|
3887
|
|
|
3888 generate_formatted_string_db (b->modeline_format,
|
|
|
3889 b->generated_modeline_string, w, dl, db,
|
|
|
3890 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3891
|
|
|
3892 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3893 set this until we've generated the modeline in order to account
|
|
|
3894 for any embedded faces. */
|
|
|
3895 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3896 }
|
|
|
3897
|
|
|
3898 static Charcount
|
|
665
|
3899 add_string_to_fstring_db_runes (pos_data *data, const Intbyte *str,
|
|
771
|
3900 Charcount pos, Charcount min_pos,
|
|
|
3901 Charcount max_pos)
|
|
428
|
3902 {
|
|
|
3903 /* This function has been Mule-ized. */
|
|
|
3904 Charcount end;
|
|
665
|
3905 const Intbyte *cur_pos = str;
|
|
428
|
3906 struct display_block *db = data->db;
|
|
|
3907
|
|
|
3908 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3909 while (Dynarr_length (db->runes) < pos)
|
|
|
3910 add_blank_rune (data, NULL, 0);
|
|
|
3911
|
|
|
3912 end = (Dynarr_length (db->runes) +
|
|
442
|
3913 bytecount_to_charcount (str, strlen ((const char *) str)));
|
|
428
|
3914 if (max_pos != -1)
|
|
|
3915 end = min (max_pos, end);
|
|
|
3916
|
|
|
3917 while (pos < end && *cur_pos)
|
|
|
3918 {
|
|
665
|
3919 const Intbyte *old_cur_pos = cur_pos;
|
|
428
|
3920 int succeeded;
|
|
|
3921
|
|
|
3922 data->ch = charptr_emchar (cur_pos);
|
|
|
3923 succeeded = (add_emchar_rune (data) != ADD_FAILED);
|
|
|
3924 INC_CHARPTR (cur_pos);
|
|
|
3925 if (succeeded)
|
|
|
3926 {
|
|
|
3927 pos++;
|
|
|
3928 data->modeline_charpos++;
|
|
|
3929 data->bytepos += cur_pos - old_cur_pos;
|
|
|
3930 }
|
|
|
3931 }
|
|
|
3932
|
|
|
3933 while (Dynarr_length (db->runes) < min_pos &&
|
|
|
3934 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3935 add_blank_rune (data, NULL, 0);
|
|
|
3936
|
|
|
3937 return Dynarr_length (db->runes);
|
|
|
3938 }
|
|
|
3939
|
|
|
3940 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
3941 modeline extents. */
|
|
|
3942 static Charcount
|
|
|
3943 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
438
|
3944 Charcount pos, Charcount min_pos,
|
|
|
3945 Charcount max_pos, Lisp_Object extent)
|
|
428
|
3946 {
|
|
|
3947 /* This function has been Mule-ized. */
|
|
|
3948 Charcount end;
|
|
|
3949 struct display_block *db = data->db;
|
|
|
3950 struct glyph_block gb;
|
|
|
3951
|
|
|
3952 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3953 while (Dynarr_length (db->runes) < pos)
|
|
|
3954 add_blank_rune (data, NULL, 0);
|
|
|
3955
|
|
|
3956 end = Dynarr_length (db->runes) + 1;
|
|
|
3957 if (max_pos != -1)
|
|
|
3958 end = min (max_pos, end);
|
|
|
3959
|
|
|
3960 gb.glyph = glyph;
|
|
438
|
3961 gb.extent = extent;
|
|
428
|
3962 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3963 pos++;
|
|
|
3964
|
|
|
3965 while (Dynarr_length (db->runes) < pos &&
|
|
|
3966 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3967 add_blank_rune (data, NULL, 0);
|
|
|
3968
|
|
|
3969 return Dynarr_length (db->runes);
|
|
|
3970 }
|
|
|
3971
|
|
|
3972 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
3973 true of max_pixsize. */
|
|
|
3974 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
3975 if (Dynarr_length (data->db->runes)) \
|
|
|
3976 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
3977 else \
|
|
|
3978 cur_pixsize = 0;
|
|
|
3979
|
|
|
3980 /* Note that this function does "positions" in terms of characters and
|
|
|
3981 not in terms of columns. This is necessary to make the formatting
|
|
|
3982 work correctly when proportional width fonts are used in the
|
|
|
3983 modeline. */
|
|
|
3984 static Charcount
|
|
|
3985 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
3986 Charcount min_pos, Charcount max_pos,
|
|
|
3987 Lisp_Object elt, int depth, int max_pixsize,
|
|
438
|
3988 face_index findex, int type, Charcount *offset,
|
|
|
3989 Lisp_Object cur_ext)
|
|
428
|
3990 {
|
|
|
3991 /* This function has been Mule-ized. */
|
|
|
3992 /* #### The other losing things in this function are:
|
|
|
3993
|
|
|
3994 -- C zero-terminated-string lossage.
|
|
|
3995 -- Non-printable characters should be converted into something
|
|
|
3996 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
3997 */
|
|
|
3998
|
|
|
3999 tail_recurse:
|
|
|
4000 if (depth > 10)
|
|
|
4001 goto invalid;
|
|
|
4002
|
|
|
4003 depth++;
|
|
|
4004
|
|
|
4005 if (STRINGP (elt))
|
|
|
4006 {
|
|
|
4007 /* A string. Add to the display line and check for %-constructs
|
|
|
4008 within it. */
|
|
|
4009
|
|
665
|
4010 Intbyte *this = XSTRING_DATA (elt);
|
|
428
|
4011
|
|
|
4012 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
4013 {
|
|
665
|
4014 Intbyte *last = this;
|
|
428
|
4015
|
|
|
4016 while (*this && *this != '%')
|
|
|
4017 this++;
|
|
|
4018
|
|
|
4019 if (this != last)
|
|
|
4020 {
|
|
438
|
4021 /* No %-construct */
|
|
428
|
4022 Charcount size =
|
|
438
|
4023 bytecount_to_charcount (last, this - last);
|
|
|
4024
|
|
|
4025 if (size <= *offset)
|
|
|
4026 *offset -= size;
|
|
|
4027 else
|
|
|
4028 {
|
|
|
4029 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
|
|
|
4030 min (pos + size - *offset, max_pos));
|
|
665
|
4031 const Intbyte *tmp_last = charptr_n_addr (last, *offset);
|
|
438
|
4032
|
|
|
4033 pos = add_string_to_fstring_db_runes (data, tmp_last,
|
|
|
4034 pos, pos, tmp_max);
|
|
|
4035 *offset = 0;
|
|
|
4036 }
|
|
428
|
4037 }
|
|
|
4038 else /* *this == '%' */
|
|
|
4039 {
|
|
|
4040 Charcount spec_width = 0;
|
|
|
4041
|
|
|
4042 this++; /* skip over '%' */
|
|
|
4043
|
|
|
4044 /* We can't allow -ve args due to the "%-" construct.
|
|
|
4045 * Argument specifies minwidth but not maxwidth
|
|
|
4046 * (maxwidth can be specified by
|
|
|
4047 * (<negative-number> . <stuff>) modeline elements)
|
|
|
4048 */
|
|
|
4049 while (isdigit (*this))
|
|
|
4050 {
|
|
|
4051 spec_width = spec_width * 10 + (*this - '0');
|
|
|
4052 this++;
|
|
|
4053 }
|
|
|
4054 spec_width += pos;
|
|
|
4055
|
|
|
4056 if (*this == 'M')
|
|
|
4057 {
|
|
|
4058 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
4059 max_pos, Vglobal_mode_string,
|
|
|
4060 depth, max_pixsize, findex,
|
|
438
|
4061 type, offset, cur_ext);
|
|
428
|
4062 }
|
|
|
4063 else if (*this == '-')
|
|
|
4064 {
|
|
|
4065 Charcount num_to_add;
|
|
|
4066
|
|
|
4067 if (max_pixsize < 0)
|
|
|
4068 num_to_add = 0;
|
|
|
4069 else if (max_pos != -1)
|
|
|
4070 num_to_add = max_pos - pos;
|
|
|
4071 else
|
|
|
4072 {
|
|
|
4073 int cur_pixsize;
|
|
|
4074 int dash_pixsize;
|
|
665
|
4075 Intbyte ch = '-';
|
|
428
|
4076 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4077
|
|
|
4078 dash_pixsize =
|
|
|
4079 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
4080 1);
|
|
|
4081
|
|
|
4082 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
4083 num_to_add++;
|
|
|
4084 }
|
|
|
4085
|
|
|
4086 while (num_to_add--)
|
|
|
4087 pos = add_string_to_fstring_db_runes
|
|
665
|
4088 (data, (const Intbyte *) "-", pos, pos, max_pos);
|
|
428
|
4089 }
|
|
|
4090 else if (*this != 0)
|
|
|
4091 {
|
|
438
|
4092 Emchar ch = charptr_emchar (this);
|
|
665
|
4093 Intbyte *str;
|
|
438
|
4094 Charcount size;
|
|
|
4095
|
|
428
|
4096 decode_mode_spec (w, ch, type);
|
|
|
4097
|
|
665
|
4098 str = Dynarr_atp (mode_spec_intbyte_string, 0);
|
|
438
|
4099 size = bytecount_to_charcount
|
|
|
4100 /* Skip the null character added by `decode_mode_spec' */
|
|
665
|
4101 (str, Dynarr_length (mode_spec_intbyte_string)) - 1;
|
|
438
|
4102
|
|
|
4103 if (size <= *offset)
|
|
|
4104 *offset -= size;
|
|
|
4105 else
|
|
|
4106 {
|
|
665
|
4107 const Intbyte *tmp_str = charptr_n_addr (str, *offset);
|
|
438
|
4108
|
|
440
|
4109 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4110 computed and used here as in the plain string case
|
|
|
4111 above. -- dv */
|
|
|
4112 pos = add_string_to_fstring_db_runes (data, tmp_str,
|
|
|
4113 pos, pos,
|
|
|
4114 max_pos);
|
|
|
4115 *offset = 0;
|
|
|
4116 }
|
|
428
|
4117 }
|
|
|
4118
|
|
|
4119 /* NOT this++. There could be any sort of character at
|
|
|
4120 the current position. */
|
|
|
4121 INC_CHARPTR (this);
|
|
|
4122 }
|
|
|
4123
|
|
|
4124 if (max_pixsize > 0)
|
|
|
4125 {
|
|
|
4126 int cur_pixsize;
|
|
|
4127 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
4128
|
|
|
4129 if (cur_pixsize >= max_pixsize)
|
|
|
4130 break;
|
|
|
4131 }
|
|
|
4132 }
|
|
|
4133 }
|
|
|
4134 else if (SYMBOLP (elt))
|
|
|
4135 {
|
|
|
4136 /* A symbol: process the value of the symbol recursively
|
|
|
4137 as if it appeared here directly. */
|
|
|
4138 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
4139
|
|
|
4140 if (!UNBOUNDP (tem))
|
|
|
4141 {
|
|
438
|
4142 /* If value is a string, output that string literally:
|
|
428
|
4143 don't check for % within it. */
|
|
|
4144 if (STRINGP (tem))
|
|
|
4145 {
|
|
665
|
4146 Intbyte *str = XSTRING_DATA (tem);
|
|
438
|
4147 Charcount size = XSTRING_CHAR_LENGTH (tem);
|
|
|
4148
|
|
|
4149 if (size <= *offset)
|
|
|
4150 *offset -= size;
|
|
|
4151 else
|
|
|
4152 {
|
|
665
|
4153 const Intbyte *tmp_str = charptr_n_addr (str, *offset);
|
|
438
|
4154
|
|
440
|
4155 /* #### NOTE: I don't understand why a tmp_max is not
|
|
438
|
4156 computed and used here as in the plain string case
|
|
|
4157 above. -- dv */
|
|
|
4158 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4159 min_pos, max_pos);
|
|
|
4160 *offset = 0;
|
|
|
4161 }
|
|
428
|
4162 }
|
|
|
4163 /* Give up right away for nil or t. */
|
|
|
4164 else if (!EQ (tem, elt))
|
|
|
4165 {
|
|
|
4166 elt = tem;
|
|
|
4167 goto tail_recurse;
|
|
|
4168 }
|
|
|
4169 }
|
|
|
4170 }
|
|
|
4171 else if (GENERIC_SPECIFIERP (elt))
|
|
|
4172 {
|
|
|
4173 Lisp_Object window, tem;
|
|
793
|
4174 window = wrap_window (w);
|
|
428
|
4175 tem = specifier_instance_no_quit (elt, Qunbound, window,
|
|
793
|
4176 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
428
|
4177 if (!UNBOUNDP (tem))
|
|
|
4178 {
|
|
|
4179 elt = tem;
|
|
|
4180 goto tail_recurse;
|
|
|
4181 }
|
|
|
4182 }
|
|
|
4183 else if (CONSP (elt))
|
|
|
4184 {
|
|
|
4185 /* A cons cell: four distinct cases.
|
|
438
|
4186 * - If first element is a string or a cons, process all the elements
|
|
|
4187 * and effectively concatenate them.
|
|
|
4188 * - If first element is a negative number, truncate displaying cdr to
|
|
|
4189 * at most that many characters. If positive, pad (with spaces)
|
|
|
4190 * to at least that many characters.
|
|
771
|
4191 * - If first element is another symbol or a boolean specifier, process
|
|
|
4192 * the cadr or caddr recursively according to whether the symbol's
|
|
|
4193 * value or specifier's instance is non-nil or nil.
|
|
|
4194 * - If first element is , process the cadr or caddr
|
|
|
4195 * recursively according to whether the instance of the specifier in
|
|
|
4196 * the modeline's window is non-nil or nil.
|
|
442
|
4197 * - If first element is an extent, process the cdr recursively
|
|
|
4198 * and handle the extent's face.
|
|
428
|
4199 */
|
|
438
|
4200
|
|
428
|
4201 Lisp_Object car, tem;
|
|
|
4202
|
|
|
4203 car = XCAR (elt);
|
|
771
|
4204 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
|
|
438
|
4205 {
|
|
|
4206 elt = XCDR (elt);
|
|
|
4207 if (!CONSP (elt))
|
|
|
4208 goto invalid;
|
|
|
4209
|
|
771
|
4210 if (SYMBOLP (car))
|
|
|
4211 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
4212 else
|
|
|
4213 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
|
|
793
|
4214 ERROR_ME_DEBUG_WARN, 0, Qzero);
|
|
438
|
4215 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
4216 Use its car if CAR has a non-nil value. */
|
|
771
|
4217 if (!UNBOUNDP (tem) && !NILP (tem))
|
|
438
|
4218 {
|
|
771
|
4219 elt = XCAR (elt);
|
|
|
4220 goto tail_recurse;
|
|
438
|
4221 }
|
|
771
|
4222 /* Symbol's value or specifier's instance is nil or unbound
|
|
438
|
4223 * Get the cddr of the original list
|
|
|
4224 * and if possible find the caddr and use that.
|
|
|
4225 */
|
|
|
4226 elt = XCDR (elt);
|
|
|
4227 if (NILP (elt))
|
|
|
4228 ;
|
|
|
4229 else if (!CONSP (elt))
|
|
|
4230 goto invalid;
|
|
|
4231 else
|
|
|
4232 {
|
|
|
4233 elt = XCAR (elt);
|
|
|
4234 goto tail_recurse;
|
|
|
4235 }
|
|
|
4236 }
|
|
428
|
4237 else if (INTP (car))
|
|
|
4238 {
|
|
|
4239 Charcount lim = XINT (car);
|
|
|
4240
|
|
|
4241 elt = XCDR (elt);
|
|
|
4242
|
|
|
4243 if (lim < 0)
|
|
|
4244 {
|
|
|
4245 /* Negative int means reduce maximum width.
|
|
|
4246 * DO NOT change MIN_PIXPOS here!
|
|
|
4247 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
4248 * and then pad to 20.
|
|
|
4249 */
|
|
|
4250 if (max_pos == -1)
|
|
|
4251 max_pos = pos - lim;
|
|
|
4252 else
|
|
|
4253 max_pos = min (max_pos, pos - lim);
|
|
|
4254 }
|
|
|
4255 else if (lim > 0)
|
|
|
4256 {
|
|
|
4257 /* Padding specified. Don't let it be more than
|
|
|
4258 * current maximum.
|
|
|
4259 */
|
|
|
4260 lim += pos;
|
|
|
4261 if (max_pos != -1 && lim > max_pos)
|
|
|
4262 lim = max_pos;
|
|
|
4263 /* If that's more padding than already wanted, queue it.
|
|
|
4264 * But don't reduce padding already specified even if
|
|
|
4265 * that is beyond the current truncation point.
|
|
|
4266 */
|
|
|
4267 if (lim > min_pos)
|
|
|
4268 min_pos = lim;
|
|
|
4269 }
|
|
|
4270 goto tail_recurse;
|
|
|
4271 }
|
|
|
4272 else if (STRINGP (car) || CONSP (car))
|
|
|
4273 {
|
|
|
4274 int limit = 50;
|
|
438
|
4275
|
|
428
|
4276 /* LIMIT is to protect against circular lists. */
|
|
|
4277 while (CONSP (elt) && --limit > 0
|
|
|
4278 && (pos < max_pos || max_pos == -1))
|
|
|
4279 {
|
|
|
4280 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
438
|
4281 XCAR (elt), depth, max_pixsize,
|
|
|
4282 findex, type, offset, cur_ext);
|
|
428
|
4283 elt = XCDR (elt);
|
|
|
4284 }
|
|
|
4285 }
|
|
|
4286 else if (EXTENTP (car))
|
|
|
4287 {
|
|
|
4288 struct extent *ext = XEXTENT (car);
|
|
|
4289
|
|
|
4290 if (EXTENT_LIVE_P (ext))
|
|
|
4291 {
|
|
|
4292 face_index old_findex = data->findex;
|
|
|
4293 Lisp_Object face;
|
|
|
4294 Lisp_Object font_inst;
|
|
|
4295 face_index new_findex;
|
|
|
4296 Bytecount start = data->bytepos;
|
|
|
4297
|
|
|
4298 face = extent_face (ext);
|
|
|
4299 if (FACEP (face))
|
|
|
4300 {
|
|
|
4301 /* #### needs to merge faces, sigh */
|
|
|
4302 /* #### needs to handle list of faces */
|
|
|
4303 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
4304 /* !!#### not right; needs to compute the max height of
|
|
|
4305 all the charsets */
|
|
|
4306 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
4307 Vcharset_ascii);
|
|
|
4308
|
|
|
4309 data->dl->ascent = max (data->dl->ascent,
|
|
|
4310 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4311 data->dl->descent = max (data->dl->descent,
|
|
|
4312 XFONT_INSTANCE (font_inst)->
|
|
|
4313 descent);
|
|
|
4314 }
|
|
|
4315 else
|
|
|
4316 new_findex = old_findex;
|
|
|
4317
|
|
|
4318 data->findex = new_findex;
|
|
|
4319 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4320 XCDR (elt), depth - 1,
|
|
438
|
4321 max_pixsize, new_findex, type,
|
|
|
4322 offset, car);
|
|
428
|
4323 data->findex = old_findex;
|
|
|
4324 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4325 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4326 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4327 }
|
|
|
4328 }
|
|
|
4329 }
|
|
|
4330 else if (GLYPHP (elt))
|
|
|
4331 {
|
|
438
|
4332 /* Glyphs are considered as one character with respect to the modeline
|
|
|
4333 horizontal scrolling facility. -- dv */
|
|
|
4334 if (*offset > 0)
|
|
|
4335 *offset -= 1;
|
|
|
4336 else
|
|
|
4337 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
|
|
|
4338 cur_ext);
|
|
428
|
4339 }
|
|
|
4340 else
|
|
|
4341 {
|
|
|
4342 invalid:
|
|
438
|
4343 {
|
|
|
4344 char *str = GETTEXT ("*invalid*");
|
|
|
4345 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
|
|
|
4346
|
|
|
4347 if (size <= *offset)
|
|
|
4348 *offset -= size;
|
|
|
4349 else
|
|
|
4350 {
|
|
665
|
4351 const Intbyte *tmp_str =
|
|
|
4352 charptr_n_addr ((const Intbyte *) str, *offset);
|
|
438
|
4353
|
|
440
|
4354 /* #### NOTE: I don't understand why a tmp_max is not computed and
|
|
438
|
4355 used here as in the plain string case above. -- dv */
|
|
|
4356 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
|
|
|
4357 min_pos, max_pos);
|
|
|
4358 *offset = 0;
|
|
|
4359 }
|
|
|
4360 }
|
|
428
|
4361 }
|
|
|
4362
|
|
|
4363 if (min_pos > pos)
|
|
|
4364 {
|
|
665
|
4365 add_string_to_fstring_db_runes (data, (const Intbyte *) "", pos,
|
|
438
|
4366 min_pos, -1);
|
|
428
|
4367 }
|
|
|
4368
|
|
|
4369 return pos;
|
|
|
4370 }
|
|
|
4371
|
|
|
4372 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4373 they do not have a modeline block, it does nothing. */
|
|
|
4374 static void
|
|
|
4375 regenerate_modeline (struct window *w)
|
|
|
4376 {
|
|
|
4377 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4378
|
|
|
4379 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4380 return;
|
|
|
4381 else
|
|
|
4382 {
|
|
|
4383 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4384 redisplay_update_line (w, 0, 0, 0);
|
|
|
4385 }
|
|
|
4386 }
|
|
|
4387
|
|
|
4388 /* Make sure that modeline display line is present in the given
|
|
|
4389 display structs if the window has a modeline and update that
|
|
|
4390 line. Returns true if a modeline was needed. */
|
|
|
4391 static int
|
|
|
4392 ensure_modeline_generated (struct window *w, int type)
|
|
|
4393 {
|
|
|
4394 int need_modeline;
|
|
|
4395
|
|
|
4396 /* minibuffer windows don't have modelines */
|
|
|
4397 if (MINI_WINDOW_P (w))
|
|
|
4398 need_modeline = 0;
|
|
|
4399 /* windows which haven't had it turned off do */
|
|
|
4400 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4401 need_modeline = 1;
|
|
|
4402 /* windows which have it turned off don't have a divider if there is
|
|
|
4403 a horizontal scrollbar */
|
|
|
4404 else if (window_scrollbar_height (w))
|
|
|
4405 need_modeline = 0;
|
|
|
4406 /* and in this case there is none */
|
|
|
4407 else
|
|
|
4408 need_modeline = 1;
|
|
|
4409
|
|
|
4410 if (need_modeline)
|
|
|
4411 {
|
|
|
4412 display_line_dynarr *dla;
|
|
|
4413
|
|
|
4414 dla = window_display_lines (w, type);
|
|
|
4415
|
|
|
4416 /* We don't care if there is a display line which is not
|
|
|
4417 currently a modeline because it is definitely going to become
|
|
|
4418 one if we have gotten to this point. */
|
|
|
4419 if (Dynarr_length (dla) == 0)
|
|
|
4420 {
|
|
|
4421 if (Dynarr_largest (dla) > 0)
|
|
800
|
4422 Dynarr_increment (dla);
|
|
428
|
4423 else
|
|
|
4424 {
|
|
|
4425 struct display_line modeline;
|
|
|
4426 xzero (modeline);
|
|
|
4427 Dynarr_add (dla, modeline);
|
|
|
4428 }
|
|
|
4429 }
|
|
|
4430
|
|
|
4431 /* If we're adding a new place marker go ahead and generate the
|
|
|
4432 modeline so that it is available for use by
|
|
|
4433 window_modeline_height. */
|
|
|
4434 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4435 }
|
|
|
4436
|
|
|
4437 return need_modeline;
|
|
|
4438 }
|
|
|
4439
|
|
|
4440 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4441 int
|
|
|
4442 real_current_modeline_height (struct window *w)
|
|
|
4443 {
|
|
|
4444 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
|
4445 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
|
4446
|
|
|
4447 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4448 {
|
|
|
4449 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4450
|
|
|
4451 if (Dynarr_length (dla))
|
|
|
4452 {
|
|
|
4453 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4454 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4455 Dynarr_atp (dla, 0)->descent);
|
|
|
4456 }
|
|
|
4457 }
|
|
|
4458 return 0;
|
|
|
4459 }
|
|
|
4460
|
|
|
4461
|
|
|
4462 /***************************************************************************/
|
|
819
|
4463 /* */
|
|
|
4464 /* displayable string routines */
|
|
|
4465 /* */
|
|
428
|
4466 /***************************************************************************/
|
|
|
4467
|
|
|
4468 /* Given a position for a string in a window, ensure that the given
|
|
|
4469 display line DL accurately represents the text on a line starting
|
|
|
4470 at the given position.
|
|
|
4471
|
|
|
4472 Yes, this is duplicating the code of create_text_block, but it
|
|
|
4473 looked just too hard to change create_text_block to handle strings
|
|
|
4474 *and* buffers. We already make a distinction between the two
|
|
|
4475 elsewhere in the code so I think unifying them would require a
|
|
|
4476 complete MULE rewrite. Besides, the other distinction is that these
|
|
|
4477 functions cover text that the user *cannot edit* so we can remove
|
|
|
4478 everything to do with cursors, minibuffers etc. Eventually the
|
|
|
4479 modeline routines should be modified to use this code as it copes
|
|
|
4480 with many more types of display situation. */
|
|
|
4481
|
|
665
|
4482 static Charbpos
|
|
428
|
4483 create_string_text_block (struct window *w, Lisp_Object disp_string,
|
|
|
4484 struct display_line *dl,
|
|
665
|
4485 Charbpos start_pos,
|
|
428
|
4486 prop_block_dynarr **prop,
|
|
|
4487 face_index default_face)
|
|
|
4488 {
|
|
|
4489 struct frame *f = XFRAME (w->frame);
|
|
|
4490 /* Note that a lot of the buffer controlled stuff has been left in
|
|
|
4491 because you might well want to make use of it (selective display
|
|
|
4492 etc), its just the buffer text that we do not use. However, it
|
|
|
4493 seems to be possible for buffer to be nil sometimes so protect
|
|
|
4494 against this case. */
|
|
|
4495 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
|
|
|
4496 struct device *d = XDEVICE (f->device);
|
|
|
4497
|
|
|
4498 /* we're working with these a lot so precalculate them */
|
|
|
4499 Bytecount slen = XSTRING_LENGTH (disp_string);
|
|
|
4500 Bytecount bi_string_zv = slen;
|
|
793
|
4501 Bytebpos bi_start_pos = string_index_char_to_byte (disp_string, start_pos);
|
|
428
|
4502
|
|
|
4503 pos_data data;
|
|
|
4504
|
|
|
4505 int truncate_win = b ? window_truncation_on (w) : 0;
|
|
|
4506
|
|
442
|
4507 /* We're going to ditch selective display for static text, it's an
|
|
|
4508 FSF thing and invisible extents are the way to go here.
|
|
|
4509 Implementing it also relies on a number of buffer-specific
|
|
428
|
4510 functions that we don't have the luxury of being able to use
|
|
|
4511 here. */
|
|
|
4512
|
|
|
4513 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
4514 can actually be displayed and which octal should be used for.
|
|
|
4515 #### This variable should probably have some rethought done to
|
|
|
4516 it.
|
|
|
4517
|
|
|
4518 #### It would also be really nice if you could specify that
|
|
|
4519 the characters come out in hex instead of in octal. Mule
|
|
|
4520 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
4521 but that's bogus -- we need a more general solution. I
|
|
|
4522 think you need to extend the concept of display tables
|
|
|
4523 into a more general conversion mechanism. Ideally you
|
|
|
4524 could specify a Lisp function that converts characters,
|
|
|
4525 but this violates the Second Golden Rule and besides would
|
|
|
4526 make things way way way way slow.
|
|
|
4527
|
|
|
4528 So instead, we extend the display-table concept, which was
|
|
|
4529 historically limited to 256-byte vectors, to one of the
|
|
|
4530 following:
|
|
|
4531
|
|
|
4532 a) A 256-entry vector, for backward compatibility;
|
|
|
4533 b) char-table, mapping characters to values;
|
|
|
4534 c) range-table, mapping ranges of characters to values;
|
|
|
4535 d) a list of the above.
|
|
|
4536
|
|
|
4537 The (d) option allows you to specify multiple display tables
|
|
|
4538 instead of just one. Each display table can specify conversions
|
|
|
4539 for some characters and leave others unchanged. The way the
|
|
|
4540 character gets displayed is determined by the first display table
|
|
|
4541 with a binding for that character. This way, you could call a
|
|
|
4542 function `enable-hex-display' that adds a hex display-table to
|
|
|
4543 the list of display tables for the current buffer.
|
|
|
4544
|
|
|
4545 #### ...not yet implemented... Also, we extend the concept of
|
|
|
4546 "mapping" to include a printf-like spec. Thus you can make all
|
|
|
4547 extended characters show up as hex with a display table like
|
|
|
4548 this:
|
|
|
4549
|
|
|
4550 #s(range-table data ((256 524288) (format "%x")))
|
|
|
4551
|
|
|
4552 Since more than one display table is possible, you have
|
|
|
4553 great flexibility in mapping ranges of characters. */
|
|
|
4554 Emchar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
|
4555 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
4556 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
4557 ? 255 : 160)) : 255;
|
|
|
4558
|
|
|
4559 Lisp_Object face_dt, window_dt;
|
|
|
4560
|
|
|
4561 /* The text display block for this display line. */
|
|
|
4562 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
4563
|
|
|
4564 /* The first time through the main loop we need to force the glyph
|
|
|
4565 data to be updated. */
|
|
|
4566 int initial = 1;
|
|
|
4567
|
|
|
4568 /* Apparently the new extent_fragment_update returns an end position
|
|
|
4569 equal to the position passed in if there are no more runs to be
|
|
|
4570 displayed. */
|
|
|
4571 int no_more_frags = 0;
|
|
|
4572
|
|
|
4573 dl->used_prop_data = 0;
|
|
|
4574 dl->num_chars = 0;
|
|
442
|
4575 dl->line_continuation = 0;
|
|
428
|
4576
|
|
|
4577 /* set up faces to use for clearing areas, used by
|
|
|
4578 output_display_line */
|
|
|
4579 dl->default_findex = default_face;
|
|
|
4580 if (default_face)
|
|
|
4581 {
|
|
|
4582 dl->left_margin_findex = default_face;
|
|
|
4583 dl->right_margin_findex = default_face;
|
|
|
4584 }
|
|
|
4585 else
|
|
|
4586 {
|
|
434
|
4587 dl->left_margin_findex =
|
|
428
|
4588 get_builtin_face_cache_index (w, Vleft_margin_face);
|
|
434
|
4589 dl->right_margin_findex =
|
|
428
|
4590 get_builtin_face_cache_index (w, Vright_margin_face);
|
|
|
4591 }
|
|
|
4592
|
|
|
4593 xzero (data);
|
|
|
4594 data.ef = extent_fragment_new (disp_string, f);
|
|
|
4595
|
|
|
4596 /* These values are used by all of the rune addition routines. We add
|
|
|
4597 them to this structure for ease of passing. */
|
|
|
4598 data.d = d;
|
|
793
|
4599 data.window = wrap_window (w);
|
|
428
|
4600 data.db = db;
|
|
|
4601 data.dl = dl;
|
|
|
4602
|
|
665
|
4603 data.bi_charbpos = bi_start_pos;
|
|
428
|
4604 data.pixpos = dl->bounds.left_in;
|
|
|
4605 data.last_charset = Qunbound;
|
|
|
4606 data.last_findex = default_face;
|
|
|
4607 data.result_str = Qnil;
|
|
|
4608 data.string = disp_string;
|
|
|
4609
|
|
|
4610 /* Set the right boundary adjusting it to take into account any end
|
|
|
4611 glyph. Save the width of the end glyph for later use. */
|
|
|
4612 data.max_pixpos = dl->bounds.right_in;
|
|
819
|
4613 data.max_pixpos -= data.end_glyph_width;
|
|
428
|
4614
|
|
|
4615 data.cursor_type = NO_CURSOR;
|
|
|
4616 data.cursor_x = -1;
|
|
|
4617
|
|
|
4618 data.start_col = 0;
|
|
|
4619 /* I don't think we want this, string areas should not scroll with
|
|
434
|
4620 the window
|
|
428
|
4621 data.start_col = w->hscroll;
|
|
|
4622 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
|
|
|
4623 */
|
|
|
4624 data.bi_start_col_enabled = 0;
|
|
|
4625 data.hscroll_glyph_width_adjust = 0;
|
|
|
4626
|
|
|
4627 /* We regenerate the line from the very beginning. */
|
|
|
4628 Dynarr_reset (db->runes);
|
|
|
4629
|
|
|
4630 /* Why is this less than or equal and not just less than? If the
|
|
|
4631 starting position is already equal to the maximum we can't add
|
|
|
4632 anything else, right? Wrong. We might still have a newline to
|
|
|
4633 add. A newline can use the room allocated for an end glyph since
|
|
|
4634 if we add it we know we aren't going to be adding any end
|
|
|
4635 glyph. */
|
|
|
4636
|
|
|
4637 /* #### Chuck -- I think this condition should be while (1).
|
|
|
4638 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
4639 and the begin-glyph ends exactly at the end of the window, the
|
|
|
4640 end-glyph and text might not be displayed. while (1) ensures
|
|
|
4641 that the loop terminates only when either (a) there is
|
|
|
4642 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
4643
|
|
|
4644 #### Also I think you need to ensure that the operation
|
|
|
4645 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
4646 can't get interrupted in the middle. If you run off the end
|
|
|
4647 of the line during that operation, then you keep accumulating
|
|
|
4648 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
4649 there's a begin glyph at a particular position and attempting
|
|
|
4650 to display that glyph results in window-end being hit and
|
|
|
4651 propagation data being generated, then the character at that
|
|
|
4652 position won't be displayed.
|
|
|
4653
|
|
|
4654 #### See also the comment after the end of this loop, below.
|
|
|
4655 */
|
|
|
4656 while (data.pixpos <= data.max_pixpos)
|
|
|
4657 {
|
|
|
4658 /* #### This check probably should not be necessary. */
|
|
665
|
4659 if (data.bi_charbpos > bi_string_zv)
|
|
428
|
4660 {
|
|
|
4661 /* #### urk! More of this lossage! */
|
|
665
|
4662 data.bi_charbpos--;
|
|
428
|
4663 goto done;
|
|
|
4664 }
|
|
|
4665
|
|
|
4666 /* Check for face changes. */
|
|
665
|
4667 if (initial || (!no_more_frags && data.bi_charbpos == data.ef->end))
|
|
428
|
4668 {
|
|
819
|
4669 Lisp_Object last_glyph = Qnil;
|
|
|
4670 /* Deal with clipped glyphs that we have already displayed. */
|
|
|
4671 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
|
|
|
4672 {
|
|
|
4673 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
|
|
|
4674 Dynarr_free (*prop);
|
|
|
4675 *prop = 0;
|
|
|
4676 }
|
|
428
|
4677 /* Now compute the face and begin/end-glyph information. */
|
|
|
4678 data.findex =
|
|
793
|
4679 /* Remember that the extent-fragment routines deal in
|
|
|
4680 Bytebpos's. */
|
|
819
|
4681 extent_fragment_update (w, data.ef, data.bi_charbpos, last_glyph);
|
|
428
|
4682 /* This is somewhat cheesy but the alternative is to
|
|
|
4683 propagate default_face into extent_fragment_update. */
|
|
|
4684 if (data.findex == DEFAULT_INDEX)
|
|
|
4685 data.findex = default_face;
|
|
|
4686
|
|
|
4687 get_display_tables (w, data.findex, &face_dt, &window_dt);
|
|
|
4688
|
|
665
|
4689 if (data.bi_charbpos == data.ef->end)
|
|
428
|
4690 no_more_frags = 1;
|
|
|
4691 }
|
|
|
4692 initial = 0;
|
|
|
4693
|
|
|
4694 /* Determine what is next to be displayed. We first handle any
|
|
665
|
4695 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
|
|
428
|
4696 display then we determine what to do based on the character at the
|
|
|
4697 current buffer position. */
|
|
|
4698
|
|
|
4699 /* If the current position is covered by an invisible extent, do
|
|
|
4700 nothing (except maybe add some ellipses).
|
|
|
4701
|
|
|
4702 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
4703 invisible extent should be investigated further. This is
|
|
|
4704 fairly low priority though. */
|
|
|
4705 if (data.ef->invisible)
|
|
|
4706 {
|
|
|
4707 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
4708 really know what I'm doing. */
|
|
|
4709 if (*prop)
|
|
|
4710 {
|
|
|
4711 Dynarr_free (*prop);
|
|
|
4712 *prop = 0;
|
|
|
4713 }
|
|
|
4714
|
|
|
4715 /* The extent fragment code only sets this when we should
|
|
|
4716 really display the ellipses. It makes sure the ellipses
|
|
|
4717 don't get displayed more than once in a row. */
|
|
|
4718 if (data.ef->invisible_ellipses)
|
|
|
4719 {
|
|
|
4720 struct glyph_block gb;
|
|
|
4721
|
|
|
4722 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
4723 data.ef->invisible_ellipses = 0;
|
|
|
4724 gb.extent = Qnil;
|
|
|
4725 gb.glyph = Vinvisible_text_glyph;
|
|
|
4726 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
4727 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
4728 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
4729 is to display a newline (for compatibility with
|
|
|
4730 selective-display-ellipses)? Maybe that's too
|
|
|
4731 abstruse. */
|
|
|
4732 if (*prop)
|
|
|
4733 goto done;
|
|
|
4734 }
|
|
|
4735
|
|
638
|
4736 /* #### What if we're dealing with a display table? */
|
|
428
|
4737 if (data.start_col)
|
|
|
4738 data.start_col--;
|
|
|
4739
|
|
665
|
4740 if (data.bi_charbpos == bi_string_zv)
|
|
428
|
4741 goto done;
|
|
|
4742 else
|
|
793
|
4743 INC_CHARBYTEBPOS (XSTRING_DATA (disp_string), data.bi_charbpos);
|
|
428
|
4744 }
|
|
|
4745
|
|
|
4746 /* If there is propagation data, then it represents the current
|
|
|
4747 buffer position being displayed. Add them and advance the
|
|
|
4748 position counter. This might also add the minibuffer
|
|
|
4749 prompt. */
|
|
|
4750 else if (*prop)
|
|
|
4751 {
|
|
|
4752 dl->used_prop_data = 1;
|
|
|
4753 *prop = add_propagation_runes (prop, &data);
|
|
|
4754
|
|
|
4755 if (*prop)
|
|
|
4756 goto done; /* gee, a really narrow window */
|
|
665
|
4757 else if (data.bi_charbpos == bi_string_zv)
|
|
428
|
4758 goto done;
|
|
665
|
4759 else if (data.bi_charbpos < 0)
|
|
428
|
4760 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
665
|
4761 data.bi_charbpos = 0;
|
|
428
|
4762 else
|
|
793
|
4763 INC_CHARBYTEBPOS (XSTRING_DATA (disp_string), data.bi_charbpos);
|
|
428
|
4764 }
|
|
|
4765
|
|
|
4766 /* If there are end glyphs, add them to the line. These are
|
|
|
4767 the end glyphs for the previous run of text. We add them
|
|
|
4768 here rather than doing them at the end of handling the
|
|
|
4769 previous run so that glyphs at the beginning and end of
|
|
|
4770 a line are handled correctly. */
|
|
|
4771 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
4772 {
|
|
819
|
4773 data.ch = XSTRING_CHAR (disp_string, data.bi_charbpos);
|
|
428
|
4774 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
819
|
4775
|
|
|
4776 if (*prop) {
|
|
428
|
4777 goto done;
|
|
819
|
4778 }
|
|
428
|
4779 }
|
|
|
4780
|
|
|
4781 /* If there are begin glyphs, add them to the line. */
|
|
|
4782 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
4783 {
|
|
819
|
4784 data.ch = XSTRING_CHAR (disp_string, data.bi_charbpos);
|
|
428
|
4785 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
819
|
4786
|
|
|
4787 if (*prop) {
|
|
428
|
4788 goto done;
|
|
819
|
4789 }
|
|
428
|
4790 }
|
|
|
4791
|
|
|
4792 /* If at end-of-buffer, we've already processed begin and
|
|
|
4793 end-glyphs at this point and there's no text to process,
|
|
|
4794 so we're done. */
|
|
665
|
4795 else if (data.bi_charbpos == bi_string_zv)
|
|
428
|
4796 goto done;
|
|
|
4797
|
|
|
4798 else
|
|
|
4799 {
|
|
|
4800 Lisp_Object entry = Qnil;
|
|
|
4801 /* Get the character at the current buffer position. */
|
|
793
|
4802 data.ch = XSTRING_CHAR (disp_string, data.bi_charbpos);
|
|
428
|
4803 if (!NILP (face_dt) || !NILP (window_dt))
|
|
|
4804 entry = display_table_entry (data.ch, face_dt, window_dt);
|
|
|
4805
|
|
|
4806 /* If there is a display table entry for it, hand it off to
|
|
|
4807 add_disp_table_entry_runes and let it worry about it. */
|
|
|
4808 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
|
|
|
4809 {
|
|
|
4810 *prop = add_disp_table_entry_runes (&data, entry);
|
|
|
4811
|
|
|
4812 if (*prop)
|
|
|
4813 goto done;
|
|
|
4814 }
|
|
|
4815
|
|
|
4816 /* Check if we have hit a newline character. If so, add a marker
|
|
|
4817 to the line and end this loop. */
|
|
|
4818 else if (data.ch == '\n')
|
|
|
4819 {
|
|
|
4820 /* We aren't going to be adding an end glyph so give its
|
|
|
4821 space back in order to make sure that the cursor can
|
|
|
4822 fit. */
|
|
819
|
4823 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4824 goto done;
|
|
|
4825 }
|
|
|
4826
|
|
|
4827 /* If the current character is considered to be printable, then
|
|
|
4828 just add it. */
|
|
|
4829 else if (data.ch >= printable_min)
|
|
|
4830 {
|
|
|
4831 *prop = add_emchar_rune (&data);
|
|
|
4832 if (*prop)
|
|
|
4833 goto done;
|
|
|
4834 }
|
|
|
4835
|
|
|
4836 /* If the current character is a tab, determine the next tab
|
|
|
4837 starting position and add a blank rune which extends from the
|
|
|
4838 current pixel position to that starting position. */
|
|
|
4839 else if (data.ch == '\t')
|
|
|
4840 {
|
|
|
4841 int tab_start_pixpos = data.pixpos;
|
|
|
4842 int next_tab_start;
|
|
|
4843 int char_tab_width;
|
|
|
4844 int prop_width = 0;
|
|
|
4845
|
|
|
4846 if (data.start_col > 1)
|
|
|
4847 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
4848
|
|
|
4849 next_tab_start =
|
|
|
4850 next_tab_position (w, tab_start_pixpos,
|
|
|
4851 dl->bounds.left_in +
|
|
|
4852 data.hscroll_glyph_width_adjust);
|
|
|
4853 if (next_tab_start > data.max_pixpos)
|
|
|
4854 {
|
|
|
4855 prop_width = next_tab_start - data.max_pixpos;
|
|
|
4856 next_tab_start = data.max_pixpos;
|
|
|
4857 }
|
|
|
4858 data.blank_width = next_tab_start - data.pixpos;
|
|
|
4859 char_tab_width =
|
|
|
4860 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
4861
|
|
|
4862 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
4863
|
|
|
4864 /* add_blank_rune is only supposed to be called with
|
|
819
|
4865 sizes guaranteed to fit in the available space. */
|
|
428
|
4866 assert (!(*prop));
|
|
|
4867
|
|
|
4868 if (prop_width)
|
|
|
4869 {
|
|
|
4870 struct prop_block pb;
|
|
|
4871 *prop = Dynarr_new (prop_block);
|
|
|
4872
|
|
|
4873 pb.type = PROP_BLANK;
|
|
|
4874 pb.data.p_blank.width = prop_width;
|
|
|
4875 pb.data.p_blank.findex = data.findex;
|
|
|
4876 Dynarr_add (*prop, pb);
|
|
|
4877
|
|
|
4878 goto done;
|
|
|
4879 }
|
|
|
4880 }
|
|
|
4881
|
|
|
4882 /* If character is a control character, pass it off to
|
|
|
4883 add_control_char_runes.
|
|
|
4884
|
|
|
4885 The is_*() routines have undefined results on
|
|
|
4886 arguments outside of the range [-1, 255]. (This
|
|
|
4887 often bites people who carelessly use `char' instead
|
|
|
4888 of `unsigned char'.)
|
|
|
4889 */
|
|
665
|
4890 else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
|
|
428
|
4891 {
|
|
|
4892 *prop = add_control_char_runes (&data, b);
|
|
|
4893
|
|
|
4894 if (*prop)
|
|
|
4895 goto done;
|
|
|
4896 }
|
|
|
4897
|
|
|
4898 /* If the character is above the ASCII range and we have not
|
|
|
4899 already handled it, then print it as an octal number. */
|
|
|
4900 else if (data.ch >= 0200)
|
|
|
4901 {
|
|
|
4902 *prop = add_octal_runes (&data);
|
|
|
4903
|
|
|
4904 if (*prop)
|
|
|
4905 goto done;
|
|
|
4906 }
|
|
|
4907
|
|
|
4908 /* Assume the current character is considered to be printable,
|
|
|
4909 then just add it. */
|
|
|
4910 else
|
|
|
4911 {
|
|
|
4912 *prop = add_emchar_rune (&data);
|
|
|
4913 if (*prop)
|
|
|
4914 goto done;
|
|
|
4915 }
|
|
|
4916
|
|
793
|
4917 INC_CHARBYTEBPOS (XSTRING_DATA (disp_string), data.bi_charbpos);
|
|
428
|
4918 }
|
|
|
4919 }
|
|
|
4920
|
|
819
|
4921 done:
|
|
428
|
4922
|
|
|
4923 /* Determine the starting point of the next line if we did not hit the
|
|
|
4924 end of the buffer. */
|
|
665
|
4925 if (data.bi_charbpos < bi_string_zv)
|
|
428
|
4926 {
|
|
|
4927 /* #### This check is not correct. If the line terminated
|
|
|
4928 due to a begin-glyph or end-glyph hitting window-end, then
|
|
665
|
4929 data.ch will not point to the character at data.bi_charbpos. If
|
|
428
|
4930 you make the two changes mentioned at the top of this loop,
|
|
|
4931 you should be able to say '(if (*prop))'. That should also
|
|
665
|
4932 make it possible to eliminate the data.bi_charbpos < BI_BUF_ZV (b)
|
|
428
|
4933 check. */
|
|
|
4934
|
|
|
4935 /* The common case is that the line ended because we hit a newline.
|
|
|
4936 In that case, the next character is just the next buffer
|
|
|
4937 position. */
|
|
|
4938 if (data.ch == '\n')
|
|
|
4939 {
|
|
793
|
4940 INC_CHARBYTEBPOS (XSTRING_DATA (disp_string), data.bi_charbpos);
|
|
428
|
4941 }
|
|
|
4942
|
|
|
4943 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
4944 line. */
|
|
|
4945 else
|
|
|
4946 {
|
|
|
4947 struct glyph_block gb;
|
|
|
4948 struct glyph_cachel *cachel;
|
|
|
4949
|
|
|
4950 /* If the line is to be truncated then we actually have to look
|
|
|
4951 for the next newline. We also add the end-of-line glyph which
|
|
|
4952 we know will fit because we adjusted the right border before
|
|
|
4953 we starting laying out the line. */
|
|
819
|
4954 data.max_pixpos += data.end_glyph_width;
|
|
428
|
4955 data.findex = default_face;
|
|
|
4956 gb.extent = Qnil;
|
|
|
4957
|
|
|
4958 if (truncate_win)
|
|
|
4959 {
|
|
665
|
4960 Bytebpos bi_pos;
|
|
428
|
4961
|
|
|
4962 /* Now find the start of the next line. */
|
|
793
|
4963 bi_pos = bi_find_next_emchar_in_string (disp_string, '\n',
|
|
|
4964 data.bi_charbpos, 1);
|
|
428
|
4965
|
|
|
4966 data.cursor_type = NO_CURSOR;
|
|
665
|
4967 data.bi_charbpos = bi_pos;
|
|
428
|
4968 gb.glyph = Vtruncation_glyph;
|
|
|
4969 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
4970 }
|
|
|
4971 else
|
|
|
4972 {
|
|
|
4973 /* The cursor can never be on the continuation glyph. */
|
|
|
4974 data.cursor_type = NO_CURSOR;
|
|
|
4975
|
|
665
|
4976 /* data.bi_charbpos is already at the start of the next line. */
|
|
428
|
4977
|
|
442
|
4978 dl->line_continuation = 1;
|
|
428
|
4979 gb.glyph = Vcontinuation_glyph;
|
|
|
4980 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
4981 }
|
|
|
4982
|
|
819
|
4983 if (data.end_glyph_width)
|
|
428
|
4984 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
|
|
|
4985
|
|
665
|
4986 if (truncate_win && data.bi_charbpos == bi_string_zv)
|
|
428
|
4987 {
|
|
793
|
4988 const Intbyte *endb = charptr_n_addr (XSTRING_DATA (disp_string),
|
|
|
4989 bi_string_zv);
|
|
428
|
4990 DEC_CHARPTR (endb);
|
|
|
4991 if (charptr_emchar (endb) != '\n')
|
|
|
4992 {
|
|
|
4993 /* #### Damn this losing shit. */
|
|
665
|
4994 data.bi_charbpos++;
|
|
428
|
4995 }
|
|
|
4996 }
|
|
|
4997 }
|
|
|
4998 }
|
|
665
|
4999 else if (data.bi_charbpos == bi_string_zv)
|
|
428
|
5000 {
|
|
|
5001 /* create_text_block () adds a bogus \n marker here which screws
|
|
|
5002 up subwindow display. Since we never have a cursor in the
|
|
|
5003 gutter we can safely ignore it. */
|
|
|
5004 }
|
|
|
5005 /* Calculate left whitespace boundary. */
|
|
|
5006 {
|
|
|
5007 int elt = 0;
|
|
|
5008
|
|
|
5009 /* Whitespace past a newline is considered right whitespace. */
|
|
|
5010 while (elt < Dynarr_length (db->runes))
|
|
|
5011 {
|
|
|
5012 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5013
|
|
|
5014 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
5015 || rb->type == RUNE_BLANK)
|
|
|
5016 {
|
|
|
5017 dl->bounds.left_white += rb->width;
|
|
|
5018 elt++;
|
|
|
5019 }
|
|
|
5020 else
|
|
|
5021 elt = Dynarr_length (db->runes);
|
|
|
5022 }
|
|
|
5023 }
|
|
|
5024
|
|
|
5025 /* Calculate right whitespace boundary. */
|
|
|
5026 {
|
|
|
5027 int elt = Dynarr_length (db->runes) - 1;
|
|
|
5028 int done = 0;
|
|
|
5029
|
|
|
5030 while (!done && elt >= 0)
|
|
|
5031 {
|
|
|
5032 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
5033
|
|
|
5034 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
5035 && isspace (rb->object.chr.ch))
|
|
|
5036 && !rb->type == RUNE_BLANK)
|
|
|
5037 {
|
|
|
5038 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
5039 done = 1;
|
|
|
5040 }
|
|
|
5041
|
|
|
5042 elt--;
|
|
|
5043
|
|
|
5044 }
|
|
|
5045
|
|
|
5046 /* The line is blank so everything is considered to be right
|
|
|
5047 whitespace. */
|
|
|
5048 if (!done)
|
|
|
5049 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
5050 }
|
|
|
5051
|
|
|
5052 /* Set the display blocks bounds. */
|
|
|
5053 db->start_pos = dl->bounds.left_in;
|
|
|
5054 if (Dynarr_length (db->runes))
|
|
|
5055 {
|
|
|
5056 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
5057
|
|
|
5058 db->end_pos = rb->xpos + rb->width;
|
|
|
5059 }
|
|
|
5060 else
|
|
|
5061 db->end_pos = dl->bounds.right_white;
|
|
|
5062
|
|
819
|
5063 calculate_baseline (&data);
|
|
428
|
5064
|
|
|
5065 dl->ascent = data.new_ascent;
|
|
|
5066 dl->descent = data.new_descent;
|
|
|
5067
|
|
|
5068 {
|
|
|
5069 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
5070
|
|
|
5071 if (dl->ascent < ascent)
|
|
|
5072 dl->ascent = ascent;
|
|
|
5073 }
|
|
|
5074 {
|
|
|
5075 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
5076
|
|
|
5077 if (dl->descent < descent)
|
|
|
5078 dl->descent = descent;
|
|
|
5079 }
|
|
|
5080
|
|
819
|
5081 calculate_yoffset (dl, db);
|
|
|
5082
|
|
428
|
5083 dl->cursor_elt = data.cursor_x;
|
|
|
5084 /* #### lossage lossage lossage! Fix this shit! */
|
|
665
|
5085 if (data.bi_charbpos > bi_string_zv)
|
|
793
|
5086 dl->end_charbpos = buffer_or_string_bytebpos_to_charbpos (disp_string,
|
|
|
5087 bi_string_zv);
|
|
428
|
5088 else
|
|
793
|
5089 dl->end_charbpos =
|
|
|
5090 buffer_or_string_bytebpos_to_charbpos (disp_string,
|
|
|
5091 data.bi_charbpos) - 1;
|
|
428
|
5092 if (truncate_win)
|
|
434
|
5093 data.dl->num_chars =
|
|
793
|
5094 string_column_at_point (disp_string, dl->end_charbpos,
|
|
|
5095 b ? XINT (b->tab_width) : 8);
|
|
428
|
5096 else
|
|
|
5097 /* This doesn't correctly take into account tabs and control
|
|
|
5098 characters but if the window isn't being truncated then this
|
|
|
5099 value isn't going to end up being used anyhow. */
|
|
665
|
5100 data.dl->num_chars = dl->end_charbpos - dl->charbpos;
|
|
428
|
5101
|
|
|
5102 /* #### handle horizontally scrolled line with text none of which
|
|
|
5103 was actually laid out. */
|
|
|
5104
|
|
|
5105 /* #### handle any remainder of overlay arrow */
|
|
|
5106
|
|
|
5107 if (*prop == ADD_FAILED)
|
|
|
5108 *prop = NULL;
|
|
|
5109
|
|
|
5110 if (truncate_win && *prop)
|
|
|
5111 {
|
|
|
5112 Dynarr_free (*prop);
|
|
|
5113 *prop = NULL;
|
|
|
5114 }
|
|
|
5115
|
|
|
5116 extent_fragment_delete (data.ef);
|
|
|
5117
|
|
|
5118 /* #### If we started at EOB, then make sure we return a value past
|
|
|
5119 it so that regenerate_window will exit properly. This is bogus.
|
|
|
5120 The main loop should get fixed so that it isn't necessary to call
|
|
|
5121 this function if we are already at EOB. */
|
|
|
5122
|
|
665
|
5123 if (data.bi_charbpos == bi_string_zv && bi_start_pos == bi_string_zv)
|
|
793
|
5124 return string_index_byte_to_char (disp_string,
|
|
|
5125 data.bi_charbpos) + 1; /* Yuck! */
|
|
428
|
5126 else
|
|
793
|
5127 return string_index_byte_to_char (disp_string, data.bi_charbpos);
|
|
428
|
5128 }
|
|
|
5129
|
|
|
5130 /* Given a display line and a starting position, ensure that the
|
|
|
5131 contents of the display line accurately represent the visual
|
|
|
5132 representation of the buffer contents starting from the given
|
|
|
5133 position when displayed in the given window. The display line ends
|
|
|
5134 when the contents of the line reach the right boundary of the given
|
|
434
|
5135 window.
|
|
|
5136
|
|
428
|
5137 This is very similar to generate_display_line but with the same
|
|
|
5138 limitations as create_string_text_block. I have taken the liberty
|
|
665
|
5139 of fixing the bytebpos stuff though.*/
|
|
|
5140
|
|
|
5141 static Charbpos
|
|
428
|
5142 generate_string_display_line (struct window *w, Lisp_Object disp_string,
|
|
|
5143 struct display_line *dl,
|
|
665
|
5144 Charbpos start_pos,
|
|
428
|
5145 prop_block_dynarr **prop,
|
|
|
5146 face_index default_face)
|
|
|
5147 {
|
|
665
|
5148 Charbpos ret_charbpos;
|
|
428
|
5149
|
|
|
5150 /* you must set bounds before calling this. */
|
|
434
|
5151
|
|
428
|
5152 /* Reset what this line is using. */
|
|
|
5153 if (dl->display_blocks)
|
|
|
5154 Dynarr_reset (dl->display_blocks);
|
|
|
5155 if (dl->left_glyphs)
|
|
|
5156 {
|
|
|
5157 Dynarr_free (dl->left_glyphs);
|
|
|
5158 dl->left_glyphs = 0;
|
|
|
5159 }
|
|
|
5160 if (dl->right_glyphs)
|
|
|
5161 {
|
|
|
5162 Dynarr_free (dl->right_glyphs);
|
|
|
5163 dl->right_glyphs = 0;
|
|
|
5164 }
|
|
|
5165
|
|
|
5166 /* We aren't generating a modeline at the moment. */
|
|
|
5167 dl->modeline = 0;
|
|
|
5168
|
|
|
5169 /* Create a display block for the text region of the line. */
|
|
665
|
5170 ret_charbpos = create_string_text_block (w, disp_string, dl, start_pos,
|
|
428
|
5171 prop, default_face);
|
|
665
|
5172 dl->charbpos = start_pos;
|
|
|
5173 if (dl->end_charbpos < dl->charbpos)
|
|
|
5174 dl->end_charbpos = dl->charbpos;
|
|
428
|
5175
|
|
|
5176 /* If there are left glyphs associated with any character in the
|
|
|
5177 text block, then create a display block to handle them. */
|
|
|
5178 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
5179 create_left_glyph_block (w, dl, 0);
|
|
|
5180
|
|
|
5181 /* If there are right glyphs associated with any character in the
|
|
|
5182 text block, then create a display block to handle them. */
|
|
|
5183 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
5184 create_right_glyph_block (w, dl);
|
|
|
5185
|
|
665
|
5186 return ret_charbpos;
|
|
428
|
5187 }
|
|
|
5188
|
|
|
5189 /* This is ripped off from regenerate_window. All we want to do is
|
|
|
5190 loop through elements in the string creating display lines until we
|
|
|
5191 have covered the provided area. Simple really. */
|
|
|
5192 void
|
|
|
5193 generate_displayable_area (struct window *w, Lisp_Object disp_string,
|
|
|
5194 int xpos, int ypos, int width, int height,
|
|
|
5195 display_line_dynarr* dla,
|
|
665
|
5196 Charbpos start_pos,
|
|
428
|
5197 face_index default_face)
|
|
|
5198 {
|
|
|
5199 int yend = ypos + height;
|
|
|
5200 Charcount s_zv;
|
|
|
5201
|
|
|
5202 prop_block_dynarr *prop = 0;
|
|
|
5203 layout_bounds bounds;
|
|
|
5204 assert (dla);
|
|
|
5205
|
|
|
5206 Dynarr_reset (dla);
|
|
|
5207 /* if there's nothing to do then do nothing. code after this assumes
|
|
|
5208 there is something to do. */
|
|
|
5209 if (NILP (disp_string))
|
|
|
5210 return;
|
|
|
5211
|
|
|
5212 s_zv = XSTRING_CHAR_LENGTH (disp_string);
|
|
|
5213
|
|
|
5214 bounds.left_out = xpos;
|
|
|
5215 bounds.right_out = xpos + width;
|
|
|
5216 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
5217 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
5218 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
5219 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
5220 depend on the contents of the line being displayed. */
|
|
|
5221 bounds.left_white = bounds.left_in;
|
|
|
5222 bounds.right_white = bounds.right_in;
|
|
|
5223
|
|
|
5224 while (ypos < yend)
|
|
|
5225 {
|
|
|
5226 struct display_line dl;
|
|
|
5227 struct display_line *dlp;
|
|
665
|
5228 Charbpos next_pos;
|
|
428
|
5229 int local;
|
|
|
5230
|
|
|
5231 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5232 {
|
|
|
5233 dlp = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
5234 local = 0;
|
|
|
5235 }
|
|
|
5236 else
|
|
|
5237 {
|
|
|
5238
|
|
|
5239 xzero (dl);
|
|
|
5240 dlp = &dl;
|
|
|
5241 local = 1;
|
|
|
5242 }
|
|
|
5243
|
|
|
5244 dlp->bounds = bounds;
|
|
|
5245 dlp->offset = 0;
|
|
|
5246 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
|
|
|
5247 &prop, default_face);
|
|
|
5248 /* we need to make sure that we continue along the line if there
|
|
|
5249 is more left to display otherwise we just end up redisplaying
|
|
|
5250 the same chunk over and over again. */
|
|
|
5251 if (next_pos == start_pos && next_pos < s_zv)
|
|
|
5252 start_pos++;
|
|
|
5253 else
|
|
|
5254 start_pos = next_pos;
|
|
|
5255
|
|
|
5256 dlp->ypos = ypos + dlp->ascent;
|
|
|
5257 ypos = dlp->ypos + dlp->descent;
|
|
|
5258
|
|
|
5259 if (ypos > yend)
|
|
|
5260 {
|
|
|
5261 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5262
|
|
|
5263 dlp->clip = (ypos - yend);
|
|
|
5264 visible_height -= dlp->clip;
|
|
|
5265
|
|
|
5266 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
5267 {
|
|
|
5268 if (local)
|
|
|
5269 free_display_line (dlp);
|
|
|
5270 break;
|
|
|
5271 }
|
|
|
5272 }
|
|
|
5273 else
|
|
|
5274 dlp->clip = 0;
|
|
|
5275
|
|
|
5276 Dynarr_add (dla, *dlp);
|
|
|
5277
|
|
|
5278 /* #### This type of check needs to be done down in the
|
|
|
5279 generate_display_line call. */
|
|
|
5280 if (start_pos >= s_zv)
|
|
|
5281 break;
|
|
|
5282 }
|
|
|
5283
|
|
|
5284 if (prop)
|
|
|
5285 Dynarr_free (prop);
|
|
|
5286 }
|
|
|
5287
|
|
|
5288
|
|
|
5289 /***************************************************************************/
|
|
|
5290 /* */
|
|
|
5291 /* window-regeneration routines */
|
|
|
5292 /* */
|
|
|
5293 /***************************************************************************/
|
|
|
5294
|
|
|
5295 /* For a given window and starting position in the buffer it contains,
|
|
|
5296 ensure that the TYPE display lines accurately represent the
|
|
|
5297 presentation of the window. We pass the buffer instead of getting
|
|
|
5298 it from the window since redisplay_window may have temporarily
|
|
|
5299 changed it to the echo area buffer. */
|
|
|
5300
|
|
|
5301 static void
|
|
665
|
5302 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
|
|
428
|
5303 {
|
|
|
5304 struct frame *f = XFRAME (w->frame);
|
|
|
5305 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5306 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
5307 int yend; /* set farther down */
|
|
|
5308 int yclip = WINDOW_TEXT_TOP_CLIP (w);
|
|
442
|
5309 int force;
|
|
428
|
5310
|
|
|
5311 prop_block_dynarr *prop;
|
|
|
5312 layout_bounds bounds;
|
|
|
5313 display_line_dynarr *dla;
|
|
|
5314 int need_modeline;
|
|
|
5315
|
|
|
5316 /* The lines had better exist by this point. */
|
|
|
5317 if (!(dla = window_display_lines (w, type)))
|
|
|
5318 abort ();
|
|
|
5319 Dynarr_reset (dla);
|
|
|
5320 w->max_line_len = 0;
|
|
|
5321
|
|
|
5322 /* Normally these get updated in redisplay_window but it is possible
|
|
|
5323 for this function to get called from some other points where that
|
|
|
5324 update may not have occurred. This acts as a safety check. */
|
|
|
5325 if (!Dynarr_length (w->face_cachels))
|
|
|
5326 reset_face_cachels (w);
|
|
|
5327 if (!Dynarr_length (w->glyph_cachels))
|
|
|
5328 reset_glyph_cachels (w);
|
|
|
5329
|
|
|
5330 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
5331 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
5332 w->last_point_x[type] = -1;
|
|
|
5333 w->last_point_y[type] = -1;
|
|
|
5334
|
|
|
5335 /* Make sure a modeline is in the structs if needed. */
|
|
|
5336 need_modeline = ensure_modeline_generated (w, type);
|
|
|
5337
|
|
|
5338 /* Wait until here to set this so that the structs have a modeline
|
|
|
5339 generated in the case where one didn't exist. */
|
|
|
5340 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
5341
|
|
|
5342 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
5343
|
|
|
5344 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
|
|
|
5345 if (MINI_WINDOW_P (w)
|
|
|
5346 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
|
|
|
5347 && !echo_area_active (f)
|
|
|
5348 && start_pos == BUF_BEGV (b))
|
|
|
5349 {
|
|
|
5350 struct prop_block pb;
|
|
|
5351 Lisp_Object string;
|
|
|
5352 prop = Dynarr_new (prop_block);
|
|
|
5353
|
|
|
5354 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
|
|
|
5355 pb.type = PROP_MINIBUF_PROMPT;
|
|
|
5356 pb.data.p_string.str = XSTRING_DATA(string);
|
|
|
5357 pb.data.p_string.len = XSTRING_LENGTH(string);
|
|
|
5358 Dynarr_add (prop, pb);
|
|
|
5359 }
|
|
|
5360 else
|
|
|
5361 prop = 0;
|
|
|
5362
|
|
442
|
5363 /* When we are computing things for scrolling purposes, make
|
|
|
5364 sure at least one line is always generated */
|
|
|
5365 force = (type == CMOTION_DISP);
|
|
|
5366
|
|
|
5367 /* Make sure this is set always */
|
|
|
5368 /* Note the conversion at end */
|
|
|
5369 w->window_end_pos[type] = start_pos;
|
|
|
5370 while (ypos < yend || force)
|
|
428
|
5371 {
|
|
|
5372 struct display_line dl;
|
|
|
5373 struct display_line *dlp;
|
|
|
5374 int local;
|
|
|
5375
|
|
|
5376 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
5377 {
|
|
|
5378 dlp = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
5379 local = 0;
|
|
|
5380 }
|
|
|
5381 else
|
|
|
5382 {
|
|
|
5383
|
|
|
5384 xzero (dl);
|
|
|
5385 dlp = &dl;
|
|
|
5386 local = 1;
|
|
|
5387 }
|
|
|
5388
|
|
|
5389 dlp->bounds = bounds;
|
|
|
5390 dlp->offset = 0;
|
|
|
5391 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
|
|
|
5392
|
|
|
5393 if (yclip > dlp->ascent)
|
|
|
5394 {
|
|
|
5395 /* this should never happen, but if it does just display the
|
|
|
5396 whole line */
|
|
|
5397 yclip = 0;
|
|
|
5398 }
|
|
|
5399
|
|
|
5400 dlp->ypos = (ypos + dlp->ascent) - yclip;
|
|
|
5401 ypos = dlp->ypos + dlp->descent;
|
|
|
5402
|
|
|
5403 /* See if we've been asked to start midway through a line, for
|
|
|
5404 partial display line scrolling. */
|
|
434
|
5405 if (yclip)
|
|
428
|
5406 {
|
|
|
5407 dlp->top_clip = yclip;
|
|
|
5408 yclip = 0;
|
|
|
5409 }
|
|
|
5410 else
|
|
|
5411 dlp->top_clip = 0;
|
|
|
5412
|
|
|
5413 if (ypos > yend)
|
|
|
5414 {
|
|
|
5415 int visible_height = dlp->ascent + dlp->descent;
|
|
|
5416
|
|
|
5417 dlp->clip = (ypos - yend);
|
|
|
5418 /* Although this seems strange we could have a single very
|
|
|
5419 tall line visible for which we need to account for both
|
|
|
5420 the top clip and the bottom clip. */
|
|
|
5421 visible_height -= (dlp->clip + dlp->top_clip);
|
|
|
5422
|
|
442
|
5423 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
|
|
428
|
5424 {
|
|
|
5425 if (local)
|
|
|
5426 free_display_line (dlp);
|
|
|
5427 break;
|
|
|
5428 }
|
|
|
5429 }
|
|
|
5430 else
|
|
|
5431 dlp->clip = 0;
|
|
|
5432
|
|
|
5433 if (dlp->cursor_elt != -1)
|
|
|
5434 {
|
|
|
5435 /* #### This check is steaming crap. Have to get things
|
|
|
5436 fixed so when create_text_block hits EOB, we're done,
|
|
|
5437 period. */
|
|
|
5438 if (w->last_point_x[type] == -1)
|
|
|
5439 {
|
|
|
5440 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
5441 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
5442 }
|
|
|
5443 else
|
|
|
5444 {
|
|
|
5445 /* #### This means that we've added a cursor at EOB
|
|
|
5446 twice. Yuck oh yuck. */
|
|
|
5447 struct display_block *db =
|
|
|
5448 get_display_block_from_line (dlp, TEXT);
|
|
|
5449
|
|
|
5450 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
5451 dlp->cursor_elt = -1;
|
|
|
5452 }
|
|
|
5453 }
|
|
|
5454
|
|
|
5455 if (dlp->num_chars > w->max_line_len)
|
|
|
5456 w->max_line_len = dlp->num_chars;
|
|
|
5457
|
|
|
5458 Dynarr_add (dla, *dlp);
|
|
|
5459
|
|
|
5460 /* #### This isn't right, but it is close enough for now. */
|
|
|
5461 w->window_end_pos[type] = start_pos;
|
|
|
5462
|
|
|
5463 /* #### This type of check needs to be done down in the
|
|
|
5464 generate_display_line call. */
|
|
|
5465 if (start_pos > BUF_ZV (b))
|
|
|
5466 break;
|
|
442
|
5467
|
|
|
5468 force = 0;
|
|
428
|
5469 }
|
|
|
5470
|
|
|
5471 if (prop)
|
|
|
5472 Dynarr_free (prop);
|
|
|
5473
|
|
|
5474 /* #### More not quite right, but close enough. */
|
|
442
|
5475 /* Ben sez: apparently window_end_pos[] is measured
|
|
428
|
5476 as the number of characters between the window end and the
|
|
|
5477 end of the buffer? This seems rather weirdo. What's
|
|
442
|
5478 the justification for this?
|
|
|
5479
|
|
|
5480 JV sez: Because BUF_Z (b) would be a good initial value, however
|
|
|
5481 that can change. This representation allows initalizing with 0.
|
|
|
5482 */
|
|
428
|
5483 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5484
|
|
|
5485 if (need_modeline)
|
|
|
5486 {
|
|
|
5487 /* We know that this is the right thing to use because we put it
|
|
|
5488 there when we first started working in this function. */
|
|
|
5489 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
5490 }
|
|
|
5491 }
|
|
|
5492
|
|
|
5493 #define REGEN_INC_FIND_START_END \
|
|
|
5494 do { \
|
|
|
5495 /* Determine start and end of lines. */ \
|
|
|
5496 if (!Dynarr_length (cdla)) \
|
|
|
5497 return 0; \
|
|
|
5498 else \
|
|
|
5499 { \
|
|
|
5500 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5501 { \
|
|
|
5502 dla_start = 1; \
|
|
|
5503 } \
|
|
|
5504 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
5505 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
5506 { \
|
|
|
5507 dla_start = 0; \
|
|
|
5508 } \
|
|
|
5509 else \
|
|
|
5510 abort (); /* structs differ */ \
|
|
|
5511 \
|
|
|
5512 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
5513 } \
|
|
|
5514 \
|
|
665
|
5515 start_pos = (Dynarr_atp (cdla, dla_start)->charbpos \
|
|
428
|
5516 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
5517 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
5518 full regen. */ \
|
|
|
5519 if (startp != start_pos) \
|
|
|
5520 return 0; \
|
|
|
5521 \
|
|
|
5522 /* Point is outside the visible region so give up. */ \
|
|
|
5523 if (pointm < start_pos) \
|
|
|
5524 return 0; \
|
|
|
5525 \
|
|
|
5526 } while (0)
|
|
|
5527
|
|
|
5528 /* This attempts to incrementally update the display structures. It
|
|
|
5529 returns a boolean indicating success or failure. This function is
|
|
|
5530 very similar to regenerate_window_incrementally and is in fact only
|
|
|
5531 called from that function. However, because of the nature of the
|
|
|
5532 changes it deals with it sometimes makes different assumptions
|
|
|
5533 which can lead to success which are much more difficult to make
|
|
|
5534 when dealing with buffer changes. */
|
|
|
5535
|
|
|
5536 static int
|
|
665
|
5537 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
|
|
|
5538 Charbpos pointm,
|
|
428
|
5539 Charcount beg_unchanged,
|
|
|
5540 Charcount end_unchanged)
|
|
|
5541 {
|
|
|
5542 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5543 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5544 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5545
|
|
|
5546 int dla_start = 0;
|
|
|
5547 int dla_end, line;
|
|
|
5548 int first_line, last_line;
|
|
665
|
5549 Charbpos start_pos;
|
|
428
|
5550 /* Don't define this in the loop where it is used because we
|
|
|
5551 definitely want its value to survive between passes. */
|
|
|
5552 prop_block_dynarr *prop = NULL;
|
|
|
5553
|
|
|
5554 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
5555 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
5556 under which this can happen, but I believe that it is probably a
|
|
|
5557 reasonable happening. */
|
|
|
5558 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
5559 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
5560 return 0;
|
|
|
5561
|
|
|
5562 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
5563 go ahead and proceed with the optimization attempt. */
|
|
|
5564 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5565 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5566 {
|
|
|
5567 struct frame *f = XFRAME (w->frame);
|
|
|
5568 struct device *d = XDEVICE (f->device);
|
|
|
5569 struct frame *sel_f = device_selected_frame (d);
|
|
|
5570 int success = 0;
|
|
|
5571
|
|
|
5572 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
5573 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5574 {
|
|
|
5575
|
|
|
5576 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
5577 {
|
|
|
5578 /* Always regenerate the modeline in case it is
|
|
|
5579 displaying the current line or column. */
|
|
|
5580 regenerate_modeline (w);
|
|
|
5581 success = 1;
|
|
|
5582 }
|
|
|
5583 }
|
|
|
5584 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
5585 {
|
|
|
5586 if (f->modeline_changed)
|
|
|
5587 regenerate_modeline (w);
|
|
|
5588 success = 1;
|
|
|
5589 }
|
|
|
5590
|
|
|
5591 if (!success)
|
|
|
5592 return 0;
|
|
|
5593 }
|
|
|
5594
|
|
|
5595 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
5596 return 1;
|
|
|
5597
|
|
|
5598 /* assert: There are no buffer modifications or they are all below the
|
|
|
5599 visible region. We assume that regenerate_window_incrementally has
|
|
|
5600 not called us unless this is true. */
|
|
|
5601
|
|
|
5602 REGEN_INC_FIND_START_END;
|
|
|
5603
|
|
|
5604 /* If the changed are starts before the visible area, give up. */
|
|
|
5605 if (beg_unchanged < startp)
|
|
|
5606 return 0;
|
|
|
5607
|
|
|
5608 /* Find what display line the extent changes first affect. */
|
|
|
5609 line = dla_start;
|
|
|
5610 while (line <= dla_end)
|
|
|
5611 {
|
|
|
5612 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
665
|
5613 Charbpos lstart = dl->charbpos + dl->offset;
|
|
|
5614 Charbpos lend = dl->end_charbpos + dl->offset;
|
|
428
|
5615
|
|
|
5616 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5617 break;
|
|
|
5618
|
|
|
5619 line++;
|
|
|
5620 }
|
|
|
5621
|
|
|
5622 /* If the changes are below the visible area then if point hasn't
|
|
|
5623 moved return success otherwise fail in order to be safe. */
|
|
|
5624 if (line > dla_end)
|
|
|
5625 {
|
|
|
5626 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5627 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
5628 return 1;
|
|
|
5629 else
|
|
|
5630 return 0;
|
|
|
5631 }
|
|
|
5632
|
|
|
5633 /* At this point we know what line the changes first affect. We now
|
|
|
5634 begin redrawing lines as long as we are still in the affected
|
|
|
5635 region and the line's size and positioning don't change.
|
|
|
5636 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5637 structs which could lead to an assertion failure. However, if we
|
|
|
5638 fail the next thing that is going to happen is a full regen so we
|
|
|
5639 will actually end up being safe. */
|
|
|
5640 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5641 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5642 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5643 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5644
|
|
|
5645 first_line = last_line = line;
|
|
|
5646 while (line <= dla_end)
|
|
|
5647 {
|
|
665
|
5648 Charbpos old_start, old_end, new_start;
|
|
428
|
5649 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5650 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5651 struct display_block *db;
|
|
|
5652 int initial_size;
|
|
|
5653
|
|
665
|
5654 assert (cdl->charbpos == ddl->charbpos);
|
|
|
5655 assert (cdl->end_charbpos == ddl->end_charbpos);
|
|
428
|
5656 assert (cdl->offset == ddl->offset);
|
|
|
5657
|
|
|
5658 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5659 initial_size = Dynarr_length (db->runes);
|
|
665
|
5660 old_start = ddl->charbpos + ddl->offset;
|
|
|
5661 old_end = ddl->end_charbpos + ddl->offset;
|
|
428
|
5662
|
|
|
5663 /* If this is the first line being updated and it used
|
|
|
5664 propagation data, fail. Otherwise we'll be okay because
|
|
|
5665 we'll have the necessary propagation data. */
|
|
|
5666 if (line == first_line && ddl->used_prop_data)
|
|
|
5667 return 0;
|
|
|
5668
|
|
665
|
5669 new_start = generate_display_line (w, ddl, 0, ddl->charbpos + ddl->offset,
|
|
428
|
5670 &prop, DESIRED_DISP);
|
|
|
5671 ddl->offset = 0;
|
|
|
5672
|
|
|
5673 /* #### If there is propagated stuff the fail. We could
|
|
|
5674 probably actually deal with this if the line had propagated
|
|
|
5675 information when originally created by a full
|
|
|
5676 regeneration. */
|
|
|
5677 if (prop)
|
|
|
5678 {
|
|
|
5679 Dynarr_free (prop);
|
|
|
5680 return 0;
|
|
|
5681 }
|
|
|
5682
|
|
|
5683 /* If any line position parameters have changed or a
|
|
|
5684 cursor has disappeared or disappeared, fail. */
|
|
|
5685 db = get_display_block_from_line (ddl, TEXT);
|
|
|
5686 if (cdl->ypos != ddl->ypos
|
|
|
5687 || cdl->ascent != ddl->ascent
|
|
|
5688 || cdl->descent != ddl->descent
|
|
|
5689 || cdl->top_clip != ddl->top_clip
|
|
|
5690 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5691 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
665
|
5692 || old_start != ddl->charbpos
|
|
|
5693 || old_end != ddl->end_charbpos
|
|
428
|
5694 || initial_size != Dynarr_length (db->runes))
|
|
|
5695 {
|
|
|
5696 return 0;
|
|
|
5697 }
|
|
|
5698
|
|
|
5699 if (ddl->cursor_elt != -1)
|
|
|
5700 {
|
|
|
5701 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5702 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5703 }
|
|
|
5704
|
|
|
5705 last_line = line;
|
|
|
5706
|
|
|
5707 /* If the extent changes end on the line we just updated then
|
|
|
5708 we're done. Otherwise go on to the next line. */
|
|
665
|
5709 if (end_unchanged <= ddl->end_charbpos)
|
|
428
|
5710 break;
|
|
|
5711 else
|
|
|
5712 line++;
|
|
|
5713 }
|
|
|
5714
|
|
|
5715 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
5716 return 1;
|
|
|
5717 }
|
|
|
5718
|
|
|
5719 /* Attempt to update the display data structures based on knowledge of
|
|
|
5720 the changed region in the buffer. Returns a boolean indicating
|
|
|
5721 success or failure. If this function returns a failure then a
|
|
|
5722 regenerate_window _must_ be performed next in order to maintain
|
|
|
5723 invariants located here. */
|
|
|
5724
|
|
|
5725 static int
|
|
665
|
5726 regenerate_window_incrementally (struct window *w, Charbpos startp,
|
|
|
5727 Charbpos pointm)
|
|
428
|
5728 {
|
|
|
5729 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5730 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
5731 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
5732 Charcount beg_unchanged, end_unchanged;
|
|
|
5733 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
5734
|
|
|
5735 int dla_start = 0;
|
|
|
5736 int dla_end, line;
|
|
665
|
5737 Charbpos start_pos;
|
|
428
|
5738
|
|
|
5739 /* If this function is called, the current and desired structures
|
|
|
5740 had better be identical. If they are not, then that is a bug. */
|
|
|
5741 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
5742
|
|
|
5743 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
5744 screws us up. */
|
|
|
5745 if (MINI_WINDOW_P (w))
|
|
|
5746 return 0;
|
|
|
5747
|
|
|
5748 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
5749 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
5750 ? -1
|
|
|
5751 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
5752
|
|
|
5753 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
5754 and succeed. */
|
|
|
5755 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
5756 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5757 extent_beg_unchanged,
|
|
|
5758 extent_end_unchanged);
|
|
|
5759
|
|
|
5760 /* We can't deal with deleted newlines. */
|
|
|
5761 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
5762 return 0;
|
|
|
5763
|
|
|
5764 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
5765 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
5766 ? -1
|
|
|
5767 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
5768
|
|
|
5769 REGEN_INC_FIND_START_END;
|
|
|
5770
|
|
|
5771 /* If the changed area starts before the visible area, give up. */
|
|
|
5772 if (beg_unchanged < startp)
|
|
|
5773 return 0;
|
|
|
5774
|
|
|
5775 /* Find what display line the buffer changes first affect. */
|
|
|
5776 line = dla_start;
|
|
|
5777 while (line <= dla_end)
|
|
|
5778 {
|
|
|
5779 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
665
|
5780 Charbpos lstart = dl->charbpos + dl->offset;
|
|
|
5781 Charbpos lend = dl->end_charbpos + dl->offset;
|
|
428
|
5782
|
|
|
5783 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
5784 break;
|
|
|
5785
|
|
|
5786 line++;
|
|
|
5787 }
|
|
|
5788
|
|
|
5789 /* If the changes are below the visible area then if point hasn't
|
|
|
5790 moved return success otherwise fail in order to be safe. */
|
|
|
5791 if (line > dla_end)
|
|
|
5792 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5793 extent_beg_unchanged,
|
|
|
5794 extent_end_unchanged);
|
|
|
5795 else
|
|
|
5796 /* At this point we know what line the changes first affect. We
|
|
|
5797 now redraw that line. If the changes are contained within it
|
|
|
5798 we are going to succeed and can update just that one line.
|
|
|
5799 Otherwise we fail. If we fail we will have altered the desired
|
|
|
5800 structs which could lead to an assertion failure. However, if
|
|
|
5801 we fail the next thing that is going to happen is a full regen
|
|
|
5802 so we will actually end up being safe. */
|
|
|
5803 {
|
|
665
|
5804 Charbpos new_start;
|
|
428
|
5805 prop_block_dynarr *prop = NULL;
|
|
|
5806 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
5807 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
5808
|
|
665
|
5809 assert (cdl->charbpos == ddl->charbpos);
|
|
|
5810 assert (cdl->end_charbpos == ddl->end_charbpos);
|
|
428
|
5811 assert (cdl->offset == ddl->offset);
|
|
|
5812
|
|
442
|
5813 /* If the line continues to next display line, fail. */
|
|
|
5814 if (ddl->line_continuation)
|
|
|
5815 return 0;
|
|
428
|
5816
|
|
|
5817 /* If the line was generated using propagation data, fail. */
|
|
|
5818 if (ddl->used_prop_data)
|
|
|
5819 return 0;
|
|
|
5820
|
|
665
|
5821 new_start = generate_display_line (w, ddl, 0, ddl->charbpos + ddl->offset,
|
|
428
|
5822 &prop, DESIRED_DISP);
|
|
|
5823 ddl->offset = 0;
|
|
|
5824
|
|
|
5825 /* If there is propagated stuff then it is pretty much a
|
|
|
5826 guarantee that more than just the one line is affected. */
|
|
|
5827 if (prop)
|
|
|
5828 {
|
|
|
5829 Dynarr_free (prop);
|
|
|
5830 return 0;
|
|
|
5831 }
|
|
|
5832
|
|
442
|
5833 /* If the line continues to next display line, fail. */
|
|
|
5834 if (ddl->line_continuation)
|
|
|
5835 return 0;
|
|
428
|
5836
|
|
|
5837 /* If any line position parameters have changed or a
|
|
|
5838 cursor has disappeared or disappeared, fail. */
|
|
|
5839 if (cdl->ypos != ddl->ypos
|
|
|
5840 || cdl->ascent != ddl->ascent
|
|
|
5841 || cdl->descent != ddl->descent
|
|
|
5842 || cdl->top_clip != ddl->top_clip
|
|
|
5843 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
5844 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
5845 {
|
|
|
5846 return 0;
|
|
|
5847 }
|
|
|
5848
|
|
|
5849 /* If the changed area also ends on this line, then we may be in
|
|
|
5850 business. Update everything and return success. */
|
|
665
|
5851 if (end_unchanged >= ddl->charbpos && end_unchanged <= ddl->end_charbpos)
|
|
428
|
5852 {
|
|
|
5853 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5854 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5855 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
5856 w->buffer);
|
|
|
5857 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
5858 w->buffer);
|
|
|
5859
|
|
|
5860 if (ddl->cursor_elt != -1)
|
|
|
5861 {
|
|
|
5862 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
5863 w->last_point_y[DESIRED_DISP] = line;
|
|
|
5864 }
|
|
|
5865
|
|
|
5866 redisplay_update_line (w, line, line, 1);
|
|
|
5867 regenerate_modeline (w);
|
|
|
5868
|
|
|
5869 /* #### For now we just flush the cache until this has been
|
|
|
5870 tested. After that is done, this should correct the
|
|
|
5871 cache directly. */
|
|
|
5872 Dynarr_reset (w->line_start_cache);
|
|
|
5873
|
|
|
5874 /* Adjust the extent changed boundaries to remove any
|
|
|
5875 overlap with the buffer changes since we've just
|
|
|
5876 successfully updated that area. */
|
|
|
5877 if (extent_beg_unchanged != -1
|
|
|
5878 && extent_beg_unchanged >= beg_unchanged
|
|
|
5879 && extent_beg_unchanged < end_unchanged)
|
|
|
5880 extent_beg_unchanged = end_unchanged;
|
|
|
5881
|
|
|
5882 if (extent_end_unchanged != -1
|
|
|
5883 && extent_end_unchanged >= beg_unchanged
|
|
|
5884 && extent_end_unchanged < end_unchanged)
|
|
|
5885 extent_end_unchanged = beg_unchanged - 1;
|
|
|
5886
|
|
|
5887 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
5888 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
5889
|
|
|
5890 /* This could lead to odd results if it fails, but since the
|
|
|
5891 buffer changes update succeeded this probably will to.
|
|
|
5892 We already know that the extent changes start at or after
|
|
|
5893 the line because we checked before entering the loop. */
|
|
|
5894 if (extent_beg_unchanged != -1
|
|
|
5895 && extent_end_unchanged != -1
|
|
665
|
5896 && ((extent_beg_unchanged < ddl->charbpos)
|
|
|
5897 || (extent_end_unchanged > ddl->end_charbpos)))
|
|
428
|
5898 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
5899 extent_beg_unchanged,
|
|
|
5900 extent_end_unchanged);
|
|
|
5901 else
|
|
|
5902 return 1;
|
|
|
5903 }
|
|
|
5904 }
|
|
|
5905
|
|
|
5906 /* Oh, well. */
|
|
|
5907 return 0;
|
|
|
5908 }
|
|
|
5909
|
|
|
5910 /* Given a window and a point, update the given display lines such
|
|
|
5911 that point is displayed in the middle of the window.
|
|
|
5912 Return the window's new start position. */
|
|
|
5913
|
|
665
|
5914 static Charbpos
|
|
|
5915 regenerate_window_point_center (struct window *w, Charbpos point, int type)
|
|
428
|
5916 {
|
|
665
|
5917 Charbpos startp;
|
|
428
|
5918
|
|
|
5919 /* We need to make sure that the modeline is generated so that the
|
|
|
5920 window height can be calculated correctly. */
|
|
|
5921 ensure_modeline_generated (w, type);
|
|
|
5922
|
|
|
5923 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
5924 regenerate_window (w, startp, point, type);
|
|
|
5925 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
5926
|
|
|
5927 return startp;
|
|
|
5928 }
|
|
|
5929
|
|
|
5930 /* Given a window and a set of display lines, return a boolean
|
|
|
5931 indicating whether the given point is contained within. */
|
|
|
5932
|
|
|
5933 static int
|
|
665
|
5934 point_visible (struct window *w, Charbpos point, int type)
|
|
428
|
5935 {
|
|
|
5936 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5937 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
5938 int first_line;
|
|
|
5939
|
|
|
5940 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
5941 first_line = 1;
|
|
|
5942 else
|
|
|
5943 first_line = 0;
|
|
|
5944
|
|
|
5945 if (Dynarr_length (dla) > first_line)
|
|
|
5946 {
|
|
665
|
5947 Charbpos start, end;
|
|
428
|
5948 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
5949
|
|
665
|
5950 start = dl->charbpos;
|
|
428
|
5951 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
5952
|
|
|
5953 if (point >= start && point <= end)
|
|
|
5954 {
|
|
|
5955 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
5956 {
|
|
|
5957 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
5958
|
|
665
|
5959 if (point >= (dl->charbpos + dl->offset)
|
|
|
5960 && point <= (dl->end_charbpos + dl->offset))
|
|
428
|
5961 return !dl->clip;
|
|
|
5962 else
|
|
|
5963 return 1;
|
|
|
5964 }
|
|
|
5965 else
|
|
|
5966 return 1;
|
|
|
5967 }
|
|
|
5968 else
|
|
|
5969 return 0;
|
|
|
5970 }
|
|
|
5971 else
|
|
|
5972 return 0;
|
|
|
5973 }
|
|
|
5974
|
|
|
5975 /* Return pixel position the middle of the window, not including the
|
|
|
5976 modeline and any potential horizontal scrollbar. */
|
|
|
5977
|
|
|
5978 int
|
|
|
5979 window_half_pixpos (struct window *w)
|
|
|
5980 {
|
|
|
5981 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
|
|
|
5982 }
|
|
|
5983
|
|
|
5984 /* Return the display line which is currently in the middle of the
|
|
|
5985 window W for display lines TYPE. */
|
|
|
5986
|
|
|
5987 int
|
|
665
|
5988 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
5989 {
|
|
|
5990 display_line_dynarr *dla;
|
|
|
5991 int half;
|
|
|
5992 int elt;
|
|
|
5993 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
5994
|
|
|
5995 if (type == CMOTION_DISP)
|
|
|
5996 regenerate_window (w, start, point, type);
|
|
|
5997
|
|
|
5998 dla = window_display_lines (w, type);
|
|
|
5999 half = window_half_pixpos (w);
|
|
|
6000
|
|
|
6001 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
6002 {
|
|
|
6003 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
6004 int line_bot = dl->ypos + dl->descent;
|
|
|
6005
|
|
|
6006 if (line_bot > half)
|
|
|
6007 return elt;
|
|
|
6008 }
|
|
|
6009
|
|
|
6010 /* We may not have a line at the middle if the end of the buffer is
|
|
|
6011 being displayed. */
|
|
|
6012 return -1;
|
|
|
6013 }
|
|
|
6014
|
|
|
6015 /* Return a value for point that would place it at the beginning of
|
|
|
6016 the line which is in the middle of the window. */
|
|
|
6017
|
|
665
|
6018 Charbpos
|
|
|
6019 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
|
|
428
|
6020 {
|
|
|
6021 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
6022 int line = line_at_center (w, type, start, point);
|
|
|
6023
|
|
|
6024 if (line == -1)
|
|
|
6025 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
6026 else
|
|
|
6027 {
|
|
|
6028 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6029 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6030
|
|
665
|
6031 return dl->charbpos;
|
|
428
|
6032 }
|
|
|
6033 }
|
|
|
6034
|
|
|
6035 /* For a given window, ensure that the current visual representation
|
|
|
6036 is accurate. */
|
|
|
6037
|
|
|
6038 static void
|
|
|
6039 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
6040 {
|
|
|
6041 struct window *w = XWINDOW (window);
|
|
|
6042 struct frame *f = XFRAME (w->frame);
|
|
|
6043 struct device *d = XDEVICE (f->device);
|
|
|
6044 Lisp_Object old_buffer = w->buffer;
|
|
|
6045 Lisp_Object the_buffer = w->buffer;
|
|
|
6046 struct buffer *b;
|
|
|
6047 int echo_active = 0;
|
|
|
6048 int startp = 1;
|
|
|
6049 int pointm;
|
|
|
6050 int old_startp = 1;
|
|
|
6051 int old_pointm = 1;
|
|
|
6052 int selected_in_its_frame;
|
|
|
6053 int selected_globally;
|
|
|
6054 int skip_output = 0;
|
|
|
6055 int truncation_changed;
|
|
|
6056 int inactive_minibuffer =
|
|
|
6057 (MINI_WINDOW_P (w) &&
|
|
|
6058 (f != device_selected_frame (d)) &&
|
|
|
6059 !is_surrogate_for_selected_frame (f));
|
|
|
6060
|
|
|
6061 /* #### In the new world this function actually does a bunch of
|
|
|
6062 optimizations such as buffer-based scrolling, but none of that is
|
|
|
6063 implemented yet. */
|
|
|
6064
|
|
|
6065 /* If this is a combination window, do its children; that's all.
|
|
|
6066 The selected window is always a leaf so we don't check for
|
|
|
6067 skip_selected here. */
|
|
|
6068 if (!NILP (w->vchild))
|
|
|
6069 {
|
|
|
6070 redisplay_windows (w->vchild, skip_selected);
|
|
|
6071 return;
|
|
|
6072 }
|
|
|
6073 if (!NILP (w->hchild))
|
|
|
6074 {
|
|
|
6075 redisplay_windows (w->hchild, skip_selected);
|
|
|
6076 return;
|
|
|
6077 }
|
|
|
6078
|
|
|
6079 /* Is this window the selected window on its frame? */
|
|
|
6080 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
|
|
|
6081 selected_globally =
|
|
|
6082 selected_in_its_frame &&
|
|
|
6083 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6084 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
|
|
|
6085 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
|
|
|
6086 if (skip_selected && selected_in_its_frame)
|
|
|
6087 return;
|
|
|
6088
|
|
|
6089 /* It is possible that the window is not fully initialized yet. */
|
|
|
6090 if (NILP (w->buffer))
|
|
|
6091 return;
|
|
|
6092
|
|
|
6093 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
6094 {
|
|
|
6095 w->buffer = the_buffer = Vecho_area_buffer;
|
|
|
6096 echo_active = 1;
|
|
|
6097 }
|
|
|
6098
|
|
|
6099 b = XBUFFER (w->buffer);
|
|
|
6100
|
|
|
6101 if (echo_active)
|
|
|
6102 {
|
|
|
6103 old_pointm = selected_globally
|
|
|
6104 ? BUF_PT (b)
|
|
|
6105 : marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6106 pointm = 1;
|
|
|
6107 }
|
|
|
6108 else
|
|
|
6109 {
|
|
|
6110 if (selected_globally)
|
|
|
6111 {
|
|
|
6112 pointm = BUF_PT (b);
|
|
|
6113 }
|
|
|
6114 else
|
|
|
6115 {
|
|
|
6116 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
6117
|
|
|
6118 if (pointm < BUF_BEGV (b))
|
|
|
6119 pointm = BUF_BEGV (b);
|
|
|
6120 else if (pointm > BUF_ZV (b))
|
|
|
6121 pointm = BUF_ZV (b);
|
|
|
6122 }
|
|
|
6123 }
|
|
|
6124 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
|
|
|
6125
|
|
|
6126 /* If the buffer has changed we have to invalidate all of our face
|
|
|
6127 cache elements. */
|
|
|
6128 if ((!echo_active && b != window_display_buffer (w))
|
|
|
6129 || !Dynarr_length (w->face_cachels)
|
|
|
6130 || f->faces_changed)
|
|
|
6131 reset_face_cachels (w);
|
|
|
6132 else
|
|
|
6133 mark_face_cachels_as_not_updated (w);
|
|
|
6134
|
|
|
6135 /* Ditto the glyph cache elements, although we do *not* invalidate
|
|
|
6136 the cache purely because glyphs have changed - this is now
|
|
|
6137 handled by the dirty flag.*/
|
|
|
6138 if ((!echo_active && b != window_display_buffer (w))
|
|
440
|
6139 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
|
|
428
|
6140 reset_glyph_cachels (w);
|
|
|
6141 else
|
|
|
6142 mark_glyph_cachels_as_not_updated (w);
|
|
|
6143
|
|
|
6144 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
6145 to find a new starting position. */
|
|
|
6146 if (!MINI_WINDOW_P (w)
|
|
|
6147 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
6148 {
|
|
|
6149 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6150
|
|
|
6151 goto regeneration_done;
|
|
|
6152 }
|
|
|
6153
|
|
|
6154 if (echo_active)
|
|
|
6155 {
|
|
|
6156 old_startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6157 startp = 1;
|
|
|
6158 }
|
|
|
6159 else
|
|
|
6160 {
|
|
|
6161 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
6162 if (startp < BUF_BEGV (b))
|
|
|
6163 startp = BUF_BEGV (b);
|
|
|
6164 else if (startp > BUF_ZV (b))
|
|
|
6165 startp = BUF_ZV (b);
|
|
|
6166 }
|
|
|
6167 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
|
|
|
6168
|
|
|
6169 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
647
|
6170 (unsigned int) window_truncation_on (w));
|
|
428
|
6171
|
|
|
6172 /* If w->force_start is set, then some function set w->start and we
|
|
|
6173 should display from there and change point, if necessary, to
|
|
|
6174 ensure that it is visible. */
|
|
|
6175 if (w->force_start || inactive_minibuffer)
|
|
|
6176 {
|
|
|
6177 w->force_start = 0;
|
|
|
6178 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
6179 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
6180
|
|
|
6181 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6182
|
|
|
6183 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
6184 {
|
|
|
6185 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
6186
|
|
|
6187 if (selected_globally)
|
|
|
6188 BUF_SET_PT (b, pointm);
|
|
|
6189
|
|
|
6190 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
6191 the_buffer);
|
|
|
6192
|
|
|
6193 /* #### BUFU amounts of overkill just to get the cursor
|
|
|
6194 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
6195 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6196 }
|
|
|
6197
|
|
|
6198 goto regeneration_done;
|
|
|
6199 }
|
|
|
6200
|
|
|
6201 /* If nothing has changed since the last redisplay, then we just
|
|
|
6202 need to make sure that point is still visible. */
|
|
|
6203 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
6204 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
6205 && pointm >= startp
|
|
|
6206 /* This check is to make sure we restore the minibuffer after a
|
|
|
6207 temporary change to the echo area. */
|
|
|
6208 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
6209 && !f->frame_changed
|
|
|
6210 && !truncation_changed
|
|
442
|
6211 /* check whether start is really at the beginning of a line GE */
|
|
428
|
6212 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
|
|
|
6213 )
|
|
|
6214 {
|
|
|
6215 /* Check if the cursor has actually moved. */
|
|
|
6216 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
6217 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
|
6218 && selected_globally
|
|
|
6219 && !w->windows_changed
|
|
|
6220 && !f->clip_changed
|
|
|
6221 && !f->extents_changed
|
|
|
6222 && !f->faces_changed
|
|
|
6223 && !f->glyphs_changed
|
|
|
6224 && !f->subwindows_changed
|
|
442
|
6225 /* && !f->subwindows_state_changed*/
|
|
428
|
6226 && !f->point_changed
|
|
|
6227 && !f->windows_structure_changed)
|
|
|
6228 {
|
|
|
6229 /* If not, we're done. */
|
|
|
6230 if (f->modeline_changed)
|
|
|
6231 regenerate_modeline (w);
|
|
|
6232
|
|
|
6233 skip_output = 1;
|
|
|
6234 goto regeneration_done;
|
|
|
6235 }
|
|
|
6236 else
|
|
|
6237 {
|
|
|
6238 /* If the new point is visible in the redisplay structures,
|
|
|
6239 then let the output update routines handle it, otherwise
|
|
|
6240 do things the hard way. */
|
|
|
6241 if (!w->windows_changed
|
|
|
6242 && !f->clip_changed
|
|
|
6243 && !f->extents_changed
|
|
|
6244 && !f->faces_changed
|
|
|
6245 && !f->glyphs_changed
|
|
|
6246 && !f->subwindows_changed
|
|
442
|
6247 /* && !f->subwindows_state_changed*/
|
|
428
|
6248 && !f->windows_structure_changed)
|
|
|
6249 {
|
|
|
6250 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
6251 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
6252 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
6253 {
|
|
|
6254 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
6255 {
|
|
|
6256 /* Always regenerate in case it is displaying
|
|
|
6257 the current line or column. */
|
|
|
6258 regenerate_modeline (w);
|
|
|
6259
|
|
|
6260 skip_output = 1;
|
|
|
6261 goto regeneration_done;
|
|
|
6262 }
|
|
|
6263 }
|
|
|
6264 else if (!selected_in_its_frame && !f->point_changed)
|
|
|
6265 {
|
|
|
6266 if (f->modeline_changed)
|
|
|
6267 regenerate_modeline (w);
|
|
|
6268
|
|
|
6269 skip_output = 1;
|
|
|
6270 goto regeneration_done;
|
|
|
6271 }
|
|
|
6272 }
|
|
|
6273
|
|
|
6274 /* If we weren't able to take the shortcut method, then use
|
|
|
6275 the brute force method. */
|
|
|
6276 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6277
|
|
|
6278 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6279 goto regeneration_done;
|
|
|
6280 }
|
|
|
6281 }
|
|
|
6282
|
|
|
6283 /* Check if the starting point is no longer at the beginning of a
|
|
|
6284 line, in which case find a new starting point. We also recenter
|
|
|
6285 if our start position is equal to point-max. Otherwise we'll end
|
|
|
6286 up with a blank window. */
|
|
|
6287 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
6288 && !(startp == BUF_BEGV (b)
|
|
|
6289 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
6290 || (pointm == startp &&
|
|
|
6291 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
6292 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
6293 || (startp == BUF_ZV (b)))
|
|
|
6294 {
|
|
|
6295 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6296
|
|
|
6297 goto regeneration_done;
|
|
|
6298 }
|
|
|
6299 /* See if we can update the data structures locally based on
|
|
|
6300 knowledge of what changed in the buffer. */
|
|
|
6301 else if (!w->windows_changed
|
|
|
6302 && !f->clip_changed
|
|
|
6303 && !f->faces_changed
|
|
|
6304 && !f->glyphs_changed
|
|
|
6305 && !f->subwindows_changed
|
|
442
|
6306 /* && !f->subwindows_state_changed*/
|
|
428
|
6307 && !f->windows_structure_changed
|
|
|
6308 && !f->frame_changed
|
|
|
6309 && !truncation_changed
|
|
|
6310 && pointm >= startp
|
|
|
6311 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
6312 {
|
|
|
6313 if (f->modeline_changed
|
|
|
6314 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
6315 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
6316 regenerate_modeline (w);
|
|
|
6317
|
|
|
6318 skip_output = 1;
|
|
|
6319 goto regeneration_done;
|
|
|
6320 }
|
|
|
6321 /* #### This is where a check for structure based scrolling would go. */
|
|
|
6322 /* If all else fails, try just regenerating and see what happens. */
|
|
|
6323 else
|
|
|
6324 {
|
|
|
6325 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6326
|
|
|
6327 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6328 goto regeneration_done;
|
|
|
6329 }
|
|
|
6330
|
|
|
6331 /* We still haven't gotten the window regenerated with point
|
|
|
6332 visible. Next we try scrolling a little and see if point comes
|
|
|
6333 back onto the screen. */
|
|
|
6334 if (scroll_step > 0)
|
|
|
6335 {
|
|
|
6336 int scrolled = scroll_conservatively;
|
|
|
6337 for (; scrolled >= 0; scrolled -= scroll_step)
|
|
|
6338 {
|
|
|
6339 startp = vmotion (w, startp,
|
|
|
6340 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
|
6341 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
6342
|
|
|
6343 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
6344 goto regeneration_done;
|
|
|
6345 }
|
|
|
6346 }
|
|
|
6347
|
|
|
6348 /* We still haven't managed to get the screen drawn with point on
|
|
|
6349 the screen, so just center it and be done with it. */
|
|
|
6350 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
|
6351
|
|
|
6352
|
|
|
6353 regeneration_done:
|
|
|
6354
|
|
|
6355 /* If the window's frame is changed then reset the current display
|
|
|
6356 lines in order to force a full repaint. */
|
|
|
6357 if (f->frame_changed)
|
|
|
6358 {
|
|
|
6359 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
6360
|
|
|
6361 Dynarr_reset (cla);
|
|
|
6362 }
|
|
|
6363
|
|
|
6364 /* Must do this before calling redisplay_output_window because it
|
|
|
6365 sets some markers on the window. */
|
|
|
6366 if (echo_active)
|
|
|
6367 {
|
|
|
6368 w->buffer = old_buffer;
|
|
|
6369 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
|
|
|
6370 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
|
|
|
6371 }
|
|
|
6372
|
|
|
6373 /* These also have to be set before calling redisplay_output_window
|
|
|
6374 since it sets the CURRENT_DISP values based on them. */
|
|
|
6375 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
6376 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
6377 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
6378 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
6379
|
|
|
6380 if (!skip_output)
|
|
|
6381 {
|
|
665
|
6382 Charbpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
6383 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
428
|
6384 ? BUF_ZV (b)
|
|
|
6385 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
6386 /* Don't pollute the cache if not sure if we are correct */
|
|
|
6387 if (w->start_at_line_beg)
|
|
|
6388 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
6389 redisplay_output_window (w);
|
|
|
6390 /*
|
|
|
6391 * If we just displayed the echo area, the line start cache is
|
|
|
6392 * no longer valid, because the minibuffer window is associated
|
|
|
6393 * with the window now.
|
|
|
6394 */
|
|
|
6395 if (echo_active)
|
|
|
6396 w->line_cache_last_updated = make_int (-1);
|
|
|
6397 }
|
|
|
6398
|
|
|
6399 /* #### This should be dependent on face changes and will need to be
|
|
|
6400 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
6401 mark_face_cachels_as_clean (w);
|
|
|
6402
|
|
438
|
6403 /* The glyph cachels only get dirty if someone changed something.
|
|
|
6404 Since redisplay has now effectively ended we can reset the dirty
|
|
|
6405 flag since everything must be up-to-date. */
|
|
428
|
6406 if (glyphs_changed)
|
|
|
6407 mark_glyph_cachels_as_clean (w);
|
|
|
6408
|
|
|
6409 w->windows_changed = 0;
|
|
|
6410 }
|
|
|
6411
|
|
|
6412 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
6413 currently visible in all frames on all devices. #### There has to
|
|
|
6414 be a better way to do this. */
|
|
|
6415
|
|
|
6416 static int
|
|
|
6417 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
6418 {
|
|
|
6419 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
6420 return 0;
|
|
|
6421 }
|
|
|
6422
|
|
|
6423 static void
|
|
|
6424 reset_buffer_changes (void)
|
|
|
6425 {
|
|
|
6426 Lisp_Object frmcons, devcons, concons;
|
|
|
6427
|
|
|
6428 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6429 {
|
|
|
6430 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6431
|
|
|
6432 if (FRAME_REPAINT_P (f))
|
|
|
6433 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
6434 }
|
|
|
6435 }
|
|
|
6436
|
|
|
6437 /* Ensure that all windows underneath the given window in the window
|
|
|
6438 hierarchy are correctly displayed. */
|
|
|
6439
|
|
|
6440 static void
|
|
|
6441 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
6442 {
|
|
|
6443 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
6444 {
|
|
|
6445 redisplay_window (window, skip_selected);
|
|
|
6446 }
|
|
|
6447 }
|
|
|
6448
|
|
|
6449 static int
|
|
|
6450 call_redisplay_end_triggers (struct window *w, void *closure)
|
|
|
6451 {
|
|
665
|
6452 Charbpos lrpos = w->last_redisplay_pos;
|
|
428
|
6453 w->last_redisplay_pos = 0;
|
|
|
6454 if (!NILP (w->buffer)
|
|
|
6455 && !NILP (w->redisplay_end_trigger)
|
|
|
6456 && lrpos > 0)
|
|
|
6457 {
|
|
665
|
6458 Charbpos pos;
|
|
428
|
6459
|
|
|
6460 if (MARKERP (w->redisplay_end_trigger)
|
|
|
6461 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
|
|
|
6462 pos = marker_position (w->redisplay_end_trigger);
|
|
|
6463 else if (INTP (w->redisplay_end_trigger))
|
|
|
6464 pos = XINT (w->redisplay_end_trigger);
|
|
|
6465 else
|
|
|
6466 {
|
|
|
6467 w->redisplay_end_trigger = Qnil;
|
|
|
6468 return 0;
|
|
|
6469 }
|
|
|
6470
|
|
|
6471 if (lrpos >= pos)
|
|
|
6472 {
|
|
793
|
6473 Lisp_Object window = wrap_window (w);
|
|
|
6474
|
|
428
|
6475 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
|
|
|
6476 Qredisplay_end_trigger_functions,
|
|
|
6477 2, window,
|
|
|
6478 w->redisplay_end_trigger);
|
|
|
6479 w->redisplay_end_trigger = Qnil;
|
|
|
6480 }
|
|
|
6481 }
|
|
|
6482
|
|
|
6483 return 0;
|
|
|
6484 }
|
|
|
6485
|
|
|
6486 /* Ensure that all windows on the given frame are correctly displayed. */
|
|
|
6487
|
|
442
|
6488 int
|
|
428
|
6489 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
6490 {
|
|
|
6491 struct device *d = XDEVICE (f->device);
|
|
|
6492
|
|
545
|
6493 if (preemption_check
|
|
|
6494 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
428
|
6495 {
|
|
|
6496 /* The preemption check itself takes a lot of time,
|
|
|
6497 so normally don't do it here. We do it if called
|
|
|
6498 from Lisp, though (`redisplay-frame'). */
|
|
|
6499 int preempted;
|
|
|
6500
|
|
|
6501 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6502 if (preempted)
|
|
|
6503 return 1;
|
|
|
6504 }
|
|
|
6505
|
|
442
|
6506 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
|
|
|
6507 {
|
|
|
6508 Lisp_Object frame;
|
|
|
6509
|
|
|
6510 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
|
|
|
6511 f->buffer_alist);
|
|
793
|
6512 frame = wrap_frame (f);
|
|
442
|
6513 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
|
|
|
6514 }
|
|
|
6515
|
|
428
|
6516 /* Before we put a hold on frame size changes, attempt to process
|
|
|
6517 any which are already pending. */
|
|
|
6518 if (f->size_change_pending)
|
|
|
6519 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
6520
|
|
|
6521 /* If frame size might need to be changed, due to changed size
|
|
|
6522 of toolbars, scrollbars etc, change it now */
|
|
|
6523 if (f->size_slipped)
|
|
|
6524 {
|
|
|
6525 adjust_frame_size (f);
|
|
|
6526 assert (!f->size_slipped);
|
|
|
6527 }
|
|
|
6528
|
|
|
6529 /* The menubar, toolbar, and icon updates must be done before
|
|
|
6530 hold_frame_size_changes is called and we are officially
|
|
|
6531 'in_display'. They may eval lisp code which may call Fsignal.
|
|
|
6532 If in_display is set Fsignal will abort. */
|
|
|
6533
|
|
|
6534 #ifdef HAVE_MENUBARS
|
|
|
6535 /* Update the menubar. It is done first since it could change
|
|
|
6536 the menubar's visibility. This way we avoid having flashing
|
|
|
6537 caused by an Expose event generated by the visibility change
|
|
|
6538 being handled. */
|
|
|
6539 update_frame_menubars (f);
|
|
|
6540 #endif /* HAVE_MENUBARS */
|
|
|
6541 #ifdef HAVE_TOOLBARS
|
|
|
6542 /* Update the toolbars. */
|
|
|
6543 update_frame_toolbars (f);
|
|
|
6544 #endif /* HAVE_TOOLBARS */
|
|
442
|
6545 /* Gutter update proper has to be done inside display when no frame
|
|
|
6546 size changes can occur, thus we separately update the gutter
|
|
|
6547 geometry here if it needs it. */
|
|
|
6548 update_frame_gutter_geometry (f);
|
|
428
|
6549
|
|
|
6550 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
6551 if (f->clear)
|
|
|
6552 f->frame_changed = 1;
|
|
|
6553
|
|
442
|
6554 /* Invalidate the subwindow caches. We use subwindows_changed here
|
|
|
6555 to cause subwindows to get instantiated. This is because
|
|
428
|
6556 subwindows_state_changed is less strict - dealing with things
|
|
|
6557 like the clicked state of button. We have to do this before
|
|
|
6558 redisplaying the gutters as subwindows get unmapped in the
|
|
|
6559 process.*/
|
|
442
|
6560 if (f->frame_changed)
|
|
|
6561 reset_frame_subwindow_instance_cache (f);
|
|
|
6562
|
|
|
6563 if (f->frame_changed || f->subwindows_changed)
|
|
|
6564 {
|
|
428
|
6565 /* we have to do this so the gutter gets regenerated. */
|
|
|
6566 reset_gutter_display_lines (f);
|
|
|
6567 }
|
|
|
6568
|
|
|
6569 hold_frame_size_changes ();
|
|
|
6570
|
|
|
6571 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6572 /* Within this section, we are defenseless and assume that the
|
|
|
6573 following cannot happen:
|
|
|
6574
|
|
|
6575 1) garbage collection
|
|
|
6576 2) Lisp code evaluation
|
|
|
6577 3) frame size changes
|
|
|
6578
|
|
|
6579 We ensure (3) by calling hold_frame_size_changes(), which
|
|
|
6580 will cause any pending frame size changes to get put on hold
|
|
|
6581 till after the end of the critical section. (1) follows
|
|
|
6582 automatically if (2) is met. #### Unfortunately, there are
|
|
|
6583 some places where Lisp code can be called within this section.
|
|
|
6584 We need to remove them.
|
|
|
6585
|
|
|
6586 If Fsignal() is called during this critical section, we
|
|
|
6587 will abort().
|
|
|
6588
|
|
|
6589 If garbage collection is called during this critical section,
|
|
|
6590 we simply return. #### We should abort instead.
|
|
|
6591
|
|
|
6592 #### If a frame-size change does occur we should probably
|
|
|
6593 actually be preempting redisplay. */
|
|
|
6594
|
|
442
|
6595 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
6596
|
|
|
6597 /* We can now update the gutters, safe in the knowledge that our
|
|
|
6598 efforts won't get undone. */
|
|
|
6599
|
|
|
6600 /* This can call lisp, but redisplay is protected by binding
|
|
|
6601 inhibit_quit. More importantly the code involving display lines
|
|
|
6602 *assumes* that GC will not happen and so does not GCPRO
|
|
|
6603 anything. Since we use this code the whole time with the gutters
|
|
|
6604 we cannot allow GC to happen when manipulating the gutters. */
|
|
|
6605 update_frame_gutters (f);
|
|
|
6606
|
|
428
|
6607 /* Erase the frame before outputting its contents. */
|
|
|
6608 if (f->clear)
|
|
|
6609 {
|
|
442
|
6610 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
6611 }
|
|
|
6612
|
|
|
6613 /* Do the selected window first. */
|
|
|
6614 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
6615
|
|
|
6616 /* Then do the rest. */
|
|
|
6617 redisplay_windows (f->root_window, 1);
|
|
|
6618
|
|
442
|
6619 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
428
|
6620
|
|
|
6621 update_frame_title (f);
|
|
|
6622
|
|
|
6623 CLASS_RESET_CHANGED_FLAGS (f);
|
|
|
6624 f->window_face_cache_reset = 0;
|
|
|
6625 f->echo_area_garbaged = 0;
|
|
|
6626 f->clear = 0;
|
|
|
6627
|
|
|
6628 if (!f->size_change_pending)
|
|
|
6629 f->size_changed = 0;
|
|
|
6630
|
|
|
6631 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
6632
|
|
|
6633 /* Allow frame size changes to occur again.
|
|
|
6634
|
|
|
6635 #### what happens if changes to other frames happen? */
|
|
|
6636 unhold_one_frame_size_changes (f);
|
|
|
6637
|
|
|
6638 map_windows (f, call_redisplay_end_triggers, 0);
|
|
|
6639 return 0;
|
|
|
6640 }
|
|
|
6641
|
|
440
|
6642 /* Ensure that all frames on the given device are correctly displayed.
|
|
|
6643 If AUTOMATIC is non-zero, and the device implementation indicates
|
|
|
6644 no automatic redisplay, as printers do, then the device is not
|
|
|
6645 redisplayed. AUTOMATIC is set to zero when called from lisp
|
|
|
6646 functions (redraw-device) and (redisplay-device), and to non-zero
|
|
|
6647 when called from "lazy" redisplay();
|
|
|
6648 */
|
|
428
|
6649
|
|
|
6650 static int
|
|
440
|
6651 redisplay_device (struct device *d, int automatic)
|
|
428
|
6652 {
|
|
|
6653 Lisp_Object frame, frmcons;
|
|
|
6654 int size_change_failed = 0;
|
|
|
6655 struct frame *f;
|
|
|
6656
|
|
545
|
6657 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
|
|
440
|
6658 return 0;
|
|
|
6659
|
|
428
|
6660 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
6661 return 0;
|
|
|
6662
|
|
|
6663 /* It is possible that redisplay has been called before the
|
|
545
|
6664 device is fully initialized, or that the console implementation
|
|
|
6665 allows frameless devices. If so then continue with the next
|
|
|
6666 device. */
|
|
428
|
6667 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
6668 return 0;
|
|
|
6669
|
|
545
|
6670 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
|
|
|
6671 {
|
|
|
6672 int preempted;
|
|
|
6673 REDISPLAY_PREEMPTION_CHECK;
|
|
|
6674 if (preempted)
|
|
|
6675 return 1;
|
|
|
6676 }
|
|
428
|
6677
|
|
|
6678 /* Always do the selected frame first. */
|
|
|
6679 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
6680
|
|
|
6681 f = XFRAME (frame);
|
|
|
6682
|
|
|
6683 if (f->icon_changed || f->windows_changed)
|
|
|
6684 update_frame_icon (f);
|
|
|
6685
|
|
|
6686 if (FRAME_REPAINT_P (f))
|
|
|
6687 {
|
|
|
6688 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
|
|
|
6689 {
|
|
588
|
6690 int preempted = redisplay_frame (f, 1);
|
|
545
|
6691 if (preempted)
|
|
|
6692 return 1;
|
|
|
6693 }
|
|
428
|
6694
|
|
|
6695 /* If the frame redisplay did not get preempted, then this flag
|
|
|
6696 should have gotten set to 0. It might be possible for that
|
|
|
6697 not to happen if a size change event were to occur at an odd
|
|
|
6698 time. To make sure we don't miss anything we simply don't
|
|
|
6699 reset the top level flags until the condition ends up being
|
|
|
6700 in the right state. */
|
|
|
6701 if (f->size_changed)
|
|
|
6702 size_change_failed = 1;
|
|
|
6703 }
|
|
|
6704
|
|
|
6705 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
6706 {
|
|
|
6707 f = XFRAME (XCAR (frmcons));
|
|
|
6708
|
|
|
6709 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
6710 continue;
|
|
|
6711
|
|
|
6712 if (f->icon_changed || f->windows_changed)
|
|
|
6713 update_frame_icon (f);
|
|
|
6714
|
|
|
6715 if (FRAME_REPAINT_P (f))
|
|
|
6716 {
|
|
430
|
6717 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
|
|
428
|
6718 {
|
|
588
|
6719 int preempted = redisplay_frame (f, 1);
|
|
545
|
6720 if (preempted)
|
|
|
6721 return 1;
|
|
428
|
6722 }
|
|
|
6723
|
|
|
6724 if (f->size_change_pending)
|
|
|
6725 size_change_failed = 1;
|
|
|
6726 }
|
|
|
6727 }
|
|
|
6728
|
|
|
6729 /* If we get here then we redisplayed all of our frames without
|
|
|
6730 getting preempted so mark ourselves as clean. */
|
|
|
6731 CLASS_RESET_CHANGED_FLAGS (d);
|
|
|
6732
|
|
|
6733 if (!size_change_failed)
|
|
|
6734 d->size_changed = 0;
|
|
|
6735
|
|
|
6736 return 0;
|
|
|
6737 }
|
|
|
6738
|
|
|
6739 static Lisp_Object
|
|
|
6740 restore_profiling_redisplay_flag (Lisp_Object val)
|
|
|
6741 {
|
|
|
6742 profiling_redisplay_flag = XINT (val);
|
|
|
6743 return Qnil;
|
|
|
6744 }
|
|
|
6745
|
|
|
6746 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
6747 the current contents of their respective buffers. */
|
|
|
6748
|
|
|
6749 static void
|
|
|
6750 redisplay_without_hooks (void)
|
|
|
6751 {
|
|
|
6752 Lisp_Object devcons, concons;
|
|
|
6753 int size_change_failed = 0;
|
|
|
6754 int count = specpdl_depth ();
|
|
|
6755
|
|
|
6756 if (profiling_active)
|
|
|
6757 {
|
|
|
6758 record_unwind_protect (restore_profiling_redisplay_flag,
|
|
|
6759 make_int (profiling_redisplay_flag));
|
|
|
6760 profiling_redisplay_flag = 1;
|
|
|
6761 }
|
|
|
6762
|
|
|
6763 if (asynch_device_change_pending)
|
|
|
6764 handle_asynch_device_change ();
|
|
|
6765
|
|
|
6766 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
|
|
430
|
6767 !disable_preemption && preemption_count < max_preempts)
|
|
428
|
6768 goto done;
|
|
|
6769
|
|
|
6770 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
6771 {
|
|
|
6772 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
6773 int preempted;
|
|
|
6774
|
|
430
|
6775 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
|
|
428
|
6776 {
|
|
440
|
6777 preempted = redisplay_device (d, 1);
|
|
428
|
6778
|
|
|
6779 if (preempted)
|
|
|
6780 {
|
|
|
6781 preemption_count++;
|
|
|
6782 RESET_CHANGED_SET_FLAGS;
|
|
|
6783 goto done;
|
|
|
6784 }
|
|
|
6785
|
|
|
6786 /* See comment in redisplay_device. */
|
|
|
6787 if (d->size_changed)
|
|
|
6788 size_change_failed = 1;
|
|
|
6789 }
|
|
|
6790 }
|
|
|
6791 preemption_count = 0;
|
|
|
6792
|
|
|
6793 /* Mark redisplay as accurate */
|
|
|
6794 GLOBAL_RESET_CHANGED_FLAGS;
|
|
|
6795 RESET_CHANGED_SET_FLAGS;
|
|
|
6796
|
|
|
6797 if (faces_changed)
|
|
|
6798 {
|
|
|
6799 mark_all_faces_as_clean ();
|
|
|
6800 faces_changed = 0;
|
|
|
6801 }
|
|
|
6802
|
|
|
6803 if (!size_change_failed)
|
|
|
6804 size_changed = 0;
|
|
|
6805
|
|
|
6806 reset_buffer_changes ();
|
|
|
6807
|
|
|
6808 done:
|
|
771
|
6809 unbind_to (count);
|
|
800
|
6810 #ifdef ERROR_CHECK_DISPLAY
|
|
|
6811 sledgehammer_check_redisplay_structs ();
|
|
|
6812 #endif /* ERROR_CHECK_DISPLAY */
|
|
428
|
6813 }
|
|
|
6814
|
|
|
6815 void
|
|
|
6816 redisplay (void)
|
|
|
6817 {
|
|
|
6818 if (last_display_warning_tick != display_warning_tick &&
|
|
|
6819 !inhibit_warning_display)
|
|
|
6820 {
|
|
|
6821 /* If an error occurs during this function, oh well.
|
|
|
6822 If we report another warning, we could get stuck in an
|
|
|
6823 infinite loop reporting warnings. */
|
|
|
6824 call0_trapping_errors (0, Qdisplay_warning_buffer);
|
|
|
6825 last_display_warning_tick = display_warning_tick;
|
|
|
6826 }
|
|
|
6827 /* The run_hook_trapping_errors functions are smart enough not
|
|
|
6828 to do any evalling if the hook function is empty, so there
|
|
|
6829 should not be any significant time loss. All places in the
|
|
|
6830 C code that call redisplay() are prepared to handle GCing,
|
|
|
6831 so we should be OK. */
|
|
|
6832 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
6833 run_hook_trapping_errors ("Error in pre-redisplay-hook",
|
|
|
6834 Qpre_redisplay_hook);
|
|
|
6835 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6836
|
|
|
6837 redisplay_without_hooks ();
|
|
|
6838
|
|
|
6839 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
6840 run_hook_trapping_errors ("Error in post-redisplay-hook",
|
|
|
6841 Qpost_redisplay_hook);
|
|
|
6842 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
6843 }
|
|
|
6844
|
|
|
6845
|
|
|
6846 /* Efficiently determine the window line number, and return a pointer
|
|
|
6847 to its printed representation. Do this regardless of whether
|
|
|
6848 line-number-mode is on. The first line in the buffer is counted as
|
|
|
6849 1. If narrowing is in effect, the lines are counted from the
|
|
|
6850 beginning of the visible portion of the buffer. */
|
|
|
6851 static char *
|
|
|
6852 window_line_number (struct window *w, int type)
|
|
|
6853 {
|
|
|
6854 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
6855 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6856 /* Be careful in the order of these tests. The first clause will
|
|
|
6857 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
|
|
|
6858 This can occur when the frame title is computed really early */
|
|
665
|
6859 Charbpos pos =
|
|
428
|
6860 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
|
|
|
6861 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
|
|
|
6862 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
|
|
|
6863 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
|
|
|
6864 ? BUF_PT (b)
|
|
|
6865 : marker_position (w->pointm[type]));
|
|
|
6866 EMACS_INT line;
|
|
|
6867
|
|
|
6868 line = buffer_line_number (b, pos, 1);
|
|
|
6869
|
|
603
|
6870 {
|
|
|
6871 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
|
|
|
6872
|
|
|
6873 long_to_string (window_line_number_buf, line + 1);
|
|
|
6874
|
|
|
6875 return window_line_number_buf;
|
|
|
6876 }
|
|
428
|
6877 }
|
|
|
6878
|
|
|
6879
|
|
|
6880 /* Given a character representing an object in a modeline
|
|
|
6881 specification, return a string (stored into the global array
|
|
665
|
6882 `mode_spec_intbyte_string') with the information that object
|
|
428
|
6883 represents.
|
|
|
6884
|
|
|
6885 This function is largely unchanged from previous versions of the
|
|
|
6886 redisplay engine.
|
|
|
6887
|
|
|
6888 Warning! This code is also used for frame titles and can be called
|
|
|
6889 very early in the device/frame update process! JV
|
|
|
6890 */
|
|
|
6891
|
|
|
6892 static void
|
|
|
6893 decode_mode_spec (struct window *w, Emchar spec, int type)
|
|
|
6894 {
|
|
|
6895 Lisp_Object obj = Qnil;
|
|
442
|
6896 const char *str = NULL;
|
|
428
|
6897 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6898
|
|
665
|
6899 Dynarr_reset (mode_spec_intbyte_string);
|
|
428
|
6900
|
|
|
6901 switch (spec)
|
|
|
6902 {
|
|
|
6903 /* print buffer name */
|
|
|
6904 case 'b':
|
|
|
6905 obj = b->name;
|
|
|
6906 break;
|
|
|
6907
|
|
|
6908 /* print visited file name */
|
|
|
6909 case 'f':
|
|
|
6910 obj = b->filename;
|
|
|
6911 break;
|
|
|
6912
|
|
|
6913 /* print the current column */
|
|
|
6914 case 'c':
|
|
|
6915 {
|
|
665
|
6916 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
|
|
428
|
6917 ? BUF_PT (b)
|
|
|
6918 : marker_position (w->pointm[type]);
|
|
|
6919 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
|
|
603
|
6920 char buf[DECIMAL_PRINT_SIZE (long)];
|
|
428
|
6921
|
|
|
6922 long_to_string (buf, col);
|
|
|
6923
|
|
665
|
6924 Dynarr_add_many (mode_spec_intbyte_string,
|
|
|
6925 (const Intbyte *) buf, strlen (buf));
|
|
428
|
6926
|
|
|
6927 goto decode_mode_spec_done;
|
|
|
6928 }
|
|
|
6929 /* print the file coding system */
|
|
|
6930 case 'C':
|
|
|
6931 {
|
|
|
6932 Lisp_Object codesys = b->buffer_file_coding_system;
|
|
|
6933 /* Be very careful here not to get an error. */
|
|
|
6934 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
6935 {
|
|
771
|
6936 codesys = find_coding_system_for_text_file (codesys, 0);
|
|
428
|
6937 if (CODING_SYSTEMP (codesys))
|
|
|
6938 obj = XCODING_SYSTEM_MNEMONIC (codesys);
|
|
|
6939 }
|
|
|
6940 }
|
|
|
6941 break;
|
|
|
6942
|
|
|
6943 /* print the current line number */
|
|
|
6944 case 'l':
|
|
|
6945 str = window_line_number (w, type);
|
|
|
6946 break;
|
|
|
6947
|
|
|
6948 /* print value of mode-name (obsolete) */
|
|
|
6949 case 'm':
|
|
|
6950 obj = b->mode_name;
|
|
|
6951 break;
|
|
|
6952
|
|
|
6953 /* print hyphen and frame number, if != 1 */
|
|
|
6954 case 'N':
|
|
|
6955 #ifdef HAVE_TTY
|
|
|
6956 {
|
|
|
6957 struct frame *f = XFRAME (w->frame);
|
|
|
6958 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
|
|
|
6959 {
|
|
|
6960 /* Naughty, naughty */
|
|
|
6961 char * writable_str = alloca_array (char, 10);
|
|
|
6962 sprintf (writable_str, "-%d", f->order_count);
|
|
|
6963 str = writable_str;
|
|
|
6964 }
|
|
|
6965 }
|
|
|
6966 #endif /* HAVE_TTY */
|
|
|
6967 break;
|
|
|
6968
|
|
|
6969 /* print Narrow if appropriate */
|
|
|
6970 case 'n':
|
|
|
6971 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
6972 || BUF_ZV (b) < BUF_Z (b))
|
|
|
6973 str = " Narrow";
|
|
|
6974 break;
|
|
|
6975
|
|
|
6976 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
6977 case '*':
|
|
|
6978 str = (!NILP (b->read_only)
|
|
|
6979 ? "%"
|
|
|
6980 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
6981 ? "*"
|
|
|
6982 : "-"));
|
|
|
6983 break;
|
|
|
6984
|
|
|
6985 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
6986 read-only but still indicate whether it is modified. */
|
|
|
6987 case '+':
|
|
|
6988 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
6989 ? "*"
|
|
|
6990 : (!NILP (b->read_only)
|
|
|
6991 ? "%"
|
|
|
6992 : "-"));
|
|
|
6993 break;
|
|
|
6994
|
|
|
6995 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
6996 modeline-format doc string. */
|
|
|
6997 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
6998 case '&':
|
|
|
6999 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
7000 ? "*"
|
|
|
7001 : "-");
|
|
|
7002 break;
|
|
|
7003
|
|
|
7004 /* print process status */
|
|
|
7005 case 's':
|
|
|
7006 obj = Fget_buffer_process (w->buffer);
|
|
|
7007 if (NILP (obj))
|
|
|
7008 str = GETTEXT ("no process");
|
|
|
7009 else
|
|
|
7010 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
7011 break;
|
|
|
7012
|
|
|
7013 /* Print name of selected frame. */
|
|
|
7014 case 'S':
|
|
|
7015 obj = XFRAME (w->frame)->name;
|
|
|
7016 break;
|
|
|
7017
|
|
|
7018 /* indicate TEXT or BINARY */
|
|
|
7019 case 't':
|
|
|
7020 /* #### NT does not use this any more. Now what? */
|
|
|
7021 str = "T";
|
|
|
7022 break;
|
|
|
7023
|
|
|
7024 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
7025 case 'p':
|
|
|
7026 {
|
|
665
|
7027 Charbpos pos = marker_position (w->start[type]);
|
|
428
|
7028
|
|
|
7029 /* This had better be while the desired lines are being done. */
|
|
|
7030 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
7031 {
|
|
|
7032 if (pos <= BUF_BEGV (b))
|
|
|
7033 str = "All";
|
|
|
7034 else
|
|
|
7035 str = "Bottom";
|
|
|
7036 }
|
|
|
7037 else if (pos <= BUF_BEGV (b))
|
|
|
7038 str = "Top";
|
|
|
7039 else
|
|
|
7040 {
|
|
|
7041 /* This hard limit is ok since the string it will hold has a
|
|
|
7042 fixed maximum length of 3. But just to be safe... */
|
|
|
7043 char buf[10];
|
|
|
7044 Charcount chars = pos - BUF_BEGV (b);
|
|
|
7045 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7046
|
|
|
7047 /* Avoid overflow on big buffers */
|
|
|
7048 int percent = total > LONG_MAX/200 ?
|
|
|
7049 (chars + total/200) / (total / 100) :
|
|
|
7050 (chars * 100 + total/2) / total;
|
|
|
7051
|
|
|
7052 /* We can't normally display a 3-digit number, so get us a
|
|
|
7053 2-digit number that is close. */
|
|
|
7054 if (percent == 100)
|
|
|
7055 percent = 99;
|
|
|
7056
|
|
|
7057 sprintf (buf, "%d%%", percent);
|
|
665
|
7058 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
|
|
428
|
7059 strlen (buf));
|
|
|
7060
|
|
|
7061 goto decode_mode_spec_done;
|
|
|
7062 }
|
|
|
7063 break;
|
|
|
7064 }
|
|
|
7065
|
|
|
7066 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
7067 Top, or print Bottom or All */
|
|
|
7068 case 'P':
|
|
|
7069 {
|
|
665
|
7070 Charbpos toppos = marker_position (w->start[type]);
|
|
|
7071 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
428
|
7072
|
|
|
7073 /* botpos is only accurate as of the last redisplay, so we can
|
|
|
7074 only treat it as a hint. In particular, after erase-buffer,
|
|
|
7075 botpos may be negative. */
|
|
|
7076 if (botpos < toppos)
|
|
|
7077 botpos = toppos;
|
|
|
7078
|
|
|
7079 if (botpos >= BUF_ZV (b))
|
|
|
7080 {
|
|
|
7081 if (toppos <= BUF_BEGV (b))
|
|
|
7082 str = "All";
|
|
|
7083 else
|
|
|
7084 str = "Bottom";
|
|
|
7085 }
|
|
|
7086 else
|
|
|
7087 {
|
|
|
7088 /* This hard limit is ok since the string it will hold has a
|
|
|
7089 fixed maximum length of around 6. But just to be safe... */
|
|
|
7090 char buf[10];
|
|
|
7091 Charcount chars = botpos - BUF_BEGV (b);
|
|
|
7092 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
7093
|
|
|
7094 /* Avoid overflow on big buffers */
|
|
|
7095 int percent = total > LONG_MAX/200 ?
|
|
|
7096 (chars + total/200) / (total / 100) :
|
|
|
7097 (chars * 100 + total/2) / max (total, 1);
|
|
|
7098
|
|
|
7099 /* We can't normally display a 3-digit number, so get us a
|
|
|
7100 2-digit number that is close. */
|
|
|
7101 if (percent == 100)
|
|
|
7102 percent = 99;
|
|
|
7103
|
|
|
7104 if (toppos <= BUF_BEGV (b))
|
|
|
7105 sprintf (buf, "Top%d%%", percent);
|
|
|
7106 else
|
|
|
7107 sprintf (buf, "%d%%", percent);
|
|
|
7108
|
|
665
|
7109 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
|
|
428
|
7110 strlen (buf));
|
|
|
7111
|
|
|
7112 goto decode_mode_spec_done;
|
|
|
7113 }
|
|
|
7114 break;
|
|
|
7115 }
|
|
|
7116
|
|
|
7117 /* print % */
|
|
|
7118 case '%':
|
|
|
7119 str = "%";
|
|
|
7120 break;
|
|
|
7121
|
|
|
7122 /* print one [ for each recursive editing level. */
|
|
|
7123 case '[':
|
|
|
7124 {
|
|
|
7125 int i;
|
|
|
7126
|
|
|
7127 if (command_loop_level > 5)
|
|
|
7128 {
|
|
|
7129 str = "[[[... ";
|
|
|
7130 break;
|
|
|
7131 }
|
|
|
7132
|
|
|
7133 for (i = 0; i < command_loop_level; i++)
|
|
665
|
7134 Dynarr_add (mode_spec_intbyte_string, '[');
|
|
428
|
7135
|
|
|
7136 goto decode_mode_spec_done;
|
|
|
7137 }
|
|
|
7138
|
|
|
7139 /* print one ] for each recursive editing level. */
|
|
|
7140 case ']':
|
|
|
7141 {
|
|
|
7142 int i;
|
|
|
7143
|
|
|
7144 if (command_loop_level > 5)
|
|
|
7145 {
|
|
|
7146 str = "...]]]";
|
|
|
7147 break;
|
|
|
7148 }
|
|
|
7149
|
|
|
7150 for (i = 0; i < command_loop_level; i++)
|
|
665
|
7151 Dynarr_add (mode_spec_intbyte_string, ']');
|
|
428
|
7152
|
|
|
7153 goto decode_mode_spec_done;
|
|
|
7154 }
|
|
|
7155
|
|
|
7156 /* print infinitely many dashes -- handle at top level now */
|
|
|
7157 case '-':
|
|
|
7158 break;
|
|
|
7159
|
|
|
7160 }
|
|
|
7161
|
|
|
7162 if (STRINGP (obj))
|
|
665
|
7163 Dynarr_add_many (mode_spec_intbyte_string,
|
|
428
|
7164 XSTRING_DATA (obj),
|
|
|
7165 XSTRING_LENGTH (obj));
|
|
|
7166 else if (str)
|
|
665
|
7167 Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) str, strlen (str));
|
|
428
|
7168
|
|
|
7169 decode_mode_spec_done:
|
|
665
|
7170 Dynarr_add (mode_spec_intbyte_string, '\0');
|
|
428
|
7171 }
|
|
|
7172
|
|
|
7173 /* Given a display line, free all of its data structures. */
|
|
|
7174
|
|
|
7175 static void
|
|
|
7176 free_display_line (struct display_line *dl)
|
|
|
7177 {
|
|
|
7178 int block;
|
|
|
7179
|
|
|
7180 if (dl->display_blocks)
|
|
|
7181 {
|
|
|
7182 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
|
7183 {
|
|
|
7184 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7185
|
|
|
7186 Dynarr_free (db->runes);
|
|
|
7187 }
|
|
|
7188
|
|
|
7189 Dynarr_free (dl->display_blocks);
|
|
|
7190 dl->display_blocks = NULL;
|
|
|
7191 }
|
|
|
7192
|
|
|
7193 if (dl->left_glyphs)
|
|
|
7194 {
|
|
|
7195 Dynarr_free (dl->left_glyphs);
|
|
|
7196 dl->left_glyphs = NULL;
|
|
|
7197 }
|
|
|
7198
|
|
|
7199 if (dl->right_glyphs)
|
|
|
7200 {
|
|
|
7201 Dynarr_free (dl->right_glyphs);
|
|
|
7202 dl->right_glyphs = NULL;
|
|
|
7203 }
|
|
|
7204 }
|
|
|
7205
|
|
|
7206
|
|
|
7207 /* Given an array of display lines, free them and all data structures
|
|
|
7208 contained within them. */
|
|
|
7209
|
|
|
7210 void
|
|
|
7211 free_display_lines (display_line_dynarr *dla)
|
|
|
7212 {
|
|
|
7213 int line;
|
|
|
7214
|
|
|
7215 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
7216 {
|
|
|
7217 free_display_line (Dynarr_atp (dla, line));
|
|
|
7218 }
|
|
|
7219
|
|
|
7220 Dynarr_free (dla);
|
|
|
7221 }
|
|
|
7222
|
|
|
7223 /* Call internal free routine for each set of display lines. */
|
|
|
7224
|
|
|
7225 void
|
|
|
7226 free_display_structs (struct window_mirror *mir)
|
|
|
7227 {
|
|
|
7228 if (mir->current_display_lines)
|
|
|
7229 {
|
|
|
7230 free_display_lines (mir->current_display_lines);
|
|
|
7231 mir->current_display_lines = 0;
|
|
|
7232 }
|
|
|
7233
|
|
|
7234 if (mir->desired_display_lines)
|
|
|
7235 {
|
|
|
7236 free_display_lines (mir->desired_display_lines);
|
|
|
7237 mir->desired_display_lines = 0;
|
|
|
7238 }
|
|
|
7239 }
|
|
|
7240
|
|
|
7241
|
|
|
7242 static void
|
|
|
7243 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
|
|
|
7244 {
|
|
|
7245 if (gba)
|
|
|
7246 {
|
|
|
7247 glyph_block *gb = Dynarr_atp (gba, 0);
|
|
|
7248 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
|
|
|
7249
|
|
|
7250 for (; gb < gb_last; gb++)
|
|
|
7251 {
|
|
|
7252 if (!NILP (gb->glyph))
|
|
|
7253 mark_object (gb->glyph);
|
|
|
7254 if (!NILP (gb->extent))
|
|
|
7255 mark_object (gb->extent);
|
|
|
7256 }
|
|
|
7257 }
|
|
|
7258 }
|
|
|
7259
|
|
442
|
7260 /* See the comment in image_instantiate_cache_result as to why marking
|
|
|
7261 the glyph will also mark the image_instance. */
|
|
|
7262 void
|
|
428
|
7263 mark_redisplay_structs (display_line_dynarr *dla)
|
|
|
7264 {
|
|
|
7265 display_line *dl = Dynarr_atp (dla, 0);
|
|
|
7266 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
7267
|
|
|
7268 for (; dl < dl_last; dl++)
|
|
|
7269 {
|
|
|
7270 display_block_dynarr *dba = dl->display_blocks;
|
|
|
7271 display_block *db = Dynarr_atp (dba, 0);
|
|
|
7272 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
|
|
|
7273
|
|
|
7274 for (; db < db_last; db++)
|
|
|
7275 {
|
|
|
7276 rune_dynarr *ra = db->runes;
|
|
|
7277 rune *r = Dynarr_atp (ra, 0);
|
|
|
7278 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
|
|
|
7279
|
|
|
7280 for (; r < r_last; r++)
|
|
|
7281 {
|
|
|
7282 if (r->type == RUNE_DGLYPH)
|
|
|
7283 {
|
|
|
7284 if (!NILP (r->object.dglyph.glyph))
|
|
|
7285 mark_object (r->object.dglyph.glyph);
|
|
|
7286 if (!NILP (r->object.dglyph.extent))
|
|
|
7287 mark_object (r->object.dglyph.extent);
|
|
|
7288 }
|
|
|
7289 }
|
|
|
7290 }
|
|
|
7291
|
|
|
7292 mark_glyph_block_dynarr (dl->left_glyphs);
|
|
|
7293 mark_glyph_block_dynarr (dl->right_glyphs);
|
|
|
7294 }
|
|
|
7295 }
|
|
|
7296
|
|
|
7297
|
|
|
7298 /*****************************************************************************
|
|
|
7299 Line Start Cache Description and Rationale
|
|
|
7300
|
|
|
7301 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
7302 It depends on the key assumption that the number of lines that can be
|
|
|
7303 displayed at any given time is fixed. This led to a complete separation
|
|
|
7304 of the scrolling code from the redisplay code. In order to fully support
|
|
|
7305 variable height lines, the scrolling code must actually be tightly
|
|
|
7306 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
7307 will be displayed on a screen for any given starting point.
|
|
|
7308
|
|
|
7309 What is ideally wanted is a complete list of the starting buffer position
|
|
|
7310 for every possible display line of a buffer along with the height of that
|
|
|
7311 display line. Maintaining such a full list would be very expensive. We
|
|
|
7312 settle for having it include information for all areas which we happen to
|
|
|
7313 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
7314 areas we need to work with.
|
|
|
7315
|
|
|
7316 In order to ensure that the cache accurately represents what redisplay
|
|
|
7317 would actually show, it is necessary to invalidate it in many situations.
|
|
|
7318 If the buffer changes, the starting positions may no longer be correct.
|
|
|
7319 If a face or an extent has changed then the line heights may have altered.
|
|
|
7320 These events happen frequently enough that the cache can end up being
|
|
|
7321 constantly disabled. With this potentially constant invalidation when is
|
|
|
7322 the cache ever useful?
|
|
|
7323
|
|
|
7324 Even if the cache is invalidated before every single usage, it is
|
|
|
7325 necessary. Scrolling often requires knowledge about display lines which
|
|
|
7326 are actually above or below the visible region. The cache provides a
|
|
|
7327 convenient light-weight method of storing this information for multiple
|
|
|
7328 display regions. This knowledge is necessary for the scrolling code to
|
|
|
7329 always obey the First Golden Rule of Redisplay.
|
|
|
7330
|
|
|
7331 If the cache already contains all of the information that the scrolling
|
|
|
7332 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
7333 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
7334 do to help out the cache is to always add the displayed region. This
|
|
|
7335 region had to be generated anyway, so the cache ends up getting the
|
|
|
7336 information basically for free. In those cases where a user is simply
|
|
|
7337 scrolling around viewing a buffer there is a high probability that this is
|
|
|
7338 sufficient to always provide the needed information. The second thing we
|
|
|
7339 can do is be smart about invalidating the cache.
|
|
|
7340
|
|
|
7341 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
7342
|
|
|
7343 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
7344 starting positions of any display lines. These types of buffer
|
|
|
7345 modifications should not invalidate the cache. This is actually a large
|
|
|
7346 optimization for redisplay speed as well.
|
|
|
7347
|
|
|
7348 + Buffer modifications frequently only affect the display of lines at and
|
|
|
7349 below where they occur. In these situations we should only invalidate
|
|
|
7350 the part of the cache starting at where the modification occurs.
|
|
|
7351
|
|
|
7352 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
7353 applicable.
|
|
|
7354 ****************************************************************************/
|
|
|
7355
|
|
|
7356 /* This will get used quite a bit so we don't want to be constantly
|
|
|
7357 allocating and freeing it. */
|
|
|
7358 static line_start_cache_dynarr *internal_cache;
|
|
|
7359
|
|
|
7360 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
7361 the TYPE display structs. */
|
|
|
7362
|
|
|
7363 static void
|
|
|
7364 update_internal_cache_list (struct window *w, int type)
|
|
|
7365 {
|
|
|
7366 int line;
|
|
|
7367 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
7368
|
|
|
7369 Dynarr_reset (internal_cache);
|
|
|
7370 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
7371 {
|
|
|
7372 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
7373
|
|
|
7374 if (dl->modeline)
|
|
|
7375 continue;
|
|
|
7376 else
|
|
|
7377 {
|
|
|
7378 struct line_start_cache lsc;
|
|
434
|
7379
|
|
665
|
7380 lsc.start = dl->charbpos;
|
|
|
7381 lsc.end = dl->end_charbpos;
|
|
428
|
7382 lsc.height = dl->ascent + dl->descent;
|
|
|
7383
|
|
|
7384 Dynarr_add (internal_cache, lsc);
|
|
|
7385 }
|
|
|
7386 }
|
|
|
7387 }
|
|
|
7388
|
|
|
7389 /* Reset the line cache if necessary. This should be run at the
|
|
|
7390 beginning of any function which access the cache. */
|
|
|
7391
|
|
|
7392 static void
|
|
|
7393 validate_line_start_cache (struct window *w)
|
|
|
7394 {
|
|
|
7395 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7396 struct frame *f = XFRAME (w->frame);
|
|
|
7397
|
|
|
7398 if (!w->line_cache_validation_override)
|
|
|
7399 {
|
|
|
7400 /* f->extents_changed used to be in here because extent face and
|
|
|
7401 size changes can cause text shifting. However, the extent
|
|
|
7402 covering the region is constantly having its face set and
|
|
|
7403 priority altered by the mouse code. This means that the line
|
|
|
7404 start cache is constantly being invalidated. This is bad
|
|
|
7405 since the mouse code also triggers heavy usage of the cache.
|
|
|
7406 Since it is an unlikely that f->extents being changed
|
|
|
7407 indicates that the cache really needs to be updated and if it
|
|
|
7408 does redisplay will catch it pretty quickly we no longer
|
|
|
7409 invalidate the cache if it is set. This greatly speeds up
|
|
|
7410 dragging out regions with the mouse. */
|
|
|
7411 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
7412 || f->faces_changed
|
|
|
7413 || f->clip_changed)
|
|
|
7414 {
|
|
|
7415 Dynarr_reset (w->line_start_cache);
|
|
|
7416 }
|
|
|
7417 }
|
|
|
7418 }
|
|
|
7419
|
|
|
7420 /* Return the very first buffer position contained in the given
|
|
|
7421 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7422 cache is valid. */
|
|
|
7423
|
|
665
|
7424 static Charbpos
|
|
428
|
7425 line_start_cache_start (struct window *w)
|
|
|
7426 {
|
|
|
7427 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7428
|
|
|
7429 if (!Dynarr_length (cache))
|
|
|
7430 return -1;
|
|
|
7431 else
|
|
|
7432 return Dynarr_atp (cache, 0)->start;
|
|
|
7433 }
|
|
|
7434
|
|
|
7435 /* Return the very last buffer position contained in the given
|
|
|
7436 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
7437 cache is valid. */
|
|
|
7438
|
|
665
|
7439 static Charbpos
|
|
428
|
7440 line_start_cache_end (struct window *w)
|
|
|
7441 {
|
|
|
7442 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7443
|
|
|
7444 if (!Dynarr_length (cache))
|
|
|
7445 return -1;
|
|
|
7446 else
|
|
|
7447 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7448 }
|
|
|
7449
|
|
|
7450 /* Return the index of the line POINT is contained within in window
|
|
|
7451 W's line start cache. It will enlarge the cache or move the cache
|
|
|
7452 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
7453 a guarantee of the number of entries in the cache present on either
|
|
|
7454 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
7455 then it will be treated as 0, but the cache window will not be
|
|
|
7456 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
7457 for any reason. */
|
|
|
7458
|
|
|
7459 int
|
|
665
|
7460 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
|
|
428
|
7461 {
|
|
|
7462 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7463 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
647
|
7464 int top, bottom, pos;
|
|
428
|
7465
|
|
|
7466 validate_line_start_cache (w);
|
|
|
7467 w->line_cache_validation_override++;
|
|
|
7468
|
|
|
7469 /* Let functions pass in negative values, but we still treat -1
|
|
|
7470 specially. */
|
|
|
7471 /* #### bogosity alert */
|
|
|
7472 if (min_past < 0 && min_past != -1)
|
|
|
7473 min_past = -min_past;
|
|
|
7474
|
|
|
7475 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
7476 || line_start_cache_end (w) < point)
|
|
|
7477 {
|
|
|
7478 int loop;
|
|
|
7479 int win_char_height = window_char_height (w, 1);
|
|
|
7480
|
|
|
7481 /* Occasionally we get here with a 0 height
|
|
|
7482 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
7483 count of 0 so handle that case. */
|
|
|
7484 if (!win_char_height)
|
|
|
7485 win_char_height = 1;
|
|
|
7486
|
|
|
7487 if (!Dynarr_length (cache))
|
|
|
7488 {
|
|
665
|
7489 Charbpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
7490 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
428
|
7491
|
|
|
7492 update_line_start_cache (w, from, to, point, 0);
|
|
|
7493
|
|
|
7494 if (!Dynarr_length (cache))
|
|
|
7495 {
|
|
|
7496 w->line_cache_validation_override--;
|
|
|
7497 return -1;
|
|
|
7498 }
|
|
|
7499 }
|
|
|
7500
|
|
|
7501 assert (Dynarr_length (cache));
|
|
|
7502
|
|
|
7503 loop = 0;
|
|
|
7504 while (line_start_cache_start (w) > point
|
|
|
7505 && (loop < cache_adjustment || min_past == -1))
|
|
|
7506 {
|
|
665
|
7507 Charbpos from, to;
|
|
428
|
7508
|
|
|
7509 from = line_start_cache_start (w);
|
|
|
7510 if (from <= BUF_BEGV (b))
|
|
|
7511 break;
|
|
|
7512
|
|
|
7513 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7514 to = line_start_cache_end (w);
|
|
|
7515
|
|
|
7516 update_line_start_cache (w, from, to, point, 0);
|
|
|
7517 loop++;
|
|
|
7518 }
|
|
|
7519
|
|
|
7520 if (line_start_cache_start (w) > point)
|
|
|
7521 {
|
|
665
|
7522 Charbpos from, to;
|
|
428
|
7523
|
|
|
7524 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7525 if (from >= BUF_ZV (b))
|
|
|
7526 {
|
|
|
7527 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7528 from = to;
|
|
|
7529 to = BUF_ZV (b);
|
|
|
7530 }
|
|
|
7531 else
|
|
|
7532 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7533
|
|
|
7534 update_line_start_cache (w, from, to, point, 0);
|
|
|
7535 }
|
|
|
7536
|
|
|
7537 loop = 0;
|
|
|
7538 while (line_start_cache_end (w) < point
|
|
|
7539 && (loop < cache_adjustment || min_past == -1))
|
|
|
7540 {
|
|
665
|
7541 Charbpos from, to;
|
|
428
|
7542
|
|
|
7543 to = line_start_cache_end (w);
|
|
|
7544 if (to >= BUF_ZV (b))
|
|
|
7545 break;
|
|
|
7546
|
|
|
7547 from = line_start_cache_end (w);
|
|
|
7548 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7549
|
|
|
7550 update_line_start_cache (w, from, to, point, 0);
|
|
|
7551 loop++;
|
|
|
7552 }
|
|
|
7553
|
|
|
7554 if (line_start_cache_end (w) < point)
|
|
|
7555 {
|
|
665
|
7556 Charbpos from, to;
|
|
428
|
7557
|
|
|
7558 from = find_next_newline_no_quit (b, point, -1);
|
|
|
7559 if (from >= BUF_ZV (b))
|
|
|
7560 {
|
|
|
7561 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
7562 from = to;
|
|
|
7563 to = BUF_ZV (b);
|
|
|
7564 }
|
|
|
7565 else
|
|
|
7566 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
7567
|
|
|
7568 update_line_start_cache (w, from, to, point, 0);
|
|
|
7569 }
|
|
|
7570 }
|
|
|
7571
|
|
|
7572 assert (Dynarr_length (cache));
|
|
|
7573
|
|
|
7574 if (min_past == -1)
|
|
|
7575 min_past = 0;
|
|
|
7576
|
|
|
7577 /* This could happen if the buffer is narrowed. */
|
|
|
7578 if (line_start_cache_start (w) > point
|
|
|
7579 || line_start_cache_end (w) < point)
|
|
|
7580 {
|
|
|
7581 w->line_cache_validation_override--;
|
|
|
7582 return -1;
|
|
|
7583 }
|
|
|
7584
|
|
|
7585 find_point_loop:
|
|
|
7586
|
|
|
7587 top = Dynarr_length (cache) - 1;
|
|
|
7588 bottom = 0;
|
|
|
7589
|
|
|
7590 while (1)
|
|
|
7591 {
|
|
647
|
7592 int new_pos;
|
|
665
|
7593 Charbpos start, end;
|
|
428
|
7594
|
|
|
7595 pos = (bottom + top + 1) >> 1;
|
|
|
7596 start = Dynarr_atp (cache, pos)->start;
|
|
|
7597 end = Dynarr_atp (cache, pos)->end;
|
|
|
7598
|
|
|
7599 if (point >= start && point <= end)
|
|
|
7600 {
|
|
|
7601 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
7602 {
|
|
665
|
7603 Charbpos from =
|
|
428
|
7604 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
7605 -min_past - 1);
|
|
665
|
7606 Charbpos to = line_start_cache_end (w);
|
|
428
|
7607
|
|
|
7608 update_line_start_cache (w, from, to, point, 0);
|
|
|
7609 goto find_point_loop;
|
|
|
7610 }
|
|
|
7611 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
7612 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
7613 {
|
|
665
|
7614 Charbpos from = line_start_cache_end (w);
|
|
|
7615 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7616 (min_past
|
|
|
7617 ? min_past
|
|
|
7618 : 1));
|
|
|
7619
|
|
|
7620 update_line_start_cache (w, from, to, point, 0);
|
|
|
7621 goto find_point_loop;
|
|
|
7622 }
|
|
|
7623 else
|
|
|
7624 {
|
|
|
7625 w->line_cache_validation_override--;
|
|
|
7626 return pos;
|
|
|
7627 }
|
|
|
7628 }
|
|
|
7629 else if (point > end)
|
|
|
7630 bottom = pos + 1;
|
|
|
7631 else if (point < start)
|
|
|
7632 top = pos - 1;
|
|
|
7633 else
|
|
|
7634 abort ();
|
|
|
7635
|
|
|
7636 new_pos = (bottom + top + 1) >> 1;
|
|
|
7637 if (pos == new_pos)
|
|
|
7638 {
|
|
|
7639 w->line_cache_validation_override--;
|
|
|
7640 return -1;
|
|
|
7641 }
|
|
|
7642 }
|
|
|
7643 }
|
|
|
7644
|
|
|
7645 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
7646 if display of the window was to begin at STARTP. */
|
|
|
7647
|
|
|
7648 int
|
|
665
|
7649 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
|
|
428
|
7650 {
|
|
|
7651 struct buffer *b = XBUFFER (w->buffer);
|
|
430
|
7652 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
|
|
428
|
7653 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
7654 int start_elt;
|
|
|
7655
|
|
|
7656 /* If point is before the intended start it obviously can't be visible. */
|
|
|
7657 if (point < startp)
|
|
|
7658 return 0;
|
|
|
7659
|
|
|
7660 /* If point or start are not in the accessible buffer range, then
|
|
|
7661 fail. */
|
|
|
7662 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
7663 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
7664 return 0;
|
|
|
7665
|
|
|
7666 validate_line_start_cache (w);
|
|
|
7667 w->line_cache_validation_override++;
|
|
|
7668
|
|
|
7669 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
7670 if (start_elt == -1)
|
|
|
7671 {
|
|
|
7672 w->line_cache_validation_override--;
|
|
|
7673 return 0;
|
|
|
7674 }
|
|
|
7675
|
|
|
7676 assert (line_start_cache_start (w) <= startp
|
|
|
7677 && line_start_cache_end (w) >= startp);
|
|
|
7678
|
|
|
7679 while (1)
|
|
|
7680 {
|
|
|
7681 int height;
|
|
|
7682
|
|
|
7683 /* Expand the cache if necessary. */
|
|
|
7684 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7685 {
|
|
665
|
7686 Charbpos old_startp =
|
|
428
|
7687 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
7688
|
|
|
7689 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
7690 window_char_height (w, 0));
|
|
|
7691
|
|
|
7692 /* We've already actually processed old_startp, so increment
|
|
|
7693 immediately. */
|
|
|
7694 start_elt++;
|
|
|
7695
|
|
|
7696 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
7697 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
7698 {
|
|
|
7699 w->line_cache_validation_override--;
|
|
|
7700 return 0;
|
|
|
7701 }
|
|
|
7702 }
|
|
|
7703
|
|
|
7704 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
7705
|
|
|
7706 if (pixpos + height > bottom)
|
|
|
7707 {
|
|
|
7708 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7709 {
|
|
|
7710 w->line_cache_validation_override--;
|
|
|
7711 return 0;
|
|
|
7712 }
|
|
|
7713 }
|
|
|
7714
|
|
|
7715 pixpos += height;
|
|
|
7716 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
7717 {
|
|
|
7718 w->line_cache_validation_override--;
|
|
|
7719 return 1;
|
|
|
7720 }
|
|
|
7721
|
|
|
7722 start_elt++;
|
|
|
7723 }
|
|
|
7724 }
|
|
|
7725
|
|
|
7726 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7727 the buffer position at the beginning or end of the last line
|
|
|
7728 displayed. The end of the last line is also know as the window end
|
|
|
7729 position.
|
|
|
7730
|
|
442
|
7731 WARNING: It is possible that redisplay failed to layout any lines for the
|
|
|
7732 windows. Under normal circumstances this is rare. However it seems that it
|
|
|
7733 does occur in the following situation: A mouse event has come in and we
|
|
|
7734 need to compute its location in a window. That code (in
|
|
|
7735 pixel_to_glyph_translation) already can handle 0 as an error return value.
|
|
|
7736
|
|
428
|
7737 #### With a little work this could probably be reworked as just a
|
|
|
7738 call to start_with_line_at_pixpos. */
|
|
|
7739
|
|
665
|
7740 static Charbpos
|
|
|
7741 start_end_of_last_line (struct window *w, Charbpos startp, int end,
|
|
442
|
7742 int may_error)
|
|
428
|
7743 {
|
|
|
7744 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7745 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
7746 int pixpos = 0;
|
|
|
7747 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
665
|
7748 Charbpos cur_start;
|
|
428
|
7749 int start_elt;
|
|
|
7750
|
|
|
7751 validate_line_start_cache (w);
|
|
|
7752 w->line_cache_validation_override++;
|
|
|
7753
|
|
|
7754 if (startp < BUF_BEGV (b))
|
|
|
7755 startp = BUF_BEGV (b);
|
|
|
7756 else if (startp > BUF_ZV (b))
|
|
|
7757 startp = BUF_ZV (b);
|
|
|
7758 cur_start = startp;
|
|
|
7759
|
|
|
7760 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
7761 if (start_elt == -1)
|
|
442
|
7762 return may_error ? 0 : startp;
|
|
428
|
7763
|
|
|
7764 while (1)
|
|
|
7765 {
|
|
|
7766 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
7767
|
|
|
7768 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
7769
|
|
|
7770 if (pixpos + height > bottom)
|
|
|
7771 {
|
|
|
7772 /* Adjust for any possible clip. */
|
|
|
7773 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
7774 start_elt--;
|
|
|
7775
|
|
|
7776 if (start_elt < 0)
|
|
|
7777 {
|
|
|
7778 w->line_cache_validation_override--;
|
|
|
7779 if (end)
|
|
|
7780 return BUF_ZV (b);
|
|
|
7781 else
|
|
|
7782 return BUF_BEGV (b);
|
|
|
7783 }
|
|
|
7784 else
|
|
|
7785 {
|
|
|
7786 w->line_cache_validation_override--;
|
|
|
7787 if (end)
|
|
|
7788 return Dynarr_atp (cache, start_elt)->end;
|
|
|
7789 else
|
|
|
7790 return Dynarr_atp (cache, start_elt)->start;
|
|
|
7791 }
|
|
|
7792 }
|
|
|
7793
|
|
|
7794 pixpos += height;
|
|
|
7795 start_elt++;
|
|
|
7796 if (start_elt == Dynarr_length (cache))
|
|
|
7797 {
|
|
665
|
7798 Charbpos from = line_start_cache_end (w);
|
|
428
|
7799 int win_char_height = window_char_height (w, 0);
|
|
665
|
7800 Charbpos to = find_next_newline_no_quit (b, from,
|
|
428
|
7801 (win_char_height
|
|
|
7802 ? win_char_height
|
|
|
7803 : 1));
|
|
|
7804
|
|
|
7805 /* We've hit the end of the bottom so that's what it is. */
|
|
|
7806 if (from >= BUF_ZV (b))
|
|
|
7807 {
|
|
|
7808 w->line_cache_validation_override--;
|
|
|
7809 return BUF_ZV (b);
|
|
|
7810 }
|
|
|
7811
|
|
|
7812 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
7813
|
|
|
7814 /* Updating the cache invalidates any current indexes. */
|
|
|
7815 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
7816 }
|
|
|
7817 }
|
|
|
7818 }
|
|
|
7819
|
|
|
7820 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7821 the buffer position at the beginning of the last line displayed. */
|
|
|
7822
|
|
665
|
7823 Charbpos
|
|
|
7824 start_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7825 {
|
|
442
|
7826 return start_end_of_last_line (w, startp, 0 , 0);
|
|
428
|
7827 }
|
|
|
7828
|
|
|
7829 /* For the given window W, if display starts at STARTP, what will be
|
|
|
7830 the buffer position at the end of the last line displayed. This is
|
|
|
7831 also know as the window end position. */
|
|
|
7832
|
|
665
|
7833 Charbpos
|
|
|
7834 end_of_last_line (struct window *w, Charbpos startp)
|
|
428
|
7835 {
|
|
442
|
7836 return start_end_of_last_line (w, startp, 1, 0);
|
|
428
|
7837 }
|
|
|
7838
|
|
665
|
7839 static Charbpos
|
|
|
7840 end_of_last_line_may_error (struct window *w, Charbpos startp)
|
|
442
|
7841 {
|
|
|
7842 return start_end_of_last_line (w, startp, 1, 1);
|
|
|
7843 }
|
|
|
7844
|
|
|
7845
|
|
428
|
7846 /* For window W, what does the starting position have to be so that
|
|
|
7847 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
7848
|
|
665
|
7849 Charbpos
|
|
|
7850 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
|
|
428
|
7851 {
|
|
|
7852 struct buffer *b = XBUFFER (w->buffer);
|
|
|
7853 int cur_elt;
|
|
665
|
7854 Charbpos cur_pos, prev_pos = point;
|
|
428
|
7855 int point_line_height;
|
|
|
7856 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
7857
|
|
|
7858 validate_line_start_cache (w);
|
|
|
7859 w->line_cache_validation_override++;
|
|
|
7860
|
|
|
7861 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
7862 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
7863 if (cur_elt < 0)
|
|
|
7864 {
|
|
|
7865 w->line_cache_validation_override--;
|
|
|
7866 return point;
|
|
|
7867 }
|
|
|
7868
|
|
|
7869 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7870
|
|
|
7871 while (1)
|
|
|
7872 {
|
|
|
7873 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7874
|
|
|
7875 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7876
|
|
|
7877 /* Do not take into account the value of vertical_clip here.
|
|
|
7878 That is the responsibility of the calling functions. */
|
|
|
7879 if (pixheight < 0)
|
|
|
7880 {
|
|
|
7881 w->line_cache_validation_override--;
|
|
|
7882 if (-pixheight > point_line_height)
|
|
|
7883 /* We can't make the target line cover pixpos, so put it
|
|
|
7884 above pixpos. That way it will at least be visible. */
|
|
|
7885 return prev_pos;
|
|
|
7886 else
|
|
|
7887 return cur_pos;
|
|
|
7888 }
|
|
|
7889
|
|
|
7890 cur_elt--;
|
|
|
7891 while (cur_elt < 0)
|
|
|
7892 {
|
|
665
|
7893 Charbpos from, to;
|
|
428
|
7894 int win_char_height;
|
|
|
7895
|
|
|
7896 if (cur_pos <= BUF_BEGV (b))
|
|
|
7897 {
|
|
|
7898 w->line_cache_validation_override--;
|
|
|
7899 return BUF_BEGV (b);
|
|
|
7900 }
|
|
|
7901
|
|
|
7902 win_char_height = window_char_height (w, 0);
|
|
|
7903 if (!win_char_height)
|
|
|
7904 win_char_height = 1;
|
|
|
7905
|
|
|
7906 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
7907 to = line_start_cache_end (w);
|
|
|
7908 update_line_start_cache (w, from, to, point, 0);
|
|
|
7909
|
|
|
7910 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
7911 assert (cur_elt >= -1);
|
|
|
7912 /* This used to be cur_elt>=0 under the assumption that if
|
|
|
7913 point is in the top line and not at BUF_BEGV, then
|
|
434
|
7914 setting the window_start to a newline before the start of
|
|
428
|
7915 the first line will always cause scrolling.
|
|
|
7916
|
|
|
7917 However in my (jv) opinion this is wrong. That new line
|
|
|
7918 can be hidden in various ways: invisible extents, an
|
|
|
7919 explicit window-start not at a newline character etc.
|
|
|
7920 The existence of those are indeed known to create crashes
|
|
|
7921 on that assert. So we have no option but to continue the
|
|
|
7922 search if we found point at the top of the line_start_cache
|
|
|
7923 again. */
|
|
434
|
7924 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
|
|
428
|
7925 }
|
|
|
7926 prev_pos = cur_pos;
|
|
|
7927 }
|
|
|
7928 }
|
|
|
7929
|
|
|
7930 /* For window W, what does the starting position have to be so that
|
|
|
7931 the line containing point is on display line LINE. If LINE is
|
|
|
7932 positive it is considered to be the number of lines from the top of
|
|
|
7933 the window (0 is the top line). If it is negative the number is
|
|
|
7934 considered to be the number of lines from the bottom (-1 is the
|
|
|
7935 bottom line). */
|
|
|
7936
|
|
665
|
7937 Charbpos
|
|
|
7938 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
|
|
428
|
7939 {
|
|
|
7940 validate_line_start_cache (w);
|
|
|
7941 w->line_cache_validation_override++;
|
|
|
7942
|
|
|
7943 if (line >= 0)
|
|
|
7944 {
|
|
|
7945 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
7946
|
|
|
7947 if (cur_elt - line < 0)
|
|
|
7948 cur_elt = 0; /* Hit the top */
|
|
|
7949 else
|
|
|
7950 cur_elt -= line;
|
|
|
7951
|
|
|
7952 w->line_cache_validation_override--;
|
|
|
7953 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7954 }
|
|
|
7955 else
|
|
|
7956 {
|
|
|
7957 /* The calculated value of pixpos is correct for the bottom line
|
|
|
7958 or what we want when line is -1. Therefore we subtract one
|
|
|
7959 because we have already handled one line. */
|
|
|
7960 int new_line = -line - 1;
|
|
|
7961 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
7962 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
665
|
7963 Charbpos retval, search_point;
|
|
428
|
7964
|
|
|
7965 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
7966 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
7967 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
7968 line, so back up from the bottom by the height of the line
|
|
|
7969 containing point. */
|
|
|
7970 if (scroll_on_clipped_lines)
|
|
|
7971 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
7972 else
|
|
|
7973 pixpos -= 1;
|
|
|
7974
|
|
|
7975 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
7976 {
|
|
|
7977 /* Hit the bottom of the buffer. */
|
|
|
7978 int adjustment =
|
|
|
7979 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
7980 Lisp_Object window;
|
|
|
7981 int defheight;
|
|
|
7982
|
|
793
|
7983 window = wrap_window (w);
|
|
428
|
7984 default_face_height_and_width (window, &defheight, 0);
|
|
|
7985
|
|
|
7986 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
7987
|
|
|
7988 pixpos -= (adjustment * defheight);
|
|
|
7989 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
7990 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
7991 }
|
|
|
7992 else
|
|
|
7993 cur_elt = cur_elt + new_line;
|
|
|
7994
|
|
|
7995 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
7996
|
|
|
7997 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
7998 w->line_cache_validation_override--;
|
|
|
7999 return retval;
|
|
|
8000 }
|
|
|
8001 }
|
|
|
8002
|
|
|
8003 /* This is used to speed up vertical scrolling by caching the known
|
|
|
8004 buffer starting positions for display lines. This allows the
|
|
|
8005 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
8006 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
8007 display structs which are in the given range.
|
|
|
8008
|
|
|
8009 Note also that the FROM/TO values are minimums. It is possible
|
|
|
8010 that this function will actually add information outside of the
|
|
|
8011 lines containing those positions. This can't hurt but it could
|
|
|
8012 possibly help.
|
|
|
8013
|
|
|
8014 #### We currently force the cache to have only 1 contiguous region.
|
|
|
8015 It might help to make the cache a dynarr of caches so that we can
|
|
|
8016 cover more areas. This might, however, turn out to be a lot of
|
|
|
8017 overhead for too little gain. */
|
|
|
8018
|
|
|
8019 static void
|
|
665
|
8020 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
|
|
|
8021 Charbpos point, int no_regen)
|
|
428
|
8022 {
|
|
|
8023 struct buffer *b = XBUFFER (w->buffer);
|
|
|
8024 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
665
|
8025 Charbpos low_bound, high_bound;
|
|
428
|
8026
|
|
|
8027 validate_line_start_cache (w);
|
|
|
8028 w->line_cache_validation_override++;
|
|
|
8029
|
|
|
8030 if (from < BUF_BEGV (b))
|
|
|
8031 from = BUF_BEGV (b);
|
|
|
8032 if (to > BUF_ZV (b))
|
|
|
8033 to = BUF_ZV (b);
|
|
|
8034
|
|
|
8035 if (from > to)
|
|
|
8036 {
|
|
|
8037 w->line_cache_validation_override--;
|
|
|
8038 return;
|
|
|
8039 }
|
|
|
8040
|
|
|
8041 if (Dynarr_length (cache))
|
|
|
8042 {
|
|
|
8043 low_bound = line_start_cache_start (w);
|
|
|
8044 high_bound = line_start_cache_end (w);
|
|
|
8045
|
|
|
8046 /* Check to see if the desired range is already in the cache. */
|
|
|
8047 if (from >= low_bound && to <= high_bound)
|
|
|
8048 {
|
|
|
8049 w->line_cache_validation_override--;
|
|
|
8050 return;
|
|
|
8051 }
|
|
|
8052
|
|
|
8053 /* Check to make sure that the desired range is adjacent to the
|
|
|
8054 current cache. If not, invalidate the cache. */
|
|
|
8055 if (to < low_bound || from > high_bound)
|
|
|
8056 {
|
|
|
8057 Dynarr_reset (cache);
|
|
|
8058 low_bound = high_bound = -1;
|
|
|
8059 }
|
|
|
8060 }
|
|
|
8061 else
|
|
|
8062 {
|
|
|
8063 low_bound = high_bound = -1;
|
|
|
8064 }
|
|
|
8065
|
|
|
8066 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
8067
|
|
|
8068 /* This could be integrated into the next two sections, but it is easier
|
|
|
8069 to follow what's going on by having it separate. */
|
|
|
8070 if (no_regen)
|
|
|
8071 {
|
|
665
|
8072 Charbpos start, end;
|
|
428
|
8073
|
|
|
8074 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
8075 if (!Dynarr_length (internal_cache))
|
|
|
8076 {
|
|
|
8077 w->line_cache_validation_override--;
|
|
|
8078 return;
|
|
|
8079 }
|
|
|
8080
|
|
|
8081 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
8082 end =
|
|
|
8083 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
8084
|
|
|
8085 /* We aren't allowed to generate additional information to fill in
|
|
|
8086 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
8087 cache. */
|
|
|
8088 if (Dynarr_length (cache))
|
|
|
8089 {
|
|
|
8090 if (end < low_bound || start > high_bound)
|
|
|
8091 Dynarr_reset (cache);
|
|
|
8092
|
|
|
8093 /* #### What should really happen if what we are doing is
|
|
|
8094 extending a line (the last line)? */
|
|
|
8095 if (Dynarr_length (cache) == 1
|
|
|
8096 && Dynarr_length (internal_cache) == 1)
|
|
|
8097 Dynarr_reset (cache);
|
|
|
8098 }
|
|
|
8099
|
|
|
8100 if (!Dynarr_length (cache))
|
|
|
8101 {
|
|
|
8102 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8103 Dynarr_length (internal_cache));
|
|
|
8104 w->line_cache_validation_override--;
|
|
|
8105 return;
|
|
|
8106 }
|
|
|
8107
|
|
|
8108 /* An extra check just in case the calling function didn't pass in
|
|
|
8109 the bounds of the DESIRED structs in the first place. */
|
|
|
8110 if (start >= low_bound && end <= high_bound)
|
|
|
8111 {
|
|
|
8112 w->line_cache_validation_override--;
|
|
|
8113 return;
|
|
|
8114 }
|
|
|
8115
|
|
|
8116 /* At this point we know that the internal cache partially overlaps
|
|
|
8117 the main cache. */
|
|
|
8118 if (start < low_bound)
|
|
|
8119 {
|
|
|
8120 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8121 while (ic_elt >= 0)
|
|
|
8122 {
|
|
|
8123 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
8124 break;
|
|
|
8125 else
|
|
|
8126 ic_elt--;
|
|
|
8127 }
|
|
|
8128
|
|
|
8129 if (!(ic_elt >= 0))
|
|
|
8130 {
|
|
|
8131 Dynarr_reset (cache);
|
|
|
8132 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8133 Dynarr_length (internal_cache));
|
|
|
8134 w->line_cache_validation_override--;
|
|
|
8135 return;
|
|
|
8136 }
|
|
|
8137
|
|
|
8138 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8139 ic_elt + 1);
|
|
|
8140 }
|
|
|
8141
|
|
|
8142 if (end > high_bound)
|
|
|
8143 {
|
|
|
8144 int ic_elt = 0;
|
|
|
8145
|
|
|
8146 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
8147 {
|
|
|
8148 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
8149 break;
|
|
|
8150 else
|
|
|
8151 ic_elt++;
|
|
|
8152 }
|
|
|
8153
|
|
|
8154 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
8155 {
|
|
|
8156 Dynarr_reset (cache);
|
|
|
8157 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8158 Dynarr_length (internal_cache));
|
|
|
8159 w->line_cache_validation_override--;
|
|
|
8160 return;
|
|
|
8161 }
|
|
|
8162
|
|
|
8163 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
8164 Dynarr_length (internal_cache) - ic_elt);
|
|
|
8165 }
|
|
|
8166
|
|
|
8167 w->line_cache_validation_override--;
|
|
|
8168 return;
|
|
|
8169 }
|
|
|
8170
|
|
|
8171 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
8172 {
|
|
665
|
8173 Charbpos startp = find_next_newline_no_quit (b, from, -1);
|
|
428
|
8174 int marker = 0;
|
|
|
8175 int old_lb = low_bound;
|
|
|
8176
|
|
|
8177 while (startp < old_lb || low_bound == -1)
|
|
|
8178 {
|
|
|
8179 int ic_elt;
|
|
665
|
8180 Charbpos new_startp;
|
|
428
|
8181
|
|
|
8182 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8183 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8184
|
|
|
8185 /* If this assert is triggered then regenerate_window failed
|
|
442
|
8186 to layout a single line. This is not possible since we
|
|
|
8187 force at least a single line to be layout for CMOTION_DISP */
|
|
|
8188 assert (Dynarr_length (internal_cache));
|
|
428
|
8189 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
8190
|
|
|
8191 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
8192 if (low_bound != -1)
|
|
|
8193 {
|
|
|
8194 while (ic_elt >= 0)
|
|
|
8195 {
|
|
|
8196 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
8197 break;
|
|
|
8198 else
|
|
|
8199 ic_elt--;
|
|
|
8200 }
|
|
|
8201 }
|
|
|
8202 assert (ic_elt >= 0);
|
|
|
8203
|
|
|
8204 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
8205
|
|
|
8206 /*
|
|
|
8207 * Handle invisible text properly:
|
|
|
8208 * If the last line we're inserting has the same end as the
|
|
|
8209 * line before which it will be added, merge the two lines.
|
|
|
8210 */
|
|
|
8211 if (Dynarr_length (cache) &&
|
|
|
8212 Dynarr_atp (internal_cache, ic_elt)->end ==
|
|
|
8213 Dynarr_atp (cache, marker)->end)
|
|
|
8214 {
|
|
|
8215 Dynarr_atp (cache, marker)->start
|
|
|
8216 = Dynarr_atp (internal_cache, ic_elt)->start;
|
|
|
8217 Dynarr_atp (cache, marker)->height
|
|
|
8218 = Dynarr_atp (internal_cache, ic_elt)->height;
|
|
|
8219 ic_elt--;
|
|
|
8220 }
|
|
|
8221
|
|
|
8222 if (ic_elt >= 0) /* we still have lines to add.. */
|
|
|
8223 {
|
|
|
8224 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8225 ic_elt + 1, marker);
|
|
|
8226 marker += (ic_elt + 1);
|
|
|
8227 }
|
|
|
8228
|
|
|
8229 if (startp < low_bound || low_bound == -1)
|
|
|
8230 low_bound = startp;
|
|
|
8231 startp = new_startp;
|
|
|
8232 if (startp > BUF_ZV (b))
|
|
|
8233 {
|
|
|
8234 w->line_cache_validation_override--;
|
|
|
8235 return;
|
|
|
8236 }
|
|
|
8237 }
|
|
|
8238 }
|
|
|
8239
|
|
|
8240 assert (Dynarr_length (cache));
|
|
|
8241 assert (from >= low_bound);
|
|
|
8242
|
|
|
8243 /* Readjust the high_bound to account for any changes made while
|
|
|
8244 correcting the low_bound. */
|
|
|
8245 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8246
|
|
|
8247 if (to > high_bound)
|
|
|
8248 {
|
|
665
|
8249 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
428
|
8250
|
|
|
8251 do
|
|
|
8252 {
|
|
|
8253 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
8254 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
8255
|
|
|
8256 /* See comment above about regenerate_window failing. */
|
|
|
8257 assert (Dynarr_length (internal_cache));
|
|
|
8258
|
|
|
8259 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
8260 Dynarr_length (internal_cache));
|
|
|
8261 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
8262 startp = high_bound + 1;
|
|
|
8263 }
|
|
|
8264 while (to > high_bound);
|
|
|
8265 }
|
|
|
8266
|
|
|
8267 w->line_cache_validation_override--;
|
|
|
8268 assert (to <= high_bound);
|
|
|
8269 }
|
|
|
8270
|
|
|
8271
|
|
|
8272 /* Given x and y coordinates in characters, relative to a window,
|
|
|
8273 return the pixel location corresponding to those coordinates. The
|
|
|
8274 pixel location returned is the center of the given character
|
|
|
8275 position. The pixel values are generated relative to the window,
|
|
|
8276 not the frame.
|
|
|
8277
|
|
|
8278 The modeline is considered to be part of the window. */
|
|
|
8279
|
|
|
8280 void
|
|
|
8281 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
8282 int *pix_x, int *pix_y)
|
|
|
8283 {
|
|
|
8284 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
8285 int num_disp_lines, modeline;
|
|
|
8286 Lisp_Object window;
|
|
|
8287 int defheight, defwidth;
|
|
|
8288
|
|
793
|
8289 window = wrap_window (w);
|
|
428
|
8290 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
8291
|
|
|
8292 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
8293 the window, use the first window line or character position
|
|
|
8294 instead. */
|
|
|
8295 if (char_y < 0)
|
|
|
8296 char_y = 0;
|
|
|
8297 if (char_x < 0)
|
|
|
8298 char_x = 0;
|
|
|
8299
|
|
|
8300 num_disp_lines = Dynarr_length (dla);
|
|
|
8301 modeline = 0;
|
|
|
8302 if (num_disp_lines)
|
|
|
8303 {
|
|
|
8304 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
8305 {
|
|
|
8306 num_disp_lines--;
|
|
|
8307 modeline = 1;
|
|
|
8308 }
|
|
|
8309 }
|
|
|
8310
|
|
|
8311 /* First check if the y position intersects the display lines. */
|
|
|
8312 if (char_y < num_disp_lines)
|
|
|
8313 {
|
|
|
8314 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
8315 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8316
|
|
|
8317 *pix_y = (dl->ypos - dl->ascent +
|
|
647
|
8318 ((dl->ascent + dl->descent - dl->clip) >> 1));
|
|
428
|
8319
|
|
|
8320 if (char_x < Dynarr_length (db->runes))
|
|
|
8321 {
|
|
|
8322 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
8323
|
|
|
8324 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
8325 }
|
|
|
8326 else
|
|
|
8327 {
|
|
|
8328 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
8329 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
8330
|
|
|
8331 char_x -= last_rune;
|
|
|
8332
|
|
|
8333 *pix_x = rb->xpos + rb->width;
|
|
|
8334 *pix_x += ((char_x - 1) * defwidth);
|
|
|
8335 *pix_x += (defwidth >> 1);
|
|
|
8336 }
|
|
|
8337 }
|
|
|
8338 else
|
|
|
8339 {
|
|
|
8340 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
8341 modeline in this since we don't have true character positions in
|
|
|
8342 it. */
|
|
|
8343
|
|
|
8344 if (!Dynarr_length (w->face_cachels))
|
|
|
8345 reset_face_cachels (w);
|
|
|
8346
|
|
|
8347 char_y -= num_disp_lines;
|
|
|
8348
|
|
|
8349 if (Dynarr_length (dla))
|
|
|
8350 {
|
|
|
8351 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
8352 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
8353 }
|
|
|
8354 else
|
|
|
8355 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
8356
|
|
|
8357 *pix_y += (char_y * defheight);
|
|
|
8358 *pix_y += (defheight >> 1);
|
|
|
8359
|
|
|
8360 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
8361 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
8362 *pix_x += (char_x * defwidth);
|
|
|
8363 *pix_x += (defwidth >> 1);
|
|
|
8364 }
|
|
|
8365
|
|
|
8366 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
8367 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
8368 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
8369 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
8370
|
|
|
8371 *pix_x -= w->pixel_left;
|
|
|
8372 *pix_y -= w->pixel_top;
|
|
|
8373 }
|
|
|
8374
|
|
|
8375 /* Given a display line and a position, determine if there is a glyph
|
|
|
8376 there and return information about it if there is. */
|
|
|
8377
|
|
|
8378 static void
|
|
|
8379 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
8380 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
8381 int *high_x_coord)
|
|
|
8382 {
|
|
|
8383 struct display_block *db;
|
|
|
8384 int elt;
|
|
|
8385 int block =
|
|
|
8386 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
8387
|
|
|
8388 /* We use get_next_display_block to get the actual display block
|
|
|
8389 that would be displayed at x_coord. */
|
|
|
8390
|
|
|
8391 if (block == NO_BLOCK)
|
|
|
8392 return;
|
|
|
8393 else
|
|
|
8394 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
8395
|
|
|
8396 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
8397 {
|
|
|
8398 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
8399
|
|
|
8400 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
8401 {
|
|
|
8402 if (rb->type == RUNE_DGLYPH)
|
|
|
8403 {
|
|
|
8404 *obj1 = rb->object.dglyph.glyph;
|
|
|
8405 *obj2 = rb->object.dglyph.extent;
|
|
|
8406 }
|
|
|
8407 else
|
|
|
8408 {
|
|
|
8409 *obj1 = Qnil;
|
|
|
8410 *obj2 = Qnil;
|
|
|
8411 }
|
|
|
8412
|
|
|
8413 if (low_x_coord)
|
|
|
8414 *low_x_coord = rb->xpos;
|
|
|
8415 if (high_x_coord)
|
|
|
8416 *high_x_coord = rb->xpos + rb->width;
|
|
|
8417
|
|
|
8418 return;
|
|
|
8419 }
|
|
|
8420 }
|
|
|
8421 }
|
|
|
8422
|
|
|
8423 #define UPDATE_CACHE_RETURN \
|
|
|
8424 do { \
|
|
|
8425 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
8426 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
8427 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
8428 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
8429 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
8430 d->pixel_to_glyph_cache.frame = f; \
|
|
|
8431 d->pixel_to_glyph_cache.col = *col; \
|
|
|
8432 d->pixel_to_glyph_cache.row = *row; \
|
|
|
8433 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
8434 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
8435 d->pixel_to_glyph_cache.w = *w; \
|
|
665
|
8436 d->pixel_to_glyph_cache.charbpos = *charbpos; \
|
|
428
|
8437 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
8438 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
8439 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
8440 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
8441 d->pixel_to_glyph_cache.retval = position; \
|
|
|
8442 RETURN_SANS_WARNINGS position; \
|
|
|
8443 } while (0)
|
|
|
8444
|
|
|
8445 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
8446 information about what is located under those coordinates.
|
|
|
8447
|
|
|
8448 The return value will be one of:
|
|
|
8449
|
|
|
8450 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
8451 OVER_MODELINE: over a modeline
|
|
|
8452 OVER_BORDER: over an internal border
|
|
|
8453 OVER_NOTHING: over the text area, but not over text
|
|
|
8454 OVER_OUTSIDE: outside of the frame border
|
|
|
8455 OVER_TEXT: over text in the text area
|
|
|
8456
|
|
|
8457 OBJ1 is one of
|
|
|
8458
|
|
|
8459 -- a toolbar button
|
|
|
8460 -- a glyph
|
|
|
8461 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
8462
|
|
|
8463 OBJ2 is one of
|
|
|
8464
|
|
|
8465 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
8466 -- nil otherwise.
|
|
|
8467
|
|
|
8468 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
8469 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
8470
|
|
|
8471 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
8472 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
8473
|
|
|
8474 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
8475 */
|
|
|
8476
|
|
|
8477 int
|
|
|
8478 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
8479 int *col, int *row, int *obj_x, int *obj_y,
|
|
665
|
8480 struct window **w, Charbpos *charbpos,
|
|
|
8481 Charbpos *closest, Charcount *modeline_closest,
|
|
428
|
8482 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
8483 {
|
|
|
8484 struct device *d;
|
|
|
8485 struct pixel_to_glyph_translation_cache *cache;
|
|
|
8486 Lisp_Object window;
|
|
|
8487 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
8488 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
8489 int position = OVER_NOTHING;
|
|
|
8490 int device_check_failed = 0;
|
|
|
8491 display_line_dynarr *dla;
|
|
|
8492
|
|
|
8493 /* This is a safety valve in case this got called with a frame in
|
|
|
8494 the middle of being deleted. */
|
|
|
8495 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
8496 {
|
|
|
8497 device_check_failed = 1;
|
|
|
8498 d = NULL, cache = NULL; /* Warning suppression */
|
|
|
8499 }
|
|
|
8500 else
|
|
|
8501 {
|
|
|
8502 d = XDEVICE (f->device);
|
|
|
8503 cache = &d->pixel_to_glyph_cache;
|
|
|
8504 }
|
|
|
8505
|
|
|
8506 if (!device_check_failed
|
|
|
8507 && cache->valid
|
|
|
8508 && cache->frame == f
|
|
|
8509 && cache->low_x_coord <= x_coord
|
|
|
8510 && cache->high_x_coord > x_coord
|
|
|
8511 && cache->low_y_coord <= y_coord
|
|
|
8512 && cache->high_y_coord > y_coord)
|
|
|
8513 {
|
|
|
8514 *col = cache->col;
|
|
|
8515 *row = cache->row;
|
|
|
8516 *obj_x = cache->obj_x;
|
|
|
8517 *obj_y = cache->obj_y;
|
|
|
8518 *w = cache->w;
|
|
665
|
8519 *charbpos = cache->charbpos;
|
|
428
|
8520 *closest = cache->closest;
|
|
|
8521 *modeline_closest = cache->modeline_closest;
|
|
|
8522 *obj1 = cache->obj1;
|
|
|
8523 *obj2 = cache->obj2;
|
|
|
8524
|
|
|
8525 return cache->retval;
|
|
|
8526 }
|
|
|
8527 else
|
|
|
8528 {
|
|
|
8529 *col = 0;
|
|
|
8530 *row = 0;
|
|
|
8531 *obj_x = 0;
|
|
|
8532 *obj_y = 0;
|
|
|
8533 *w = 0;
|
|
665
|
8534 *charbpos = 0;
|
|
428
|
8535 *closest = 0;
|
|
|
8536 *modeline_closest = -1;
|
|
|
8537 *obj1 = Qnil;
|
|
|
8538 *obj2 = Qnil;
|
|
|
8539
|
|
|
8540 low_x_coord = x_coord;
|
|
|
8541 high_x_coord = x_coord + 1;
|
|
|
8542 low_y_coord = y_coord;
|
|
|
8543 high_y_coord = y_coord + 1;
|
|
|
8544 }
|
|
|
8545
|
|
|
8546 if (device_check_failed)
|
|
|
8547 return OVER_NOTHING;
|
|
|
8548
|
|
|
8549 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
8550 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
8551 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
8552 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
8553
|
|
|
8554 /* Check if the mouse is outside of the text area actually used by
|
|
|
8555 redisplay. */
|
|
|
8556 if (y_coord < frm_top)
|
|
|
8557 {
|
|
|
8558 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
8559 {
|
|
|
8560 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8561 high_y_coord = frm_top;
|
|
|
8562 position = OVER_BORDER;
|
|
|
8563 }
|
|
|
8564 else if (y_coord >= 0)
|
|
|
8565 {
|
|
|
8566 low_y_coord = 0;
|
|
|
8567 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
8568 position = OVER_TOOLBAR;
|
|
|
8569 }
|
|
|
8570 else
|
|
|
8571 {
|
|
|
8572 low_y_coord = y_coord;
|
|
|
8573 high_y_coord = 0;
|
|
|
8574 position = OVER_OUTSIDE;
|
|
|
8575 }
|
|
|
8576 }
|
|
|
8577 else if (y_coord >= frm_bottom)
|
|
|
8578 {
|
|
|
8579 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
8580 {
|
|
|
8581 low_y_coord = frm_bottom;
|
|
|
8582 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8583 position = OVER_BORDER;
|
|
|
8584 }
|
|
|
8585 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
8586 {
|
|
|
8587 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
8588 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8589 position = OVER_TOOLBAR;
|
|
|
8590 }
|
|
|
8591 else
|
|
|
8592 {
|
|
|
8593 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
8594 high_y_coord = y_coord;
|
|
|
8595 position = OVER_OUTSIDE;
|
|
|
8596 }
|
|
|
8597 }
|
|
|
8598
|
|
|
8599 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
8600 {
|
|
|
8601 if (x_coord < frm_left)
|
|
|
8602 {
|
|
|
8603 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
8604 {
|
|
|
8605 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8606 high_x_coord = frm_left;
|
|
|
8607 position = OVER_BORDER;
|
|
|
8608 }
|
|
|
8609 else if (x_coord >= 0)
|
|
|
8610 {
|
|
|
8611 low_x_coord = 0;
|
|
|
8612 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
8613 position = OVER_TOOLBAR;
|
|
|
8614 }
|
|
|
8615 else
|
|
|
8616 {
|
|
|
8617 low_x_coord = x_coord;
|
|
|
8618 high_x_coord = 0;
|
|
|
8619 position = OVER_OUTSIDE;
|
|
|
8620 }
|
|
|
8621 }
|
|
|
8622 else if (x_coord >= frm_right)
|
|
|
8623 {
|
|
|
8624 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
8625 {
|
|
|
8626 low_x_coord = frm_right;
|
|
|
8627 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8628 position = OVER_BORDER;
|
|
|
8629 }
|
|
|
8630 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
8631 {
|
|
|
8632 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
8633 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8634 position = OVER_TOOLBAR;
|
|
|
8635 }
|
|
|
8636 else
|
|
|
8637 {
|
|
|
8638 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
8639 high_x_coord = x_coord;
|
|
|
8640 position = OVER_OUTSIDE;
|
|
|
8641 }
|
|
|
8642 }
|
|
|
8643 }
|
|
|
8644
|
|
|
8645 #ifdef HAVE_TOOLBARS
|
|
|
8646 if (position == OVER_TOOLBAR)
|
|
|
8647 {
|
|
|
8648 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
8649 *obj2 = Qnil;
|
|
|
8650 *w = 0;
|
|
|
8651 UPDATE_CACHE_RETURN;
|
|
|
8652 }
|
|
|
8653 #endif /* HAVE_TOOLBARS */
|
|
|
8654
|
|
|
8655 /* We still have to return the window the pointer is next to and its
|
|
|
8656 relative y position even if it is outside the x boundary. */
|
|
|
8657 if (x_coord < frm_left)
|
|
|
8658 x_coord = frm_left;
|
|
|
8659 else if (x_coord > frm_right)
|
|
|
8660 x_coord = frm_right;
|
|
|
8661
|
|
|
8662 /* Same in reverse. */
|
|
|
8663 if (y_coord < frm_top)
|
|
|
8664 y_coord = frm_top;
|
|
|
8665 else if (y_coord > frm_bottom)
|
|
|
8666 y_coord = frm_bottom;
|
|
|
8667
|
|
|
8668 /* Find what window the given coordinates are actually in. */
|
|
|
8669 window = f->root_window;
|
|
|
8670 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
8671
|
|
|
8672 /* If we didn't find a window, we're done. */
|
|
|
8673 if (!*w)
|
|
|
8674 {
|
|
|
8675 UPDATE_CACHE_RETURN;
|
|
|
8676 }
|
|
|
8677 else if (position != OVER_NOTHING)
|
|
|
8678 {
|
|
|
8679 *closest = 0;
|
|
|
8680 *modeline_closest = -1;
|
|
|
8681
|
|
|
8682 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
8683 {
|
|
|
8684 *w = 0;
|
|
|
8685 UPDATE_CACHE_RETURN;
|
|
|
8686 }
|
|
|
8687 }
|
|
|
8688
|
|
|
8689 /* Check if the window is a minibuffer but isn't active. */
|
|
|
8690 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
8691 {
|
|
|
8692 /* Must reset the window value since some callers will ignore
|
|
|
8693 the return value if it is set. */
|
|
|
8694 *w = 0;
|
|
|
8695 UPDATE_CACHE_RETURN;
|
|
|
8696 }
|
|
|
8697
|
|
|
8698 /* See if the point is over window vertical divider */
|
|
|
8699 if (window_needs_vertical_divider (*w))
|
|
|
8700 {
|
|
|
8701 int div_x_high = WINDOW_RIGHT (*w);
|
|
|
8702 int div_x_low = div_x_high - window_divider_width (*w);
|
|
|
8703 int div_y_high = WINDOW_BOTTOM (*w);
|
|
|
8704 int div_y_low = WINDOW_TOP (*w);
|
|
|
8705
|
|
|
8706 if (div_x_low < x_coord && x_coord <= div_x_high &&
|
|
|
8707 div_y_low < y_coord && y_coord <= div_y_high)
|
|
|
8708 {
|
|
|
8709 low_x_coord = div_x_low;
|
|
|
8710 high_x_coord = div_x_high;
|
|
|
8711 low_y_coord = div_y_low;
|
|
|
8712 high_y_coord = div_y_high;
|
|
|
8713 position = OVER_V_DIVIDER;
|
|
|
8714 UPDATE_CACHE_RETURN;
|
|
|
8715 }
|
|
|
8716 }
|
|
|
8717
|
|
|
8718 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
8719
|
|
|
8720 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
8721 {
|
|
|
8722 int really_over_nothing = 0;
|
|
|
8723 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
8724
|
|
|
8725 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
8726 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
8727 {
|
|
|
8728 int check_margin_glyphs = 0;
|
|
|
8729 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
8730 struct rune *rb = 0;
|
|
|
8731
|
|
|
8732 if (x_coord < dl->bounds.left_white
|
|
|
8733 || x_coord >= dl->bounds.right_white)
|
|
|
8734 check_margin_glyphs = 1;
|
|
|
8735
|
|
|
8736 low_y_coord = dl->ypos - dl->ascent;
|
|
|
8737 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
8738
|
|
|
8739 if (position == OVER_BORDER
|
|
|
8740 || position == OVER_OUTSIDE
|
|
|
8741 || check_margin_glyphs)
|
|
|
8742 {
|
|
|
8743 int x_check, left_bound;
|
|
|
8744
|
|
|
8745 if (check_margin_glyphs)
|
|
|
8746 {
|
|
|
8747 x_check = x_coord;
|
|
|
8748 left_bound = dl->bounds.left_white;
|
|
|
8749 }
|
|
|
8750 else
|
|
|
8751 {
|
|
|
8752 x_check = high_x_coord;
|
|
|
8753 left_bound = frm_left;
|
|
|
8754 }
|
|
|
8755
|
|
|
8756 if (Dynarr_length (db->runes))
|
|
|
8757 {
|
|
|
8758 if (x_check <= left_bound)
|
|
|
8759 {
|
|
|
8760 if (dl->modeline)
|
|
665
|
8761 *modeline_closest = Dynarr_atp (db->runes, 0)->charbpos;
|
|
428
|
8762 else
|
|
665
|
8763 *closest = Dynarr_atp (db->runes, 0)->charbpos;
|
|
428
|
8764 }
|
|
|
8765 else
|
|
|
8766 {
|
|
|
8767 if (dl->modeline)
|
|
|
8768 *modeline_closest =
|
|
|
8769 Dynarr_atp (db->runes,
|
|
665
|
8770 Dynarr_length (db->runes) - 1)->charbpos;
|
|
428
|
8771 else
|
|
|
8772 *closest =
|
|
|
8773 Dynarr_atp (db->runes,
|
|
665
|
8774 Dynarr_length (db->runes) - 1)->charbpos;
|
|
428
|
8775 }
|
|
|
8776
|
|
|
8777 if (dl->modeline)
|
|
|
8778 *modeline_closest += dl->offset;
|
|
|
8779 else
|
|
|
8780 *closest += dl->offset;
|
|
|
8781 }
|
|
|
8782 else
|
|
|
8783 {
|
|
|
8784 /* #### What should be here. */
|
|
|
8785 if (dl->modeline)
|
|
|
8786 *modeline_closest = 0;
|
|
|
8787 else
|
|
|
8788 *closest = 0;
|
|
|
8789 }
|
|
|
8790
|
|
|
8791 if (check_margin_glyphs)
|
|
|
8792 {
|
|
|
8793 if (x_coord < dl->bounds.left_in
|
|
|
8794 || x_coord >= dl->bounds.right_in)
|
|
|
8795 {
|
|
|
8796 /* If we are over the outside margins then we
|
|
|
8797 know the loop over the text block isn't going
|
|
|
8798 to accomplish anything. So we go ahead and
|
|
|
8799 set what information we can right here and
|
|
|
8800 return. */
|
|
|
8801 (*row)--;
|
|
|
8802 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8803 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8804 &low_x_coord, &high_x_coord);
|
|
|
8805
|
|
|
8806 UPDATE_CACHE_RETURN;
|
|
|
8807 }
|
|
|
8808 }
|
|
|
8809 else
|
|
|
8810 UPDATE_CACHE_RETURN;
|
|
|
8811 }
|
|
|
8812
|
|
|
8813 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
8814 {
|
|
|
8815 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
8816
|
|
|
8817 if (!past_end)
|
|
|
8818 rb = Dynarr_atp (db->runes, *col);
|
|
|
8819
|
|
|
8820 if (past_end ||
|
|
|
8821 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
8822 {
|
|
|
8823 if (past_end)
|
|
|
8824 {
|
|
|
8825 (*col)--;
|
|
|
8826 rb = Dynarr_atp (db->runes, *col);
|
|
|
8827 }
|
|
|
8828
|
|
665
|
8829 *charbpos = rb->charbpos + dl->offset;
|
|
428
|
8830 low_x_coord = rb->xpos;
|
|
|
8831 high_x_coord = rb->xpos + rb->width;
|
|
|
8832
|
|
|
8833 if (rb->type == RUNE_DGLYPH)
|
|
|
8834 {
|
|
|
8835 int elt = *col + 1;
|
|
|
8836
|
|
|
8837 /* Find the first character after the glyph. */
|
|
|
8838 while (elt < Dynarr_length (db->runes))
|
|
|
8839 {
|
|
|
8840 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
8841 {
|
|
|
8842 if (dl->modeline)
|
|
|
8843 *modeline_closest =
|
|
665
|
8844 (Dynarr_atp (db->runes, elt)->charbpos +
|
|
428
|
8845 dl->offset);
|
|
|
8846 else
|
|
|
8847 *closest =
|
|
665
|
8848 (Dynarr_atp (db->runes, elt)->charbpos +
|
|
428
|
8849 dl->offset);
|
|
|
8850 break;
|
|
|
8851 }
|
|
|
8852
|
|
|
8853 elt++;
|
|
|
8854 }
|
|
|
8855
|
|
|
8856 /* In this case we failed to find a non-glyph
|
|
|
8857 character so we return the last position
|
|
|
8858 displayed on the line. */
|
|
|
8859 if (elt == Dynarr_length (db->runes))
|
|
|
8860 {
|
|
|
8861 if (dl->modeline)
|
|
665
|
8862 *modeline_closest = dl->end_charbpos + dl->offset;
|
|
428
|
8863 else
|
|
665
|
8864 *closest = dl->end_charbpos + dl->offset;
|
|
428
|
8865 really_over_nothing = 1;
|
|
|
8866 }
|
|
|
8867 }
|
|
|
8868 else
|
|
|
8869 {
|
|
|
8870 if (dl->modeline)
|
|
665
|
8871 *modeline_closest = rb->charbpos + dl->offset;
|
|
428
|
8872 else
|
|
665
|
8873 *closest = rb->charbpos + dl->offset;
|
|
428
|
8874 }
|
|
|
8875
|
|
|
8876 if (dl->modeline)
|
|
|
8877 {
|
|
|
8878 *row = window_displayed_height (*w);
|
|
|
8879
|
|
|
8880 if (position == OVER_NOTHING)
|
|
|
8881 position = OVER_MODELINE;
|
|
|
8882
|
|
|
8883 if (rb->type == RUNE_DGLYPH)
|
|
|
8884 {
|
|
|
8885 *obj1 = rb->object.dglyph.glyph;
|
|
|
8886 *obj2 = rb->object.dglyph.extent;
|
|
|
8887 }
|
|
|
8888 else if (rb->type == RUNE_CHAR)
|
|
|
8889 {
|
|
|
8890 *obj1 = Qnil;
|
|
|
8891 *obj2 = Qnil;
|
|
|
8892 }
|
|
|
8893 else
|
|
|
8894 {
|
|
|
8895 *obj1 = Qnil;
|
|
|
8896 *obj2 = Qnil;
|
|
|
8897 }
|
|
|
8898
|
|
|
8899 UPDATE_CACHE_RETURN;
|
|
|
8900 }
|
|
|
8901 else if (past_end
|
|
|
8902 || (rb->type == RUNE_CHAR
|
|
|
8903 && rb->object.chr.ch == '\n'))
|
|
|
8904 {
|
|
|
8905 (*row)--;
|
|
|
8906 /* At this point we may have glyphs in the right
|
|
|
8907 inside margin. */
|
|
|
8908 if (check_margin_glyphs)
|
|
|
8909 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
8910 &low_x_coord, &high_x_coord);
|
|
|
8911 UPDATE_CACHE_RETURN;
|
|
|
8912 }
|
|
|
8913 else
|
|
|
8914 {
|
|
|
8915 (*row)--;
|
|
|
8916 if (rb->type == RUNE_DGLYPH)
|
|
|
8917 {
|
|
|
8918 *obj1 = rb->object.dglyph.glyph;
|
|
|
8919 *obj2 = rb->object.dglyph.extent;
|
|
|
8920 }
|
|
|
8921 else if (rb->type == RUNE_CHAR)
|
|
|
8922 {
|
|
|
8923 *obj1 = Qnil;
|
|
|
8924 *obj2 = Qnil;
|
|
|
8925 }
|
|
|
8926 else
|
|
|
8927 {
|
|
|
8928 *obj1 = Qnil;
|
|
|
8929 *obj2 = Qnil;
|
|
|
8930 }
|
|
|
8931
|
|
|
8932 *obj_x = x_coord - rb->xpos;
|
|
|
8933 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
8934
|
|
|
8935 /* At this point we may have glyphs in the left
|
|
|
8936 inside margin. */
|
|
|
8937 if (check_margin_glyphs)
|
|
|
8938 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
8939
|
|
|
8940 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
8941 position = OVER_TEXT;
|
|
|
8942
|
|
|
8943 UPDATE_CACHE_RETURN;
|
|
|
8944 }
|
|
|
8945 }
|
|
|
8946 }
|
|
|
8947 }
|
|
|
8948 }
|
|
|
8949
|
|
|
8950 *row = Dynarr_length (dla) - 1;
|
|
|
8951 if (FRAME_WIN_P (f))
|
|
|
8952 {
|
|
|
8953 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
8954
|
|
|
8955 if (bot_elt >= 0)
|
|
|
8956 {
|
|
|
8957 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
8958 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
8959 Lisp_Object lwin;
|
|
|
8960 int defheight;
|
|
|
8961
|
|
793
|
8962 lwin = wrap_window (*w);
|
|
428
|
8963 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
8964
|
|
|
8965 *row += (adj_area / defheight);
|
|
|
8966 }
|
|
|
8967 }
|
|
|
8968
|
|
|
8969 /* #### This should be checked out some more to determine what
|
|
|
8970 should really be going on. */
|
|
|
8971 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
8972 *closest = 0;
|
|
|
8973 else
|
|
442
|
8974 *closest = end_of_last_line_may_error (*w,
|
|
428
|
8975 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
8976 *col = 0;
|
|
|
8977 UPDATE_CACHE_RETURN;
|
|
|
8978 }
|
|
|
8979 #undef UPDATE_CACHE_RETURN
|
|
|
8980
|
|
|
8981
|
|
|
8982 /***************************************************************************/
|
|
|
8983 /* */
|
|
|
8984 /* Lisp functions */
|
|
|
8985 /* */
|
|
|
8986 /***************************************************************************/
|
|
|
8987
|
|
|
8988 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
|
8989 Ensure that all minibuffers are correctly showing the echo area.
|
|
|
8990 */
|
|
|
8991 ())
|
|
|
8992 {
|
|
|
8993 Lisp_Object devcons, concons;
|
|
|
8994
|
|
|
8995 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
8996 {
|
|
|
8997 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
8998 Lisp_Object frmcons;
|
|
|
8999
|
|
|
9000 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9001 {
|
|
|
9002 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
9003
|
|
|
9004 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
|
9005 {
|
|
|
9006 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
442
|
9007
|
|
|
9008 MAYBE_DEVMETH (d, frame_output_begin, (f));
|
|
|
9009
|
|
428
|
9010 /*
|
|
|
9011 * If the frame size has changed, there may be random
|
|
|
9012 * chud on the screen left from previous messages
|
|
|
9013 * because redisplay_frame hasn't been called yet.
|
|
|
9014 * Clear the screen to get rid of the potential mess.
|
|
|
9015 */
|
|
|
9016 if (f->echo_area_garbaged)
|
|
|
9017 {
|
|
442
|
9018 MAYBE_DEVMETH (d, clear_frame, (f));
|
|
428
|
9019 f->echo_area_garbaged = 0;
|
|
|
9020 }
|
|
|
9021 redisplay_window (window, 0);
|
|
442
|
9022 MAYBE_DEVMETH (d, frame_output_end, (f));
|
|
|
9023
|
|
428
|
9024 call_redisplay_end_triggers (XWINDOW (window), 0);
|
|
|
9025 }
|
|
|
9026 }
|
|
|
9027 }
|
|
|
9028
|
|
|
9029 return Qnil;
|
|
|
9030 }
|
|
|
9031
|
|
|
9032 static Lisp_Object
|
|
|
9033 restore_disable_preemption_value (Lisp_Object value)
|
|
|
9034 {
|
|
|
9035 disable_preemption = XINT (value);
|
|
|
9036 return Qnil;
|
|
|
9037 }
|
|
|
9038
|
|
|
9039 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
|
9040 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
9041 FRAME defaults to the selected frame if omitted.
|
|
|
9042 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9043 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9044 input and is guaranteed to proceed to completion.
|
|
|
9045 */
|
|
|
9046 (frame, no_preempt))
|
|
|
9047 {
|
|
|
9048 struct frame *f = decode_frame (frame);
|
|
|
9049 int count = specpdl_depth ();
|
|
|
9050
|
|
|
9051 if (!NILP (no_preempt))
|
|
|
9052 {
|
|
|
9053 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9054 make_int (disable_preemption));
|
|
|
9055 disable_preemption++;
|
|
|
9056 }
|
|
|
9057
|
|
|
9058 f->clear = 1;
|
|
|
9059 redisplay_frame (f, 1);
|
|
|
9060
|
|
442
|
9061 /* See the comment in Fredisplay_frame. */
|
|
|
9062 RESET_CHANGED_SET_FLAGS;
|
|
|
9063
|
|
771
|
9064 return unbind_to (count);
|
|
428
|
9065 }
|
|
|
9066
|
|
|
9067 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
|
9068 Ensure that FRAME's contents are correctly displayed.
|
|
|
9069 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
9070 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9071 the frame.
|
|
|
9072 FRAME defaults to the selected frame if omitted.
|
|
|
9073 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9074 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9075 input and is guaranteed to proceed to completion.
|
|
|
9076 */
|
|
|
9077 (frame, no_preempt))
|
|
|
9078 {
|
|
|
9079 struct frame *f = decode_frame (frame);
|
|
|
9080 int count = specpdl_depth ();
|
|
|
9081
|
|
|
9082 if (!NILP (no_preempt))
|
|
|
9083 {
|
|
|
9084 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9085 make_int (disable_preemption));
|
|
|
9086 disable_preemption++;
|
|
|
9087 }
|
|
|
9088
|
|
|
9089 redisplay_frame (f, 1);
|
|
|
9090
|
|
442
|
9091 /* If we don't reset the global redisplay flags here, subsequent
|
|
|
9092 changes to the display will not get registered by redisplay
|
|
|
9093 because it thinks it already has registered changes. If you
|
|
|
9094 really knew what you were doing you could confuse redisplay by
|
|
|
9095 calling Fredisplay_frame while updating another frame. We assume
|
|
|
9096 that if you know what you are doing you will not be that
|
|
|
9097 stupid. */
|
|
|
9098 RESET_CHANGED_SET_FLAGS;
|
|
|
9099
|
|
771
|
9100 return unbind_to (count);
|
|
428
|
9101 }
|
|
|
9102
|
|
|
9103 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
|
9104 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
9105 DEVICE defaults to the selected device if omitted.
|
|
|
9106 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9107 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9108 input and is guaranteed to proceed to completion.
|
|
|
9109 */
|
|
|
9110 (device, no_preempt))
|
|
|
9111 {
|
|
|
9112 struct device *d = decode_device (device);
|
|
|
9113 Lisp_Object frmcons;
|
|
|
9114 int count = specpdl_depth ();
|
|
|
9115
|
|
|
9116 if (!NILP (no_preempt))
|
|
|
9117 {
|
|
|
9118 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9119 make_int (disable_preemption));
|
|
|
9120 disable_preemption++;
|
|
|
9121 }
|
|
|
9122
|
|
|
9123 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
9124 {
|
|
|
9125 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
9126 }
|
|
440
|
9127 redisplay_device (d, 0);
|
|
428
|
9128
|
|
442
|
9129 /* See the comment in Fredisplay_frame. */
|
|
|
9130 RESET_CHANGED_SET_FLAGS;
|
|
|
9131
|
|
771
|
9132 return unbind_to (count);
|
|
428
|
9133 }
|
|
|
9134
|
|
|
9135 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
|
9136 Ensure that DEVICE's contents are correctly displayed.
|
|
|
9137 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
9138 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
9139 the device.
|
|
|
9140 DEVICE defaults to the selected device if omitted.
|
|
|
9141 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
9142 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
9143 input and is guaranteed to proceed to completion.
|
|
|
9144 */
|
|
|
9145 (device, no_preempt))
|
|
|
9146 {
|
|
|
9147 struct device *d = decode_device (device);
|
|
|
9148 int count = specpdl_depth ();
|
|
|
9149
|
|
|
9150 if (!NILP (no_preempt))
|
|
|
9151 {
|
|
|
9152 record_unwind_protect (restore_disable_preemption_value,
|
|
|
9153 make_int (disable_preemption));
|
|
|
9154 disable_preemption++;
|
|
|
9155 }
|
|
|
9156
|
|
440
|
9157 redisplay_device (d, 0);
|
|
428
|
9158
|
|
442
|
9159 /* See the comment in Fredisplay_frame. */
|
|
|
9160 RESET_CHANGED_SET_FLAGS;
|
|
|
9161
|
|
771
|
9162 return unbind_to (count);
|
|
428
|
9163 }
|
|
|
9164
|
|
|
9165 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
9166 regardless if the all flag is set or not. It remains in existence
|
|
|
9167 solely for backwards compatibility. */
|
|
|
9168 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
|
9169 Force the modeline of the current buffer to be redisplayed.
|
|
|
9170 With optional non-nil ALL, force redisplay of all modelines.
|
|
|
9171 */
|
|
|
9172 (all))
|
|
|
9173 {
|
|
|
9174 MARK_MODELINE_CHANGED;
|
|
|
9175 return Qnil;
|
|
|
9176 }
|
|
|
9177
|
|
|
9178 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
|
9179 Force an immediate update of the cursor on FRAME.
|
|
|
9180 FRAME defaults to the selected frame if omitted.
|
|
|
9181 */
|
|
|
9182 (frame))
|
|
|
9183 {
|
|
|
9184 redisplay_redraw_cursor (decode_frame (frame), 1);
|
|
|
9185 return Qnil;
|
|
|
9186 }
|
|
|
9187
|
|
|
9188
|
|
|
9189 /***************************************************************************/
|
|
|
9190 /* */
|
|
|
9191 /* Lisp-variable change triggers */
|
|
|
9192 /* */
|
|
|
9193 /***************************************************************************/
|
|
|
9194
|
|
|
9195 static void
|
|
|
9196 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
9197 Lisp_Object oldval)
|
|
|
9198 {
|
|
|
9199 /* Nothing to be done? */
|
|
|
9200 }
|
|
|
9201
|
|
|
9202 int
|
|
|
9203 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
9204 Lisp_Object in_object, int flags)
|
|
|
9205 {
|
|
|
9206 /* #### clip_changed should really be renamed something like
|
|
|
9207 global_redisplay_change. */
|
|
|
9208 MARK_CLIP_CHANGED;
|
|
|
9209 return 0;
|
|
|
9210 }
|
|
|
9211
|
|
|
9212 /* This is called if the built-in glyphs have their properties
|
|
|
9213 changed. */
|
|
|
9214 void
|
|
|
9215 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
9216 Lisp_Object locale)
|
|
|
9217 {
|
|
|
9218 if (WINDOWP (locale))
|
|
|
9219 {
|
|
|
9220 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
|
|
|
9221 }
|
|
|
9222 else if (FRAMEP (locale))
|
|
|
9223 {
|
|
|
9224 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
|
|
|
9225 }
|
|
|
9226 else if (DEVICEP (locale))
|
|
|
9227 {
|
|
|
9228 Lisp_Object frmcons;
|
|
|
9229 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
9230 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9231 }
|
|
|
9232 else if (CONSOLEP (locale))
|
|
|
9233 {
|
|
|
9234 Lisp_Object frmcons, devcons;
|
|
|
9235 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
|
|
|
9236 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9237 }
|
|
|
9238 else /* global or buffer */
|
|
|
9239 {
|
|
|
9240 Lisp_Object frmcons, devcons, concons;
|
|
|
9241 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
9242 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
|
|
|
9243 }
|
|
|
9244 }
|
|
|
9245
|
|
|
9246 static void
|
|
|
9247 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
9248 Lisp_Object oldval)
|
|
|
9249 {
|
|
|
9250 if (XFRAME (w->frame)->init_finished)
|
|
|
9251 Fforce_cursor_redisplay (w->frame);
|
|
|
9252 }
|
|
|
9253
|
|
|
9254 #ifdef MEMORY_USAGE_STATS
|
|
|
9255
|
|
|
9256
|
|
|
9257 /***************************************************************************/
|
|
|
9258 /* */
|
|
|
9259 /* memory usage computation */
|
|
|
9260 /* */
|
|
|
9261 /***************************************************************************/
|
|
|
9262
|
|
|
9263 static int
|
|
|
9264 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
9265 {
|
|
|
9266 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9267 }
|
|
|
9268
|
|
|
9269 static int
|
|
|
9270 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
9271 struct overhead_stats *ovstats)
|
|
|
9272 {
|
|
|
9273 int total, i;
|
|
|
9274
|
|
|
9275 if (!dyn)
|
|
|
9276 return 0;
|
|
|
9277
|
|
|
9278 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9279 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9280 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
9281
|
|
|
9282 return total;
|
|
|
9283 }
|
|
|
9284
|
|
|
9285 static int
|
|
|
9286 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
9287 struct overhead_stats *ovstats)
|
|
|
9288 {
|
|
|
9289 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9290 }
|
|
|
9291
|
|
|
9292 int
|
|
|
9293 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
9294 struct overhead_stats *ovstats)
|
|
|
9295 {
|
|
|
9296 int total, i;
|
|
|
9297
|
|
|
9298 if (!dyn)
|
|
|
9299 return 0;
|
|
|
9300
|
|
|
9301 total = Dynarr_memory_usage (dyn, ovstats);
|
|
|
9302 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
9303 {
|
|
|
9304 struct display_line *dl = &Dynarr_at (dyn, i);
|
|
|
9305 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
|
|
|
9306 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
|
|
|
9307 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
|
|
|
9308 }
|
|
|
9309
|
|
|
9310 return total;
|
|
|
9311 }
|
|
|
9312
|
|
|
9313 int
|
|
|
9314 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
9315 struct overhead_stats *ovstats)
|
|
|
9316 {
|
|
|
9317 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
|
|
|
9318 }
|
|
|
9319
|
|
|
9320 #endif /* MEMORY_USAGE_STATS */
|
|
|
9321
|
|
800
|
9322 static int
|
|
|
9323 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
|
|
|
9324 {
|
|
|
9325 int i, j;
|
|
|
9326 display_line_dynarr *dl;
|
|
|
9327
|
|
|
9328 dl = window_display_lines (w, CURRENT_DISP);
|
|
|
9329
|
|
|
9330 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9331 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9332 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9333 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9334
|
|
|
9335 dl = window_display_lines (w, DESIRED_DISP);
|
|
|
9336
|
|
|
9337 for (i = 0; i < Dynarr_largest (dl); i++)
|
|
|
9338 for (j = i + 1; j < Dynarr_largest (dl); j++)
|
|
|
9339 assert (Dynarr_atp (dl, i)->display_blocks !=
|
|
|
9340 Dynarr_atp (dl, j)->display_blocks);
|
|
|
9341
|
|
|
9342 return 0;
|
|
|
9343 }
|
|
|
9344
|
|
|
9345 static void
|
|
|
9346 sledgehammer_check_redisplay_structs (void)
|
|
|
9347 {
|
|
|
9348 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
|
|
|
9349 }
|
|
|
9350
|
|
428
|
9351
|
|
|
9352 /***************************************************************************/
|
|
|
9353 /* */
|
|
|
9354 /* initialization */
|
|
|
9355 /* */
|
|
|
9356 /***************************************************************************/
|
|
|
9357
|
|
|
9358 void
|
|
|
9359 init_redisplay (void)
|
|
|
9360 {
|
|
|
9361 disable_preemption = 0;
|
|
|
9362 preemption_count = 0;
|
|
|
9363 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
9364
|
|
|
9365 #ifndef PDUMP
|
|
|
9366 if (!initialized)
|
|
|
9367 #endif
|
|
|
9368 {
|
|
440
|
9369 if (!cmotion_display_lines)
|
|
|
9370 cmotion_display_lines = Dynarr_new (display_line);
|
|
665
|
9371 if (!mode_spec_intbyte_string)
|
|
|
9372 mode_spec_intbyte_string = Dynarr_new (Intbyte);
|
|
440
|
9373 if (!formatted_string_extent_dynarr)
|
|
|
9374 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
|
|
|
9375 if (!formatted_string_extent_start_dynarr)
|
|
|
9376 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
9377 if (!formatted_string_extent_end_dynarr)
|
|
|
9378 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
9379 if (!internal_cache)
|
|
|
9380 internal_cache = Dynarr_new (line_start_cache);
|
|
428
|
9381 }
|
|
|
9382
|
|
|
9383 /* window system is nil when in -batch mode */
|
|
|
9384 if (!initialized || noninteractive)
|
|
|
9385 return;
|
|
|
9386
|
|
|
9387 /* If the user wants to use a window system, we shouldn't bother
|
|
|
9388 initializing the terminal. This is especially important when the
|
|
|
9389 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
9390 using the window system.
|
|
|
9391
|
|
|
9392 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
9393 with an error message if that doesn't work. */
|
|
|
9394
|
|
|
9395 #ifdef HAVE_X_WINDOWS
|
|
|
9396 if (!strcmp (display_use, "x"))
|
|
|
9397 {
|
|
|
9398 /* Some stuff checks this way early. */
|
|
|
9399 Vwindow_system = Qx;
|
|
|
9400 Vinitial_window_system = Qx;
|
|
|
9401 return;
|
|
|
9402 }
|
|
|
9403 #endif /* HAVE_X_WINDOWS */
|
|
|
9404
|
|
462
|
9405 #ifdef HAVE_GTK
|
|
|
9406 if (!strcmp (display_use, "gtk"))
|
|
|
9407 {
|
|
|
9408 Vwindow_system = Qgtk;
|
|
|
9409 Vinitial_window_system = Qgtk;
|
|
|
9410 return;
|
|
|
9411 }
|
|
|
9412 #endif
|
|
|
9413
|
|
428
|
9414 #ifdef HAVE_MS_WINDOWS
|
|
|
9415 if (!strcmp (display_use, "mswindows"))
|
|
|
9416 {
|
|
|
9417 /* Some stuff checks this way early. */
|
|
|
9418 Vwindow_system = Qmswindows;
|
|
|
9419 Vinitial_window_system = Qmswindows;
|
|
|
9420 return;
|
|
|
9421 }
|
|
|
9422 #endif /* HAVE_MS_WINDOWS */
|
|
|
9423
|
|
|
9424 #ifdef HAVE_TTY
|
|
|
9425 /* If no window system has been specified, try to use the terminal. */
|
|
|
9426 if (!isatty (0))
|
|
|
9427 {
|
|
|
9428 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
9429 exit (1);
|
|
|
9430 }
|
|
|
9431
|
|
|
9432 /* Look at the TERM variable */
|
|
771
|
9433 if (!egetenv ("TERM"))
|
|
428
|
9434 {
|
|
|
9435 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
9436 exit (1);
|
|
|
9437 }
|
|
|
9438
|
|
|
9439 Vinitial_window_system = Qtty;
|
|
|
9440 return;
|
|
|
9441 #else /* not HAVE_TTY */
|
|
|
9442 /* No DISPLAY specified, and no TTY support. */
|
|
|
9443 stderr_out ("XEmacs: Cannot open display.\n\
|
|
|
9444 Please set the environmental variable DISPLAY to an appropriate value.\n");
|
|
|
9445 exit (1);
|
|
|
9446 #endif
|
|
|
9447 /* Unreached. */
|
|
|
9448 }
|
|
|
9449
|
|
|
9450 void
|
|
|
9451 syms_of_redisplay (void)
|
|
|
9452 {
|
|
563
|
9453 DEFSYMBOL (Qcursor_in_echo_area);
|
|
428
|
9454 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
563
|
9455 DEFSYMBOL (Qpre_redisplay_hook);
|
|
|
9456 DEFSYMBOL (Qpost_redisplay_hook);
|
|
428
|
9457 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
563
|
9458 DEFSYMBOL (Qdisplay_warning_buffer);
|
|
|
9459 DEFSYMBOL (Qbar_cursor);
|
|
|
9460 DEFSYMBOL (Qredisplay_end_trigger_functions);
|
|
|
9461 DEFSYMBOL (Qtop_bottom);
|
|
|
9462 DEFSYMBOL (Qbuffer_list_changed_hook);
|
|
428
|
9463
|
|
|
9464 DEFSUBR (Fredisplay_echo_area);
|
|
|
9465 DEFSUBR (Fredraw_frame);
|
|
|
9466 DEFSUBR (Fredisplay_frame);
|
|
|
9467 DEFSUBR (Fredraw_device);
|
|
|
9468 DEFSUBR (Fredisplay_device);
|
|
|
9469 DEFSUBR (Fredraw_modeline);
|
|
|
9470 DEFSUBR (Fforce_cursor_redisplay);
|
|
|
9471 }
|
|
|
9472
|
|
|
9473 void
|
|
|
9474 vars_of_redisplay (void)
|
|
|
9475 {
|
|
|
9476
|
|
|
9477 #if 0
|
|
|
9478 staticpro (&last_arrow_position);
|
|
|
9479 staticpro (&last_arrow_string);
|
|
|
9480 last_arrow_position = Qnil;
|
|
|
9481 last_arrow_string = Qnil;
|
|
|
9482 #endif /* 0 */
|
|
|
9483
|
|
|
9484 /* #### Probably temporary */
|
|
|
9485 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
9486 \(Temporary) Setting this will impact the performance of the internal
|
|
|
9487 line start cache.
|
|
|
9488 */ );
|
|
|
9489 cache_adjustment = 2;
|
|
|
9490
|
|
|
9491 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
9492 Minimum pixel height for clipped bottom display line.
|
|
|
9493 A clipped line shorter than this won't be displayed.
|
|
|
9494 */ ,
|
|
|
9495 redisplay_variable_changed);
|
|
|
9496 vertical_clip = 5;
|
|
|
9497
|
|
|
9498 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
9499 Minimum visible area for clipped glyphs at right boundary.
|
|
|
9500 Clipped glyphs shorter than this won't be displayed.
|
|
|
9501 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
9502 */ ,
|
|
|
9503 redisplay_variable_changed);
|
|
|
9504 horizontal_clip = 5;
|
|
|
9505
|
|
|
9506 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
9507 String displayed by modeline-format's "%m" specification.
|
|
|
9508 */ );
|
|
|
9509 Vglobal_mode_string = Qnil;
|
|
|
9510
|
|
|
9511 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
9512 Marker for where to display an arrow on top of the buffer text.
|
|
|
9513 This must be the beginning of a line in order to work.
|
|
|
9514 See also `overlay-arrow-string'.
|
|
|
9515 */ ,
|
|
|
9516 redisplay_variable_changed);
|
|
|
9517 Voverlay_arrow_position = Qnil;
|
|
|
9518
|
|
|
9519 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
442
|
9520 String or glyph to display as an arrow. See also `overlay-arrow-position'.
|
|
444
|
9521 \(Note that despite the name of this variable, it can be set to a glyph as
|
|
442
|
9522 well as a string.)
|
|
428
|
9523 */ ,
|
|
|
9524 redisplay_variable_changed);
|
|
|
9525 Voverlay_arrow_string = Qnil;
|
|
|
9526
|
|
|
9527 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
9528 *The number of lines to try scrolling a window by when point moves out.
|
|
|
9529 If that fails to bring point back on frame, point is centered instead.
|
|
|
9530 If this is zero, point is always centered after it moves off screen.
|
|
|
9531 */ );
|
|
|
9532 scroll_step = 0;
|
|
|
9533
|
|
|
9534 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
|
|
|
9535 *Scroll up to this many lines, to bring point back on screen.
|
|
|
9536 */ );
|
|
|
9537 scroll_conservatively = 0;
|
|
|
9538
|
|
|
9539 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
9540 &truncate_partial_width_windows /*
|
|
|
9541 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
9542 */ ,
|
|
|
9543 redisplay_variable_changed);
|
|
|
9544 truncate_partial_width_windows = 1;
|
|
|
9545
|
|
442
|
9546 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
|
|
|
9547 *Non-nil substitutes a visual signal for the audible bell.
|
|
|
9548
|
|
|
9549 Default behavior is to flash the whole screen. On some platforms,
|
|
|
9550 special effects are available using the following values:
|
|
|
9551
|
|
|
9552 'display Flash the whole screen (ie, the default behavior).
|
|
|
9553 'top-bottom Flash only the top and bottom lines of the selected frame.
|
|
|
9554
|
|
|
9555 When effects are unavailable on a platform, the visual bell is the
|
|
|
9556 default, whole screen. (Currently only X supports any special effects.)
|
|
428
|
9557 */ );
|
|
442
|
9558 Vvisible_bell = Qnil;
|
|
428
|
9559
|
|
|
9560 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
9561 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
9562 A non-nil value is useful if the terminal can automatically preserve
|
|
|
9563 Emacs's frame display when you reenter Emacs.
|
|
|
9564 It is up to you to set this variable if your terminal can do that.
|
|
|
9565 */ );
|
|
|
9566 no_redraw_on_reenter = 0;
|
|
|
9567
|
|
|
9568 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
9569 A symbol naming the window-system under which Emacs is running,
|
|
|
9570 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
|
9571
|
|
|
9572 Do not use this variable, except for GNU Emacs compatibility, as it
|
|
|
9573 gives wrong values in a multi-device environment. Use `console-type'
|
|
|
9574 instead.
|
|
|
9575 */ );
|
|
|
9576 Vwindow_system = Qnil;
|
|
|
9577
|
|
|
9578 /* #### Temporary shit until window-system is eliminated. */
|
|
|
9579 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
9580 DON'T TOUCH
|
|
|
9581 */ );
|
|
|
9582 Vinitial_window_system = Qnil;
|
|
|
9583
|
|
|
9584 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
9585 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
9586 */ );
|
|
|
9587 cursor_in_echo_area = 0;
|
|
|
9588
|
|
|
9589 /* #### Shouldn't this be generalized as follows:
|
|
|
9590
|
|
|
9591 if nil, use block cursor.
|
|
|
9592 if a number, use a bar cursor of that width.
|
|
|
9593 Otherwise, use a 1-pixel bar cursor.
|
|
|
9594
|
|
|
9595 #### Or better yet, this variable should be trashed entirely
|
|
|
9596 (use a Lisp-magic variable to maintain compatibility)
|
|
|
9597 and a specifier `cursor-shape' added, which allows a block
|
|
|
9598 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
9599 maybe a caret cursor, etc. */
|
|
|
9600
|
|
|
9601 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
448
|
9602 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
428
|
9603 */ );
|
|
|
9604 Vbar_cursor = Qnil;
|
|
|
9605
|
|
|
9606 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
9607 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
|
|
|
9608 Function or functions to run before every redisplay.
|
|
|
9609 */ );
|
|
|
9610 Vpre_redisplay_hook = Qnil;
|
|
|
9611
|
|
|
9612 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
|
|
|
9613 Function or functions to run after every redisplay.
|
|
|
9614 */ );
|
|
|
9615 Vpost_redisplay_hook = Qnil;
|
|
|
9616 #endif /* INHIBIT_REDISPLAY_HOOKS */
|
|
|
9617
|
|
442
|
9618 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
|
|
|
9619 Function or functions to call when a frame's buffer list has changed.
|
|
|
9620 This is called during redisplay, before redisplaying each frame.
|
|
|
9621 Functions on this hook are called with one argument, the frame.
|
|
|
9622 */ );
|
|
|
9623 Vbuffer_list_changed_hook = Qnil;
|
|
|
9624
|
|
428
|
9625 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
9626 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
9627 at next redisplay. You should not normally change this; the function
|
|
|
9628 `display-warning' automatically does this at appropriate times.
|
|
|
9629 */ );
|
|
|
9630 display_warning_tick = 0;
|
|
|
9631
|
|
|
9632 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
9633 Non-nil means inhibit display of warning messages.
|
|
|
9634 You should *bind* this, not set it. Any pending warning messages
|
|
|
9635 will be displayed when the binding no longer applies.
|
|
|
9636 */ );
|
|
|
9637 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
9638 This way, the warnings don't obliterate the splash screen. */
|
|
|
9639 inhibit_warning_display = 1;
|
|
|
9640
|
|
|
9641 DEFVAR_LISP ("window-size-change-functions",
|
|
|
9642 &Vwindow_size_change_functions /*
|
|
|
9643 Not currently implemented.
|
|
|
9644 Functions called before redisplay, if window sizes have changed.
|
|
|
9645 The value should be a list of functions that take one argument.
|
|
|
9646 Just before redisplay, for each frame, if any of its windows have changed
|
|
|
9647 size since the last redisplay, or have been split or deleted,
|
|
|
9648 all the functions in the list are called, with the frame as argument.
|
|
|
9649 */ );
|
|
|
9650 Vwindow_size_change_functions = Qnil;
|
|
|
9651
|
|
|
9652 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
|
|
|
9653 Not currently implemented.
|
|
|
9654 Functions to call before redisplaying a window with scrolling.
|
|
|
9655 Each function is called with two arguments, the window
|
|
|
9656 and its new display-start position. Note that the value of `window-end'
|
|
|
9657 is not valid when these functions are called.
|
|
|
9658 */ );
|
|
|
9659 Vwindow_scroll_functions = Qnil;
|
|
|
9660
|
|
|
9661 DEFVAR_LISP ("redisplay-end-trigger-functions",
|
|
|
9662 &Vredisplay_end_trigger_functions /*
|
|
|
9663 See `set-window-redisplay-end-trigger'.
|
|
|
9664 */ );
|
|
|
9665 Vredisplay_end_trigger_functions = Qnil;
|
|
|
9666
|
|
|
9667 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
|
|
|
9668 *Non-nil means column display number starts at 1.
|
|
|
9669 */ );
|
|
|
9670 column_number_start_at_one = 0;
|
|
|
9671 }
|
|
|
9672
|
|
|
9673 void
|
|
|
9674 specifier_vars_of_redisplay (void)
|
|
|
9675 {
|
|
|
9676 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
9677 *Width of left margin.
|
|
|
9678 This is a specifier; use `set-specifier' to change it.
|
|
|
9679 */ );
|
|
|
9680 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9681 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9682 set_specifier_caching (Vleft_margin_width,
|
|
438
|
9683 offsetof (struct window, left_margin_width),
|
|
428
|
9684 some_window_value_changed,
|
|
438
|
9685 offsetof (struct frame, left_margin_width),
|
|
444
|
9686 margin_width_changed_in_frame, 0);
|
|
428
|
9687
|
|
|
9688 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
9689 *Width of right margin.
|
|
|
9690 This is a specifier; use `set-specifier' to change it.
|
|
|
9691 */ );
|
|
|
9692 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
9693 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
|
|
|
9694 set_specifier_caching (Vright_margin_width,
|
|
438
|
9695 offsetof (struct window, right_margin_width),
|
|
428
|
9696 some_window_value_changed,
|
|
438
|
9697 offsetof (struct frame, right_margin_width),
|
|
444
|
9698 margin_width_changed_in_frame, 0);
|
|
428
|
9699
|
|
|
9700 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
9701 *Minimum ascent height of lines.
|
|
|
9702 This is a specifier; use `set-specifier' to change it.
|
|
|
9703 */ );
|
|
|
9704 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
9705 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9706 set_specifier_caching (Vminimum_line_ascent,
|
|
438
|
9707 offsetof (struct window, minimum_line_ascent),
|
|
428
|
9708 some_window_value_changed,
|
|
444
|
9709 0, 0, 0);
|
|
428
|
9710
|
|
|
9711 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
9712 *Minimum descent height of lines.
|
|
|
9713 This is a specifier; use `set-specifier' to change it.
|
|
|
9714 */ );
|
|
|
9715 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
9716 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
|
|
|
9717 set_specifier_caching (Vminimum_line_descent,
|
|
438
|
9718 offsetof (struct window, minimum_line_descent),
|
|
428
|
9719 some_window_value_changed,
|
|
444
|
9720 0, 0, 0);
|
|
428
|
9721
|
|
|
9722 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
9723 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
9724 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9725 This is a specifier; use `set-specifier' to change it.
|
|
|
9726 */ );
|
|
|
9727 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
9728 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9729 set_specifier_caching (Vuse_left_overflow,
|
|
438
|
9730 offsetof (struct window, use_left_overflow),
|
|
428
|
9731 some_window_value_changed,
|
|
444
|
9732 0, 0, 0);
|
|
428
|
9733
|
|
|
9734 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
9735 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
9736 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
9737 This is a specifier; use `set-specifier' to change it.
|
|
|
9738 */ );
|
|
|
9739 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
9740 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
|
|
|
9741 set_specifier_caching (Vuse_right_overflow,
|
|
438
|
9742 offsetof (struct window, use_right_overflow),
|
|
428
|
9743 some_window_value_changed,
|
|
444
|
9744 0, 0, 0);
|
|
428
|
9745
|
|
|
9746 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
9747 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
9748 This is a specifier; use `set-specifier' to change it.
|
|
|
9749 */ );
|
|
|
9750 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
9751 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
|
|
|
9752 set_specifier_caching (Vtext_cursor_visible_p,
|
|
438
|
9753 offsetof (struct window, text_cursor_visible_p),
|
|
428
|
9754 text_cursor_visible_p_changed,
|
|
444
|
9755 0, 0, 0);
|
|
428
|
9756
|
|
|
9757 }
|
