|
0
|
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.
|
|
|
4 Copyright (C) 1995, 1996 Ben Wing.
|
|
|
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 "extents.h"
|
|
|
49 #include "faces.h"
|
|
|
50 #include "frame.h"
|
|
|
51 #include "glyphs.h"
|
|
|
52 #include "insdel.h"
|
|
|
53 #include "menubar.h"
|
|
|
54 #include "objects.h"
|
|
|
55 #include "process.h"
|
|
|
56 #include "redisplay.h"
|
|
|
57 #include "toolbar.h"
|
|
|
58 #include "window.h"
|
|
|
59
|
|
70
|
60 #ifdef MULE
|
|
|
61 #include "mule-coding.h"
|
|
|
62 #endif
|
|
16
|
63
|
|
0
|
64 /* Note: We have to be careful throughout this code to properly handle
|
|
|
65 and differentiate between Bufbytes and Emchars.
|
|
|
66
|
|
|
67 Since strings are generally composed of Bufbytes, I've taken the tack
|
|
|
68 that any contiguous set of Bufbytes is called a "string", while
|
|
|
69 any contiguous set of Emchars is called an "array". */
|
|
|
70
|
|
|
71 /* Return value to indicate a failure by an add_*_rune routine to add
|
|
|
72 a rune, but no propagation information needs to be returned. */
|
|
|
73 #define ADD_FAILED (prop_block_dynarr *) 1
|
|
|
74
|
|
|
75 #define BEGIN_GLYPHS 0
|
|
|
76 #define END_GLYPHS 1
|
|
|
77 #define LEFT_GLYPHS 2
|
|
|
78 #define RIGHT_GLYPHS 3
|
|
|
79
|
|
|
80 /* Set the vertical clip to 0 if we are currently updating the line
|
|
|
81 start cache. Otherwise for buffers of line height 1 it may fail to
|
|
|
82 be able to work properly because regenerate_window will not layout
|
|
|
83 a single line. */
|
|
|
84 #define VERTICAL_CLIP(w, display) \
|
|
|
85 (updating_line_start_cache \
|
|
|
86 ? 0 \
|
|
|
87 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
|
|
|
88 ? INT_MAX \
|
|
|
89 : vertical_clip))
|
|
|
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
|
|
|
94 /* NOTE: Bytinds not Bufpos's in this structure. */
|
|
|
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 struct device *d;
|
|
|
102 struct display_block *db;
|
|
|
103 struct display_line *dl;
|
|
|
104 Emchar ch; /* Character that is to be added. This is
|
|
|
105 used to communicate this information to
|
|
|
106 add_emchar_rune(). */
|
|
|
107 Lisp_Object last_charset; /* The charset of the previous character.
|
|
|
108 Used to optimize some lookups -- we
|
|
|
109 only have to do some things when
|
|
|
110 the charset changes. */
|
|
|
111 int last_char_width; /* The width of the previous character. */
|
|
|
112 int font_is_bogus; /* If true, it means we couldn't instantiate
|
|
|
113 the font for this charset, so we substitute
|
|
|
114 ~'s from the ASCII charset. */
|
|
|
115 Bytind bi_bufpos;
|
|
|
116 Bytind bi_endpos;
|
|
|
117 int pixpos;
|
|
|
118 int max_pixpos;
|
|
|
119 int blank_width; /* Width of the blank that is to be added.
|
|
|
120 This is used to communicate this information
|
|
|
121 to add_blank_rune().
|
|
|
122
|
|
|
123 This is also used rather cheesily to
|
|
|
124 communicate the width of the eol-cursor-size
|
|
|
125 blank that exists at the end of the line.
|
|
|
126 add_emchar_rune() is called cheesily with
|
|
|
127 the non-printing char '\n', which is stuck
|
|
|
128 in the output routines with its width being
|
|
|
129 BLANK_WIDTH. */
|
|
|
130 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
|
|
|
131 unsigned int cursor_type :3;
|
|
|
132 int cursor_x; /* rune block cursor is at */
|
|
|
133 int start_col; /* Number of character columns (each column has
|
|
|
134 a width of the default char width) that still
|
|
|
135 need to be skipped. This is used for horizontal
|
|
|
136 scrolling, where a certain number of columns
|
|
|
137 (those off the left side of the screen) need
|
|
|
138 to be skipped before anything is displayed. */
|
|
|
139 Bytind bi_start_col_enabled;
|
|
|
140
|
|
|
141 /* Information about the face the text should be displayed in and
|
|
|
142 any begin-glyphs and end-glyphs. */
|
|
|
143 struct extent_fragment *ef;
|
|
|
144 face_index findex;
|
|
|
145
|
|
|
146 /* The height of a pixmap may either be predetermined if the user
|
|
2
|
147 has set a baseline value, or it may be dependent on whatever the
|
|
|
148 line ascent and descent values end up being, based just on font
|
|
0
|
149 information. In the first case we can immediately update the
|
|
|
150 values, thus their inclusion here. In the last case we cannot
|
|
|
151 determine the actual contribution to the line height until we
|
|
|
152 have finished laying out all text on the line. Thus we propagate
|
|
|
153 the max height of such pixmaps and do a final calculation after
|
|
|
154 all text has been added to the line. */
|
|
|
155 int new_ascent;
|
|
|
156 int new_descent;
|
|
|
157 int max_pixmap_height;
|
|
|
158
|
|
|
159 Lisp_Object result_str; /* String where we put the result of
|
|
|
160 generating a formatted string in the modeline. */
|
|
|
161 int is_modeline; /* Non-zero if we're generating the modeline. */
|
|
|
162 Charcount modeline_charpos; /* Number of chars used in result_str so far;
|
|
|
163 corresponds to bytepos. */
|
|
|
164 Bytecount bytepos; /* Number of bytes used in result_str so far.
|
|
|
165 We don't actually copy the bytes into result_str
|
|
|
166 until the end because we don't know how big the
|
|
|
167 string is going to be until then. */
|
|
|
168 } pos_data;
|
|
|
169
|
|
|
170 enum prop_type
|
|
|
171 {
|
|
|
172 PROP_STRING,
|
|
|
173 PROP_CHAR,
|
|
|
174 PROP_MINIBUF_PROMPT,
|
|
|
175 PROP_BLANK
|
|
|
176 };
|
|
|
177
|
|
|
178 /* Data that should be propagated to the next line. Either a single
|
|
|
179 Emchar or a string of Bufbyte's.
|
|
|
180
|
|
|
181 The actual data that is propagated ends up as a Dynarr of these
|
|
|
182 blocks.
|
|
|
183
|
|
|
184 #### It's unclean that both Emchars and Bufbytes are here.
|
|
|
185 */
|
|
|
186
|
|
|
187 struct prop_block
|
|
|
188 {
|
|
|
189 enum prop_type type;
|
|
|
190
|
|
|
191 union data
|
|
|
192 {
|
|
|
193 struct
|
|
|
194 {
|
|
|
195 Bufbyte *str;
|
|
|
196 Bytecount len; /* length of the string. */
|
|
|
197 } p_string;
|
|
|
198
|
|
|
199 struct
|
|
|
200 {
|
|
|
201 Emchar ch;
|
|
|
202 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
|
|
|
203 unsigned int cursor_type :3;
|
|
|
204 } p_char;
|
|
|
205
|
|
|
206 struct
|
|
|
207 {
|
|
|
208 int width;
|
|
|
209 face_index findex;
|
|
|
210 } p_blank;
|
|
|
211 } data;
|
|
|
212 };
|
|
|
213
|
|
|
214 typedef struct prop_block_dynarr_type
|
|
|
215 {
|
|
|
216 Dynarr_declare (struct prop_block);
|
|
|
217 } prop_block_dynarr;
|
|
|
218
|
|
|
219
|
|
|
220 /*
|
|
|
221 * Prototypes for all functions defined in redisplay.c.
|
|
|
222 */
|
|
|
223 struct display_block *get_display_block_from_line (struct display_line *dl,
|
|
|
224 enum display_type type);
|
|
|
225 layout_bounds calculate_display_line_boundaries (struct window *w,
|
|
|
226 int modeline);
|
|
|
227 static Bufpos generate_display_line (struct window *w, struct display_line *dl,
|
|
|
228 int bounds, Bufpos start_pos,
|
|
|
229 int start_col, prop_block_dynarr **prop,
|
|
|
230 int type);
|
|
|
231 static void generate_modeline (struct window *w, struct display_line *dl,
|
|
|
232 int type);
|
|
|
233 static int ensure_modeline_generated (struct window *w, int type);
|
|
|
234 static void generate_formatted_string_db (Lisp_Object format_str,
|
|
|
235 Lisp_Object result_str,
|
|
|
236 struct window *w,
|
|
|
237 struct display_line *dl,
|
|
|
238 struct display_block *db,
|
|
|
239 face_index findex, int min_pixpos,
|
|
|
240 int max_pixpos, int type);
|
|
|
241 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
|
|
|
242 Charcount pos, Charcount min_pos,
|
|
|
243 Charcount max_pos, Lisp_Object elt,
|
|
|
244 int depth, int max_pixsize,
|
|
|
245 face_index findex, int type);
|
|
|
246 static prop_block_dynarr *add_emchar_rune (pos_data *data);
|
|
|
247 static prop_block_dynarr *add_bufbyte_string_runes (pos_data *data,
|
|
|
248 Bufbyte *c_string,
|
|
|
249 Bytecount c_length,
|
|
|
250 int no_prop);
|
|
|
251 static prop_block_dynarr *add_blank_rune (pos_data *data, struct window *w,
|
|
|
252 int char_tab_width);
|
|
|
253 static prop_block_dynarr *add_octal_runes (pos_data *data);
|
|
|
254 static prop_block_dynarr *add_control_char_runes (pos_data *data,
|
|
|
255 struct buffer *b);
|
|
|
256 static prop_block_dynarr *add_disp_table_entry_runes (pos_data *data,
|
|
|
257 Lisp_Object entry);
|
|
|
258 static prop_block_dynarr *add_propagation_runes (prop_block_dynarr **prop,
|
|
|
259 pos_data *data);
|
|
|
260 static prop_block_dynarr *add_glyph_rune (pos_data *data,
|
|
|
261 struct glyph_block *gb,
|
|
|
262 int pos_type, int allow_cursor,
|
|
|
263 struct glyph_cachel *cachel);
|
|
|
264 static prop_block_dynarr *add_glyph_runes (pos_data *data,
|
|
|
265 int pos_type);
|
|
|
266 /* NOTE: Bytinds not Bufpos's here. */
|
|
|
267 static Bytind create_text_block (struct window *w, struct display_line *dl,
|
|
|
268 Bytind bi_start_pos, int start_col,
|
|
|
269 prop_block_dynarr **prop, int type);
|
|
|
270 static int create_overlay_glyph_block (struct window *w,
|
|
|
271 struct display_line *dl);
|
|
|
272 static void create_left_glyph_block (struct window *w,
|
|
|
273 struct display_line *dl,
|
|
|
274 int overlay_width);
|
|
|
275 static void create_right_glyph_block (struct window *w,
|
|
|
276 struct display_line *dl);
|
|
|
277 static void regenerate_window (struct window *w, Bufpos start_pos,
|
|
|
278 Bufpos point, int type);
|
|
70
|
279 static void regenerate_window_point_center (struct window *w, Bufpos point,
|
|
|
280 int type);
|
|
0
|
281 int window_half_pixpos (struct window *w);
|
|
|
282 int line_at_center (struct window *w, int type, Bufpos start, Bufpos point);
|
|
|
283 Bufpos point_at_center (struct window *w, int type, Bufpos start,
|
|
|
284 Bufpos point);
|
|
|
285 static void redisplay_window (Lisp_Object window, int skip_selected);
|
|
|
286 static void redisplay_windows (Lisp_Object window, int skip_selected);
|
|
|
287 static int redisplay_frame (struct frame *f, int preemption_check);
|
|
|
288 void redisplay (void);
|
|
|
289 static void decode_mode_spec (struct window *w, Emchar spec, int type);
|
|
|
290 static void free_display_line (struct display_line *dl);
|
|
|
291 void free_display_structs (struct window_mirror *mir);
|
|
|
292 static int point_visible (struct window *w, Bufpos point, int type);
|
|
|
293 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
|
|
|
294 Bufpos point, int no_regen);
|
|
|
295 static Bufpos line_start_cache_start (struct window *w);
|
|
|
296 static Bufpos line_start_cache_end (struct window *w);
|
|
|
297
|
|
|
298 /* This used to be 10 but 30 seems to give much better performance. */
|
|
|
299 #define INIT_MAX_PREEMPTS 30
|
|
|
300 static int max_preempts;
|
|
|
301
|
|
|
302 #define REDISPLAY_PREEMPTION_CHECK \
|
|
|
303 do { \
|
|
|
304 preempted = 0; \
|
|
|
305 if (!disable_preemption && \
|
|
|
306 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro))) \
|
|
|
307 if (!INTERACTIVE || detect_input_pending ()) { \
|
|
|
308 preempted = 1; \
|
|
|
309 } \
|
|
|
310 } while (0)
|
|
|
311
|
|
|
312 /*
|
|
|
313 * Redisplay global variables.
|
|
|
314 */
|
|
|
315
|
|
|
316 /* We need a third set of display structures for the cursor motion
|
|
|
317 routines. We used to just give each window a third set. However,
|
|
|
318 we always fully regenerate the structures when needed so there
|
|
|
319 isn't any reason we need more than a single set. */
|
|
|
320 display_line_dynarr *cmotion_display_lines;
|
|
|
321
|
|
|
322 /* Used by generate_formatted_string. Global because they get used so
|
|
|
323 much that the dynamic allocation time adds up. */
|
|
|
324 emchar_dynarr *formatted_string_emchar_dynarr;
|
|
|
325 struct display_line formatted_string_display_line;
|
|
|
326 /* We store the extents that we need to generate in a Dynarr and then
|
|
|
327 frob them all on at the end of generating the string. We do it
|
|
|
328 this way rather than adding them as we generate the string because
|
|
|
329 we don't store the text into the resulting string until we're done
|
|
|
330 (to avoid having to resize the string multiple times), and we don't
|
|
|
331 want to go around adding extents to a string when the extents might
|
|
|
332 stretch off the end of the string. */
|
|
|
333 extent_dynarr *formatted_string_extent_dynarr;
|
|
|
334 bytecount_dynarr *formatted_string_extent_start_dynarr;
|
|
|
335 bytecount_dynarr *formatted_string_extent_end_dynarr;
|
|
|
336
|
|
|
337
|
|
|
338 /* #### probably temporary */
|
|
|
339 int cache_adjustment;
|
|
|
340
|
|
|
341 /* This holds a string representing the text corresponding to a single
|
|
|
342 modeline % spec. */
|
|
|
343 static bufbyte_dynarr *mode_spec_bufbyte_string;
|
|
|
344
|
|
|
345 int in_display; /* 1 if in redisplay. */
|
|
|
346
|
|
|
347 int disable_preemption; /* Used for debugging redisplay and for
|
|
|
348 force-redisplay. */
|
|
|
349
|
|
|
350 /* We only allow max_preempts preemptions before we force a redisplay. */
|
|
|
351 static int preemption_count;
|
|
|
352
|
|
|
353 /* Minimum pixel height of clipped bottom display line. */
|
|
|
354 int vertical_clip;
|
|
|
355
|
|
|
356 /* Minimum visible pixel width of clipped glyphs at right margin. */
|
|
|
357 int horizontal_clip;
|
|
|
358
|
|
|
359 /* Set if currently inside update_line_start_cache. */
|
|
|
360 int updating_line_start_cache;
|
|
|
361
|
|
|
362 /* Nonzero means reading single-character input with prompt
|
|
|
363 so put cursor on minibuffer after the prompt. */
|
|
|
364 int cursor_in_echo_area;
|
|
|
365 Lisp_Object Qcursor_in_echo_area;
|
|
|
366
|
|
|
367 /* Nonzero means truncate lines in all windows less wide than the frame */
|
|
|
368 int truncate_partial_width_windows;
|
|
|
369
|
|
|
370 /* non-nil if a buffer has changed since the last time redisplay completed */
|
|
|
371 int buffers_changed;
|
|
|
372 int buffers_changed_set;
|
|
|
373
|
|
|
374 /* non-nil if hscroll has changed somewhere or a buffer has been
|
|
|
375 narrowed or widened */
|
|
|
376 int clip_changed;
|
|
|
377 int clip_changed_set;
|
|
|
378
|
|
|
379 /* non-nil if any extent has changed since the last time redisplay completed */
|
|
|
380 int extents_changed;
|
|
|
381 int extents_changed_set;
|
|
|
382
|
|
|
383 /* non-nil if any face has changed since the last time redisplay completed */
|
|
|
384 int faces_changed;
|
|
|
385
|
|
|
386 /* Nonzero means some frames have been marked as garbaged */
|
|
|
387 int frame_changed;
|
|
|
388
|
|
|
389 /* This variable is 1 if the icon has to be updated.
|
|
|
390 It is set to 1 when `frame-icon-glyph' changes. */
|
|
|
391 int icon_changed;
|
|
|
392 int icon_changed_set;
|
|
|
393
|
|
|
394 /* This variable is 1 if the menubar widget has to be updated.
|
|
|
395 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
|
|
|
396 has been indapted. */
|
|
|
397 /* indapted???? */
|
|
|
398 int menubar_changed;
|
|
|
399 int menubar_changed_set;
|
|
|
400
|
|
|
401 /* true iff we should redraw the modelines on the next redisplay */
|
|
|
402 int modeline_changed;
|
|
|
403 int modeline_changed_set;
|
|
|
404
|
|
|
405 /* non-nil if point has changed in some buffer since the last time
|
|
|
406 redisplay completed */
|
|
|
407 int point_changed;
|
|
|
408 int point_changed_set;
|
|
|
409
|
|
|
410 /* non-nil if some frame has changed its size */
|
|
|
411 int size_changed;
|
|
|
412
|
|
|
413 /* non-nil if some device has signaled that it wants to change size */
|
|
|
414 int asynch_device_change_pending;
|
|
|
415
|
|
|
416 /* non-nil if any toolbar has changed */
|
|
|
417 int toolbar_changed;
|
|
|
418 int toolbar_changed_set;
|
|
|
419
|
|
|
420 /* non-nil if any window has changed since the last time redisplay completed */
|
|
|
421 int windows_changed;
|
|
|
422
|
|
2
|
423 /* non-nil if any frame's window structure has changed since the last
|
|
0
|
424 time redisplay completed */
|
|
|
425 int windows_structure_changed;
|
|
|
426
|
|
|
427 /* If non-nil, use vertical bar cursor. */
|
|
|
428 Lisp_Object Vbar_cursor;
|
|
|
429 Lisp_Object Qbar_cursor;
|
|
|
430
|
|
|
431
|
|
|
432 int visible_bell; /* If true and the terminal will support it
|
|
|
433 then the frame will flash instead of
|
|
|
434 beeping when an error occurs */
|
|
|
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 to try scrolling a
|
|
|
449 window by when point leaves the window; if
|
|
|
450 it is <=0 then point is centered in the window */
|
|
|
451 int scroll_step;
|
|
|
452
|
|
|
453 /* Marker for where to display an arrow on top of the buffer text. */
|
|
|
454 Lisp_Object Voverlay_arrow_position;
|
|
|
455 /* String to display for the arrow. */
|
|
|
456 Lisp_Object Voverlay_arrow_string;
|
|
|
457
|
|
|
458 Lisp_Object Vwindow_size_change_functions;
|
|
|
459 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
|
|
|
460 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
|
|
|
461
|
|
|
462 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
|
|
|
463 this more. */
|
|
|
464 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
465 /* #### Chuck says: I think this needs more thought.
|
|
|
466 Think about this for 19.14. */
|
|
|
467 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
|
|
|
468 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
|
|
|
469 #endif
|
|
|
470
|
|
|
471 int last_display_warning_tick, display_warning_tick;
|
|
|
472 Lisp_Object Qdisplay_warning_buffer;
|
|
|
473 int inhibit_warning_display;
|
|
|
474
|
|
|
475 Lisp_Object Vleft_margin_width, Vright_margin_width;
|
|
|
476 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
|
|
|
477 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
|
|
|
478 Lisp_Object Vtext_cursor_visible_p;
|
|
|
479
|
|
|
480
|
|
|
481 /***************************************************************************/
|
|
|
482 /* */
|
|
|
483 /* low-level interfaces onto device routines */
|
|
|
484 /* */
|
|
|
485 /***************************************************************************/
|
|
|
486
|
|
|
487 static int
|
|
|
488 redisplay_text_width_emchar_string (struct window *w, int findex,
|
|
|
489 Emchar *str, Charcount len)
|
|
|
490 {
|
|
|
491 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
492 Lisp_Object window = Qnil;
|
|
|
493
|
|
|
494 find_charsets_in_emchar_string (charsets, str, len);
|
|
|
495 XSETWINDOW (window, w);
|
|
|
496 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
|
|
|
497 charsets);
|
|
|
498 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
|
|
|
499 text_width, (WINDOW_FACE_CACHEL (w, findex),
|
|
|
500 str, len));
|
|
|
501 }
|
|
|
502
|
|
|
503 static emchar_dynarr *rtw_emchar_dynarr;
|
|
|
504
|
|
|
505 int
|
|
|
506 redisplay_text_width_string (struct window *w, int findex,
|
|
|
507 Bufbyte *nonreloc, Lisp_Object reloc,
|
|
|
508 Bytecount offset, Bytecount len)
|
|
|
509 {
|
|
|
510 if (!rtw_emchar_dynarr)
|
|
|
511 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
512 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
513
|
|
|
514 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
515 if (STRINGP (reloc))
|
|
16
|
516 nonreloc = XSTRING_DATA (reloc);
|
|
0
|
517 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
|
518 return redisplay_text_width_emchar_string
|
|
|
519 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
520 Dynarr_length (rtw_emchar_dynarr));
|
|
|
521 }
|
|
|
522
|
|
|
523 int
|
|
|
524 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
|
|
|
525 Bufbyte *nonreloc, Lisp_Object reloc,
|
|
|
526 Bytecount offset, Bytecount len)
|
|
|
527 {
|
|
|
528 unsigned char charsets[NUM_LEADING_BYTES];
|
|
|
529 Lisp_Object frame = Qnil;
|
|
|
530 struct face_cachel cachel;
|
|
|
531
|
|
|
532 if (!rtw_emchar_dynarr)
|
|
|
533 rtw_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
534 Dynarr_reset (rtw_emchar_dynarr);
|
|
|
535
|
|
|
536 fixup_internal_substring (nonreloc, reloc, offset, &len);
|
|
|
537 if (STRINGP (reloc))
|
|
16
|
538 nonreloc = XSTRING_DATA (reloc);
|
|
0
|
539 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
|
|
|
540 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
|
|
|
541 reset_face_cachel (&cachel);
|
|
|
542 cachel.face = face;
|
|
|
543 XSETFRAME (frame, f);
|
|
|
544 ensure_face_cachel_complete (&cachel, frame, charsets);
|
|
|
545 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
|
|
|
546 text_width, (&cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
|
|
|
547 Dynarr_length (rtw_emchar_dynarr)));
|
|
|
548 }
|
|
|
549
|
|
|
550 /* Return the display block from DL of the given TYPE. A display line
|
|
|
551 can have only one display block of each possible type. If DL does
|
|
|
552 not have a block of type TYPE, one will be created and added to DL. */
|
|
|
553
|
|
|
554 struct display_block *
|
|
|
555 get_display_block_from_line (struct display_line *dl, enum display_type type)
|
|
|
556 {
|
|
|
557 int elt;
|
|
|
558 struct display_block db;
|
|
|
559
|
|
|
560 /* Check if this display line already has a block of the desired type and
|
|
|
561 if so, return it. */
|
|
|
562 if (dl->display_blocks)
|
|
|
563 {
|
|
|
564 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
|
|
|
565 {
|
|
|
566 if (Dynarr_at (dl->display_blocks, elt).type == type)
|
|
|
567 return (Dynarr_atp (dl->display_blocks, elt));
|
|
|
568 }
|
|
|
569
|
|
|
570 /* There isn't an active block of the desired type, but there
|
|
|
571 might still be allocated blocks we need to reuse. */
|
|
|
572 if (elt < Dynarr_largest (dl->display_blocks))
|
|
|
573 {
|
|
|
574 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
|
|
|
575
|
|
|
576 /* 'add' the block to the list */
|
|
|
577 Dynarr_increment (dl->display_blocks);
|
|
|
578
|
|
|
579 /* initialize and return */
|
|
|
580 dbp->type = type;
|
|
|
581 return dbp;
|
|
|
582 }
|
|
|
583 }
|
|
|
584 else
|
|
|
585 {
|
|
|
586 /* This line doesn't have any display blocks, so initialize the display
|
|
|
587 bock array. */
|
|
|
588 dl->display_blocks = Dynarr_new (struct display_block);
|
|
|
589 }
|
|
|
590
|
|
|
591 /* The line doesn't have a block of the desired type so go ahead and create
|
|
|
592 one and add it to the line. */
|
|
|
593 memset (&db, 0, sizeof (struct display_block));
|
|
|
594 db.type = type;
|
|
|
595 db.runes = Dynarr_new (struct rune);
|
|
|
596 Dynarr_add (dl->display_blocks, db);
|
|
|
597
|
|
|
598 /* Return the newly added display block. */
|
|
|
599 elt = Dynarr_length (dl->display_blocks) - 1;
|
|
|
600
|
|
|
601 return Dynarr_atp (dl->display_blocks, elt);
|
|
|
602 }
|
|
|
603
|
|
|
604 static int
|
|
|
605 tab_char_width (struct window *w)
|
|
|
606 {
|
|
|
607 struct buffer *b = XBUFFER (w->buffer);
|
|
|
608 int char_tab_width = XINT (b->tab_width);
|
|
|
609
|
|
|
610 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
|
|
|
611
|
|
|
612 return char_tab_width;
|
|
|
613 }
|
|
|
614
|
|
|
615 static int
|
|
|
616 space_width (struct window *w)
|
|
|
617 {
|
|
|
618 /* While tabs are traditional composed of spaces, for variable-width
|
|
|
619 fonts the space character tends to give too narrow a value. So
|
|
|
620 we use 'n' instead. Except that we don't. We use the default
|
|
|
621 character width for the default face. If this is actually
|
|
|
622 defined by the font then it is probably the best thing to
|
|
|
623 actually use. If it isn't, we have assumed it is 'n' and have
|
|
|
624 already calculated its width. Thus we can avoid a call to
|
|
|
625 XTextWidth on X frames by just querying the default width. */
|
|
|
626 return XFONT_INSTANCE
|
|
|
627 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
|
|
|
628 }
|
|
|
629
|
|
|
630 static int
|
|
|
631 tab_pix_width (struct window *w)
|
|
|
632 {
|
|
|
633 return (space_width (w) * tab_char_width (w));
|
|
|
634 }
|
|
|
635
|
|
|
636 /* Given a pixel position in a window, return the pixel location of
|
|
|
637 the next tabstop. Tabs are calculated from the left window edge in
|
|
|
638 terms of spaces displayed in the default face. Formerly the space
|
|
|
639 width was determined using the currently active face. That method
|
|
|
640 leads to tabstops which do not line up. */
|
|
|
641
|
|
|
642 static int
|
|
|
643 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
|
|
|
644 {
|
|
|
645 int n_pos = left_pixpos;
|
|
|
646 int pix_tab_width = tab_pix_width (w);
|
|
|
647
|
|
|
648 /* Adjust n_pos for any hscrolling which has happened. */
|
|
|
649 if (w->hscroll > 1)
|
|
|
650 n_pos -= space_width (w) * (w->hscroll - 1);
|
|
|
651
|
|
|
652 while (n_pos <= start_pixpos)
|
|
|
653 n_pos += pix_tab_width;
|
|
|
654
|
|
|
655 return n_pos;
|
|
|
656 }
|
|
|
657
|
|
|
658 /* For the given window, calculate the outside and margin boundaries for a
|
|
|
659 display line. The whitespace boundaries must be calculated by the text
|
|
|
660 layout routines. */
|
|
|
661
|
|
|
662 layout_bounds
|
|
|
663 calculate_display_line_boundaries (struct window *w, int modeline)
|
|
|
664 {
|
|
|
665 layout_bounds bounds;
|
|
|
666
|
|
|
667 /* Set the outermost boundaries which are the boundaries of the
|
|
|
668 window itself minus the gutters (and minus the scrollbars if this
|
|
|
669 is for the modeline). */
|
|
|
670 if (!modeline)
|
|
|
671 {
|
|
|
672 bounds.left_out = WINDOW_TEXT_LEFT (w);
|
|
|
673 bounds.right_out = WINDOW_TEXT_RIGHT (w);
|
|
|
674 }
|
|
|
675 else
|
|
|
676 {
|
|
|
677 bounds.left_out = WINDOW_MODELINE_LEFT (w);
|
|
|
678 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
|
|
|
679 }
|
|
|
680
|
|
|
681 /* The inner boundaries mark where the glyph margins are located. */
|
|
|
682 bounds.left_in = bounds.left_out + window_left_margin_width (w);
|
|
|
683 bounds.right_in = bounds.right_out - window_right_margin_width (w);
|
|
|
684
|
|
|
685 /* We cannot fully calculate the whitespace boundaries as they
|
|
|
686 depend on the contents of the line being displayed. */
|
|
|
687 bounds.left_white = bounds.left_in;
|
|
|
688 bounds.right_white = bounds.right_in;
|
|
|
689
|
|
|
690 return bounds;
|
|
|
691 }
|
|
|
692
|
|
|
693 /* Given a display line and a starting position, ensure that the
|
|
|
694 contents of the display line accurately represent the visual
|
|
|
695 representation of the buffer contents starting from the given
|
|
|
696 position when displayed in the given window. The display line ends
|
|
|
697 when the contents of the line reach the right boundary of the given
|
|
|
698 window. */
|
|
|
699
|
|
|
700 static Bufpos
|
|
|
701 generate_display_line (struct window *w, struct display_line *dl, int bounds,
|
|
|
702 Bufpos start_pos, int start_col,
|
|
|
703 prop_block_dynarr **prop, int type)
|
|
|
704 {
|
|
|
705 Bufpos ret_bufpos;
|
|
|
706 int overlay_width;
|
|
|
707 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
|
|
|
708
|
|
|
709 /* If our caller hasn't already set the boundaries, then do so now. */
|
|
|
710 if (!bounds)
|
|
|
711 dl->bounds = calculate_display_line_boundaries (w, 0);
|
|
|
712
|
|
|
713 /* Reset what this line is using. */
|
|
|
714 if (dl->display_blocks)
|
|
|
715 Dynarr_reset (dl->display_blocks);
|
|
|
716 if (dl->left_glyphs)
|
|
|
717 {
|
|
|
718 Dynarr_free (dl->left_glyphs);
|
|
|
719 dl->left_glyphs = 0;
|
|
|
720 }
|
|
|
721 if (dl->right_glyphs)
|
|
|
722 {
|
|
|
723 Dynarr_free (dl->right_glyphs);
|
|
|
724 dl->right_glyphs = 0;
|
|
|
725 }
|
|
|
726
|
|
|
727 /* We aren't generating a modeline at the moment. */
|
|
|
728 dl->modeline = 0;
|
|
|
729
|
|
|
730 /* Create a display block for the text region of the line. */
|
|
|
731 {
|
|
|
732 /* #### urk urk urk!!! Chuck fix this shit! */
|
|
|
733 Bytind hacked_up_bytind =
|
|
|
734 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
|
|
|
735 start_col, prop, type);
|
|
|
736 if (hacked_up_bytind > BI_BUF_ZV (b))
|
|
|
737 ret_bufpos = BUF_ZV (b) + 1;
|
|
|
738 else
|
|
|
739 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
|
|
|
740 }
|
|
|
741 dl->bufpos = start_pos;
|
|
|
742 if (dl->end_bufpos < dl->bufpos)
|
|
|
743 dl->end_bufpos = dl->bufpos;
|
|
|
744
|
|
|
745 if (MARKERP (Voverlay_arrow_position)
|
|
|
746 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
|
|
|
747 && start_pos == marker_position (Voverlay_arrow_position)
|
|
|
748 && (STRINGP (Voverlay_arrow_string)
|
|
|
749 || GLYPHP (Voverlay_arrow_string)))
|
|
|
750 {
|
|
|
751 overlay_width = create_overlay_glyph_block (w, dl);
|
|
|
752 }
|
|
|
753 else
|
|
|
754 overlay_width = 0;
|
|
|
755
|
|
|
756 /* If there are left glyphs associated with any character in the
|
|
|
757 text block, then create a display block to handle them. */
|
|
|
758 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
|
|
|
759 create_left_glyph_block (w, dl, overlay_width);
|
|
|
760
|
|
|
761 /* If there are right glyphs associated with any character in the
|
|
|
762 text block, then create a display block to handle them. */
|
|
|
763 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
|
|
|
764 create_right_glyph_block (w, dl);
|
|
|
765
|
|
|
766 /* In the future additional types of display blocks may be generated
|
|
|
767 here. */
|
|
|
768
|
|
|
769 w->last_redisplay_pos = ret_bufpos;
|
|
|
770
|
|
|
771 return ret_bufpos;
|
|
|
772 }
|
|
|
773
|
|
|
774 /* Adds an hscroll glyph to a display block. If this is called, then
|
|
|
775 the block had better be empty.
|
|
|
776
|
|
|
777 Yes, there are multiple places where this function is called but
|
|
|
778 that is the way it has to be. Each calling function has to deal
|
|
|
779 with bi_start_col_enabled a little differently depending on the
|
|
|
780 object being worked with. */
|
|
|
781
|
|
|
782 static prop_block_dynarr *
|
|
|
783 add_hscroll_rune (pos_data *data)
|
|
|
784 {
|
|
|
785 struct glyph_block gb;
|
|
|
786 prop_block_dynarr *retval;
|
|
|
787 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
|
|
|
788 unsigned int old_cursor_type = data->cursor_type;
|
|
|
789 Bytind bi_old_bufpos = data->bi_bufpos;
|
|
|
790
|
|
|
791 if (data->cursor_type == CURSOR_ON
|
|
|
792 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
|
|
|
793 && data->bi_cursor_bufpos <= data->bi_bufpos)
|
|
|
794 {
|
|
|
795 data->bi_cursor_bufpos = data->bi_start_col_enabled;
|
|
|
796 }
|
|
|
797 else
|
|
|
798 {
|
|
|
799 data->cursor_type = NO_CURSOR;
|
|
|
800 }
|
|
|
801
|
|
|
802 data->bi_endpos = data->bi_bufpos;
|
|
|
803 data->bi_bufpos = data->bi_start_col_enabled;
|
|
|
804
|
|
|
805 gb.extent = Qnil;
|
|
|
806 gb.glyph = Vhscroll_glyph;
|
|
|
807 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
808 GLYPH_CACHEL (XWINDOW (data->window),
|
|
|
809 HSCROLL_GLYPH_INDEX));
|
|
|
810
|
|
|
811 data->bi_endpos = 0;
|
|
|
812 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
|
|
|
813 data->cursor_type = old_cursor_type;
|
|
|
814 data->bi_bufpos = bi_old_bufpos;
|
|
|
815
|
|
|
816 data->bi_start_col_enabled = 0;
|
|
|
817 return retval;
|
|
|
818 }
|
|
|
819
|
|
|
820 /* Adds a character rune to a display block. If there is not enough
|
|
|
821 room to fit the rune on the display block (as determined by the
|
|
|
822 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
|
|
|
823
|
|
|
824 static prop_block_dynarr *
|
|
|
825 add_emchar_rune (pos_data *data)
|
|
|
826 {
|
|
|
827 struct rune rb, *crb;
|
|
|
828 int width, local;
|
|
|
829
|
|
|
830 if (data->start_col)
|
|
|
831 {
|
|
|
832 data->start_col--;
|
|
|
833
|
|
|
834 if (data->start_col)
|
|
|
835 return NULL;
|
|
|
836 }
|
|
|
837
|
|
|
838 if (data->bi_start_col_enabled)
|
|
|
839 {
|
|
|
840 return add_hscroll_rune (data);
|
|
|
841 }
|
|
|
842
|
|
|
843 if (data->ch == '\n')
|
|
|
844 {
|
|
|
845 data->font_is_bogus = 0;
|
|
|
846 /* Cheesy end-of-line pseudo-character. */
|
|
|
847 width = data->blank_width;
|
|
|
848 }
|
|
|
849 else
|
|
|
850 {
|
|
|
851 Lisp_Object charset = CHAR_CHARSET (data->ch);
|
|
70
|
852 if (!EQ (charset, data->last_charset))
|
|
0
|
853 {
|
|
|
854 /* OK, we need to do things the hard way. */
|
|
|
855 struct window *w = XWINDOW (data->window);
|
|
|
856 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
|
|
|
857 Lisp_Object font_instance =
|
|
|
858 ensure_face_cachel_contains_charset (cachel, data->window,
|
|
|
859 charset);
|
|
|
860 struct Lisp_Font_Instance *fi;
|
|
|
861
|
|
|
862 if (EQ (font_instance, Vthe_null_font_instance))
|
|
|
863 {
|
|
|
864 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
865 data->font_is_bogus = 1;
|
|
|
866 }
|
|
|
867 else
|
|
|
868 data->font_is_bogus = 0;
|
|
|
869
|
|
|
870 fi = XFONT_INSTANCE (font_instance);
|
|
|
871 if (!fi->proportional_p)
|
|
|
872 /* sweetness and light. */
|
|
|
873 data->last_char_width = fi->width;
|
|
|
874 else
|
|
|
875 data->last_char_width = -1;
|
|
2
|
876 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
|
|
0
|
877 data->new_descent = max (data->new_descent, (int) fi->descent);
|
|
|
878 }
|
|
|
879
|
|
|
880 width = data->last_char_width;
|
|
|
881 if (width < 0)
|
|
|
882 {
|
|
|
883 /* bummer. Proportional fonts. */
|
|
|
884 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
|
|
|
885 data->findex,
|
|
|
886 &data->ch, 1);
|
|
|
887 }
|
|
|
888 }
|
|
|
889
|
|
|
890 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
|
|
|
891 {
|
|
|
892 return ADD_FAILED;
|
|
|
893 }
|
|
|
894
|
|
|
895 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
|
|
|
896 {
|
|
|
897 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
|
|
|
898 local = 0;
|
|
|
899 }
|
|
|
900 else
|
|
|
901 {
|
|
|
902 crb = &rb;
|
|
|
903 local = 1;
|
|
|
904 }
|
|
|
905
|
|
|
906 crb->findex = data->findex;
|
|
|
907 crb->xpos = data->pixpos;
|
|
|
908 crb->width = width;
|
|
|
909 if (data->bi_bufpos)
|
|
|
910 {
|
|
|
911 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
912 crb->bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
|
|
|
913 }
|
|
|
914 else if (data->is_modeline)
|
|
|
915 crb->bufpos = data->modeline_charpos;
|
|
|
916 else
|
|
|
917 /* fuckme if this shouldn't be an abort. */
|
|
|
918 /* abort (); fuckme harder, this abort gets tripped quite often,
|
|
|
919 in propagation and whatnot. #### fixme */
|
|
|
920 crb->bufpos = 0;
|
|
|
921 crb->type = RUNE_CHAR;
|
|
|
922 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
|
|
|
923 crb->endpos = 0;
|
|
|
924
|
|
|
925 if (data->cursor_type == CURSOR_ON)
|
|
|
926 {
|
|
|
927 if (data->bi_bufpos == data->bi_cursor_bufpos)
|
|
|
928 {
|
|
|
929 crb->cursor_type = CURSOR_ON;
|
|
|
930 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
931 }
|
|
|
932 else
|
|
|
933 crb->cursor_type = CURSOR_OFF;
|
|
|
934 }
|
|
|
935 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
936 {
|
|
|
937 crb->cursor_type = CURSOR_ON;
|
|
|
938 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
939 data->cursor_type = NO_CURSOR;
|
|
|
940 }
|
|
|
941 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
942 crb->cursor_type = IGNORE_CURSOR;
|
|
|
943 else
|
|
|
944 crb->cursor_type = CURSOR_OFF;
|
|
|
945
|
|
|
946 if (local)
|
|
|
947 Dynarr_add (data->db->runes, *crb);
|
|
|
948 else
|
|
|
949 Dynarr_increment (data->db->runes);
|
|
|
950
|
|
|
951 data->pixpos += width;
|
|
|
952
|
|
|
953 return NULL;
|
|
|
954 }
|
|
|
955
|
|
|
956 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
|
|
|
957 for each character in the string. Propagate any left-over data
|
|
|
958 unless NO_PROP is non-zero. */
|
|
|
959
|
|
|
960 static prop_block_dynarr *
|
|
|
961 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
|
|
|
962 Bytecount c_length, int no_prop)
|
|
|
963 {
|
|
|
964 Bufbyte *pos, *end = c_string + c_length;
|
|
|
965 prop_block_dynarr *prop;
|
|
|
966
|
|
|
967 /* #### This function is too simplistic. It needs to do the same
|
|
|
968 sort of character interpretation (display-table lookup,
|
|
|
969 ctl-arrow checking), etc. that create_text_block() does.
|
|
|
970 The functionality to do this in that routine needs to be
|
|
|
971 modularized. */
|
|
|
972
|
|
|
973 for (pos = c_string; pos < end;)
|
|
|
974 {
|
|
|
975 data->ch = charptr_emchar (pos);
|
|
|
976
|
|
|
977 prop = add_emchar_rune (data);
|
|
|
978
|
|
|
979 if (prop)
|
|
|
980 {
|
|
|
981 if (no_prop)
|
|
|
982 return ADD_FAILED;
|
|
|
983 else
|
|
|
984 {
|
|
|
985 struct prop_block pb;
|
|
|
986 Bytecount len = end - pos;
|
|
|
987 prop = Dynarr_new (struct prop_block);
|
|
|
988
|
|
|
989 pb.type = PROP_STRING;
|
|
|
990 pb.data.p_string.str =
|
|
|
991 (Bufbyte *) xmalloc (sizeof (Bufbyte) * len);
|
|
|
992 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
|
|
|
993 pb.data.p_string.len = len;
|
|
|
994
|
|
|
995 Dynarr_add (prop, pb);
|
|
|
996 return prop;
|
|
|
997 }
|
|
|
998 }
|
|
|
999 INC_CHARPTR (pos);
|
|
|
1000 assert (pos <= end);
|
|
|
1001 }
|
|
|
1002
|
|
|
1003 return NULL;
|
|
|
1004 }
|
|
|
1005
|
|
|
1006 /* Add a single rune of the specified width. The area covered by this
|
|
|
1007 rune will be displayed in the foreground color of the associated
|
|
|
1008 face. */
|
|
|
1009
|
|
|
1010 static prop_block_dynarr *
|
|
|
1011 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
|
|
|
1012 {
|
|
|
1013 struct rune rb;
|
|
|
1014
|
|
|
1015 /* If data->start_col is not 0 then this call to add_blank_rune must have
|
|
|
1016 been to add it as a tab. */
|
|
|
1017 if (data->start_col)
|
|
|
1018 {
|
|
|
1019 /* assert (w != NULL) */
|
|
|
1020 prop_block_dynarr *retval;
|
|
|
1021
|
|
|
1022 /* If we have still not fully scrolled horizontally, subtract
|
|
|
1023 the width of this tab and return. */
|
|
|
1024 if (char_tab_width < data->start_col)
|
|
|
1025 {
|
|
|
1026 data->start_col -= char_tab_width;
|
|
|
1027 return NULL;
|
|
|
1028 }
|
|
|
1029 else if (char_tab_width == data->start_col)
|
|
|
1030 data->blank_width = 0;
|
|
|
1031 else
|
|
|
1032 {
|
|
|
1033 int spcwid = space_width (w);
|
|
|
1034
|
|
|
1035 if (spcwid >= data->blank_width)
|
|
|
1036 data->blank_width = 0;
|
|
|
1037 else
|
|
|
1038 data->blank_width -= spcwid;
|
|
|
1039 }
|
|
|
1040
|
|
|
1041 data->start_col = 0;
|
|
|
1042 retval = add_hscroll_rune (data);
|
|
|
1043
|
|
|
1044 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1045 if (retval != NULL || !data->blank_width)
|
|
|
1046 return retval;
|
|
|
1047 }
|
|
|
1048
|
|
|
1049 /* Blank runes are always calculated to fit. */
|
|
|
1050 assert (data->pixpos + data->blank_width <= data->max_pixpos);
|
|
|
1051
|
|
|
1052 rb.findex = data->findex;
|
|
|
1053 rb.xpos = data->pixpos;
|
|
|
1054 rb.width = data->blank_width;
|
|
|
1055 if (data->bi_bufpos)
|
|
|
1056 {
|
|
|
1057 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1058 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
|
|
|
1059 }
|
|
|
1060 else
|
|
|
1061 /* #### and this is really correct too? */
|
|
|
1062 rb.bufpos = 0;
|
|
|
1063 rb.endpos = 0;
|
|
|
1064 rb.type = RUNE_BLANK;
|
|
|
1065
|
|
|
1066 if (data->cursor_type == CURSOR_ON)
|
|
|
1067 {
|
|
|
1068 if (data->bi_bufpos == data->bi_cursor_bufpos)
|
|
|
1069 {
|
|
|
1070 rb.cursor_type = CURSOR_ON;
|
|
|
1071 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1072 }
|
|
|
1073 else
|
|
|
1074 rb.cursor_type = CURSOR_OFF;
|
|
|
1075 }
|
|
|
1076 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1077 {
|
|
|
1078 rb.cursor_type = CURSOR_ON;
|
|
|
1079 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1080 data->cursor_type = NO_CURSOR;
|
|
|
1081 }
|
|
|
1082 else
|
|
|
1083 rb.cursor_type = CURSOR_OFF;
|
|
|
1084
|
|
|
1085 Dynarr_add (data->db->runes, rb);
|
|
|
1086 data->pixpos += data->blank_width;
|
|
|
1087
|
|
|
1088 return NULL;
|
|
|
1089 }
|
|
|
1090
|
|
|
1091 /* Add runes representing a character in octal. */
|
|
|
1092
|
|
|
1093 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
|
|
|
1094 { \
|
|
|
1095 if (add_failed || (add_failed = add_emchar_rune (data))) \
|
|
|
1096 { \
|
|
|
1097 struct prop_block pb; \
|
|
|
1098 if (!prop) \
|
|
|
1099 prop = Dynarr_new (struct prop_block); \
|
|
|
1100 \
|
|
|
1101 pb.type = PROP_CHAR; \
|
|
|
1102 pb.data.p_char.ch = data->ch; \
|
|
|
1103 pb.data.p_char.cursor_type = data->cursor_type; \
|
|
|
1104 Dynarr_add (prop, pb); \
|
|
|
1105 } \
|
|
|
1106 } while (0)
|
|
|
1107
|
|
|
1108 static prop_block_dynarr *
|
|
|
1109 add_octal_runes (pos_data *data)
|
|
|
1110 {
|
|
|
1111 prop_block_dynarr *prop, *add_failed;
|
|
|
1112 Emchar orig_char = data->ch;
|
|
|
1113 unsigned int orig_cursor_type = data->cursor_type;
|
|
|
1114
|
|
|
1115 /* Initialize */
|
|
|
1116 prop = NULL;
|
|
|
1117 add_failed = NULL;
|
|
|
1118
|
|
|
1119 if (data->start_col)
|
|
|
1120 data->start_col--;
|
|
|
1121
|
|
|
1122 if (!data->start_col)
|
|
|
1123 {
|
|
|
1124 if (data->bi_start_col_enabled)
|
|
|
1125 {
|
|
|
1126 add_failed = add_hscroll_rune (data);
|
|
|
1127 }
|
|
|
1128 else
|
|
|
1129 {
|
|
|
1130 struct glyph_block gb;
|
|
|
1131 struct window *w = XWINDOW (data->window);
|
|
|
1132
|
|
|
1133 gb.extent = Qnil;
|
|
|
1134 gb.glyph = Voctal_escape_glyph;
|
|
|
1135 add_failed =
|
|
|
1136 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1137 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
|
|
|
1138 }
|
|
|
1139 }
|
|
|
1140
|
|
|
1141 /* We only propagate information if the glyph was partially
|
|
|
1142 added. */
|
|
|
1143 if (add_failed)
|
|
|
1144 return add_failed;
|
|
|
1145
|
|
|
1146 data->cursor_type = IGNORE_CURSOR;
|
|
|
1147
|
|
|
1148 if (data->ch >= 0x100)
|
|
|
1149 {
|
|
|
1150 /* If the character is an extended Mule character, it could have
|
|
|
1151 up to 19 bits. For the moment, we treat it as a seven-digit
|
|
|
1152 octal number. This is not that pretty, but whatever. */
|
|
|
1153 data->ch = (7 & (orig_char >> 18)) + '0';
|
|
|
1154 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1155
|
|
|
1156 data->ch = (7 & (orig_char >> 15)) + '0';
|
|
|
1157 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1158
|
|
|
1159 data->ch = (7 & (orig_char >> 12)) + '0';
|
|
|
1160 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1161
|
|
|
1162 data->ch = (7 & (orig_char >> 9)) + '0';
|
|
|
1163 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1164 }
|
|
|
1165
|
|
|
1166 data->ch = (7 & (orig_char >> 6)) + '0';
|
|
|
1167 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1168
|
|
|
1169 data->ch = (7 & (orig_char >> 3)) + '0';
|
|
|
1170 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1171
|
|
|
1172 data->ch = (7 & orig_char) + '0';
|
|
|
1173 ADD_NEXT_OCTAL_RUNE_CHAR;
|
|
|
1174
|
|
|
1175 data->cursor_type = orig_cursor_type;
|
|
|
1176 return prop;
|
|
|
1177 }
|
|
|
1178
|
|
|
1179 #undef ADD_NEXT_OCTAL_RUNE_CHAR
|
|
|
1180
|
|
|
1181 /* Add runes representing a control character to a display block. */
|
|
|
1182
|
|
|
1183 static prop_block_dynarr *
|
|
|
1184 add_control_char_runes (pos_data *data, struct buffer *b)
|
|
|
1185 {
|
|
|
1186 if (!NILP (b->ctl_arrow))
|
|
|
1187 {
|
|
|
1188 prop_block_dynarr *prop;
|
|
|
1189 Emchar orig_char = data->ch;
|
|
|
1190 unsigned int old_cursor_type = data->cursor_type;
|
|
|
1191
|
|
|
1192 /* Initialize */
|
|
|
1193 prop = NULL;
|
|
|
1194
|
|
|
1195 if (data->start_col)
|
|
|
1196 data->start_col--;
|
|
|
1197
|
|
|
1198 if (!data->start_col)
|
|
|
1199 {
|
|
|
1200 if (data->bi_start_col_enabled)
|
|
|
1201 {
|
|
|
1202 prop_block_dynarr *retval;
|
|
|
1203
|
|
|
1204 retval = add_hscroll_rune (data);
|
|
|
1205 if (retval)
|
|
|
1206 return retval;
|
|
|
1207 }
|
|
|
1208 else
|
|
|
1209 {
|
|
|
1210 struct glyph_block gb;
|
|
|
1211 struct window *w = XWINDOW (data->window);
|
|
|
1212
|
|
|
1213 gb.extent = Qnil;
|
|
|
1214 gb.glyph = Vcontrol_arrow_glyph;
|
|
|
1215
|
|
|
1216 /* We only propagate information if the glyph was partially
|
|
|
1217 added. */
|
|
|
1218 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
|
|
|
1219 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
|
|
|
1220 return ADD_FAILED;
|
|
|
1221 }
|
|
|
1222 }
|
|
|
1223
|
|
|
1224 if (orig_char == 0177)
|
|
|
1225 data->ch = '?';
|
|
|
1226 else
|
|
|
1227 data->ch = orig_char ^ 0100;
|
|
|
1228 data->cursor_type = IGNORE_CURSOR;
|
|
|
1229
|
|
|
1230 if (add_emchar_rune (data))
|
|
|
1231 {
|
|
|
1232 struct prop_block pb;
|
|
|
1233 if (!prop)
|
|
|
1234 prop = Dynarr_new (struct prop_block);
|
|
|
1235
|
|
|
1236 pb.type = PROP_CHAR;
|
|
|
1237 pb.data.p_char.ch = data->ch;
|
|
|
1238 pb.data.p_char.cursor_type = data->cursor_type;
|
|
|
1239 Dynarr_add (prop, pb);
|
|
|
1240 }
|
|
|
1241
|
|
|
1242 data->cursor_type = old_cursor_type;
|
|
|
1243 return prop;
|
|
|
1244 }
|
|
|
1245 else
|
|
|
1246 {
|
|
|
1247 return add_octal_runes (data);
|
|
|
1248 }
|
|
|
1249 }
|
|
|
1250
|
|
|
1251 /* Given a display table entry, call the appropriate functions to
|
|
|
1252 display each element of the entry. */
|
|
|
1253
|
|
|
1254 static prop_block_dynarr *
|
|
|
1255 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
|
|
|
1256 {
|
|
|
1257 prop_block_dynarr *prop = NULL;
|
|
|
1258
|
|
|
1259 if (VECTORP (entry))
|
|
|
1260 {
|
|
|
1261 struct Lisp_Vector *de = XVECTOR (entry);
|
|
|
1262 long len = vector_length (de);
|
|
|
1263 int elt;
|
|
|
1264
|
|
|
1265 for (elt = 0; elt < len; elt++)
|
|
|
1266 {
|
|
|
1267 if (NILP (de->contents[elt]))
|
|
|
1268 continue;
|
|
|
1269 else if (STRINGP (de->contents[elt]))
|
|
|
1270 {
|
|
|
1271 prop =
|
|
|
1272 add_bufbyte_string_runes
|
|
|
1273 (data,
|
|
16
|
1274 XSTRING_DATA (de->contents[elt]),
|
|
|
1275 XSTRING_LENGTH (de->contents[elt]),
|
|
0
|
1276 0);
|
|
|
1277 }
|
|
|
1278 else if (GLYPHP (de->contents[elt]))
|
|
|
1279 {
|
|
|
1280 if (data->start_col)
|
|
|
1281 data->start_col--;
|
|
|
1282
|
|
|
1283 if (!data->start_col && data->bi_start_col_enabled)
|
|
|
1284 {
|
|
|
1285 prop = add_hscroll_rune (data);
|
|
|
1286 }
|
|
|
1287 else
|
|
|
1288 {
|
|
|
1289 struct glyph_block gb;
|
|
|
1290
|
|
|
1291 gb.glyph = de->contents[elt];
|
|
|
1292 gb.extent = Qnil;
|
|
|
1293 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1294 }
|
|
|
1295 }
|
|
|
1296 else if (CHAR_OR_CHAR_INTP (de->contents[elt]))
|
|
|
1297 {
|
|
|
1298 data->ch = XCHAR_OR_CHAR_INT (de->contents[elt]);
|
|
|
1299 prop = add_emchar_rune (data);
|
|
|
1300 }
|
|
|
1301 /* Else blow it off because someone added a bad entry and we
|
|
|
1302 don't have any safe way of signaling an error. */
|
|
|
1303
|
|
|
1304 /* #### Still need to add any remaining elements to the
|
|
|
1305 propagation information. */
|
|
|
1306 if (prop)
|
|
|
1307 return prop;
|
|
|
1308 }
|
|
|
1309 }
|
|
|
1310 else if (STRINGP (entry))
|
|
|
1311 {
|
|
|
1312 prop = add_bufbyte_string_runes (data,
|
|
16
|
1313 XSTRING_DATA (entry),
|
|
|
1314 XSTRING_LENGTH (entry),
|
|
0
|
1315 0);
|
|
|
1316 }
|
|
|
1317 else if (GLYPHP (entry))
|
|
|
1318 {
|
|
|
1319 if (data->start_col)
|
|
|
1320 data->start_col--;
|
|
|
1321
|
|
|
1322 if (!data->start_col && data->bi_start_col_enabled)
|
|
|
1323 {
|
|
|
1324 prop = add_hscroll_rune (data);
|
|
|
1325 }
|
|
|
1326 else
|
|
|
1327 {
|
|
|
1328 struct glyph_block gb;
|
|
|
1329
|
|
|
1330 gb.glyph = entry;
|
|
|
1331 gb.extent = Qnil;
|
|
|
1332 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
1333 }
|
|
|
1334 }
|
|
|
1335 else if (CHAR_OR_CHAR_INTP (entry))
|
|
|
1336 {
|
|
|
1337 data->ch = XCHAR_OR_CHAR_INT (entry);
|
|
|
1338 prop = add_emchar_rune (data);
|
|
|
1339 }
|
|
|
1340
|
|
|
1341 /* Else blow it off because someone added a bad entry and we don't
|
|
|
1342 have any safe way of signaling an error. Hey, this comment
|
|
|
1343 sounds familiar. */
|
|
|
1344 return prop;
|
|
|
1345 }
|
|
|
1346
|
|
|
1347 /* Add runes which were propagated from the previous line. */
|
|
|
1348
|
|
|
1349 static prop_block_dynarr *
|
|
|
1350 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
|
|
|
1351 {
|
|
|
1352 /* #### Remember to handle start_col parameter of data when the rest of
|
|
|
1353 this is finished. */
|
|
|
1354 /* #### Chuck -- I've redone this function a bit. It looked like the
|
|
|
1355 case of not all the propagation blocks being added was not handled
|
|
|
1356 well. */
|
|
|
1357 /* #### Chuck -- I also think the double indirection of PROP is kind
|
|
|
1358 of bogus. A cleaner solution is just to check for
|
|
|
1359 Dynarr_length (prop) > 0. */
|
|
|
1360 /* #### This function also doesn't even pay attention to ADD_FAILED!
|
|
|
1361 This is seriously fucked! Seven ####'s in 130 lines -- is that a
|
|
|
1362 record? */
|
|
|
1363 int elt;
|
|
|
1364 prop_block_dynarr *add_failed;
|
|
|
1365 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
|
|
|
1366 unsigned int old_cursor_type = data->cursor_type;
|
|
|
1367
|
|
|
1368 for (elt = 0; elt < Dynarr_length (*prop); elt++)
|
|
|
1369 {
|
|
|
1370 struct prop_block *pb = Dynarr_atp (*prop, elt);
|
|
|
1371
|
|
|
1372 switch (pb->type)
|
|
|
1373 {
|
|
|
1374 case PROP_CHAR:
|
|
|
1375 data->ch = pb->data.p_char.ch;
|
|
|
1376 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
|
|
|
1377 data->cursor_type = pb->data.p_char.cursor_type;
|
|
|
1378 add_failed = add_emchar_rune (data);
|
|
|
1379
|
|
|
1380 if (add_failed)
|
|
|
1381 goto oops_no_more_space;
|
|
|
1382 break;
|
|
|
1383 case PROP_STRING:
|
|
|
1384 if (pb->data.p_string.str)
|
|
|
1385 xfree (pb->data.p_string.str);
|
|
|
1386 /* #### bogus bogus -- this doesn't do anything!
|
|
|
1387 Should probably call add_bufbyte_string_runes(),
|
|
|
1388 once that function is fixed. */
|
|
|
1389 break;
|
|
|
1390 case PROP_MINIBUF_PROMPT:
|
|
|
1391 {
|
|
|
1392 face_index old_findex = data->findex;
|
|
|
1393 Bytind bi_old_bufpos = data->bi_bufpos;
|
|
|
1394
|
|
|
1395 data->findex = DEFAULT_INDEX;
|
|
|
1396 data->bi_bufpos = 0;
|
|
|
1397 data->cursor_type = NO_CURSOR;
|
|
|
1398
|
|
|
1399 while (pb->data.p_string.len > 0)
|
|
|
1400 {
|
|
|
1401 data->ch = charptr_emchar (pb->data.p_string.str);
|
|
|
1402 add_failed = add_emchar_rune (data);
|
|
|
1403
|
|
|
1404 if (add_failed)
|
|
|
1405 {
|
|
|
1406 data->findex = old_findex;
|
|
|
1407 data->bi_bufpos = bi_old_bufpos;
|
|
|
1408 goto oops_no_more_space;
|
|
|
1409 }
|
|
|
1410 else
|
|
|
1411 {
|
|
|
1412 /* Complicated equivalent of ptr++, len-- */
|
|
|
1413 Bufbyte *oldpos = pb->data.p_string.str;
|
|
|
1414 INC_CHARPTR (pb->data.p_string.str);
|
|
|
1415 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
|
|
|
1416 }
|
|
|
1417 }
|
|
|
1418
|
|
|
1419 data->findex = old_findex;
|
|
|
1420 /* ##### FIXME FIXME FIXME -- Upon successful return from
|
|
|
1421 this function, data->bi_bufpos is automatically incremented.
|
|
|
1422 However, we don't want that to happen if we were adding
|
|
|
1423 the minibuffer prompt. */
|
|
|
1424 {
|
|
|
1425 struct buffer *buf =
|
|
|
1426 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
|
|
|
1427 /* #### Chuck fix this shit or I'm gonna scream! */
|
|
|
1428 if (bi_old_bufpos > BI_BUF_BEGV (buf))
|
|
|
1429 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
|
|
|
1430 else
|
|
|
1431 /* #### is this correct? Does anyone know?
|
|
|
1432 Does anyone care? Is this a cheesy hack or what? */
|
|
|
1433 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
|
|
|
1434 }
|
|
|
1435 }
|
|
|
1436 break;
|
|
|
1437 case PROP_BLANK:
|
|
|
1438 {
|
|
|
1439 /* #### I think it's unnecessary and misleading to preserve
|
|
|
1440 the blank_width, as it implies that the value carries
|
|
|
1441 over from one rune to the next, which is wrong. */
|
|
|
1442 int old_width = data->blank_width;
|
|
|
1443 face_index old_findex = data->findex;
|
|
|
1444
|
|
|
1445 data->findex = pb->data.p_blank.findex;
|
|
|
1446 data->blank_width = pb->data.p_blank.width;
|
|
|
1447 data->bi_cursor_bufpos = 0;
|
|
|
1448 data->cursor_type = IGNORE_CURSOR;
|
|
|
1449
|
|
|
1450 if (data->pixpos + data->blank_width > data->max_pixpos)
|
|
|
1451 data->blank_width = data->max_pixpos - data->pixpos;
|
|
|
1452
|
|
|
1453 /* We pass a bogus value of char_tab_width. It shouldn't
|
|
|
1454 matter because unless something is really screwed up
|
|
|
1455 this call won't cause that arg to be used. */
|
|
|
1456 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
|
|
|
1457
|
|
|
1458 /* This can happen in the case where we have a tab which
|
|
|
1459 is wider than the window. */
|
|
|
1460 if (data->blank_width != pb->data.p_blank.width)
|
|
|
1461 {
|
|
|
1462 pb->data.p_blank.width -= data->blank_width;
|
|
|
1463 add_failed = ADD_FAILED;
|
|
|
1464 }
|
|
|
1465
|
|
|
1466 data->findex = old_findex;
|
|
|
1467 data->blank_width = old_width;
|
|
|
1468
|
|
|
1469 if (add_failed)
|
|
|
1470 goto oops_no_more_space;
|
|
|
1471 }
|
|
|
1472 break;
|
|
|
1473 default:
|
|
|
1474 abort ();
|
|
|
1475 }
|
|
|
1476 }
|
|
|
1477
|
|
|
1478 oops_no_more_space:
|
|
|
1479
|
|
|
1480 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
|
|
|
1481 data->cursor_type = old_cursor_type;
|
|
|
1482 if (elt < Dynarr_length (*prop))
|
|
|
1483 {
|
|
|
1484 Dynarr_delete_many (*prop, 0, elt);
|
|
|
1485 return *prop;
|
|
|
1486 }
|
|
|
1487 else
|
|
|
1488 {
|
|
|
1489 Dynarr_free (*prop);
|
|
|
1490 return NULL;
|
|
|
1491 }
|
|
|
1492 }
|
|
|
1493
|
|
|
1494 /* Add 'text layout glyphs at position POS_TYPE that are contained to
|
|
|
1495 the display block, but add all other types to the appropriate list
|
|
|
1496 of the display line. They will be added later by different
|
|
|
1497 routines. */
|
|
|
1498
|
|
|
1499 static prop_block_dynarr *
|
|
|
1500 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
|
|
|
1501 int allow_cursor, struct glyph_cachel *cachel)
|
|
|
1502 {
|
|
|
1503 struct window *w = XWINDOW (data->window);
|
|
|
1504
|
|
|
1505 /* A nil extent indicates a special glyph (ex. truncator). */
|
|
|
1506 if (NILP (gb->extent)
|
|
|
1507 || (pos_type == BEGIN_GLYPHS &&
|
|
|
1508 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
|
|
|
1509 || (pos_type == END_GLYPHS &&
|
|
|
1510 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
|
|
|
1511 {
|
|
|
1512 struct rune rb;
|
|
|
1513 int width;
|
|
|
1514 int xoffset = 0;
|
|
|
1515 int ascent, descent;
|
|
|
1516 Lisp_Object baseline;
|
|
|
1517 Lisp_Object face;
|
|
|
1518
|
|
|
1519 if (cachel)
|
|
|
1520 width = cachel->width;
|
|
|
1521 else
|
|
|
1522 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
|
|
|
1523
|
|
|
1524 if (!width)
|
|
|
1525 return NULL;
|
|
|
1526
|
|
|
1527 if (data->start_col)
|
|
|
1528 {
|
|
|
1529 prop_block_dynarr *retval;
|
|
|
1530 int glyph_char_width = width / space_width (w);
|
|
|
1531
|
|
|
1532 /* If we still have not fully scrolled horizontally after
|
|
|
1533 taking into account the width of the glyph, subtract its
|
|
|
1534 width and return. */
|
|
|
1535 if (glyph_char_width < data->start_col)
|
|
|
1536 {
|
|
|
1537 data->start_col -= glyph_char_width;
|
|
|
1538 return NULL;
|
|
|
1539 }
|
|
|
1540 else if (glyph_char_width == data->start_col)
|
|
|
1541 width = 0;
|
|
|
1542 else
|
|
|
1543 {
|
|
|
1544 xoffset = space_width (w) * data->start_col;
|
|
|
1545 width -= xoffset;
|
|
|
1546
|
|
|
1547 /* #### Can this happen? */
|
|
|
1548 if (width < 0)
|
|
|
1549 width = 0;
|
|
|
1550 }
|
|
|
1551
|
|
|
1552 data->start_col = 0;
|
|
|
1553 retval = add_hscroll_rune (data);
|
|
|
1554
|
|
|
1555 /* Could be caused by the handling of the hscroll rune. */
|
|
|
1556 if (retval != NULL || !width)
|
|
|
1557 return retval;
|
|
|
1558 }
|
|
|
1559 else
|
|
|
1560 xoffset = 0;
|
|
|
1561
|
|
|
1562 if (data->pixpos + width > data->max_pixpos)
|
|
|
1563 {
|
|
|
1564 /* If this is the first object we are attempting to add to
|
|
|
1565 the line then we ignore the horizontal_clip threshold.
|
|
|
1566 Otherwise we will loop until the bottom of the window
|
|
|
1567 continually failing to add this glyph because it is wider
|
|
|
1568 than the window. We could alternatively just completely
|
|
|
1569 ignore the glyph and proceed from there but I think that
|
|
|
1570 this is a better solution. */
|
|
|
1571 if (Dynarr_length (data->db->runes)
|
|
|
1572 && data->max_pixpos - data->pixpos < horizontal_clip)
|
|
|
1573 return ADD_FAILED;
|
|
|
1574 else
|
|
|
1575 width = data->max_pixpos - data->pixpos;
|
|
|
1576 }
|
|
|
1577
|
|
|
1578 if (cachel)
|
|
|
1579 {
|
|
|
1580 ascent = cachel->ascent;
|
|
|
1581 descent = cachel->descent;
|
|
|
1582 }
|
|
|
1583 else
|
|
|
1584 {
|
|
|
1585 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
|
|
|
1586 descent = glyph_descent (gb->glyph, Qnil, data->findex,
|
|
|
1587 data->window);
|
|
|
1588 }
|
|
|
1589
|
|
|
1590 baseline = glyph_baseline (gb->glyph, data->window);
|
|
|
1591
|
|
|
1592 if (glyph_contrib_p (gb->glyph, data->window))
|
|
|
1593 {
|
|
|
1594 /* A pixmap that has not had a baseline explicitly set. Its
|
|
|
1595 contribution will be determined later. */
|
|
|
1596 if (NILP (baseline))
|
|
|
1597 {
|
|
|
1598 int height = ascent + descent;
|
|
|
1599 data->max_pixmap_height = max (data->max_pixmap_height, height);
|
|
|
1600 }
|
|
|
1601
|
|
|
1602 /* A string so determine contribution normally. */
|
|
|
1603 else if (EQ (baseline, Qt))
|
|
|
1604 {
|
|
|
1605 data->new_ascent = max (data->new_ascent, ascent);
|
|
|
1606 data->new_descent = max (data->new_descent, descent);
|
|
|
1607 }
|
|
|
1608
|
|
|
1609 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
1610 contribution here. */
|
|
|
1611 else if (INTP (baseline))
|
|
|
1612 {
|
|
|
1613 int height = ascent + descent;
|
|
|
1614 int pix_ascent, pix_descent;
|
|
|
1615
|
|
|
1616 pix_ascent = height * XINT (baseline) / 100;
|
|
|
1617 pix_descent = height - pix_ascent;
|
|
|
1618
|
|
|
1619 data->new_ascent = max (data->new_ascent, pix_ascent);
|
|
|
1620 data->new_descent = max (data->new_descent, pix_descent);
|
|
|
1621 }
|
|
|
1622
|
|
|
1623 /* Otherwise something is screwed up. */
|
|
|
1624 else
|
|
|
1625 abort ();
|
|
|
1626 }
|
|
|
1627
|
|
|
1628 face = glyph_face (gb->glyph, data->window);
|
|
|
1629 if (NILP (face))
|
|
|
1630 rb.findex = data->findex;
|
|
|
1631 else
|
|
|
1632 rb.findex = get_builtin_face_cache_index (w, face);
|
|
|
1633
|
|
|
1634 rb.xpos = data->pixpos;
|
|
|
1635 rb.width = width;
|
|
|
1636 rb.bufpos = 0; /* glyphs are never "at" anywhere */
|
|
|
1637 if (data->bi_endpos)
|
|
|
1638 {
|
|
|
1639 /* #### is this necessary at all? */
|
|
|
1640 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
1641 rb.endpos = bytind_to_bufpos (buf, data->bi_endpos);
|
|
|
1642 }
|
|
|
1643 else
|
|
|
1644 rb.endpos = 0;
|
|
|
1645 rb.type = RUNE_DGLYPH;
|
|
|
1646 /* #### Ben sez: this is way bogus if the glyph is a string.
|
|
|
1647 You should not make the output routines have to cope with
|
|
|
1648 this. The string could contain Mule characters, or non-
|
|
|
1649 printable characters, or characters to be passed through
|
|
|
1650 the display table, or non-character objects (when this gets
|
|
|
1651 implemented), etc. Instead, this routine here should parse
|
|
|
1652 the string into a series of runes. */
|
|
|
1653 rb.object.dglyph.glyph = gb->glyph;
|
|
|
1654 rb.object.dglyph.extent = gb->extent;
|
|
|
1655 rb.object.dglyph.xoffset = xoffset;
|
|
|
1656
|
|
|
1657 if (allow_cursor)
|
|
|
1658 {
|
|
|
1659 {
|
|
|
1660 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
1661 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
|
|
|
1662 }
|
|
|
1663
|
|
|
1664 if (data->cursor_type == CURSOR_ON)
|
|
|
1665 {
|
|
|
1666 if (data->bi_bufpos == data->bi_cursor_bufpos)
|
|
|
1667 {
|
|
|
1668 rb.cursor_type = CURSOR_ON;
|
|
|
1669 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1670 }
|
|
|
1671 else
|
|
|
1672 rb.cursor_type = CURSOR_OFF;
|
|
|
1673 }
|
|
|
1674 else if (data->cursor_type == NEXT_CURSOR)
|
|
|
1675 {
|
|
|
1676 rb.cursor_type = CURSOR_ON;
|
|
|
1677 data->cursor_x = Dynarr_length (data->db->runes);
|
|
|
1678 data->cursor_type = NO_CURSOR;
|
|
|
1679 }
|
|
|
1680 else if (data->cursor_type == IGNORE_CURSOR)
|
|
|
1681 rb.cursor_type = IGNORE_CURSOR;
|
|
|
1682 else if (data->cursor_type == NO_CURSOR)
|
|
|
1683 rb.cursor_type = NO_CURSOR;
|
|
|
1684 else
|
|
|
1685 rb.cursor_type = CURSOR_OFF;
|
|
|
1686 }
|
|
|
1687 else
|
|
|
1688 rb.cursor_type = CURSOR_OFF;
|
|
|
1689
|
|
|
1690 Dynarr_add (data->db->runes, rb);
|
|
|
1691 data->pixpos += width;
|
|
|
1692
|
|
|
1693 return NULL;
|
|
|
1694 }
|
|
|
1695 else
|
|
|
1696 {
|
|
|
1697 if (!NILP (glyph_face (gb->glyph, data->window)))
|
|
|
1698 gb->findex =
|
|
|
1699 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
|
|
|
1700 data->window));
|
|
|
1701 else
|
|
|
1702 gb->findex = data->findex;
|
|
|
1703
|
|
|
1704 if (pos_type == BEGIN_GLYPHS)
|
|
|
1705 {
|
|
|
1706 if (!data->dl->left_glyphs)
|
|
|
1707 data->dl->left_glyphs = Dynarr_new (struct glyph_block);
|
|
|
1708 Dynarr_add (data->dl->left_glyphs, *gb);
|
|
|
1709 return NULL;
|
|
|
1710 }
|
|
|
1711 else if (pos_type == END_GLYPHS)
|
|
|
1712 {
|
|
|
1713 if (!data->dl->right_glyphs)
|
|
|
1714 data->dl->right_glyphs = Dynarr_new (struct glyph_block);
|
|
|
1715 Dynarr_add (data->dl->right_glyphs, *gb);
|
|
|
1716 return NULL;
|
|
|
1717 }
|
|
|
1718 else
|
|
|
1719 abort (); /* there are no unknown types */
|
|
|
1720 }
|
|
|
1721
|
|
|
1722 return NULL; /* shut up compiler */
|
|
|
1723 }
|
|
|
1724
|
|
|
1725 /* Add all glyphs at position POS_TYPE that are contained in the given
|
|
|
1726 data. */
|
|
|
1727
|
|
|
1728 static prop_block_dynarr *
|
|
|
1729 add_glyph_runes (pos_data *data, int pos_type)
|
|
|
1730 {
|
|
|
1731 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
|
|
|
1732 why didn't you just modify add_glyph_rune in the first place? */
|
|
|
1733 int elt;
|
|
|
1734 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
|
|
|
1735 ? data->ef->begin_glyphs
|
|
|
1736 : data->ef->end_glyphs);
|
|
|
1737 prop_block_dynarr *prop;
|
|
|
1738
|
|
|
1739 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
|
|
|
1740 {
|
|
|
1741 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
|
|
|
1742 0);
|
|
|
1743
|
|
|
1744 if (prop)
|
|
|
1745 {
|
|
|
1746 /* #### Add some propagation information. */
|
|
|
1747 return prop;
|
|
|
1748 }
|
|
|
1749 }
|
|
|
1750
|
|
|
1751 Dynarr_reset (glyph_arr);
|
|
|
1752
|
|
|
1753 return NULL;
|
|
|
1754 }
|
|
|
1755
|
|
|
1756 /* Given a position for a buffer in a window, ensure that the given
|
|
|
1757 display line DL accurately represents the text on a line starting
|
|
|
1758 at the given position.
|
|
|
1759
|
|
|
1760 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
|
|
|
1761 You must do appropriate conversion. */
|
|
|
1762
|
|
|
1763 static Bytind
|
|
|
1764 create_text_block (struct window *w, struct display_line *dl,
|
|
|
1765 Bytind bi_start_pos, int start_col,
|
|
|
1766 prop_block_dynarr **prop, int type)
|
|
|
1767 {
|
|
|
1768 struct frame *f = XFRAME (w->frame);
|
|
|
1769 struct buffer *b = XBUFFER (w->buffer);
|
|
|
1770 struct device *d = XDEVICE (f->device);
|
|
|
1771
|
|
|
1772 pos_data data;
|
|
|
1773 struct Lisp_Vector *dt = 0;
|
|
|
1774
|
|
|
1775 /* Don't display anything in the minibuffer if this window is not on
|
|
|
1776 a selected frame. We consider all other windows to be active
|
|
|
1777 minibuffers as it simplifies the coding. */
|
|
|
1778 int active_minibuffer = (!MINI_WINDOW_P (w) ||
|
|
|
1779 (f == device_selected_frame (d)) ||
|
|
|
1780 is_surrogate_for_selected_frame (f));
|
|
|
1781
|
|
|
1782 int truncate_win = window_truncation_on (w);
|
|
|
1783 int end_glyph_width;
|
|
|
1784
|
|
|
1785 /* If the buffer's value of selective_display is an integer then
|
|
|
1786 only lines that start with less than selective_display columns of
|
|
|
1787 space will be displayed. If selective_display is t then all text
|
|
|
1788 after a ^M is invisible. */
|
|
|
1789 int selective = (INTP (b->selective_display)
|
|
|
1790 ? XINT (b->selective_display)
|
|
|
1791 : ((!NILP (b->selective_display) ? -1 : 0)));
|
|
|
1792
|
|
|
1793 /* The variable ctl-arrow allows the user to specify what characters
|
|
|
1794 can actually be displayed and which octal should be used for.
|
|
|
1795 #### This variable should probably have some rethought done to
|
|
|
1796 it.
|
|
|
1797
|
|
|
1798 #### It would also be really nice if you could specify that
|
|
|
1799 the characters come out in hex instead of in octal. Mule
|
|
|
1800 does that by adding a ctl-hexa variable similar to ctl-arrow,
|
|
|
1801 but that's bogus -- we need a more general solution. I
|
|
|
1802 think you need to extend the concept of display tables
|
|
|
1803 into a more general conversion mechanism. Ideally you
|
|
|
1804 could specify a Lisp function that converts characters,
|
|
|
1805 but this violates the Second Golden Rule and besides would
|
|
|
1806 make things way way way way slow. An idea I like is to
|
|
|
1807 be able to specify multiple display tables instead of just
|
|
|
1808 one. Each display table can specify conversions for some
|
|
|
1809 characters and leave others unchanged. The way the
|
|
|
1810 character gets displayed is determined by the first display
|
|
|
1811 table with a binding for that character. This way, you
|
|
|
1812 could call a function `enable-hex-display' that adds a
|
|
|
1813 pre-defined hex display-table (or maybe computes one if
|
|
|
1814 you give weird parameters to the function) and adds it
|
|
|
1815 to the list of display tables for the current buffer.
|
|
|
1816
|
|
|
1817 Unfortunately there are still problems dealing with Mule
|
|
|
1818 characters. For example, maybe I want to specify that
|
|
|
1819 all extended characters (i.e. >= 256) are displayed in hex.
|
|
|
1820 It's not reasonable to create a mapping for all possible
|
|
|
1821 such characters, because there are about 2^19 of them.
|
|
|
1822 One way of dealing with this is to extend the concept
|
|
|
1823 of what a display table is. Currently it's only allowed
|
|
|
1824 to be a 256-entry vector. Instead, it should be something
|
|
|
1825 like:
|
|
|
1826
|
|
|
1827 a) A 256-entry vector, for backward compatibility
|
|
|
1828 b) Some sort of hashtable, mapping characters to values
|
|
|
1829 c) A list that specifies a range of values and the
|
|
|
1830 mapping to provide for those values.
|
|
|
1831
|
|
|
1832 Also, extend the concept of "mapping" to include a
|
|
|
1833 printf-like spec. Then, you could make all extended
|
|
|
1834 characters show up as hex with a display table like
|
|
|
1835
|
|
|
1836 ((256 . 524288) . "%x")
|
|
|
1837
|
|
|
1838 Since more than one display table is possible, you have
|
|
|
1839 great flexibility in mapping ranges of characters.
|
|
|
1840 */
|
|
|
1841 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
|
|
|
1842 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
|
|
|
1843 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
|
|
|
1844 ? 255 : 160));
|
|
|
1845
|
|
|
1846 /* The text display block for this display line. */
|
|
|
1847 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
1848
|
|
|
1849 /* The first time through the main loop we need to force the glyph
|
|
|
1850 data to be updated. */
|
|
|
1851 int initial = 1;
|
|
|
1852
|
|
|
1853 /* Apparently the new extent_fragment_update returns an end position
|
|
|
1854 equal to the position passed in if there are no more runs to be
|
|
|
1855 displayed. */
|
|
|
1856 int no_more_frags = 0;
|
|
|
1857
|
|
|
1858 Lisp_Object synch_minibuffers_value =
|
|
|
1859 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
|
|
|
1860
|
|
|
1861 dl->used_prop_data = 0;
|
|
|
1862 dl->num_chars = 0;
|
|
|
1863
|
|
|
1864 memset (&data, 0, sizeof (data));
|
|
|
1865 data.ef = extent_fragment_new (w->buffer, f);
|
|
|
1866
|
|
|
1867 /* These values are used by all of the rune addition routines. We add
|
|
|
1868 them to this structure for ease of passing. */
|
|
|
1869 data.d = d;
|
|
|
1870 XSETWINDOW (data.window, w);
|
|
|
1871 data.db = db;
|
|
|
1872 data.dl = dl;
|
|
|
1873
|
|
|
1874 data.bi_bufpos = bi_start_pos;
|
|
|
1875 data.pixpos = dl->bounds.left_in;
|
|
|
1876 data.last_charset = Qunbound;
|
|
|
1877 data.result_str = Qnil;
|
|
|
1878
|
|
|
1879 /* Set the right boundary adjusting it to take into account any end
|
|
|
1880 glyph. Save the width of the end glyph for later use. */
|
|
|
1881 data.max_pixpos = dl->bounds.right_in;
|
|
|
1882 if (truncate_win)
|
|
|
1883 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
|
|
|
1884 else
|
|
|
1885 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
|
|
|
1886 data.max_pixpos -= end_glyph_width;
|
|
|
1887
|
|
|
1888 if (cursor_in_echo_area)
|
|
|
1889 {
|
|
|
1890 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
1891 {
|
|
|
1892 data.bi_cursor_bufpos = BI_BUF_ZV (b);
|
|
|
1893 data.cursor_type = CURSOR_ON;
|
|
|
1894 }
|
|
|
1895 else
|
|
|
1896 data.cursor_type = NO_CURSOR;
|
|
|
1897 }
|
|
|
1898 else if (MINI_WINDOW_P (w) && !active_minibuffer)
|
|
|
1899 data.cursor_type = NO_CURSOR;
|
|
70
|
1900 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
|
|
0
|
1901 {
|
|
|
1902 data.bi_cursor_bufpos = BI_BUF_PT (b);
|
|
|
1903 data.cursor_type = CURSOR_ON;
|
|
|
1904 }
|
|
|
1905 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
|
|
|
1906 {
|
|
|
1907 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
|
|
|
1908 data.cursor_type = CURSOR_ON;
|
|
|
1909 }
|
|
|
1910 else
|
|
|
1911 data.cursor_type = NO_CURSOR;
|
|
|
1912 data.cursor_x = -1;
|
|
|
1913
|
|
|
1914 data.start_col = w->hscroll;
|
|
|
1915 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
|
|
|
1916
|
|
|
1917 /* We regenerate the line from the very beginning. */
|
|
|
1918 Dynarr_reset (db->runes);
|
|
|
1919
|
|
|
1920 /* Why is this less than or equal and not just less than? If the
|
|
|
1921 starting position is already equal to the maximum we can't add
|
|
|
1922 anything else, right? Wrong. We might still have a newline to
|
|
|
1923 add. A newline can use the room allocated for an end glyph since
|
|
|
1924 if we add it we know we aren't going to be adding any end
|
|
|
1925 glyph. */
|
|
|
1926
|
|
|
1927 /* #### Chuck -- I think this condition should be while (1).
|
|
|
1928 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
|
|
|
1929 and the begin-glyph ends exactly at the end of the window, the
|
|
|
1930 end-glyph and text might not be displayed. while (1) ensures
|
|
|
1931 that the loop terminates only when either (a) there is
|
|
|
1932 propagation data or (b) the end-of-line or end-of-buffer is hit.
|
|
|
1933
|
|
|
1934 #### Also I think you need to ensure that the operation
|
|
|
1935 "add begin glyphs; add end glyphs; add text" is atomic and
|
|
|
1936 can't get interrupted in the middle. If you run off the end
|
|
|
1937 of the line during that operation, then you keep accumulating
|
|
|
1938 propagation data until you're done. Otherwise, if the (e.g.)
|
|
|
1939 there's a begin glyph at a particular position and attempting
|
|
|
1940 to display that glyph results in window-end being hit and
|
|
|
1941 propagation data being generated, then the character at that
|
|
|
1942 position won't be displayed.
|
|
|
1943
|
|
|
1944 #### See also the comment after the end of this loop, below.
|
|
|
1945 */
|
|
|
1946 while (data.pixpos <= data.max_pixpos
|
|
|
1947 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
1948 {
|
|
|
1949 /* #### This check probably should not be necessary. */
|
|
|
1950 if (data.bi_bufpos > BI_BUF_ZV (b))
|
|
|
1951 {
|
|
|
1952 /* #### urk! More of this lossage! */
|
|
|
1953 data.bi_bufpos--;
|
|
|
1954 goto done;
|
|
|
1955 }
|
|
|
1956
|
|
|
1957 /* If selective display was an integer and we aren't working on
|
|
|
1958 a continuation line then find the next line we are actually
|
|
|
1959 supposed to display. */
|
|
|
1960 if (selective > 0
|
|
|
1961 && (data.bi_bufpos == BI_BUF_BEGV (b)
|
|
|
1962 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
|
|
|
1963 {
|
|
|
1964 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
|
|
|
1965 {
|
|
|
1966 data.bi_bufpos =
|
|
|
1967 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
|
|
|
1968 if (data.bi_bufpos >= BI_BUF_ZV (b))
|
|
|
1969 {
|
|
|
1970 data.bi_bufpos = BI_BUF_ZV (b);
|
|
|
1971 goto done;
|
|
|
1972 }
|
|
|
1973 }
|
|
|
1974 }
|
|
|
1975
|
|
|
1976 /* Check for face changes. */
|
|
|
1977 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
|
|
|
1978 {
|
|
|
1979 /* Now compute the face and begin/end-glyph information. */
|
|
|
1980 data.findex =
|
|
|
1981 /* Remember that the extent-fragment routines deal in Bytind's. */
|
|
|
1982 extent_fragment_update (w, data.ef, data.bi_bufpos);
|
|
|
1983
|
|
|
1984 if (data.bi_bufpos == data.ef->end)
|
|
|
1985 no_more_frags = 1;
|
|
|
1986
|
|
|
1987 dt = get_display_table (w, data.findex);
|
|
|
1988 }
|
|
|
1989 initial = 0;
|
|
|
1990
|
|
|
1991 /* Determine what is next to be displayed. We first handle any
|
|
|
1992 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
|
|
|
1993 display then we determine what to do based on the character at the
|
|
|
1994 current buffer position. */
|
|
|
1995
|
|
|
1996 /* If the current position is covered by an invisible extent, do
|
|
|
1997 nothing (except maybe add some ellipses).
|
|
|
1998
|
|
|
1999 #### The behavior of begin and end-glyphs at the edge of an
|
|
|
2000 invisible extent should be investigated further. This is
|
|
|
2001 fairly low priority though. */
|
|
|
2002 if (data.ef->invisible)
|
|
|
2003 {
|
|
|
2004 /* #### Chuck, perhaps you could look at this code? I don't
|
|
|
2005 really know what I'm doing. */
|
|
|
2006 if (*prop)
|
|
|
2007 {
|
|
|
2008 Dynarr_free (*prop);
|
|
|
2009 *prop = 0;
|
|
|
2010 }
|
|
|
2011
|
|
|
2012 /* The extent fragment code only sets this when we should
|
|
|
2013 really display the ellipses. It makes sure the ellipses
|
|
|
2014 don't get displayed more than once in a row. */
|
|
|
2015 if (data.ef->invisible_ellipses)
|
|
|
2016 {
|
|
|
2017 struct glyph_block gb;
|
|
|
2018
|
|
|
2019 data.ef->invisible_ellipses_already_displayed = 1;
|
|
|
2020 data.ef->invisible_ellipses = 0;
|
|
|
2021 gb.extent = Qnil;
|
|
|
2022 gb.glyph = Vinvisible_text_glyph;
|
|
|
2023 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2024 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2025 /* Perhaps they shouldn't propagate if the very next thing
|
|
|
2026 is to display a newline (for compatibility with
|
|
|
2027 selective-display-ellipses)? Maybe that's too
|
|
|
2028 abstruse. */
|
|
|
2029 if (*prop)
|
|
|
2030 goto done;
|
|
|
2031 }
|
|
|
2032
|
|
|
2033 /* If point is in an invisible region we place it on the
|
|
|
2034 next visible character. */
|
|
|
2035 if (data.cursor_type == CURSOR_ON
|
|
|
2036 && data.bi_bufpos == data.bi_cursor_bufpos)
|
|
|
2037 {
|
|
|
2038 data.cursor_type = NEXT_CURSOR;
|
|
|
2039 }
|
|
|
2040
|
|
|
2041 /* #### What if we we're dealing with a display table? */
|
|
|
2042 if (data.start_col)
|
|
|
2043 data.start_col--;
|
|
|
2044
|
|
|
2045 if (data.bi_bufpos == BI_BUF_ZV (b))
|
|
|
2046 goto done;
|
|
|
2047 else
|
|
|
2048 INC_BYTIND (b, data.bi_bufpos);
|
|
|
2049 }
|
|
|
2050
|
|
|
2051 /* If there is propagation data, then it represents the current
|
|
|
2052 buffer position being displayed. Add them and advance the
|
|
|
2053 position counter. This might also add the minibuffer
|
|
|
2054 prompt. */
|
|
|
2055 else if (*prop)
|
|
|
2056 {
|
|
|
2057 dl->used_prop_data = 1;
|
|
|
2058 *prop = add_propagation_runes (prop, &data);
|
|
|
2059
|
|
|
2060 if (*prop)
|
|
|
2061 goto done; /* gee, a really narrow window */
|
|
|
2062 else if (data.bi_bufpos == BI_BUF_ZV (b))
|
|
|
2063 goto done;
|
|
|
2064 else if (data.bi_bufpos < BI_BUF_BEGV (b))
|
|
|
2065 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
|
|
|
2066 data.bi_bufpos = BI_BUF_BEGV (b);
|
|
|
2067 else
|
|
|
2068 INC_BYTIND (b, data.bi_bufpos);
|
|
|
2069 }
|
|
|
2070
|
|
|
2071 /* If there are end glyphs, add them to the line. These are
|
|
|
2072 the end glyphs for the previous run of text. We add them
|
|
|
2073 here rather than doing them at the end of handling the
|
|
|
2074 previous run so that glyphs at the beginning and end of
|
|
|
2075 a line are handled correctly. */
|
|
|
2076 else if (Dynarr_length (data.ef->end_glyphs) > 0)
|
|
|
2077 {
|
|
|
2078 *prop = add_glyph_runes (&data, END_GLYPHS);
|
|
|
2079 if (*prop)
|
|
|
2080 goto done;
|
|
|
2081 }
|
|
|
2082
|
|
|
2083 /* If there are begin glyphs, add them to the line. */
|
|
|
2084 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
|
|
|
2085 {
|
|
|
2086 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
|
|
|
2087 if (*prop)
|
|
|
2088 goto done;
|
|
|
2089 }
|
|
|
2090
|
|
|
2091 /* If at end-of-buffer, we've already processed begin and
|
|
|
2092 end-glyphs at this point and there's no text to process,
|
|
|
2093 so we're done. */
|
|
|
2094 else if (data.bi_bufpos == BI_BUF_ZV (b))
|
|
|
2095 goto done;
|
|
|
2096
|
|
|
2097 else
|
|
|
2098 {
|
|
|
2099 /* Get the character at the current buffer position. */
|
|
|
2100 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
|
|
|
2101
|
|
|
2102 /* If there is a display table entry for it, hand it off to
|
|
|
2103 add_disp_table_entry_runes and let it worry about it. */
|
|
|
2104 if (dt && !NILP (DISP_CHAR_ENTRY (dt, data.ch)))
|
|
|
2105 {
|
|
|
2106 *prop =
|
|
|
2107 add_disp_table_entry_runes (&data,
|
|
|
2108 DISP_CHAR_ENTRY (dt, data.ch));
|
|
|
2109
|
|
|
2110 if (*prop)
|
|
|
2111 goto done;
|
|
|
2112 }
|
|
|
2113
|
|
|
2114 /* Check if we have hit a newline character. If so, add a marker
|
|
|
2115 to the line and end this loop. */
|
|
|
2116 else if (data.ch == '\n')
|
|
|
2117 {
|
|
|
2118 /* We aren't going to be adding an end glyph so give its
|
|
|
2119 space back in order to make sure that the cursor can
|
|
|
2120 fit. */
|
|
|
2121 data.max_pixpos += end_glyph_width;
|
|
|
2122
|
|
|
2123 if (selective > 0
|
|
|
2124 && (bi_spaces_at_point
|
|
|
2125 (b, next_bytind (b, data.bi_bufpos))
|
|
|
2126 >= selective))
|
|
|
2127 {
|
|
|
2128 if (!NILP (b->selective_display_ellipses))
|
|
|
2129 {
|
|
|
2130 struct glyph_block gb;
|
|
|
2131
|
|
|
2132 gb.extent = Qnil;
|
|
|
2133 gb.glyph = Vinvisible_text_glyph;
|
|
|
2134 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2135 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2136 }
|
|
|
2137 else
|
|
|
2138 {
|
|
|
2139 /* Cheesy, cheesy, cheesy. We mark the end of the
|
|
|
2140 line with a special "character rune" whose width
|
|
|
2141 is the EOL cursor width and whose character is
|
|
|
2142 the non-printing character '\n'. */
|
|
|
2143 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2144 *prop = add_emchar_rune (&data);
|
|
|
2145 }
|
|
|
2146
|
|
|
2147 /* We need to set data.bi_bufpos to the start of the
|
|
|
2148 next visible region in order to make this line
|
|
|
2149 appear to contain all of the invisible area.
|
|
|
2150 Otherwise, the line cache won't work
|
|
|
2151 correctly. */
|
|
|
2152 INC_BYTIND (b, data.bi_bufpos);
|
|
|
2153 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
|
|
|
2154 {
|
|
|
2155 data.bi_bufpos =
|
|
|
2156 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
|
|
|
2157 if (data.bi_bufpos >= BI_BUF_ZV (b))
|
|
|
2158 {
|
|
|
2159 data.bi_bufpos = BI_BUF_ZV (b);
|
|
|
2160 break;
|
|
|
2161 }
|
|
|
2162 }
|
|
|
2163 if (BI_BUF_FETCH_CHAR
|
|
|
2164 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
|
|
|
2165 DEC_BYTIND (b, data.bi_bufpos);
|
|
|
2166 }
|
|
|
2167 else
|
|
|
2168 {
|
|
|
2169 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2170 *prop = add_emchar_rune (&data);
|
|
|
2171 }
|
|
|
2172
|
|
|
2173 goto done;
|
|
|
2174 }
|
|
|
2175
|
|
|
2176 /* If the current character is ^M, and selective display is
|
|
|
2177 enabled, then add the invisible-text-glyph if
|
|
|
2178 selective-display-ellipses is set. In any case, this
|
|
|
2179 line is done. */
|
|
|
2180 else if (data.ch == (('M' & 037)) && selective == -1)
|
|
|
2181 {
|
|
|
2182 Bytind bi_next_bufpos;
|
|
|
2183
|
|
|
2184 /* Find the buffer position at the end of the line. */
|
|
|
2185 bi_next_bufpos =
|
|
|
2186 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
|
|
|
2187 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
|
|
|
2188 == '\n')
|
|
|
2189 DEC_BYTIND (b, bi_next_bufpos);
|
|
|
2190
|
|
|
2191 /* If the cursor is somewhere in the elided text make
|
|
|
2192 sure that the cursor gets drawn appropriately. */
|
|
|
2193 if (data.cursor_type == CURSOR_ON
|
|
|
2194 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
|
|
|
2195 data.bi_cursor_bufpos < bi_next_bufpos))
|
|
|
2196 {
|
|
|
2197 data.cursor_type = NEXT_CURSOR;
|
|
|
2198 }
|
|
|
2199
|
|
|
2200 /* We won't be adding a truncation or continuation glyph
|
|
|
2201 so give up the room allocated for them. */
|
|
|
2202 data.max_pixpos += end_glyph_width;
|
|
|
2203
|
|
|
2204 if (!NILP (b->selective_display_ellipses))
|
|
|
2205 {
|
|
|
2206 /* We don't propagate anything from the invisible
|
|
|
2207 text glyph if it fails to fit. This is
|
|
|
2208 intentional. */
|
|
|
2209 struct glyph_block gb;
|
|
|
2210
|
|
|
2211 gb.extent = Qnil;
|
|
|
2212 gb.glyph = Vinvisible_text_glyph;
|
|
|
2213 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
|
|
|
2214 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
|
|
|
2215 }
|
|
|
2216
|
|
|
2217 /* Set the buffer position to the end of the line. We
|
|
|
2218 need to do this before potentially adding a newline
|
|
|
2219 so that the cursor flag will get set correctly (if
|
|
|
2220 needed). */
|
|
|
2221 data.bi_bufpos = bi_next_bufpos;
|
|
|
2222
|
|
|
2223 if (NILP (b->selective_display_ellipses)
|
|
|
2224 || data.bi_cursor_bufpos == bi_next_bufpos)
|
|
|
2225 {
|
|
|
2226 /* We have to at least add a newline character so
|
|
|
2227 that the cursor shows up properly. */
|
|
|
2228 data.ch = '\n';
|
|
|
2229 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2230 data.findex = DEFAULT_INDEX;
|
|
|
2231 data.start_col = 0;
|
|
|
2232 data.bi_start_col_enabled = 0;
|
|
|
2233
|
|
|
2234 add_emchar_rune (&data);
|
|
|
2235 }
|
|
|
2236
|
|
|
2237 /* This had better be a newline but doing it this way
|
|
|
2238 we'll see obvious incorrect results if it isn't. No
|
|
|
2239 need to abort here. */
|
|
|
2240 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
|
|
|
2241
|
|
|
2242 goto done;
|
|
|
2243 }
|
|
|
2244
|
|
|
2245 /* If the current character is considered to be printable, then
|
|
|
2246 just add it. */
|
|
|
2247 else if (data.ch >= printable_min)
|
|
|
2248 {
|
|
|
2249 *prop = add_emchar_rune (&data);
|
|
|
2250 if (*prop)
|
|
|
2251 goto done;
|
|
|
2252 }
|
|
|
2253
|
|
|
2254 /* If the current character is a tab, determine the next tab
|
|
|
2255 starting position and add a blank rune which extends from the
|
|
|
2256 current pixel position to that starting position. */
|
|
|
2257 else if (data.ch == '\t')
|
|
|
2258 {
|
|
|
2259 int tab_start_pixpos = data.pixpos;
|
|
|
2260 int next_tab_start;
|
|
|
2261 int char_tab_width;
|
|
|
2262 int prop_width = 0;
|
|
|
2263
|
|
|
2264 if (data.start_col > 1)
|
|
|
2265 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
|
|
|
2266
|
|
|
2267 next_tab_start = next_tab_position (w, tab_start_pixpos,
|
|
|
2268 dl->bounds.left_in);
|
|
|
2269 if (next_tab_start > data.max_pixpos)
|
|
|
2270 {
|
|
|
2271 prop_width = next_tab_start - data.max_pixpos;
|
|
|
2272 next_tab_start = data.max_pixpos;
|
|
|
2273 }
|
|
|
2274 data.blank_width = next_tab_start - data.pixpos;
|
|
|
2275 char_tab_width =
|
|
|
2276 (next_tab_start - tab_start_pixpos) / space_width (w);
|
|
|
2277
|
|
|
2278 *prop = add_blank_rune (&data, w, char_tab_width);
|
|
|
2279
|
|
|
2280 /* add_blank_rune is only supposed to be called with
|
|
|
2281 sizes guaranteed to fit in the available space. */
|
|
|
2282 assert (!(*prop));
|
|
|
2283
|
|
|
2284 if (prop_width)
|
|
|
2285 {
|
|
|
2286 struct prop_block pb;
|
|
|
2287 *prop = Dynarr_new (struct prop_block);
|
|
|
2288
|
|
|
2289 pb.type = PROP_BLANK;
|
|
|
2290 pb.data.p_blank.width = prop_width;
|
|
|
2291 pb.data.p_blank.findex = data.findex;
|
|
|
2292 Dynarr_add (*prop, pb);
|
|
|
2293
|
|
|
2294 goto done;
|
|
|
2295 }
|
|
|
2296 }
|
|
|
2297
|
|
|
2298 /* If character is a control character, pass it off to
|
|
|
2299 add_control_char_runes.
|
|
|
2300
|
|
|
2301 The is_*() routines have undefined results on
|
|
|
2302 arguments outside of the range [-1, 255]. (This
|
|
|
2303 often bites people who carelessly use `char' instead
|
|
|
2304 of `unsigned char'.)
|
|
|
2305 */
|
|
|
2306 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
|
|
|
2307 {
|
|
|
2308 *prop = add_control_char_runes (&data, b);
|
|
|
2309
|
|
|
2310 if (*prop)
|
|
|
2311 goto done;
|
|
|
2312 }
|
|
|
2313
|
|
|
2314 /* If the character is above the ASCII range and we have not
|
|
|
2315 already handled it, then print it as an octal number. */
|
|
|
2316 else if (data.ch >= 0200)
|
|
|
2317 {
|
|
|
2318 *prop = add_octal_runes (&data);
|
|
|
2319
|
|
|
2320 if (*prop)
|
|
|
2321 goto done;
|
|
|
2322 }
|
|
|
2323
|
|
|
2324 /* Assume the current character is considered to be printable,
|
|
|
2325 then just add it. */
|
|
|
2326 else
|
|
|
2327 {
|
|
|
2328 *prop = add_emchar_rune (&data);
|
|
|
2329 if (*prop)
|
|
|
2330 goto done;
|
|
|
2331 }
|
|
|
2332
|
|
|
2333 INC_BYTIND (b, data.bi_bufpos);
|
|
|
2334 }
|
|
|
2335 }
|
|
|
2336
|
|
|
2337 done:
|
|
|
2338
|
|
|
2339 /* Determine the starting point of the next line if we did not hit the
|
|
|
2340 end of the buffer. */
|
|
|
2341 if (data.bi_bufpos < BI_BUF_ZV (b)
|
|
|
2342 && (active_minibuffer || !NILP (synch_minibuffers_value)))
|
|
|
2343 {
|
|
|
2344 /* #### This check is not correct. If the line terminated
|
|
|
2345 due to a begin-glyph or end-glyph hitting window-end, then
|
|
|
2346 data.ch will not point to the character at data.bi_bufpos. If
|
|
|
2347 you make the two changes mentioned at the top of this loop,
|
|
|
2348 you should be able to say '(if (*prop))'. That should also
|
|
|
2349 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
|
|
|
2350 check. */
|
|
|
2351
|
|
|
2352 /* The common case is that the line ended because we hit a newline.
|
|
|
2353 In that case, the next character is just the next buffer
|
|
|
2354 position. */
|
|
|
2355 if (data.ch == '\n')
|
|
|
2356 {
|
|
|
2357 /* If data.start_col_enabled is still true, then the window is
|
|
|
2358 scrolled far enough so that nothing on this line is visible.
|
|
|
2359 We need to stick a trunctation glyph at the beginning of the
|
|
|
2360 line in that case unless the line is completely blank. */
|
|
|
2361 if (data.bi_start_col_enabled)
|
|
|
2362 {
|
|
|
2363 if (data.cursor_type == CURSOR_ON)
|
|
|
2364 {
|
|
|
2365 if (data.bi_cursor_bufpos >= bi_start_pos
|
|
|
2366 && data.bi_cursor_bufpos <= data.bi_bufpos)
|
|
|
2367 data.bi_cursor_bufpos = data.bi_bufpos;
|
|
|
2368 }
|
|
|
2369 data.findex = DEFAULT_INDEX;
|
|
|
2370 data.start_col = 0;
|
|
|
2371 data.bi_start_col_enabled = 0;
|
|
|
2372
|
|
|
2373 if (data.bi_bufpos != bi_start_pos)
|
|
|
2374 {
|
|
|
2375 struct glyph_block gb;
|
|
|
2376
|
|
|
2377 gb.extent = Qnil;
|
|
|
2378 gb.glyph = Vhscroll_glyph;
|
|
|
2379 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
|
|
|
2380 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
|
|
|
2381 }
|
|
|
2382 else
|
|
|
2383 {
|
|
|
2384 /* This duplicates code down below to add a newline to
|
|
|
2385 the end of an otherwise empty line.*/
|
|
|
2386 data.ch = '\n';
|
|
|
2387 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2388
|
|
|
2389 add_emchar_rune (&data);
|
|
|
2390 }
|
|
|
2391 }
|
|
|
2392
|
|
|
2393 INC_BYTIND (b, data.bi_bufpos);
|
|
|
2394 }
|
|
|
2395
|
|
|
2396 /* Otherwise we have a buffer line which cannot fit on one display
|
|
|
2397 line. */
|
|
|
2398 else
|
|
|
2399 {
|
|
|
2400 struct glyph_block gb;
|
|
|
2401 struct glyph_cachel *cachel;
|
|
|
2402
|
|
|
2403 /* If the line is to be truncated then we actually have to look
|
|
|
2404 for the next newline. We also add the end-of-line glyph which
|
|
|
2405 we know will fit because we adjusted the right border before
|
|
|
2406 we starting laying out the line. */
|
|
|
2407 data.max_pixpos += end_glyph_width;
|
|
|
2408 data.findex = DEFAULT_INDEX;
|
|
|
2409 gb.extent = Qnil;
|
|
|
2410
|
|
|
2411 if (truncate_win)
|
|
|
2412 {
|
|
|
2413 Bytind bi_pos;
|
|
|
2414
|
|
|
2415 /* Now find the start of the next line. */
|
|
|
2416 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
|
|
|
2417
|
|
|
2418 /* If the cursor is past the truncation line then we
|
|
|
2419 make it appear on the truncation glyph. If we've hit
|
|
|
2420 the end of the buffer then we also make the cursor
|
|
70
|
2421 appear unless eob is immediately preceeded by a
|
|
0
|
2422 newline. In that case the cursor should actually
|
|
|
2423 appear on the next line. */
|
|
|
2424 if (data.cursor_type == CURSOR_ON
|
|
|
2425 && data.bi_cursor_bufpos >= data.bi_bufpos
|
|
|
2426 && (data.bi_cursor_bufpos < bi_pos ||
|
|
|
2427 (bi_pos == BI_BUF_ZV (b)
|
|
|
2428 && (bi_pos == BI_BUF_BEGV (b)
|
|
|
2429 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
|
|
|
2430 != '\n')))))
|
|
|
2431 data.bi_cursor_bufpos = bi_pos;
|
|
|
2432 else
|
|
|
2433 data.cursor_type = NO_CURSOR;
|
|
|
2434
|
|
|
2435 data.bi_bufpos = bi_pos;
|
|
|
2436 gb.glyph = Vtruncation_glyph;
|
|
|
2437 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
|
|
|
2438 }
|
|
|
2439 else
|
|
|
2440 {
|
|
|
2441 /* The cursor can never be on the continuation glyph. */
|
|
|
2442 data.cursor_type = NO_CURSOR;
|
|
|
2443
|
|
|
2444 /* data.bi_bufpos is already at the start of the next line. */
|
|
|
2445
|
|
|
2446 gb.glyph = Vcontinuation_glyph;
|
|
|
2447 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
|
|
|
2448 }
|
|
|
2449
|
|
|
2450 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
|
|
|
2451
|
|
|
2452 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
|
|
|
2453 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
|
|
|
2454 /* #### Damn this losing shit. */
|
|
|
2455 data.bi_bufpos++;
|
|
|
2456 }
|
|
|
2457 }
|
|
|
2458 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
|
|
|
2459 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
|
|
|
2460 {
|
|
|
2461 /* We need to add a marker to the end of the line since there is no
|
|
|
2462 newline character in order for the cursor to get drawn. We label
|
|
|
2463 it as a newline so that it gets handled correctly by the
|
|
|
2464 whitespace routines below. */
|
|
|
2465
|
|
|
2466 data.ch = '\n';
|
|
|
2467 data.blank_width = DEVMETH (d, eol_cursor_width, ());
|
|
|
2468 data.findex = DEFAULT_INDEX;
|
|
|
2469 data.start_col = 0;
|
|
|
2470 data.bi_start_col_enabled = 0;
|
|
|
2471
|
|
|
2472 data.max_pixpos += data.blank_width;
|
|
|
2473 add_emchar_rune (&data);
|
|
|
2474 data.max_pixpos -= data.blank_width;
|
|
|
2475
|
|
|
2476 /* #### urk! Chuck, this shit is bad news. Going around
|
|
|
2477 manipulating invalid positions is guaranteed to result in
|
|
|
2478 trouble sooner or later. */
|
|
|
2479 data.bi_bufpos = BI_BUF_ZV (b) + 1;
|
|
|
2480 }
|
|
|
2481
|
|
|
2482 /* Calculate left whitespace boundary. */
|
|
|
2483 {
|
|
|
2484 int elt = 0;
|
|
|
2485
|
|
|
2486 /* Whitespace past a newline is considered right whitespace. */
|
|
|
2487 while (elt < Dynarr_length (db->runes))
|
|
|
2488 {
|
|
|
2489 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2490
|
|
|
2491 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
|
|
|
2492 || rb->type == RUNE_BLANK)
|
|
|
2493 {
|
|
|
2494 dl->bounds.left_white += rb->width;
|
|
|
2495 elt++;
|
|
|
2496 }
|
|
|
2497 else
|
|
|
2498 elt = Dynarr_length (db->runes);
|
|
|
2499 }
|
|
|
2500 }
|
|
|
2501
|
|
|
2502 /* Calculate right whitespace boundary. */
|
|
|
2503 {
|
|
|
2504 int elt = Dynarr_length (db->runes) - 1;
|
|
|
2505 int done = 0;
|
|
|
2506
|
|
|
2507 while (!done && elt >= 0)
|
|
|
2508 {
|
|
|
2509 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
2510
|
|
|
2511 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
|
|
|
2512 && isspace (rb->object.chr.ch))
|
|
|
2513 && !rb->type == RUNE_BLANK)
|
|
|
2514 {
|
|
|
2515 dl->bounds.right_white = rb->xpos + rb->width;
|
|
|
2516 done = 1;
|
|
|
2517 }
|
|
|
2518
|
|
|
2519 elt--;
|
|
|
2520
|
|
|
2521 }
|
|
|
2522
|
|
|
2523 /* The line is blank so everything is considered to be right
|
|
|
2524 whitespace. */
|
|
|
2525 if (!done)
|
|
|
2526 dl->bounds.right_white = dl->bounds.left_in;
|
|
|
2527 }
|
|
|
2528
|
|
|
2529 /* Set the display blocks bounds. */
|
|
|
2530 db->start_pos = dl->bounds.left_in;
|
|
|
2531 if (Dynarr_length (db->runes))
|
|
|
2532 {
|
|
|
2533 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
2534
|
|
|
2535 db->end_pos = rb->xpos + rb->width;
|
|
|
2536 }
|
|
|
2537 else
|
|
|
2538 db->end_pos = dl->bounds.right_white;
|
|
|
2539
|
|
|
2540 /* update line height parameters */
|
|
|
2541 if (!data.new_ascent && !data.new_descent)
|
|
|
2542 {
|
|
|
2543 /* We've got a blank line so initialize these values from the default
|
|
|
2544 face. */
|
|
|
2545 default_face_font_info (data.window, &data.new_ascent,
|
|
|
2546 &data.new_descent, 0, 0, 0);
|
|
|
2547 }
|
|
|
2548
|
|
|
2549 if (data.max_pixmap_height)
|
|
|
2550 {
|
|
|
2551 int height = data.new_ascent + data.new_descent;
|
|
|
2552 int pix_ascent, pix_descent;
|
|
|
2553
|
|
|
2554 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2555 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
|
2556
|
|
|
2557 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2558 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2559 }
|
|
|
2560
|
|
|
2561 dl->ascent = data.new_ascent;
|
|
|
2562 dl->descent = data.new_descent;
|
|
|
2563
|
|
|
2564 {
|
|
|
2565 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
|
|
|
2566
|
|
|
2567 if (dl->ascent < ascent)
|
|
|
2568 dl->ascent = ascent;
|
|
|
2569 }
|
|
|
2570 {
|
|
|
2571 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
|
|
|
2572
|
|
|
2573 if (dl->descent < descent)
|
|
|
2574 dl->descent = descent;
|
|
|
2575 }
|
|
|
2576
|
|
|
2577 dl->cursor_elt = data.cursor_x;
|
|
|
2578 /* #### lossage lossage lossage! Fix this shit! */
|
|
|
2579 if (data.bi_bufpos > BI_BUF_ZV (b))
|
|
|
2580 dl->end_bufpos = BUF_ZV (b);
|
|
|
2581 else
|
|
|
2582 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
|
|
|
2583 if (truncate_win)
|
|
|
2584 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
|
|
|
2585 else
|
|
|
2586 /* This doesn't correctly take into account tabs and control
|
|
|
2587 characters but if the window isn't being truncated then this
|
|
|
2588 value isn't going to end up being used anyhow. */
|
|
|
2589 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
|
|
|
2590
|
|
|
2591 /* #### handle horizontally scrolled line with text none of which
|
|
|
2592 was actually laid out. */
|
|
|
2593
|
|
|
2594 /* #### handle any remainder of overlay arrow */
|
|
|
2595
|
|
|
2596 if (*prop == ADD_FAILED)
|
|
|
2597 *prop = NULL;
|
|
|
2598
|
|
|
2599 if (truncate_win && *prop)
|
|
|
2600 {
|
|
|
2601 Dynarr_free (*prop);
|
|
|
2602 *prop = NULL;
|
|
|
2603 }
|
|
|
2604
|
|
|
2605 extent_fragment_delete (data.ef);
|
|
|
2606
|
|
|
2607 /* #### If we started at EOB, then make sure we return a value past
|
|
|
2608 it so that regenerate_window will exit properly. This is bogus.
|
|
|
2609 The main loop should get fixed so that it isn't necessary to call
|
|
|
2610 this function if we are already at EOB. */
|
|
|
2611
|
|
|
2612 if (data.bi_bufpos == BI_BUF_ZV (b) && bi_start_pos == BI_BUF_ZV (b))
|
|
|
2613 return (data.bi_bufpos + 1); /* Yuck! */
|
|
|
2614 else
|
|
|
2615 return data.bi_bufpos;
|
|
|
2616 }
|
|
|
2617
|
|
|
2618 /* Display the overlay arrow at the beginning of the given line. */
|
|
|
2619
|
|
|
2620 static int
|
|
|
2621 create_overlay_glyph_block (struct window *w, struct display_line *dl)
|
|
|
2622 {
|
|
|
2623 struct frame *f = XFRAME (w->frame);
|
|
|
2624 struct device *d = XDEVICE (f->device);
|
|
|
2625 pos_data data;
|
|
|
2626
|
|
|
2627 /* If Voverlay_arrow_string isn't valid then just fail silently. */
|
|
|
2628 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
|
|
|
2629 return 0;
|
|
|
2630
|
|
|
2631 memset (&data, 0, sizeof (data));
|
|
|
2632 data.ef = NULL;
|
|
|
2633 data.d = d;
|
|
|
2634 XSETWINDOW (data.window, w);
|
|
|
2635 data.db = get_display_block_from_line (dl, OVERWRITE);
|
|
|
2636 data.dl = dl;
|
|
|
2637 data.pixpos = dl->bounds.left_in;
|
|
|
2638 data.max_pixpos = dl->bounds.right_in;
|
|
|
2639 data.cursor_type = NO_CURSOR;
|
|
|
2640 data.cursor_x = -1;
|
|
|
2641 data.findex = DEFAULT_INDEX;
|
|
|
2642 data.last_charset = Qunbound;
|
|
|
2643 data.result_str = Qnil;
|
|
|
2644
|
|
|
2645 Dynarr_reset (data.db->runes);
|
|
|
2646
|
|
|
2647 if (STRINGP (Voverlay_arrow_string))
|
|
|
2648 {
|
|
|
2649 add_bufbyte_string_runes
|
|
|
2650 (&data,
|
|
16
|
2651 XSTRING_DATA (Voverlay_arrow_string),
|
|
|
2652 XSTRING_LENGTH (Voverlay_arrow_string),
|
|
0
|
2653 1);
|
|
|
2654 }
|
|
|
2655 else if (GLYPHP (Voverlay_arrow_string))
|
|
|
2656 {
|
|
|
2657 struct glyph_block gb;
|
|
|
2658
|
|
|
2659 gb.glyph = Voverlay_arrow_string;
|
|
|
2660 gb.extent = Qnil;
|
|
|
2661 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
2662 }
|
|
|
2663
|
|
|
2664 if (data.max_pixmap_height)
|
|
|
2665 {
|
|
|
2666 int height = data.new_ascent + data.new_descent;
|
|
|
2667 int pix_ascent, pix_descent;
|
|
|
2668
|
|
|
2669 pix_descent = data.max_pixmap_height * data.new_descent / height;
|
|
|
2670 pix_ascent = data.max_pixmap_height - pix_descent;
|
|
|
2671
|
|
|
2672 data.new_ascent = max (data.new_ascent, pix_ascent);
|
|
|
2673 data.new_descent = max (data.new_descent, pix_descent);
|
|
|
2674 }
|
|
|
2675
|
|
|
2676 dl->ascent = data.new_ascent;
|
|
|
2677 dl->descent = data.new_descent;
|
|
|
2678
|
|
|
2679 data.db->start_pos = dl->bounds.left_in;
|
|
|
2680 data.db->end_pos = data.pixpos;
|
|
|
2681
|
|
|
2682 return (data.pixpos - dl->bounds.left_in);
|
|
|
2683 }
|
|
|
2684
|
|
|
2685 /* Add a type of glyph to a margin display block. */
|
|
|
2686
|
|
|
2687 static int
|
|
|
2688 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
|
|
|
2689 int count, int glyph_type, int side, Lisp_Object window)
|
|
|
2690 {
|
|
|
2691 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
|
|
|
2692 ? dl->left_glyphs
|
|
|
2693 : dl->right_glyphs);
|
|
|
2694 int elt, end;
|
|
|
2695 int xpos = start;
|
|
|
2696 int reverse;
|
|
|
2697
|
|
|
2698 if ((glyph_type == GL_WHITESPACE && side == LEFT_GLYPHS)
|
|
|
2699 || (glyph_type == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
|
|
|
2700 {
|
|
|
2701 reverse = 1;
|
|
|
2702 elt = Dynarr_length (gbd) - 1;
|
|
|
2703 end = 0;
|
|
|
2704 }
|
|
|
2705 else
|
|
|
2706 {
|
|
|
2707 reverse = 0;
|
|
|
2708 elt = 0;
|
|
|
2709 end = Dynarr_length (gbd);
|
|
|
2710 }
|
|
|
2711
|
|
|
2712 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
|
|
|
2713 {
|
|
|
2714 struct glyph_block *gb = Dynarr_atp (gbd, elt);
|
|
|
2715
|
|
|
2716 if (NILP (gb->extent))
|
|
|
2717 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
2718
|
|
|
2719 if (gb->active &&
|
|
|
2720 ((side == LEFT_GLYPHS &&
|
|
|
2721 extent_begin_glyph_layout (XEXTENT (gb->extent)) == glyph_type)
|
|
|
2722 || (side == RIGHT_GLYPHS &&
|
|
|
2723 extent_end_glyph_layout (XEXTENT (gb->extent)) == glyph_type)))
|
|
|
2724 {
|
|
|
2725 struct rune rb;
|
|
|
2726
|
|
|
2727 rb.width = gb->width;
|
|
|
2728 rb.findex = gb->findex;
|
|
|
2729 rb.xpos = xpos;
|
|
|
2730 rb.bufpos = -1;
|
|
|
2731 rb.endpos = 0;
|
|
|
2732 rb.type = RUNE_DGLYPH;
|
|
|
2733 rb.object.dglyph.glyph = gb->glyph;
|
|
|
2734 rb.object.dglyph.extent = gb->extent;
|
|
|
2735 rb.object.dglyph.xoffset = 0;
|
|
|
2736 rb.cursor_type = CURSOR_OFF;
|
|
|
2737
|
|
|
2738 Dynarr_add (db->runes, rb);
|
|
|
2739 xpos += rb.width;
|
|
|
2740 count--;
|
|
|
2741 gb->active = 0;
|
|
|
2742
|
|
|
2743 if (glyph_contrib_p (gb->glyph, window))
|
|
|
2744 {
|
|
|
2745 unsigned short ascent, descent;
|
|
|
2746 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
|
|
|
2747
|
|
|
2748 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
|
|
|
2749 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
|
|
|
2750
|
|
|
2751 /* A pixmap that has not had a baseline explicitly set.
|
|
|
2752 We use the existing ascent / descent ratio of the
|
|
|
2753 line. */
|
|
|
2754 if (NILP (baseline))
|
|
|
2755 {
|
|
|
2756 int gheight = ascent + descent;
|
|
|
2757 int line_height = dl->ascent + dl->descent;
|
|
|
2758 int pix_ascent, pix_descent;
|
|
|
2759
|
|
|
2760 pix_descent = (int) (gheight * dl->descent) / line_height;
|
|
|
2761 pix_ascent = gheight - pix_descent;
|
|
|
2762
|
|
|
2763 dl->ascent = max ((int) dl->ascent, pix_ascent);
|
|
|
2764 dl->descent = max ((int) dl->descent, pix_descent);
|
|
|
2765 }
|
|
|
2766
|
|
|
2767 /* A string so determine contribution normally. */
|
|
|
2768 else if (EQ (baseline, Qt))
|
|
|
2769 {
|
|
|
2770 dl->ascent = max (dl->ascent, ascent);
|
|
|
2771 dl->descent = max (dl->descent, descent);
|
|
|
2772 }
|
|
|
2773
|
|
|
2774 /* A pixmap with an explicitly set baseline. We determine the
|
|
|
2775 contribution here. */
|
|
|
2776 else if (INTP (baseline))
|
|
|
2777 {
|
|
|
2778 int height = ascent + descent;
|
|
|
2779 int pix_ascent, pix_descent;
|
|
|
2780
|
|
|
2781 pix_ascent = height * XINT (baseline) / 100;
|
|
|
2782 pix_descent = height - pix_ascent;
|
|
|
2783
|
|
|
2784 dl->ascent = max ((int) dl->ascent, pix_ascent);
|
|
|
2785 dl->descent = max ((int) dl->descent, pix_descent);
|
|
|
2786 }
|
|
|
2787
|
|
|
2788 /* Otherwise something is screwed up. */
|
|
|
2789 else
|
|
|
2790 abort ();
|
|
|
2791 }
|
|
|
2792 }
|
|
|
2793
|
|
|
2794 (reverse ? elt-- : elt++);
|
|
|
2795 }
|
|
|
2796
|
|
|
2797 return xpos;
|
|
|
2798 }
|
|
|
2799
|
|
|
2800 /* Add a blank to a margin display block. */
|
|
|
2801
|
|
|
2802 static void
|
|
|
2803 add_margin_blank (struct display_line *dl, struct display_block *db,
|
|
|
2804 struct window *w, int xpos, int width, int side)
|
|
|
2805 {
|
|
|
2806 struct rune rb;
|
|
|
2807
|
|
|
2808 rb.findex = (side == LEFT_GLYPHS
|
|
|
2809 ? get_builtin_face_cache_index (w, Vleft_margin_face)
|
|
|
2810 : get_builtin_face_cache_index (w, Vright_margin_face));
|
|
|
2811 rb.xpos = xpos;
|
|
|
2812 rb.width = width;
|
|
|
2813 rb.bufpos = -1;
|
|
|
2814 rb.endpos = 0;
|
|
|
2815 rb.type = RUNE_BLANK;
|
|
|
2816 rb.cursor_type = CURSOR_OFF;
|
|
|
2817
|
|
|
2818 Dynarr_add (db->runes, rb);
|
|
|
2819 }
|
|
|
2820
|
|
|
2821 /* Display glyphs in the left outside margin, left inside margin and
|
|
|
2822 left whitespace area. */
|
|
|
2823
|
|
|
2824 static void
|
|
|
2825 create_left_glyph_block (struct window *w, struct display_line *dl,
|
|
|
2826 int overlay_width)
|
|
|
2827 {
|
|
|
2828 Lisp_Object window;
|
|
|
2829
|
|
|
2830 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
|
|
|
2831 int elt, end_xpos;
|
|
|
2832 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
|
|
|
2833 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
2834 int left_in_start = dl->bounds.left_in;
|
|
|
2835 int left_in_end = dl->bounds.left_in + overlay_width;
|
|
|
2836
|
|
|
2837 struct display_block *odb, *idb;
|
|
|
2838
|
|
|
2839 XSETWINDOW (window, w);
|
|
|
2840
|
|
|
2841 /* We have to add the glyphs to the line in the order outside,
|
|
|
2842 inside, whitespace. However the precedence dictates that we
|
|
|
2843 determine how many will fit in the reverse order. */
|
|
|
2844
|
|
|
2845 /* Determine how many whitespace glyphs we can display and where
|
|
|
2846 they should start. */
|
|
|
2847 white_in_start = dl->bounds.left_white;
|
|
|
2848 white_out_start = left_in_start;
|
|
|
2849 white_out_cnt = white_in_cnt = 0;
|
|
|
2850 elt = 0;
|
|
|
2851
|
|
|
2852 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
2853 {
|
|
|
2854 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
2855
|
|
|
2856 if (NILP (gb->extent))
|
|
|
2857 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
2858
|
|
|
2859 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
2860 {
|
|
|
2861 int width;
|
|
|
2862
|
|
|
2863 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
2864
|
|
|
2865 if (white_in_start - width >= left_in_end)
|
|
|
2866 {
|
|
|
2867 white_in_cnt++;
|
|
|
2868 white_in_start -= width;
|
|
|
2869 gb->width = width;
|
|
|
2870 gb->active = 1;
|
|
|
2871 }
|
|
|
2872 else if (use_overflow
|
|
|
2873 && (white_out_start - width > dl->bounds.left_out))
|
|
|
2874 {
|
|
|
2875 white_out_cnt++;
|
|
|
2876 white_out_start -= width;
|
|
|
2877 gb->width = width;
|
|
|
2878 gb->active = 1;
|
|
|
2879 }
|
|
|
2880 else
|
|
|
2881 gb->active = 0;
|
|
|
2882 }
|
|
|
2883
|
|
|
2884 elt++;
|
|
|
2885 }
|
|
|
2886
|
|
|
2887 /* Determine how many inside margin glyphs we can display and where
|
|
|
2888 they should start. The inside margin glyphs get whatever space
|
|
|
2889 is left after the whitespace glyphs have been displayed. These
|
|
|
2890 are tricky to calculate since if we decide to use the overflow
|
|
|
2891 area we basicaly have to start over. So for these we build up a
|
|
|
2892 list of just the inside margin glyphs and manipulate it to
|
|
|
2893 determine the needed info. */
|
|
|
2894 {
|
|
|
2895 glyph_block_dynarr *ib;
|
|
|
2896 int avail_in, avail_out;
|
|
|
2897 int done = 0;
|
|
|
2898 int marker = 0;
|
|
|
2899 int used_in, used_out;
|
|
|
2900
|
|
|
2901 elt = 0;
|
|
|
2902 used_in = used_out = 0;
|
|
|
2903 ib = Dynarr_new (struct glyph_block);
|
|
|
2904 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
2905 {
|
|
|
2906 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
2907
|
|
|
2908 if (NILP (gb->extent))
|
|
|
2909 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
2910
|
|
|
2911 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
2912 GL_INSIDE_MARGIN)
|
|
|
2913 {
|
|
|
2914 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
2915 used_in += gb->width;
|
|
|
2916 Dynarr_add (ib, *gb);
|
|
|
2917 }
|
|
|
2918
|
|
|
2919 elt++;
|
|
|
2920 }
|
|
|
2921
|
|
|
2922 if (white_out_cnt)
|
|
|
2923 avail_in = 0;
|
|
|
2924 else
|
|
|
2925 {
|
|
|
2926 avail_in = white_in_start - left_in_end;
|
|
|
2927 if (avail_in < 0)
|
|
|
2928 avail_in = 0;
|
|
|
2929 }
|
|
|
2930
|
|
|
2931 if (!use_overflow)
|
|
|
2932 avail_out = 0;
|
|
|
2933 else
|
|
|
2934 avail_out = white_out_start - dl->bounds.left_out;
|
|
|
2935
|
|
|
2936 marker = 0;
|
|
|
2937 while (!done && marker < Dynarr_length (ib))
|
|
|
2938 {
|
|
|
2939 int width = Dynarr_atp (ib, marker)->width;
|
|
|
2940
|
|
|
2941 /* If everything now fits in the available inside margin
|
|
|
2942 space, we're done. */
|
|
|
2943 if (used_in <= avail_in)
|
|
|
2944 done = 1;
|
|
|
2945 else
|
|
|
2946 {
|
|
|
2947 /* Otherwise see if we have room to move a glyph to the
|
|
|
2948 outside. */
|
|
|
2949 if (used_out + width <= avail_out)
|
|
|
2950 {
|
|
|
2951 used_out += width;
|
|
|
2952 used_in -= width;
|
|
|
2953 }
|
|
|
2954 else
|
|
|
2955 done = 1;
|
|
|
2956 }
|
|
|
2957
|
|
|
2958 if (!done)
|
|
|
2959 marker++;
|
|
|
2960 }
|
|
|
2961
|
|
|
2962 /* At this point we now know that everything from marker on goes in
|
|
|
2963 the inside margin and everything before it goes in the outside
|
|
|
2964 margin. The stuff going into the outside margin is guaranteed
|
|
|
2965 to fit, but we may have to trim some stuff from the inside. */
|
|
|
2966
|
|
|
2967 in_in_end = left_in_end;
|
|
|
2968 in_out_start = white_out_start;
|
|
|
2969 in_out_cnt = in_in_cnt = 0;
|
|
|
2970
|
|
|
2971 Dynarr_free (ib);
|
|
|
2972 elt = 0;
|
|
|
2973 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
2974 {
|
|
|
2975 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
2976
|
|
|
2977 if (NILP (gb->extent))
|
|
|
2978 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
2979
|
|
|
2980 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
2981 GL_INSIDE_MARGIN)
|
|
|
2982 {
|
|
|
2983 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
2984
|
|
|
2985 if (used_out)
|
|
|
2986 {
|
|
|
2987 in_out_cnt++;
|
|
|
2988 in_out_start -= width;
|
|
|
2989 gb->width = width;
|
|
|
2990 gb->active = 1;
|
|
|
2991 used_out -= width;
|
|
|
2992 }
|
|
|
2993 else if (in_in_end + width < white_in_start)
|
|
|
2994 {
|
|
|
2995 in_in_cnt++;
|
|
|
2996 in_in_end += width;
|
|
|
2997 gb->width = width;
|
|
|
2998 gb->active = 1;
|
|
|
2999 }
|
|
|
3000 else
|
|
|
3001 gb->active = 0;
|
|
|
3002 }
|
|
|
3003
|
|
|
3004 elt++;
|
|
|
3005 }
|
|
|
3006 }
|
|
|
3007
|
|
|
3008 /* Determine how many outside margin glyphs we can display. They
|
|
|
3009 always start at the left outside margin and can only use the
|
|
|
3010 outside margin space. */
|
|
|
3011 out_end = dl->bounds.left_out;
|
|
|
3012 out_cnt = 0;
|
|
|
3013 elt = 0;
|
|
|
3014
|
|
|
3015 while (elt < Dynarr_length (dl->left_glyphs))
|
|
|
3016 {
|
|
|
3017 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
|
|
|
3018
|
|
|
3019 if (NILP (gb->extent))
|
|
|
3020 abort (); /* these should have beeb handled in add_glyph_rune */
|
|
|
3021
|
|
|
3022 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
|
|
|
3023 GL_OUTSIDE_MARGIN)
|
|
|
3024 {
|
|
|
3025 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
3026
|
|
|
3027 if (out_end + width <= in_out_start)
|
|
|
3028 {
|
|
|
3029 out_cnt++;
|
|
|
3030 out_end += width;
|
|
|
3031 gb->width = width;
|
|
|
3032 gb->active = 1;
|
|
|
3033 }
|
|
|
3034 else
|
|
|
3035 gb->active = 0;
|
|
|
3036 }
|
|
|
3037
|
|
|
3038 elt++;
|
|
|
3039 }
|
|
|
3040
|
|
|
3041 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3042 to the appropriate display blocks. */
|
|
|
3043 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3044 {
|
|
|
3045 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
|
|
|
3046 odb->start_pos = dl->bounds.left_out;
|
|
|
3047 /* #### We should stop adding a blank to account for the space
|
|
|
3048 between the end of the glyphs and the margin and instead set
|
|
|
3049 this accordingly. */
|
|
|
3050 odb->end_pos = dl->bounds.left_in;
|
|
|
3051 Dynarr_reset (odb->runes);
|
|
|
3052 }
|
|
|
3053 else
|
|
|
3054 odb = 0;
|
|
|
3055
|
|
|
3056 if (in_in_cnt || white_in_cnt)
|
|
|
3057 {
|
|
|
3058 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
|
|
|
3059 idb->start_pos = dl->bounds.left_in;
|
|
|
3060 /* #### See above comment for odb->end_pos */
|
|
|
3061 idb->end_pos = dl->bounds.left_white;
|
|
|
3062 Dynarr_reset (idb->runes);
|
|
|
3063 }
|
|
|
3064 else
|
|
|
3065 idb = 0;
|
|
|
3066
|
|
|
3067 /* First add the outside margin glyphs. */
|
|
|
3068 if (out_cnt)
|
|
|
3069 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
|
|
|
3070 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3071 else
|
|
|
3072 end_xpos = dl->bounds.left_out;
|
|
|
3073
|
|
|
3074 /* There may be blank space between the outside margin glyphs and
|
|
|
3075 the inside margin glyphs. If so, add a blank. */
|
|
|
3076 if (in_out_cnt && (in_out_start - end_xpos))
|
|
|
3077 {
|
|
|
3078 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
|
|
|
3079 LEFT_GLYPHS);
|
|
|
3080 }
|
|
|
3081
|
|
|
3082 /* Next add the inside margin glyphs which are actually in the
|
|
|
3083 outside margin. */
|
|
|
3084 if (in_out_cnt)
|
|
|
3085 {
|
|
|
3086 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
|
|
|
3087 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3088 }
|
|
|
3089
|
|
|
3090 /* If we didn't add any inside margin glyphs to the outside margin,
|
|
|
3091 but are adding whitespace glyphs, then we need to add a blank
|
|
|
3092 here. */
|
|
|
3093 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
|
|
|
3094 {
|
|
|
3095 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
|
|
|
3096 LEFT_GLYPHS);
|
|
|
3097 }
|
|
|
3098
|
|
|
3099 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3100 outside margin. */
|
|
|
3101 if (white_out_cnt)
|
|
|
3102 {
|
|
|
3103 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
|
|
|
3104 GL_WHITESPACE, LEFT_GLYPHS, window);
|
|
|
3105 }
|
|
|
3106
|
|
|
3107 /* We take care of clearing between the end of the glyphs and the
|
|
|
3108 start of the inside margin for lines which have glyphs. */
|
|
|
3109 if (odb && (left_in_start - end_xpos))
|
|
|
3110 {
|
|
|
3111 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
|
|
|
3112 LEFT_GLYPHS);
|
|
|
3113 }
|
|
|
3114
|
|
|
3115 /* Next add the inside margin glyphs which are actually in the
|
|
|
3116 inside margin. */
|
|
|
3117 if (in_in_cnt)
|
|
|
3118 {
|
|
|
3119 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
|
|
|
3120 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
|
|
|
3121 }
|
|
|
3122 else
|
|
|
3123 end_xpos = left_in_end;
|
|
|
3124
|
|
|
3125 /* Make sure that the area between the end of the inside margin
|
|
|
3126 glyphs and the whitespace glyphs is cleared. */
|
|
|
3127 if (idb && (white_in_start - end_xpos > 0))
|
|
|
3128 {
|
|
|
3129 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
|
|
|
3130 LEFT_GLYPHS);
|
|
|
3131 }
|
|
|
3132
|
|
|
3133 /* Next add the whitespace margin glyphs which are actually in the
|
|
|
3134 inside margin. */
|
|
|
3135 if (white_in_cnt)
|
|
|
3136 {
|
|
|
3137 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
|
|
|
3138 LEFT_GLYPHS, window);
|
|
|
3139 }
|
|
|
3140
|
|
|
3141 /* Whitespace glyphs always end right next to the text block so
|
|
|
3142 there is nothing we have to make sure is cleared after them. */
|
|
|
3143 }
|
|
|
3144
|
|
|
3145 /* Display glyphs in the right outside margin, right inside margin and
|
|
|
3146 right whitespace area. */
|
|
|
3147
|
|
|
3148 static void
|
|
|
3149 create_right_glyph_block (struct window *w, struct display_line *dl)
|
|
|
3150 {
|
|
|
3151 Lisp_Object window;
|
|
|
3152
|
|
|
3153 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
|
|
|
3154 int elt, end_xpos;
|
|
|
3155 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
|
|
|
3156 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
|
|
|
3157
|
|
|
3158 struct display_block *odb, *idb;
|
|
|
3159
|
|
|
3160 XSETWINDOW (window, w);
|
|
|
3161
|
|
|
3162 /* We have to add the glyphs to the line in the order outside,
|
|
|
3163 inside, whitespace. However the precedence dictates that we
|
|
|
3164 determine how many will fit in the reverse order. */
|
|
|
3165
|
|
|
3166 /* Determine how many whitespace glyphs we can display and where
|
|
|
3167 they should start. */
|
|
|
3168 white_in_end = dl->bounds.right_white;
|
|
|
3169 white_out_end = dl->bounds.right_in;
|
|
|
3170 white_out_cnt = white_in_cnt = 0;
|
|
|
3171 elt = 0;
|
|
|
3172
|
|
|
3173 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3174 {
|
|
|
3175 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3176
|
|
|
3177 if (NILP (gb->extent))
|
|
|
3178 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3179
|
|
|
3180 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
|
|
|
3181 {
|
|
|
3182 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
3183
|
|
|
3184 if (white_in_end + width <= dl->bounds.right_in)
|
|
|
3185 {
|
|
|
3186 white_in_cnt++;
|
|
|
3187 white_in_end += width;
|
|
|
3188 gb->width = width;
|
|
|
3189 gb->active = 1;
|
|
|
3190 }
|
|
|
3191 else if (use_overflow
|
|
|
3192 && (white_out_end + width <= dl->bounds.right_out))
|
|
|
3193 {
|
|
|
3194 white_out_cnt++;
|
|
|
3195 white_out_end += width;
|
|
|
3196 gb->width = width;
|
|
|
3197 gb->active = 1;
|
|
|
3198 }
|
|
|
3199 else
|
|
|
3200 gb->active = 0;
|
|
|
3201 }
|
|
|
3202
|
|
|
3203 elt++;
|
|
|
3204 }
|
|
|
3205
|
|
|
3206 /* Determine how many inside margin glyphs we can display and where
|
|
|
3207 they should start. The inside margin glyphs get whatever space
|
|
|
3208 is left after the whitespace glyphs have been displayed. These
|
|
|
3209 are tricky to calculate since if we decide to use the overflow
|
|
|
3210 area we basicaly have to start over. So for these we build up a
|
|
|
3211 list of just the inside margin glyphs and manipulate it to
|
|
|
3212 determine the needed info. */
|
|
|
3213 {
|
|
|
3214 glyph_block_dynarr *ib;
|
|
|
3215 int avail_in, avail_out;
|
|
|
3216 int done = 0;
|
|
|
3217 int marker = 0;
|
|
|
3218 int used_in, used_out;
|
|
|
3219
|
|
|
3220 elt = 0;
|
|
|
3221 used_in = used_out = 0;
|
|
|
3222 ib = Dynarr_new (struct glyph_block);
|
|
|
3223 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3224 {
|
|
|
3225 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3226
|
|
|
3227 if (NILP (gb->extent))
|
|
|
3228 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3229
|
|
|
3230 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3231 {
|
|
|
3232 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
3233 used_in += gb->width;
|
|
|
3234 Dynarr_add (ib, *gb);
|
|
|
3235 }
|
|
|
3236
|
|
|
3237 elt++;
|
|
|
3238 }
|
|
|
3239
|
|
|
3240 if (white_out_cnt)
|
|
|
3241 avail_in = 0;
|
|
|
3242 else
|
|
|
3243 avail_in = dl->bounds.right_in - white_in_end;
|
|
|
3244
|
|
|
3245 if (!use_overflow)
|
|
|
3246 avail_out = 0;
|
|
|
3247 else
|
|
|
3248 avail_out = dl->bounds.right_out - white_out_end;
|
|
|
3249
|
|
|
3250 marker = 0;
|
|
|
3251 while (!done && marker < Dynarr_length (ib))
|
|
|
3252 {
|
|
|
3253 int width = Dynarr_atp (ib, marker)->width;
|
|
|
3254
|
|
|
3255 /* If everything now fits in the available inside margin
|
|
|
3256 space, we're done. */
|
|
|
3257 if (used_in <= avail_in)
|
|
|
3258 done = 1;
|
|
|
3259 else
|
|
|
3260 {
|
|
|
3261 /* Otherwise see if we have room to move a glyph to the
|
|
|
3262 outside. */
|
|
|
3263 if (used_out + width <= avail_out)
|
|
|
3264 {
|
|
|
3265 used_out += width;
|
|
|
3266 used_in -= width;
|
|
|
3267 }
|
|
|
3268 else
|
|
|
3269 done = 1;
|
|
|
3270 }
|
|
|
3271
|
|
|
3272 if (!done)
|
|
|
3273 marker++;
|
|
|
3274 }
|
|
|
3275
|
|
|
3276 /* At this point we now know that everything from marker on goes in
|
|
|
3277 the inside margin and everything before it goes in the outside
|
|
|
3278 margin. The stuff going into the outside margin is guaranteed
|
|
|
3279 to fit, but we may have to trim some stuff from the inside. */
|
|
|
3280
|
|
|
3281 in_in_start = dl->bounds.right_in;
|
|
|
3282 in_out_end = dl->bounds.right_in;
|
|
|
3283 in_out_cnt = in_in_cnt = 0;
|
|
|
3284
|
|
|
3285 Dynarr_free (ib);
|
|
|
3286 elt = 0;
|
|
|
3287 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3288 {
|
|
|
3289 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3290
|
|
|
3291 if (NILP (gb->extent))
|
|
|
3292 abort (); /* these should have been handled in add_glyph_rune */
|
|
|
3293
|
|
|
3294 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
|
|
|
3295 {
|
|
|
3296 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
3297
|
|
|
3298 if (used_out)
|
|
|
3299 {
|
|
|
3300 in_out_cnt++;
|
|
|
3301 in_out_end += width;
|
|
|
3302 gb->width = width;
|
|
|
3303 gb->active = 1;
|
|
|
3304 used_out -= width;
|
|
|
3305 }
|
|
|
3306 else if (in_in_start - width >= white_in_end)
|
|
|
3307 {
|
|
|
3308 in_in_cnt++;
|
|
|
3309 in_in_start -= width;
|
|
|
3310 gb->width = width;
|
|
|
3311 gb->active = 1;
|
|
|
3312 }
|
|
|
3313 else
|
|
|
3314 gb->active = 0;
|
|
|
3315 }
|
|
|
3316
|
|
|
3317 elt++;
|
|
|
3318 }
|
|
|
3319 }
|
|
|
3320
|
|
|
3321 /* Determine how many outside margin glyphs we can display. They
|
|
|
3322 always start at the right outside margin and can only use the
|
|
|
3323 outside margin space. */
|
|
|
3324 out_start = dl->bounds.right_out;
|
|
|
3325 out_cnt = 0;
|
|
|
3326 elt = 0;
|
|
|
3327
|
|
|
3328 while (elt < Dynarr_length (dl->right_glyphs))
|
|
|
3329 {
|
|
|
3330 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
|
|
|
3331
|
|
|
3332 if (NILP (gb->extent))
|
|
|
3333 abort (); /* these should have beeb handled in add_glyph_rune */
|
|
|
3334
|
|
|
3335 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
|
|
|
3336 {
|
|
|
3337 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
|
|
|
3338
|
|
|
3339 if (out_start - width >= in_out_end)
|
|
|
3340 {
|
|
|
3341 out_cnt++;
|
|
|
3342 out_start -= width;
|
|
|
3343 gb->width = width;
|
|
|
3344 gb->active = 1;
|
|
|
3345 }
|
|
|
3346 else
|
|
|
3347 gb->active = 0;
|
|
|
3348 }
|
|
|
3349
|
|
|
3350 elt++;
|
|
|
3351 }
|
|
|
3352
|
|
|
3353 /* Now that we now where everything goes, we add the glyphs as runes
|
|
|
3354 to the appropriate display blocks. */
|
|
|
3355 if (out_cnt || in_out_cnt || white_out_cnt)
|
|
|
3356 {
|
|
|
3357 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
|
|
|
3358 /* #### See comments before odb->start_pos init in
|
|
|
3359 create_left_glyph_block */
|
|
|
3360 odb->start_pos = dl->bounds.right_in;
|
|
|
3361 odb->end_pos = dl->bounds.right_out;
|
|
|
3362 Dynarr_reset (odb->runes);
|
|
|
3363 }
|
|
|
3364 else
|
|
|
3365 odb = 0;
|
|
|
3366
|
|
|
3367 if (in_in_cnt || white_in_cnt)
|
|
|
3368 {
|
|
|
3369 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
|
|
|
3370 idb->start_pos = dl->bounds.right_white;
|
|
|
3371 /* #### See comments before odb->start_pos init in
|
|
|
3372 create_left_glyph_block */
|
|
|
3373 idb->end_pos = dl->bounds.right_in;
|
|
|
3374 Dynarr_reset (idb->runes);
|
|
|
3375 }
|
|
|
3376 else
|
|
|
3377 idb = 0;
|
|
|
3378
|
|
|
3379 /* First add the whitespace margin glyphs which are actually in the
|
|
|
3380 inside margin. */
|
|
|
3381 if (white_in_cnt)
|
|
|
3382 {
|
|
|
3383 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
|
|
|
3384 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
|
|
|
3385 window);
|
|
|
3386 }
|
|
|
3387 else
|
|
|
3388 end_xpos = dl->bounds.right_white;
|
|
|
3389
|
|
|
3390 /* Make sure that the area between the end of the whitespace glyphs
|
|
|
3391 and the inside margin glyphs is cleared. */
|
|
|
3392 if (in_in_cnt && (in_in_start - end_xpos))
|
|
|
3393 {
|
|
|
3394 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
|
|
|
3395 RIGHT_GLYPHS);
|
|
|
3396 }
|
|
|
3397
|
|
|
3398 /* Next add the inside margin glyphs which are actually in the
|
|
|
3399 inside margin. */
|
|
|
3400 if (in_in_cnt)
|
|
|
3401 {
|
|
|
3402 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
|
|
|
3403 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3404 }
|
|
|
3405
|
|
|
3406 /* If we didn't add any inside margin glyphs then make sure the rest
|
|
|
3407 of the inside margin area gets cleared. */
|
|
|
3408 if (idb && (dl->bounds.right_in - end_xpos))
|
|
|
3409 {
|
|
|
3410 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
|
|
|
3411 RIGHT_GLYPHS);
|
|
|
3412 }
|
|
|
3413
|
|
|
3414 /* Next add any whitespace glyphs in the outside margin. */
|
|
|
3415 if (white_out_cnt)
|
|
|
3416 {
|
|
|
3417 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
|
|
|
3418 GL_WHITESPACE, RIGHT_GLYPHS, window);
|
|
|
3419 }
|
|
|
3420 else
|
|
|
3421 end_xpos = dl->bounds.right_in;
|
|
|
3422
|
|
|
3423 /* Next add any inside margin glyphs in the outside margin. */
|
|
|
3424 if (in_out_cnt)
|
|
|
3425 {
|
|
|
3426 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
|
|
|
3427 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
|
|
|
3428 }
|
|
|
3429
|
|
|
3430 /* There may be space between any whitespace or inside margin glyphs
|
|
|
3431 in the outside margin and the actual outside margin glyphs. */
|
|
|
3432 if (odb && (out_start - end_xpos))
|
|
|
3433 {
|
|
|
3434 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
|
|
|
3435 RIGHT_GLYPHS);
|
|
|
3436 }
|
|
|
3437
|
|
|
3438 /* Finally, add the outside margin glyphs. */
|
|
|
3439 if (out_cnt)
|
|
|
3440 {
|
|
|
3441 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
|
|
|
3442 RIGHT_GLYPHS, window);
|
|
|
3443 }
|
|
|
3444 }
|
|
|
3445
|
|
|
3446
|
|
|
3447 /***************************************************************************/
|
|
|
3448 /* */
|
|
|
3449 /* modeline routines */
|
|
|
3450 /* */
|
|
|
3451 /***************************************************************************/
|
|
|
3452
|
|
|
3453 /* Ensure that the given display line DL accurately represents the
|
|
|
3454 modeline for the given window. */
|
|
|
3455
|
|
|
3456 static void
|
|
|
3457 generate_modeline (struct window *w, struct display_line *dl, int type)
|
|
|
3458 {
|
|
|
3459 struct buffer *b = XBUFFER (w->buffer);
|
|
|
3460 struct frame *f = XFRAME (w->frame);
|
|
|
3461 struct device *d = XDEVICE (f->device);
|
|
|
3462
|
|
|
3463 /* Unlike display line and rune pointers, this one can't change underneath
|
|
|
3464 our feet. */
|
|
|
3465 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
3466 int max_pixpos, min_pixpos, ypos_adj;
|
|
|
3467 Lisp_Object font_inst;
|
|
|
3468
|
|
|
3469 /* This will actually determine incorrect inside boundaries for the
|
|
|
3470 modeline since it ignores the margins. However being aware of this fact
|
|
|
3471 we never use those values anywhere so it doesn't matter. */
|
|
|
3472 dl->bounds = calculate_display_line_boundaries (w, 1);
|
|
|
3473
|
|
|
3474 /* We are generating a modeline. */
|
|
|
3475 dl->modeline = 1;
|
|
|
3476 dl->cursor_elt = -1;
|
|
|
3477
|
|
|
3478 /* Reset the runes on the modeline. */
|
|
|
3479 Dynarr_reset (db->runes);
|
|
|
3480
|
|
|
3481 if (!WINDOW_HAS_MODELINE_P (w))
|
|
|
3482 {
|
|
|
3483 struct rune rb;
|
|
|
3484
|
|
|
3485 /* If there is a horizontal scrollbar, don't add anything. */
|
|
|
3486 if (window_scrollbar_height (w))
|
|
|
3487 return;
|
|
|
3488
|
|
|
3489 dl->ascent = DEVMETH (d, divider_height, ());
|
|
|
3490 dl->descent = 0;
|
|
|
3491 /* The modeline is at the bottom of the gutters. */
|
|
|
3492 dl->ypos = WINDOW_BOTTOM (w);
|
|
|
3493
|
|
|
3494 rb.findex = MODELINE_INDEX;
|
|
|
3495 rb.xpos = dl->bounds.left_out;
|
|
|
3496 rb.width = dl->bounds.right_out - dl->bounds.left_out;
|
|
|
3497 rb.bufpos = 0;
|
|
|
3498 rb.endpos = 0;
|
|
|
3499 rb.type = RUNE_HLINE;
|
|
|
3500 rb.object.hline.thickness = 1;
|
|
|
3501 rb.object.hline.yoffset = 0;
|
|
|
3502 rb.cursor_type = NO_CURSOR;
|
|
|
3503
|
|
|
3504 if (!EQ (Qzero, w->modeline_shadow_thickness)
|
|
|
3505 && FRAME_WIN_P (f))
|
|
|
3506 {
|
|
|
3507 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3508
|
|
|
3509 dl->ypos -= shadow_thickness;
|
|
|
3510 rb.xpos += shadow_thickness;
|
|
|
3511 rb.width -= 2 * shadow_thickness;
|
|
|
3512 }
|
|
|
3513
|
|
|
3514 Dynarr_add (db->runes, rb);
|
|
|
3515 return;
|
|
|
3516 }
|
|
|
3517
|
|
|
3518 /* !!#### not right; needs to compute the max height of
|
|
|
3519 all the charsets */
|
|
|
3520 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
|
|
|
3521
|
|
|
3522 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
|
|
|
3523 dl->descent = XFONT_INSTANCE (font_inst)->descent;
|
|
|
3524
|
|
|
3525 min_pixpos = dl->bounds.left_out;
|
|
|
3526 max_pixpos = dl->bounds.right_out;
|
|
|
3527
|
|
|
3528 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
|
|
|
3529 {
|
|
|
3530 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
|
|
|
3531
|
|
|
3532 ypos_adj = shadow_thickness;
|
|
|
3533 min_pixpos += shadow_thickness;
|
|
|
3534 max_pixpos -= shadow_thickness;
|
|
|
3535 }
|
|
|
3536 else
|
|
|
3537 ypos_adj = 0;
|
|
|
3538
|
|
|
3539 generate_formatted_string_db (b->modeline_format,
|
|
|
3540 b->generated_modeline_string, w, dl, db,
|
|
|
3541 MODELINE_INDEX, min_pixpos, max_pixpos, type);
|
|
|
3542
|
|
|
3543 /* The modeline is at the bottom of the gutters. We have to wait to
|
|
|
3544 set this until we've generated teh modeline in order to account
|
|
|
3545 for any embedded faces. */
|
|
|
3546 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
|
|
|
3547 }
|
|
|
3548
|
|
|
3549 static void
|
|
|
3550 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
|
|
|
3551 struct window *w, struct display_line *dl,
|
|
|
3552 struct display_block *db, face_index findex,
|
|
|
3553 int min_pixpos, int max_pixpos, int type)
|
|
|
3554 {
|
|
|
3555 struct frame *f = XFRAME (w->frame);
|
|
|
3556 struct device *d = XDEVICE (f->device);
|
|
|
3557
|
|
|
3558 pos_data data;
|
|
|
3559 int c_pixpos;
|
|
|
3560
|
|
|
3561 memset (&data, 0, sizeof (data));
|
|
|
3562 data.d = d;
|
|
|
3563 data.db = db;
|
|
|
3564 data.dl = dl;
|
|
|
3565 data.findex = findex;
|
|
|
3566 data.pixpos = min_pixpos;
|
|
|
3567 data.max_pixpos = max_pixpos;
|
|
|
3568 data.cursor_type = NO_CURSOR;
|
|
|
3569 data.last_charset = Qunbound;
|
|
|
3570 data.result_str = result_str;
|
|
|
3571 data.is_modeline = 1;
|
|
|
3572 XSETWINDOW (data.window, w);
|
|
|
3573
|
|
|
3574 Dynarr_reset (formatted_string_extent_dynarr);
|
|
|
3575 Dynarr_reset (formatted_string_extent_start_dynarr);
|
|
|
3576 Dynarr_reset (formatted_string_extent_end_dynarr);
|
|
|
3577
|
|
|
3578 /* This recursively builds up the modeline. */
|
|
|
3579 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
|
|
|
3580 max_pixpos - min_pixpos, findex, type);
|
|
|
3581
|
|
|
3582 if (Dynarr_length (db->runes))
|
|
|
3583 {
|
|
|
3584 struct rune *rb =
|
|
|
3585 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
3586 c_pixpos = rb->xpos + rb->width;
|
|
|
3587 }
|
|
|
3588 else
|
|
|
3589 c_pixpos = min_pixpos;
|
|
|
3590
|
|
|
3591 /* If we don't reach the right side of the window, add a blank rune
|
|
|
3592 to make up the difference. This usually only occurs if the
|
|
|
3593 modeline face is using a proportional width font or a fixed width
|
|
|
3594 font of a different size from the default face font. */
|
|
|
3595
|
|
|
3596 if (c_pixpos < max_pixpos)
|
|
|
3597 {
|
|
|
3598 data.pixpos = c_pixpos;
|
|
|
3599 data.blank_width = max_pixpos - data.pixpos;
|
|
|
3600
|
|
|
3601 add_blank_rune (&data, NULL, 0);
|
|
|
3602 }
|
|
|
3603
|
|
|
3604 /* Now create the result string and frob the extents into it. */
|
|
|
3605 if (!NILP (result_str))
|
|
|
3606 {
|
|
|
3607 int elt;
|
|
|
3608 Bytecount len;
|
|
|
3609 Bufbyte *strdata;
|
|
|
3610 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
|
|
|
3611
|
|
|
3612 detach_all_extents (result_str);
|
|
|
3613 resize_string (XSTRING (result_str), -1,
|
|
16
|
3614 data.bytepos - XSTRING_LENGTH (result_str));
|
|
|
3615
|
|
|
3616 strdata = XSTRING_DATA (result_str);
|
|
0
|
3617
|
|
|
3618 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
3619 {
|
|
|
3620 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
3621 {
|
|
|
3622 len += (set_charptr_emchar
|
|
|
3623 (strdata + len, Dynarr_atp (db->runes,
|
|
|
3624 elt)->object.chr.ch));
|
|
|
3625 }
|
|
|
3626 }
|
|
|
3627
|
|
|
3628 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
|
|
|
3629 elt++)
|
|
|
3630 {
|
|
|
3631 Lisp_Object extent = Qnil;
|
|
|
3632 Lisp_Object child;
|
|
|
3633
|
|
|
3634 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
|
|
|
3635 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
|
|
|
3636 if (NILP (child))
|
|
|
3637 {
|
|
|
3638 child = Fmake_extent (Qnil, Qnil, result_str);
|
|
|
3639 Fputhash (extent, child, buf->modeline_extent_table);
|
|
|
3640 }
|
|
|
3641 Fset_extent_parent (child, extent);
|
|
|
3642 set_extent_endpoints
|
|
|
3643 (XEXTENT (child),
|
|
|
3644 Dynarr_at (formatted_string_extent_start_dynarr, elt),
|
|
|
3645 Dynarr_at (formatted_string_extent_end_dynarr, elt),
|
|
|
3646 result_str);
|
|
|
3647 }
|
|
|
3648 }
|
|
|
3649 }
|
|
|
3650
|
|
|
3651 static Charcount
|
|
|
3652 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
|
|
|
3653 Charcount pos, Charcount min, Charcount max)
|
|
|
3654 {
|
|
|
3655 /* This function has been Mule-ized. */
|
|
|
3656 Charcount end;
|
|
|
3657 CONST Bufbyte *cur_pos = str;
|
|
|
3658 struct display_block *db = data->db;
|
|
|
3659
|
|
|
3660 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3661 while (Dynarr_length (db->runes) < pos)
|
|
|
3662 add_blank_rune (data, NULL, 0);
|
|
|
3663
|
|
|
3664 end = (Dynarr_length (db->runes) +
|
|
|
3665 bytecount_to_charcount (str, strlen ((CONST char *) str)));
|
|
|
3666 if (max != -1)
|
|
|
3667 end = min (max, end);
|
|
|
3668
|
|
|
3669 while (pos < end && *cur_pos)
|
|
|
3670 {
|
|
|
3671 CONST Bufbyte *old_cur_pos = cur_pos;
|
|
|
3672 int succeeded;
|
|
|
3673
|
|
|
3674 data->ch = charptr_emchar (cur_pos);
|
|
|
3675 succeeded = (add_emchar_rune (data) != ADD_FAILED);
|
|
|
3676 INC_CHARPTR (cur_pos);
|
|
|
3677 if (succeeded)
|
|
|
3678 {
|
|
|
3679 pos++;
|
|
|
3680 data->modeline_charpos++;
|
|
|
3681 data->bytepos += cur_pos - old_cur_pos;
|
|
|
3682 }
|
|
|
3683 }
|
|
|
3684
|
|
|
3685 while (Dynarr_length (db->runes) < min &&
|
|
|
3686 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3687 add_blank_rune (data, NULL, 0);
|
|
|
3688
|
|
|
3689 return Dynarr_length (db->runes);
|
|
|
3690 }
|
|
|
3691
|
|
|
3692 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
|
|
|
3693 modeline extents. */
|
|
|
3694 static Charcount
|
|
|
3695 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
|
|
|
3696 Charcount pos, Charcount min, Charcount max)
|
|
|
3697 {
|
|
|
3698 /* This function has been Mule-ized. */
|
|
|
3699 Charcount end;
|
|
|
3700 struct display_block *db = data->db;
|
|
|
3701 struct glyph_block gb;
|
|
|
3702
|
|
|
3703 data->blank_width = space_width (XWINDOW (data->window));
|
|
|
3704 while (Dynarr_length (db->runes) < pos)
|
|
|
3705 add_blank_rune (data, NULL, 0);
|
|
|
3706
|
|
|
3707 end = Dynarr_length (db->runes) + 1;
|
|
|
3708 if (max != -1)
|
|
|
3709 end = min (max, end);
|
|
|
3710
|
|
|
3711 gb.glyph = glyph;
|
|
|
3712 gb.extent = Qnil;
|
|
|
3713 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
|
|
|
3714 pos++;
|
|
|
3715
|
|
|
3716 while (Dynarr_length (db->runes) < pos &&
|
|
|
3717 (data->pixpos + data->blank_width <= data->max_pixpos))
|
|
|
3718 add_blank_rune (data, NULL, 0);
|
|
|
3719
|
|
|
3720 return Dynarr_length (db->runes);
|
|
|
3721 }
|
|
|
3722
|
|
|
3723 /* If max_pos is == -1, it is considered to be infinite. The same is
|
|
|
3724 true of max_pixsize. */
|
|
|
3725 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
|
|
|
3726 if (Dynarr_length (data->db->runes)) \
|
|
|
3727 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
|
|
|
3728 else \
|
|
|
3729 cur_pixsize = 0;
|
|
|
3730
|
|
|
3731 /* Note that this function does "positions" in terms of characters and
|
|
|
3732 not in terms of columns. This is necessary to make the formatting
|
|
|
3733 work correctly when proportional width fonts are used in the
|
|
|
3734 modeline. */
|
|
|
3735 static Charcount
|
|
|
3736 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
|
|
|
3737 Charcount min_pos, Charcount max_pos,
|
|
|
3738 Lisp_Object elt, int depth, int max_pixsize,
|
|
|
3739 face_index findex, int type)
|
|
|
3740 {
|
|
|
3741 /* This function has been Mule-ized. */
|
|
|
3742 /* #### The other losing things in this function are:
|
|
|
3743
|
|
|
3744 -- C zero-terminated-string lossage.
|
|
|
3745 -- Non-printable characters should be converted into something
|
|
|
3746 appropriate (e.g. ^F) instead of blindly being printed anyway.
|
|
|
3747 */
|
|
|
3748
|
|
|
3749 tail_recurse:
|
|
|
3750 if (depth > 10)
|
|
|
3751 goto invalid;
|
|
|
3752
|
|
|
3753 depth++;
|
|
|
3754
|
|
|
3755 if (STRINGP (elt))
|
|
|
3756 {
|
|
|
3757 /* A string. Add to the display line and check for %-constructs
|
|
|
3758 within it. */
|
|
|
3759
|
|
16
|
3760 Bufbyte *this = XSTRING_DATA (elt);
|
|
0
|
3761
|
|
|
3762 while ((pos < max_pos || max_pos == -1) && *this)
|
|
|
3763 {
|
|
|
3764 Bufbyte *last = this;
|
|
|
3765
|
|
|
3766 while (*this && *this != '%')
|
|
|
3767 this++;
|
|
|
3768
|
|
|
3769 if (this != last)
|
|
|
3770 {
|
|
|
3771 /* The string is just a string. */
|
|
|
3772 Charcount size =
|
|
|
3773 bytecount_to_charcount (last, this - last) + pos;
|
|
|
3774 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
|
|
|
3775
|
|
|
3776 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
|
|
|
3777 tmp_max);
|
|
|
3778 }
|
|
|
3779 else /* *this == '%' */
|
|
|
3780 {
|
|
|
3781 Charcount spec_width = 0;
|
|
|
3782
|
|
|
3783 this++; /* skip over '%' */
|
|
|
3784
|
|
|
3785 /* We can't allow -ve args due to the "%-" construct.
|
|
|
3786 * Argument specifies minwidth but not maxwidth
|
|
|
3787 * (maxwidth can be specified by
|
|
|
3788 * (<negative-number> . <stuff>) modeline elements)
|
|
|
3789 */
|
|
|
3790 while (isdigit (*this))
|
|
|
3791 {
|
|
|
3792 spec_width = spec_width * 10 + (*this - '0');
|
|
|
3793 this++;
|
|
|
3794 }
|
|
|
3795 spec_width += pos;
|
|
|
3796
|
|
|
3797 if (*this == 'M')
|
|
|
3798 {
|
|
|
3799 pos = generate_fstring_runes (w, data, pos, spec_width,
|
|
|
3800 max_pos, Vglobal_mode_string,
|
|
|
3801 depth, max_pixsize, findex,
|
|
|
3802 type);
|
|
|
3803 }
|
|
|
3804 else if (*this == '-')
|
|
|
3805 {
|
|
|
3806 Charcount num_to_add;
|
|
|
3807
|
|
|
3808 if (max_pixsize < 0)
|
|
|
3809 num_to_add = 0;
|
|
|
3810 else if (max_pos != -1)
|
|
|
3811 num_to_add = max_pos - pos;
|
|
|
3812 else
|
|
|
3813 {
|
|
|
3814 int cur_pixsize;
|
|
|
3815 int dash_pixsize;
|
|
|
3816 Bufbyte ch = '-';
|
|
|
3817 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
3818
|
|
|
3819 dash_pixsize =
|
|
|
3820 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
|
|
|
3821 1);
|
|
|
3822
|
|
|
3823 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
|
|
|
3824 num_to_add++;
|
|
|
3825 }
|
|
|
3826
|
|
|
3827 while (num_to_add--)
|
|
|
3828 pos = add_string_to_fstring_db_runes
|
|
|
3829 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
|
|
|
3830 }
|
|
|
3831 else if (*this != 0)
|
|
|
3832 {
|
|
|
3833 Bufbyte *str;
|
|
|
3834 Emchar ch = charptr_emchar (this);
|
|
|
3835 decode_mode_spec (w, ch, type);
|
|
|
3836
|
|
|
3837 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
|
|
|
3838 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
|
|
|
3839 max_pos);
|
|
|
3840 }
|
|
|
3841
|
|
|
3842 /* NOT this++. There could be any sort of character at
|
|
|
3843 the current position. */
|
|
|
3844 INC_CHARPTR (this);
|
|
|
3845 }
|
|
|
3846
|
|
|
3847 if (max_pixsize > 0)
|
|
|
3848 {
|
|
|
3849 int cur_pixsize;
|
|
|
3850 SET_CURRENT_MODE_CHARS_PIXSIZE;
|
|
|
3851
|
|
|
3852 if (cur_pixsize >= max_pixsize)
|
|
|
3853 break;
|
|
|
3854 }
|
|
|
3855 }
|
|
|
3856 }
|
|
|
3857 else if (SYMBOLP (elt))
|
|
|
3858 {
|
|
|
3859 /* A symbol: process the value of the symbol recursively
|
|
|
3860 as if it appeared here directly. */
|
|
|
3861 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
|
|
|
3862
|
|
|
3863 if (!UNBOUNDP (tem))
|
|
|
3864 {
|
|
|
3865 /* If value is a string, output that string literally:
|
|
|
3866 don't check for % within it. */
|
|
|
3867 if (STRINGP (tem))
|
|
|
3868 {
|
|
|
3869 pos =
|
|
|
3870 add_string_to_fstring_db_runes
|
|
16
|
3871 (data, XSTRING_DATA (tem), pos, min_pos, max_pos);
|
|
0
|
3872 }
|
|
|
3873 /* Give up right away for nil or t. */
|
|
|
3874 else if (!EQ (tem, elt))
|
|
|
3875 {
|
|
|
3876 elt = tem;
|
|
|
3877 goto tail_recurse;
|
|
|
3878 }
|
|
|
3879 }
|
|
|
3880 }
|
|
|
3881 else if (CONSP (elt))
|
|
|
3882 {
|
|
|
3883 /* A cons cell: four distinct cases.
|
|
|
3884 * If first element is a string or a cons, process all the elements
|
|
|
3885 * and effectively concatenate them.
|
|
|
3886 * If first element is a negative number, truncate displaying cdr to
|
|
|
3887 * at most that many characters. If positive, pad (with spaces)
|
|
|
3888 * to at least that many characters.
|
|
|
3889 * If first element is a symbol, process the cadr or caddr recursively
|
|
|
3890 * according to whether the symbol's value is non-nil or nil.
|
|
|
3891 * If first element is a face, process the cdr recursively
|
|
|
3892 * without altering the depth.
|
|
|
3893 */
|
|
|
3894 Lisp_Object car, tem;
|
|
|
3895
|
|
|
3896 car = XCAR (elt);
|
|
|
3897 if (SYMBOLP (car))
|
|
|
3898 {
|
|
|
3899 elt = XCDR (elt);
|
|
|
3900 if (!CONSP (elt))
|
|
|
3901 goto invalid;
|
|
|
3902 tem = symbol_value_in_buffer (car, w->buffer);
|
|
|
3903 /* elt is now the cdr, and we know it is a cons cell.
|
|
|
3904 Use its car if CAR has a non-nil value. */
|
|
|
3905 if (!UNBOUNDP (tem))
|
|
|
3906 {
|
|
|
3907 if (!NILP (tem))
|
|
|
3908 {
|
|
|
3909 elt = XCAR (elt);
|
|
|
3910 goto tail_recurse;
|
|
|
3911 }
|
|
|
3912 }
|
|
|
3913 /* Symbol's value is nil (or symbol is unbound)
|
|
|
3914 * Get the cddr of the original list
|
|
|
3915 * and if possible find the caddr and use that.
|
|
|
3916 */
|
|
|
3917 elt = XCDR (elt);
|
|
|
3918 if (NILP (elt))
|
|
|
3919 ;
|
|
|
3920 else if (!CONSP (elt))
|
|
|
3921 goto invalid;
|
|
|
3922 else
|
|
|
3923 {
|
|
|
3924 elt = XCAR (elt);
|
|
|
3925 goto tail_recurse;
|
|
|
3926 }
|
|
|
3927 }
|
|
|
3928 else if (INTP (car))
|
|
|
3929 {
|
|
|
3930 Charcount lim = XINT (car);
|
|
|
3931
|
|
|
3932 elt = XCDR (elt);
|
|
|
3933
|
|
|
3934 if (lim < 0)
|
|
|
3935 {
|
|
|
3936 /* Negative int means reduce maximum width.
|
|
|
3937 * DO NOT change MIN_PIXPOS here!
|
|
|
3938 * (20 -10 . foo) should truncate foo to 10 col
|
|
|
3939 * and then pad to 20.
|
|
|
3940 */
|
|
|
3941 if (max_pos == -1)
|
|
|
3942 max_pos = pos - lim;
|
|
|
3943 else
|
|
|
3944 max_pos = min (max_pos, pos - lim);
|
|
|
3945 }
|
|
|
3946 else if (lim > 0)
|
|
|
3947 {
|
|
|
3948 /* Padding specified. Don't let it be more than
|
|
|
3949 * current maximum.
|
|
|
3950 */
|
|
|
3951 lim += pos;
|
|
|
3952 if (max_pos != -1 && lim > max_pos)
|
|
|
3953 lim = max_pos;
|
|
|
3954 /* If that's more padding than already wanted, queue it.
|
|
|
3955 * But don't reduce padding already specified even if
|
|
|
3956 * that is beyond the current truncation point.
|
|
|
3957 */
|
|
|
3958 if (lim > min_pos)
|
|
|
3959 min_pos = lim;
|
|
|
3960 }
|
|
|
3961 goto tail_recurse;
|
|
|
3962 }
|
|
|
3963 else if (STRINGP (car) || CONSP (car))
|
|
|
3964 {
|
|
|
3965 int limit = 50;
|
|
|
3966 /* LIMIT is to protect against circular lists. */
|
|
|
3967 while (CONSP (elt) && --limit > 0
|
|
|
3968 && (pos < max_pos || max_pos == -1))
|
|
|
3969 {
|
|
|
3970 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
3971 XCAR (elt), depth,
|
|
|
3972 max_pixsize, findex, type);
|
|
|
3973 elt = XCDR (elt);
|
|
|
3974 }
|
|
|
3975 }
|
|
|
3976 else if (EXTENTP (car))
|
|
|
3977 {
|
|
|
3978 struct extent *ext = XEXTENT (car);
|
|
|
3979
|
|
|
3980 if (EXTENT_LIVE_P (ext))
|
|
|
3981 {
|
|
|
3982 face_index old_findex = data->findex;
|
|
|
3983 Lisp_Object face;
|
|
|
3984 Lisp_Object font_inst;
|
|
|
3985 face_index new_findex;
|
|
|
3986 Bytecount start = data->bytepos;
|
|
|
3987
|
|
|
3988 face = extent_face (ext);
|
|
|
3989 if (FACEP (face))
|
|
|
3990 {
|
|
|
3991 /* #### needs to merge faces, sigh */
|
|
|
3992 /* #### needs to handle list of faces */
|
|
|
3993 new_findex = get_builtin_face_cache_index (w, face);
|
|
|
3994 /* !!#### not right; needs to compute the max height of
|
|
|
3995 all the charsets */
|
|
|
3996 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
|
|
|
3997 Vcharset_ascii);
|
|
|
3998
|
|
|
3999 data->dl->ascent = max (data->dl->ascent,
|
|
|
4000 XFONT_INSTANCE (font_inst)->ascent);
|
|
|
4001 data->dl->descent = max (data->dl->descent,
|
|
|
4002 XFONT_INSTANCE (font_inst)->
|
|
|
4003 descent);
|
|
|
4004 }
|
|
|
4005 else
|
|
|
4006 new_findex = old_findex;
|
|
|
4007
|
|
|
4008 data->findex = new_findex;
|
|
|
4009 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
|
|
|
4010 XCDR (elt), depth - 1,
|
|
|
4011 max_pixsize, new_findex, type);
|
|
|
4012 data->findex = old_findex;
|
|
|
4013 Dynarr_add (formatted_string_extent_dynarr, ext);
|
|
|
4014 Dynarr_add (formatted_string_extent_start_dynarr, start);
|
|
|
4015 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
|
|
|
4016 }
|
|
|
4017 }
|
|
|
4018 }
|
|
|
4019 else if (GLYPHP (elt))
|
|
|
4020 {
|
|
|
4021 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
|
|
|
4022 }
|
|
|
4023 else
|
|
|
4024 {
|
|
|
4025 invalid:
|
|
|
4026 pos =
|
|
|
4027 add_string_to_fstring_db_runes
|
|
|
4028 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
|
|
|
4029 max_pos);
|
|
|
4030 }
|
|
|
4031
|
|
|
4032 if (min_pos > pos)
|
|
|
4033 {
|
|
|
4034 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
|
|
|
4035 -1);
|
|
|
4036 }
|
|
|
4037
|
|
|
4038 return pos;
|
|
|
4039 }
|
|
|
4040
|
|
|
4041 /* The caller is responsible for freeing the returned string. */
|
|
2
|
4042 Bufbyte *
|
|
0
|
4043 generate_formatted_string (struct window *w, Lisp_Object format_str,
|
|
|
4044 Lisp_Object result_str, face_index findex, int type)
|
|
|
4045 {
|
|
|
4046 struct display_line *dl;
|
|
|
4047 struct display_block *db;
|
|
|
4048 int elt = 0;
|
|
|
4049
|
|
|
4050 dl = &formatted_string_display_line;
|
|
|
4051 db = get_display_block_from_line (dl, TEXT);
|
|
|
4052 Dynarr_reset (db->runes);
|
|
|
4053
|
|
|
4054 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
|
|
|
4055 -1, type);
|
|
|
4056
|
|
|
4057 Dynarr_reset (formatted_string_emchar_dynarr);
|
|
|
4058 while (elt < Dynarr_length (db->runes))
|
|
|
4059 {
|
|
|
4060 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
|
|
|
4061 Dynarr_add (formatted_string_emchar_dynarr,
|
|
|
4062 Dynarr_atp (db->runes, elt)->object.chr.ch);
|
|
|
4063 elt++;
|
|
|
4064 }
|
|
|
4065
|
|
2
|
4066 return
|
|
|
4067 convert_emchar_string_into_malloced_string
|
|
|
4068 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
|
|
|
4069 Dynarr_length (formatted_string_emchar_dynarr), 0);
|
|
0
|
4070 }
|
|
|
4071
|
|
|
4072 /* Update just the modeline. Assumes the desired display structs. If
|
|
|
4073 they do not have a modeline block, it does nothing. */
|
|
|
4074 static void
|
|
|
4075 regenerate_modeline (struct window *w)
|
|
|
4076 {
|
|
|
4077 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
|
|
|
4078
|
|
|
4079 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
|
|
|
4080 return;
|
|
|
4081 else
|
|
|
4082 {
|
|
|
4083 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
|
|
|
4084 redisplay_update_line (w, 0, 0, 0);
|
|
|
4085 }
|
|
|
4086 }
|
|
|
4087
|
|
|
4088 /* Make sure that modeline display line is present in the given
|
|
|
4089 display structs if the window has a modeline and update that
|
|
|
4090 line. Returns true if a modeline was needed. */
|
|
|
4091 static int
|
|
|
4092 ensure_modeline_generated (struct window *w, int type)
|
|
|
4093 {
|
|
|
4094 int need_modeline;
|
|
|
4095
|
|
|
4096 /* minibuffer windows don't have modelines */
|
|
|
4097 if (MINI_WINDOW_P (w))
|
|
|
4098 need_modeline = 0;
|
|
|
4099 /* windows which haven't had it turned off do */
|
|
|
4100 else if (WINDOW_HAS_MODELINE_P (w))
|
|
|
4101 need_modeline = 1;
|
|
|
4102 /* windows which have it turned off don't have a divider if there is
|
|
|
4103 a horizontal scrollbar */
|
|
|
4104 else if (window_scrollbar_height (w))
|
|
|
4105 need_modeline = 0;
|
|
|
4106 /* and in this case there is none */
|
|
|
4107 else
|
|
|
4108 need_modeline = 1;
|
|
|
4109
|
|
|
4110 if (need_modeline)
|
|
|
4111 {
|
|
|
4112 display_line_dynarr *dla;
|
|
|
4113
|
|
|
4114 dla = window_display_lines (w, type);
|
|
|
4115
|
|
|
4116 /* We don't care if there is a display line which is not
|
|
|
4117 currently a modeline because it is definitely going to become
|
|
|
4118 one if we have gotten to this point. */
|
|
|
4119 if (Dynarr_length (dla) == 0)
|
|
|
4120 {
|
|
|
4121 if (Dynarr_largest (dla) > 0)
|
|
|
4122 {
|
|
|
4123 struct display_line *mlp = Dynarr_atp (dla, 0);
|
|
|
4124 Dynarr_add (dla, *mlp);
|
|
|
4125 }
|
|
|
4126 else
|
|
|
4127 {
|
|
|
4128 struct display_line modeline;
|
|
|
4129 memset (&modeline, 0, sizeof (struct display_line));
|
|
|
4130 Dynarr_add (dla, modeline);
|
|
|
4131 }
|
|
|
4132 }
|
|
|
4133
|
|
|
4134 /* If we're adding a new place marker go ahead and generate the
|
|
|
4135 modeline so that it is available for use by
|
|
|
4136 window_modeline_height. */
|
|
|
4137 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4138 }
|
|
|
4139
|
|
|
4140 return need_modeline;
|
|
|
4141 }
|
|
|
4142
|
|
|
4143 /* #### Kludge or not a kludge. I tend towards the former. */
|
|
|
4144 int
|
|
|
4145 real_current_modeline_height (struct window *w)
|
|
|
4146 {
|
|
|
4147 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
|
|
2
|
4148 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
|
|
0
|
4149
|
|
|
4150 if (ensure_modeline_generated (w, CMOTION_DISP))
|
|
|
4151 {
|
|
|
4152 display_line_dynarr *dla;
|
|
|
4153
|
|
|
4154 dla = window_display_lines (w, CMOTION_DISP);
|
|
|
4155
|
|
|
4156 if (Dynarr_length (dla))
|
|
|
4157 {
|
|
|
4158 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
4159 return (Dynarr_atp (dla, 0)->ascent +
|
|
|
4160 Dynarr_atp (dla, 0)->descent);
|
|
|
4161 else
|
|
|
4162 return 0;
|
|
|
4163 }
|
|
|
4164 else
|
|
|
4165 return 0;
|
|
|
4166 }
|
|
|
4167 else
|
|
|
4168 return 0;
|
|
|
4169 }
|
|
|
4170
|
|
|
4171
|
|
|
4172 /***************************************************************************/
|
|
|
4173 /* */
|
|
|
4174 /* window-regeneration routines */
|
|
|
4175 /* */
|
|
|
4176 /***************************************************************************/
|
|
|
4177
|
|
|
4178 /* For a given window and starting position in the buffer it contains,
|
|
|
4179 ensure that the TYPE display lines accurately represent the
|
|
|
4180 presentation of the window. We pass the buffer instead of getting
|
|
|
4181 it from the window since redisplay_window may have temporarily
|
|
|
4182 changed it to the echo area buffer. */
|
|
|
4183
|
|
|
4184 static void
|
|
|
4185 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
|
|
|
4186 {
|
|
|
4187 struct frame *f = XFRAME (w->frame);
|
|
|
4188 struct buffer *b = XBUFFER (w->buffer);
|
|
|
4189 int ypos = WINDOW_TEXT_TOP (w);
|
|
|
4190 int yend; /* set farther down */
|
|
|
4191
|
|
|
4192 prop_block_dynarr *prop;
|
|
|
4193 layout_bounds bounds;
|
|
|
4194 display_line_dynarr *dla;
|
|
|
4195 int need_modeline;
|
|
|
4196
|
|
|
4197 /* The lines had better exist by this point. */
|
|
|
4198 if (!(dla = window_display_lines (w, type)))
|
|
|
4199 abort ();
|
|
|
4200 Dynarr_reset (dla);
|
|
|
4201 w->max_line_len = 0;
|
|
|
4202
|
|
|
4203 /* Normally these get updated in redisplay_window but it is possible
|
|
|
4204 for this function to get called from some other points where that
|
|
|
4205 update may not have occurred. This acts as a safety check. */
|
|
|
4206 if (!Dynarr_length (w->face_cachels))
|
|
|
4207 reset_face_cachels (w);
|
|
|
4208 if (!Dynarr_length (w->glyph_cachels))
|
|
|
4209 reset_glyph_cachels (w);
|
|
|
4210
|
|
|
4211 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
|
|
|
4212 Fset_marker (w->pointm[type], make_int (point), w->buffer);
|
|
|
4213 w->last_point_x[type] = -1;
|
|
|
4214 w->last_point_y[type] = -1;
|
|
|
4215
|
|
|
4216 /* Make sure a modeline is in the structs if needed. */
|
|
|
4217 need_modeline = ensure_modeline_generated (w, type);
|
|
|
4218
|
|
|
4219 /* Wait until here to set this so that the structs have a modeline
|
|
|
4220 generated in the case where one didn't exist. */
|
|
|
4221 yend = WINDOW_TEXT_BOTTOM (w);
|
|
|
4222
|
|
|
4223 bounds = calculate_display_line_boundaries (w, 0);
|
|
|
4224
|
|
|
4225 if (MINI_WINDOW_P (w)
|
|
|
4226 && !NILP (Vminibuf_prompt)
|
|
|
4227 && !echo_area_active (f)
|
|
|
4228 && start_pos == BUF_BEGV (b))
|
|
|
4229 {
|
|
|
4230 struct prop_block pb;
|
|
|
4231 prop = Dynarr_new (struct prop_block);
|
|
|
4232
|
|
|
4233 pb.type = PROP_MINIBUF_PROMPT;
|
|
16
|
4234 pb.data.p_string.str = XSTRING_DATA (Vminibuf_prompt);
|
|
|
4235 pb.data.p_string.len = XSTRING_LENGTH (Vminibuf_prompt);
|
|
0
|
4236 Dynarr_add (prop, pb);
|
|
|
4237 }
|
|
|
4238 else
|
|
|
4239 prop = 0;
|
|
|
4240
|
|
|
4241 while (ypos < yend)
|
|
|
4242 {
|
|
|
4243 struct display_line dl;
|
|
|
4244 struct display_line *dlp;
|
|
|
4245 int local;
|
|
|
4246
|
|
|
4247 if (Dynarr_length (dla) < Dynarr_largest (dla))
|
|
|
4248 {
|
|
|
4249 dlp = Dynarr_atp (dla, Dynarr_length (dla));
|
|
|
4250 local = 0;
|
|
|
4251 }
|
|
|
4252 else
|
|
|
4253 {
|
|
|
4254 dlp = &dl;
|
|
|
4255 memset (dlp, 0, sizeof (struct display_line));
|
|
|
4256 local = 1;
|
|
|
4257 }
|
|
|
4258
|
|
|
4259 dlp->bounds = bounds;
|
|
|
4260 dlp->offset = 0;
|
|
|
4261 start_pos = generate_display_line (w, dlp, 1, start_pos,
|
|
|
4262 w->hscroll, &prop, type);
|
|
|
4263 dlp->ypos = ypos + dlp->ascent;
|
|
|
4264 ypos = dlp->ypos + dlp->descent;
|
|
|
4265
|
|
|
4266 if (ypos > yend)
|
|
|
4267 {
|
|
|
4268 int visible_height = dlp->ascent + dlp->descent;
|
|
|
4269
|
|
|
4270 dlp->clip = (ypos - yend);
|
|
|
4271 visible_height -= dlp->clip;
|
|
|
4272
|
|
|
4273 if (visible_height < VERTICAL_CLIP (w, 1))
|
|
|
4274 {
|
|
|
4275 if (local)
|
|
|
4276 free_display_line (dlp);
|
|
|
4277 break;
|
|
|
4278 }
|
|
|
4279 }
|
|
|
4280 else
|
|
|
4281 dlp->clip = 0;
|
|
|
4282
|
|
|
4283 if (dlp->cursor_elt != -1)
|
|
|
4284 {
|
|
|
4285 /* #### This check is steaming crap. Have to get things
|
|
|
4286 fixed so when create_text_block hits EOB, we're done,
|
|
|
4287 period. */
|
|
|
4288 if (w->last_point_x[type] == -1)
|
|
|
4289 {
|
|
|
4290 w->last_point_x[type] = dlp->cursor_elt;
|
|
|
4291 w->last_point_y[type] = Dynarr_length (dla);
|
|
|
4292 }
|
|
|
4293 else
|
|
|
4294 {
|
|
|
4295 /* #### This means that we've added a cursor at EOB
|
|
|
4296 twice. Yuck oh yuck. */
|
|
|
4297 struct display_block *db =
|
|
|
4298 get_display_block_from_line (dlp, TEXT);
|
|
|
4299
|
|
|
4300 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
|
|
|
4301 dlp->cursor_elt = -1;
|
|
|
4302 }
|
|
|
4303 }
|
|
|
4304
|
|
|
4305 if (dlp->num_chars > w->max_line_len)
|
|
|
4306 w->max_line_len = dlp->num_chars;
|
|
|
4307
|
|
|
4308 Dynarr_add (dla, *dlp);
|
|
|
4309
|
|
|
4310 /* #### This isn't right, but it is close enough for now. */
|
|
|
4311 w->window_end_pos[type] = start_pos;
|
|
|
4312
|
|
|
4313 /* #### This type of check needs to be done down in the
|
|
|
4314 generate_display_line call. */
|
|
|
4315 if (start_pos > BUF_ZV (b))
|
|
|
4316 break;
|
|
|
4317 }
|
|
|
4318
|
|
|
4319 if (prop)
|
|
|
4320 Dynarr_free (prop);
|
|
|
4321
|
|
|
4322 /* #### More not quite right, but close enough. */
|
|
|
4323 /* #### Ben sez: apparently window_end_pos[] is measured
|
|
|
4324 as the number of characters between the window end and the
|
|
|
4325 end of the buffer? This seems rather weirdo. What's
|
|
|
4326 the justification for this? */
|
|
|
4327 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
|
|
|
4328
|
|
|
4329 if (need_modeline)
|
|
|
4330 {
|
|
|
4331 /* We know that this is the right thing to use because we put it
|
|
|
4332 there when we first started working in this function. */
|
|
|
4333 generate_modeline (w, Dynarr_atp (dla, 0), type);
|
|
|
4334 }
|
|
|
4335 }
|
|
|
4336
|
|
|
4337 #define REGEN_INC_FIND_START_END \
|
|
|
4338 do { \
|
|
|
4339 /* Determine start and end of lines. */ \
|
|
|
4340 if (!Dynarr_length (cdla)) \
|
|
|
4341 return 0; \
|
|
|
4342 else \
|
|
|
4343 { \
|
|
|
4344 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
|
|
|
4345 { \
|
|
|
4346 dla_start = 1; \
|
|
|
4347 } \
|
|
|
4348 else if (!Dynarr_atp (cdla, 0)->modeline \
|
|
|
4349 && !Dynarr_atp (ddla, 0)->modeline) \
|
|
|
4350 { \
|
|
|
4351 dla_start = 0; \
|
|
|
4352 } \
|
|
|
4353 else \
|
|
|
4354 abort (); /* structs differ */ \
|
|
|
4355 \
|
|
|
4356 dla_end = Dynarr_length (cdla) - 1; \
|
|
|
4357 } \
|
|
|
4358 \
|
|
|
4359 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
|
|
|
4360 + Dynarr_atp (cdla, dla_start)->offset); \
|
|
|
4361 /* If this isn't true, then startp has changed and we need to do a \
|
|
|
4362 full regen. */ \
|
|
|
4363 if (startp != start_pos) \
|
|
|
4364 return 0; \
|
|
|
4365 \
|
|
|
4366 /* Point is outside the visible region so give up. */ \
|
|
|
4367 if (pointm < start_pos) \
|
|
|
4368 return 0; \
|
|
|
4369 \
|
|
|
4370 } while (0)
|
|
|
4371
|
|
|
4372 /* This attempts to incrementally update the display structures. It
|
|
|
4373 returns a boolean indicating success or failure. This function is
|
|
|
4374 very similar to regenerate_window_incrementally and is in fact only
|
|
|
4375 called from that function. However, because of the nature of the
|
|
|
4376 changes it deals with it sometimes makes different assumptions
|
|
|
4377 which can lead to success which are much more difficult to make
|
|
|
4378 when dealing with buffer changes. */
|
|
|
4379
|
|
|
4380 static int
|
|
|
4381 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
|
|
|
4382 Bufpos pointm,
|
|
|
4383 Charcount beg_unchanged,
|
|
|
4384 Charcount end_unchanged)
|
|
|
4385 {
|
|
|
4386 struct buffer *b = XBUFFER (w->buffer);
|
|
|
4387 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
4388 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
4389
|
|
|
4390 int dla_start = 0;
|
|
|
4391 int dla_end, line;
|
|
|
4392 int first_line, last_line;
|
|
|
4393 Bufpos start_pos;
|
|
|
4394 /* Don't define this in the loop where it is used because we
|
|
|
4395 definitely want its value to survive between passes. */
|
|
|
4396 prop_block_dynarr *prop = NULL;
|
|
|
4397
|
|
|
4398 /* If we don't have any buffer change recorded but the modiff flag has
|
|
|
4399 been incremented, then fail. I'm not sure of the exact circumstances
|
|
|
4400 under which this can happen, but I believe that it is probably a
|
|
|
4401 reasonable happening. */
|
|
|
4402 if (!point_visible (w, pointm, CURRENT_DISP)
|
|
|
4403 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
|
|
|
4404 return 0;
|
|
|
4405
|
|
|
4406 /* If the cursor is moved we attempt to update it. If we succeed we
|
|
|
4407 go ahead and proceed with the optimization attempt. */
|
|
|
4408 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
4409 || pointm != marker_position (w->last_point[CURRENT_DISP]))
|
|
|
4410 {
|
|
|
4411 struct frame *f = XFRAME (w->frame);
|
|
|
4412 struct device *d = XDEVICE (f->device);
|
|
|
4413 struct frame *sel_f = device_selected_frame (d);
|
|
|
4414 int success = 0;
|
|
|
4415
|
|
|
4416 if (w->last_point_x[CURRENT_DISP] != -1
|
|
|
4417 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
4418 {
|
|
|
4419
|
|
|
4420 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
|
|
|
4421 {
|
|
|
4422 /* Always regenerate the modeline in case it is
|
|
|
4423 displaying the current line or column. */
|
|
|
4424 regenerate_modeline (w);
|
|
|
4425 success = 1;
|
|
|
4426 }
|
|
|
4427 }
|
|
|
4428 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
|
|
|
4429 {
|
|
|
4430 if (f->modeline_changed)
|
|
|
4431 regenerate_modeline (w);
|
|
|
4432 success = 1;
|
|
|
4433 }
|
|
|
4434
|
|
|
4435 if (!success)
|
|
|
4436 return 0;
|
|
|
4437 }
|
|
|
4438
|
|
|
4439 if (beg_unchanged == -1 && end_unchanged == -1)
|
|
|
4440 return 1;
|
|
|
4441
|
|
|
4442 /* assert: There are no buffer modifications or they are all below the
|
|
|
4443 visible region. We assume that regenerate_window_incrementally has
|
|
|
4444 not called us unless this is true. */
|
|
|
4445
|
|
|
4446 REGEN_INC_FIND_START_END;
|
|
|
4447
|
|
|
4448 /* If the changed are starts before the visible area, give up. */
|
|
|
4449 if (beg_unchanged < startp)
|
|
|
4450 return 0;
|
|
|
4451
|
|
|
4452 /* Find what display line the extent changes first affect. */
|
|
|
4453 line = dla_start;
|
|
|
4454 while (line <= dla_end)
|
|
|
4455 {
|
|
|
4456 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
|
4457 Bufpos lstart = dl->bufpos + dl->offset;
|
|
|
4458 Bufpos lend = dl->end_bufpos + dl->offset;
|
|
|
4459
|
|
|
4460 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
4461 break;
|
|
|
4462
|
|
|
4463 line++;
|
|
|
4464 }
|
|
|
4465
|
|
|
4466 /* If the changes are below the visible area then if point hasn't
|
|
|
4467 moved return success otherwise fail in order to be safe. */
|
|
|
4468 if (line > dla_end)
|
|
|
4469 {
|
|
|
4470 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
4471 && pointm == marker_position (w->last_point[CURRENT_DISP]))
|
|
|
4472 return 1;
|
|
|
4473 else
|
|
|
4474 return 0;
|
|
|
4475 }
|
|
|
4476
|
|
|
4477 /* At this point we know what line the changes first affect. We now
|
|
|
4478 begin redrawing lines as long as we are still in the affected
|
|
|
4479 region and the line's size and positioning don't change.
|
|
|
4480 Otherwise we fail. If we fail we will have altered the desired
|
|
|
4481 structs which could lead to an assertion failure. However, if we
|
|
|
4482 fail the next thing that is going to happen is a full regen so we
|
|
|
4483 will actually end up being safe. */
|
|
|
4484 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
4485 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
4486 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
4487 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
4488
|
|
|
4489 first_line = last_line = line;
|
|
|
4490 while (line <= dla_end)
|
|
|
4491 {
|
|
|
4492 Bufpos old_start, old_end, new_start;
|
|
|
4493 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
4494 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
4495 struct display_block *db;
|
|
|
4496 int initial_size;
|
|
|
4497
|
|
|
4498 assert (cdl->bufpos == ddl->bufpos);
|
|
|
4499 assert (cdl->end_bufpos == ddl->end_bufpos);
|
|
|
4500 assert (cdl->offset == ddl->offset);
|
|
|
4501
|
|
|
4502 db = get_display_block_from_line (ddl, TEXT);
|
|
|
4503 initial_size = Dynarr_length (db->runes);
|
|
|
4504 old_start = ddl->bufpos + ddl->offset;
|
|
|
4505 old_end = ddl->end_bufpos + ddl->offset;
|
|
|
4506
|
|
|
4507 /* If this is the first line being updated and it used
|
|
|
4508 propagation data, fail. Otherwise we'll be okay because
|
|
|
4509 we'll have the necessary propagation data. */
|
|
|
4510 if (line == first_line && ddl->used_prop_data)
|
|
|
4511 return 0;
|
|
|
4512
|
|
|
4513 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
|
|
|
4514 w->hscroll, &prop, DESIRED_DISP);
|
|
|
4515 ddl->offset = 0;
|
|
|
4516
|
|
|
4517 /* #### If there is propagated stuff the fail. We could
|
|
|
4518 probably actually deal with this if the line had propagated
|
|
|
4519 information when originally created by a full
|
|
|
4520 regeneration. */
|
|
|
4521 if (prop)
|
|
|
4522 {
|
|
|
4523 Dynarr_free (prop);
|
|
|
4524 return 0;
|
|
|
4525 }
|
|
|
4526
|
|
|
4527 /* If any line position parameters have changed or a
|
|
|
4528 cursor has disappeared or disappeared, fail. */
|
|
|
4529 db = get_display_block_from_line (ddl, TEXT);
|
|
|
4530 if (cdl->ypos != ddl->ypos
|
|
|
4531 || cdl->ascent != ddl->ascent
|
|
|
4532 || cdl->descent != ddl->descent
|
|
|
4533 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
4534 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
|
|
|
4535 || old_start != ddl->bufpos
|
|
|
4536 || old_end != ddl->end_bufpos
|
|
|
4537 || initial_size != Dynarr_length (db->runes))
|
|
|
4538 {
|
|
|
4539 return 0;
|
|
|
4540 }
|
|
|
4541
|
|
|
4542 if (ddl->cursor_elt != -1)
|
|
|
4543 {
|
|
|
4544 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
4545 w->last_point_y[DESIRED_DISP] = line;
|
|
|
4546 }
|
|
|
4547
|
|
|
4548 last_line = line;
|
|
|
4549
|
|
|
4550 /* If the extent changes end on the line we just updated then
|
|
|
4551 we're done. Otherwise go on to the next line. */
|
|
|
4552 if (end_unchanged <= ddl->end_bufpos)
|
|
|
4553 break;
|
|
|
4554 else
|
|
|
4555 line++;
|
|
|
4556 }
|
|
|
4557
|
|
|
4558 redisplay_update_line (w, first_line, last_line, 1);
|
|
|
4559 return 1;
|
|
|
4560 }
|
|
|
4561
|
|
|
4562 /* Attempt to update the display data structures based on knowledge of
|
|
|
4563 the changed region in the buffer. Returns a boolean indicating
|
|
|
4564 success or failure. If this function returns a failure then a
|
|
|
4565 regenerate_window _must_ be performed next in order to maintain
|
|
|
4566 invariants located here. */
|
|
|
4567
|
|
|
4568 static int
|
|
|
4569 regenerate_window_incrementally (struct window *w, Bufpos startp,
|
|
|
4570 Bufpos pointm)
|
|
|
4571 {
|
|
|
4572 struct buffer *b = XBUFFER (w->buffer);
|
|
|
4573 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
|
|
|
4574 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
|
|
|
4575 Charcount beg_unchanged, end_unchanged;
|
|
|
4576 Charcount extent_beg_unchanged, extent_end_unchanged;
|
|
|
4577
|
|
|
4578 int dla_start = 0;
|
|
|
4579 int dla_end, line;
|
|
|
4580 Bufpos start_pos;
|
|
|
4581
|
|
|
4582 /* If this function is called, the current and desired structures
|
|
|
4583 had better be identical. If they are not, then that is a bug. */
|
|
|
4584 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
|
|
|
4585
|
|
|
4586 /* We don't handle minibuffer windows yet. The minibuffer prompt
|
|
|
4587 screws us up. */
|
|
|
4588 if (MINI_WINDOW_P (w))
|
|
|
4589 return 0;
|
|
|
4590
|
|
|
4591 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
|
|
|
4592 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
|
|
|
4593 ? -1
|
|
|
4594 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
|
|
|
4595
|
|
|
4596 /* If nothing has changed in the buffer, then make sure point is ok
|
|
|
4597 and succeed. */
|
|
|
4598 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
|
|
|
4599 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
4600 extent_beg_unchanged,
|
|
|
4601 extent_end_unchanged);
|
|
|
4602
|
|
|
4603 /* We can't deal with deleted newlines. */
|
|
|
4604 if (BUF_NEWLINE_WAS_DELETED (b))
|
|
|
4605 return 0;
|
|
|
4606
|
|
|
4607 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
|
|
|
4608 end_unchanged = (BUF_END_UNCHANGED (b) == -1
|
|
|
4609 ? -1
|
|
|
4610 : BUF_Z (b) - BUF_END_UNCHANGED (b));
|
|
|
4611
|
|
|
4612 REGEN_INC_FIND_START_END;
|
|
|
4613
|
|
|
4614 /* If the changed area starts before the visible area, give up. */
|
|
|
4615 if (beg_unchanged < startp)
|
|
|
4616 return 0;
|
|
|
4617
|
|
|
4618 /* Find what display line the buffer changes first affect. */
|
|
|
4619 line = dla_start;
|
|
|
4620 while (line <= dla_end)
|
|
|
4621 {
|
|
|
4622 struct display_line *dl = Dynarr_atp (cdla, line);
|
|
|
4623 Bufpos lstart = dl->bufpos + dl->offset;
|
|
|
4624 Bufpos lend = dl->end_bufpos + dl->offset;
|
|
|
4625
|
|
|
4626 if (beg_unchanged >= lstart && beg_unchanged <= lend)
|
|
|
4627 break;
|
|
|
4628
|
|
|
4629 line++;
|
|
|
4630 }
|
|
|
4631
|
|
|
4632 /* If the changes are below the visible area then if point hasn't
|
|
|
4633 moved return success otherwise fail in order to be safe. */
|
|
|
4634 if (line > dla_end)
|
|
|
4635 {
|
|
|
4636 return regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
4637 extent_beg_unchanged,
|
|
|
4638 extent_end_unchanged);
|
|
|
4639 }
|
|
|
4640 else
|
|
|
4641 /* At this point we know what line the changes first affect. We
|
|
|
4642 now redraw that line. If the changes are contained within it
|
|
|
4643 we are going to succeed and can update just that one line.
|
|
|
4644 Otherwise we fail. If we fail we will have altered the desired
|
|
|
4645 structs which could lead to an assertion failure. However, if
|
|
|
4646 we fail the next thing that is going to happen is a full regen
|
|
|
4647 so we will actually end up being safe. */
|
|
|
4648 {
|
|
|
4649 Bufpos new_start;
|
|
|
4650 prop_block_dynarr *prop = NULL;
|
|
|
4651 struct display_line *cdl = Dynarr_atp (cdla, line);
|
|
|
4652 struct display_line *ddl = Dynarr_atp (ddla, line);
|
|
|
4653
|
|
|
4654 assert (cdl->bufpos == ddl->bufpos);
|
|
|
4655 assert (cdl->end_bufpos == ddl->end_bufpos);
|
|
|
4656 assert (cdl->offset == ddl->offset);
|
|
|
4657
|
|
|
4658 /* If the last rune is already a continuation glyph, fail.
|
|
|
4659 #### We should be able to handle this better. */
|
|
|
4660 {
|
|
|
4661 struct display_block *db = get_display_block_from_line (ddl, TEXT);
|
|
|
4662 if (Dynarr_length (db->runes))
|
|
|
4663 {
|
|
|
4664 struct rune *rb =
|
|
|
4665 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
4666
|
|
|
4667 if (rb->type == RUNE_DGLYPH
|
|
|
4668 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
|
|
|
4669 return 0;
|
|
|
4670 }
|
|
|
4671 }
|
|
|
4672
|
|
|
4673 /* If the line was generated using propagation data, fail. */
|
|
|
4674 if (ddl->used_prop_data)
|
|
|
4675 return 0;
|
|
|
4676
|
|
|
4677 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
|
|
|
4678 w->hscroll, &prop, DESIRED_DISP);
|
|
|
4679 ddl->offset = 0;
|
|
|
4680
|
|
|
4681 /* If there is propagated stuff then it is pretty much a
|
|
|
4682 guarantee that more than just the one line is affected. */
|
|
|
4683 if (prop)
|
|
|
4684 {
|
|
|
4685 Dynarr_free (prop);
|
|
|
4686 return 0;
|
|
|
4687 }
|
|
|
4688
|
|
|
4689 /* If the last rune is now a continuation glyph, fail. */
|
|
|
4690 {
|
|
|
4691 struct display_block *db = get_display_block_from_line (ddl, TEXT);
|
|
|
4692 if (Dynarr_length (db->runes))
|
|
|
4693 {
|
|
|
4694 struct rune *rb =
|
|
|
4695 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
|
|
|
4696
|
|
|
4697 if (rb->type == RUNE_DGLYPH
|
|
|
4698 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
|
|
|
4699 return 0;
|
|
|
4700 }
|
|
|
4701 }
|
|
|
4702
|
|
|
4703 /* If any line position parameters have changed or a
|
|
|
4704 cursor has disappeared or disappeared, fail. */
|
|
|
4705 if (cdl->ypos != ddl->ypos
|
|
|
4706 || cdl->ascent != ddl->ascent
|
|
|
4707 || cdl->descent != ddl->descent
|
|
|
4708 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
|
|
|
4709 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
|
|
|
4710 {
|
|
|
4711 return 0;
|
|
|
4712 }
|
|
|
4713
|
|
|
4714 /* If the changed area also ends on this line, then we may be in
|
|
|
4715 business. Update everything and return success. */
|
|
|
4716 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
|
|
|
4717 {
|
|
|
4718 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
4719 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
4720 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
|
|
|
4721 w->buffer);
|
|
|
4722 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
|
|
|
4723 w->buffer);
|
|
|
4724
|
|
|
4725 if (ddl->cursor_elt != -1)
|
|
|
4726 {
|
|
|
4727 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
|
|
|
4728 w->last_point_y[DESIRED_DISP] = line;
|
|
|
4729 }
|
|
|
4730
|
|
|
4731 redisplay_update_line (w, line, line, 1);
|
|
|
4732 regenerate_modeline (w);
|
|
|
4733
|
|
|
4734 /* #### For now we just flush the cache until this has been
|
|
|
4735 tested. After that is done, this should correct the
|
|
|
4736 cache directly. */
|
|
|
4737 Dynarr_reset (w->line_start_cache);
|
|
|
4738
|
|
|
4739 /* Adjust the extent changed boundaries to remove any
|
|
|
4740 overlap with the buffer changes since we've just
|
|
|
4741 successfully updated that area. */
|
|
|
4742 if (extent_beg_unchanged != -1
|
|
|
4743 && extent_beg_unchanged >= beg_unchanged
|
|
|
4744 && extent_beg_unchanged < end_unchanged)
|
|
|
4745 extent_beg_unchanged = end_unchanged;
|
|
|
4746
|
|
|
4747 if (extent_end_unchanged != -1
|
|
|
4748 && extent_end_unchanged >= beg_unchanged
|
|
|
4749 && extent_end_unchanged < end_unchanged)
|
|
|
4750 extent_end_unchanged = beg_unchanged - 1;
|
|
|
4751
|
|
|
4752 if (extent_end_unchanged <= extent_beg_unchanged)
|
|
|
4753 extent_beg_unchanged = extent_end_unchanged = -1;
|
|
|
4754
|
|
|
4755 /* This could lead to odd results if it fails, but since the
|
|
|
4756 buffer changes update succeeded this probably will to.
|
|
|
4757 We already know that the extent changes start at or after
|
|
|
4758 the line because we checked before entering the loop. */
|
|
|
4759 if (extent_beg_unchanged != -1
|
|
|
4760 && extent_end_unchanged != -1
|
|
|
4761 && ((extent_beg_unchanged < ddl->bufpos)
|
|
|
4762 || (extent_end_unchanged > ddl->end_bufpos)))
|
|
|
4763 {
|
|
|
4764 return
|
|
|
4765 regenerate_window_extents_only_changed (w, startp, pointm,
|
|
|
4766 extent_beg_unchanged,
|
|
|
4767 extent_end_unchanged);
|
|
|
4768 }
|
|
|
4769 else
|
|
|
4770 return 1;
|
|
|
4771 }
|
|
|
4772 }
|
|
|
4773
|
|
|
4774 /* Oh, well. */
|
|
|
4775 return 0;
|
|
|
4776 }
|
|
|
4777
|
|
|
4778 /* Given a window and a point, update the given display lines such
|
|
70
|
4779 that point is displayed in the middle of the window. */
|
|
|
4780
|
|
|
4781 static void
|
|
0
|
4782 regenerate_window_point_center (struct window *w, Bufpos point, int type)
|
|
|
4783 {
|
|
|
4784 Bufpos startp;
|
|
|
4785
|
|
|
4786 /* We need to make sure that the modeline is generated so that the
|
|
|
4787 window height can be calculated correctly. */
|
|
|
4788 ensure_modeline_generated (w, type);
|
|
|
4789
|
|
|
4790 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
|
|
|
4791 regenerate_window (w, startp, point, type);
|
|
|
4792 Fset_marker (w->start[type], make_int (startp), w->buffer);
|
|
|
4793
|
|
70
|
4794 return;
|
|
0
|
4795 }
|
|
|
4796
|
|
|
4797 /* Given a window and a set of display lines, return a boolean
|
|
|
4798 indicating whether the given point is contained within. */
|
|
|
4799
|
|
|
4800 static int
|
|
|
4801 point_visible (struct window *w, Bufpos point, int type)
|
|
|
4802 {
|
|
|
4803 struct buffer *b = XBUFFER (w->buffer);
|
|
|
4804 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
4805 int first_line;
|
|
|
4806
|
|
|
4807 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
|
|
|
4808 first_line = 1;
|
|
|
4809 else
|
|
|
4810 first_line = 0;
|
|
|
4811
|
|
|
4812 if (Dynarr_length (dla) > first_line)
|
|
|
4813 {
|
|
|
4814 Bufpos start, end;
|
|
|
4815 struct display_line *dl = Dynarr_atp (dla, first_line);
|
|
|
4816
|
|
|
4817 start = dl->bufpos;
|
|
|
4818 end = BUF_Z (b) - w->window_end_pos[type] - 1;
|
|
|
4819
|
|
|
4820 if (point >= start && point <= end)
|
|
|
4821 {
|
|
|
4822 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
|
|
|
4823 {
|
|
|
4824 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
4825
|
|
|
4826 if (point >= (dl->bufpos + dl->offset)
|
|
|
4827 && point <= (dl->end_bufpos + dl->offset))
|
|
|
4828 return (!dl->clip);
|
|
|
4829 else
|
|
|
4830 return 1;
|
|
|
4831 }
|
|
|
4832 else
|
|
|
4833 return 1;
|
|
|
4834 }
|
|
|
4835 else
|
|
|
4836 return 0;
|
|
|
4837 }
|
|
|
4838 else
|
|
|
4839 return 0;
|
|
|
4840 }
|
|
|
4841
|
|
|
4842 /* Return pixel position the middle of the window, not including the
|
|
|
4843 modeline and any potential horizontal scrollbar. */
|
|
|
4844
|
|
|
4845 int
|
|
|
4846 window_half_pixpos (struct window *w)
|
|
|
4847 {
|
|
|
4848 return (WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1));
|
|
|
4849 }
|
|
|
4850
|
|
|
4851 /* Return the display line which is currently in the middle of the
|
|
|
4852 window W for display lines TYPE. */
|
|
|
4853
|
|
|
4854 int
|
|
|
4855 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
|
|
|
4856 {
|
|
|
4857 display_line_dynarr *dla;
|
|
|
4858 int half;
|
|
|
4859 int elt;
|
|
|
4860 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
|
|
|
4861
|
|
|
4862 if (type == CMOTION_DISP)
|
|
|
4863 regenerate_window (w, start, point, type);
|
|
|
4864
|
|
|
4865 dla = window_display_lines (w, type);
|
|
|
4866 half = window_half_pixpos (w);
|
|
|
4867
|
|
|
4868 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
|
|
|
4869 {
|
|
|
4870 struct display_line *dl = Dynarr_atp (dla, elt);
|
|
|
4871 int line_bot = dl->ypos + dl->descent;
|
|
|
4872
|
|
|
4873 if (line_bot > half)
|
|
|
4874 return elt;
|
|
|
4875 }
|
|
|
4876
|
|
|
4877 /* We may not have a line at the middle if the end of the buffer is
|
|
|
4878 being displayed. */
|
|
|
4879 return -1;
|
|
|
4880 }
|
|
|
4881
|
|
|
4882 /* Return a value for point that would place it at the beginning of
|
|
|
4883 the line which is in the middle of the window. */
|
|
|
4884
|
|
|
4885 Bufpos
|
|
|
4886 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
|
|
|
4887 {
|
|
|
4888 /* line_at_center will regenerate the display structures, if necessary. */
|
|
|
4889 int line = line_at_center (w, type, start, point);
|
|
|
4890
|
|
|
4891 if (line == -1)
|
|
|
4892 return BUF_ZV (XBUFFER (w->buffer));
|
|
|
4893 else
|
|
|
4894 {
|
|
|
4895 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
4896 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
4897
|
|
|
4898 return dl->bufpos;
|
|
|
4899 }
|
|
|
4900 }
|
|
|
4901
|
|
|
4902 /* For a given window, ensure that the current visual representation
|
|
|
4903 is accurate. */
|
|
|
4904
|
|
|
4905 static void
|
|
|
4906 redisplay_window (Lisp_Object window, int skip_selected)
|
|
|
4907 {
|
|
|
4908 struct window *w = XWINDOW (window);
|
|
|
4909 struct frame *f = XFRAME (w->frame);
|
|
|
4910 struct device *d = XDEVICE (f->device);
|
|
|
4911 Lisp_Object old_buffer = w->buffer;
|
|
|
4912 struct buffer *b;
|
|
|
4913 int echo_active = 0;
|
|
|
4914 int startp = 1;
|
|
|
4915 int pointm;
|
|
70
|
4916 int selected;
|
|
0
|
4917 int skip_output = 0;
|
|
|
4918 int truncation_changed;
|
|
|
4919 int inactive_minibuffer =
|
|
|
4920 (MINI_WINDOW_P (w) &&
|
|
|
4921 (f != device_selected_frame (d)) &&
|
|
|
4922 !is_surrogate_for_selected_frame (f));
|
|
|
4923
|
|
|
4924 /* #### In the new world this function actually does a bunch of
|
|
|
4925 optimizations such as buffer-based scrolling, but none of that is
|
|
|
4926 implemented yet. */
|
|
|
4927
|
|
|
4928 /* If this is a combination window, do its children; that's all.
|
|
|
4929 The selected window is always a leaf so we don't check for
|
|
|
4930 skip_selected here. */
|
|
|
4931 if (!NILP (w->vchild))
|
|
|
4932 {
|
|
|
4933 redisplay_windows (w->vchild, skip_selected);
|
|
|
4934 return;
|
|
|
4935 }
|
|
|
4936 if (!NILP (w->hchild))
|
|
|
4937 {
|
|
|
4938 redisplay_windows (w->hchild, skip_selected);
|
|
|
4939 return;
|
|
|
4940 }
|
|
|
4941
|
|
|
4942 /* Is this window the selected window on its frame? */
|
|
70
|
4943 selected =
|
|
|
4944 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))));
|
|
|
4945 if (skip_selected && selected)
|
|
0
|
4946 return;
|
|
|
4947
|
|
|
4948 /* It is possible that the window is not fully initialized yet. */
|
|
|
4949 if (NILP (w->buffer))
|
|
|
4950 return;
|
|
|
4951
|
|
|
4952 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
4953 {
|
|
|
4954 w->buffer = Vecho_area_buffer;
|
|
|
4955 echo_active = 1;
|
|
|
4956 }
|
|
|
4957
|
|
|
4958 b = XBUFFER (w->buffer);
|
|
|
4959
|
|
|
4960 if (echo_active)
|
|
|
4961 pointm = 1;
|
|
|
4962 else
|
|
|
4963 {
|
|
70
|
4964 if (selected)
|
|
0
|
4965 {
|
|
|
4966 pointm = BUF_PT (b);
|
|
|
4967 }
|
|
|
4968 else
|
|
|
4969 {
|
|
|
4970 pointm = marker_position (w->pointm[CURRENT_DISP]);
|
|
|
4971
|
|
|
4972 if (pointm < BUF_BEGV (b))
|
|
|
4973 pointm = BUF_BEGV (b);
|
|
|
4974 else if (pointm > BUF_ZV (b))
|
|
|
4975 pointm = BUF_ZV (b);
|
|
|
4976 }
|
|
|
4977 }
|
|
|
4978 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), old_buffer);
|
|
|
4979
|
|
|
4980 /* If the buffer has changed we have to invalid all of our face
|
|
|
4981 cache elements. */
|
|
|
4982 if ((!echo_active && b != window_display_buffer (w))
|
|
|
4983 || !Dynarr_length (w->face_cachels)
|
|
|
4984 || f->faces_changed)
|
|
|
4985 reset_face_cachels (w);
|
|
|
4986 else
|
|
|
4987 mark_face_cachels_as_not_updated (w);
|
|
|
4988
|
|
|
4989 /* Ditto the glyph cache elements. */
|
|
|
4990 if ((!echo_active && b != window_display_buffer (w))
|
|
|
4991 || !Dynarr_length (w->glyph_cachels))
|
|
|
4992 reset_glyph_cachels (w);
|
|
|
4993 else
|
|
|
4994 mark_glyph_cachels_as_not_updated (w);
|
|
|
4995
|
|
|
4996 /* If the marker's buffer is not the window's buffer, then we need
|
|
|
4997 to find a new starting position. */
|
|
|
4998 if (!MINI_WINDOW_P (w)
|
|
|
4999 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
|
|
|
5000 {
|
|
70
|
5001 regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
0
|
5002
|
|
|
5003 goto regeneration_done;
|
|
|
5004 }
|
|
|
5005
|
|
|
5006 if (echo_active)
|
|
|
5007 startp = 1;
|
|
|
5008 else
|
|
|
5009 {
|
|
|
5010 startp = marker_position (w->start[CURRENT_DISP]);
|
|
|
5011 if (startp < BUF_BEGV (b))
|
|
|
5012 startp = BUF_BEGV (b);
|
|
|
5013 else if (startp > BUF_ZV (b))
|
|
|
5014 startp = BUF_ZV (b);
|
|
|
5015 }
|
|
|
5016 Fset_marker (w->start[DESIRED_DISP], make_int (startp), old_buffer);
|
|
|
5017
|
|
|
5018 truncation_changed = (find_window_mirror (w)->truncate_win !=
|
|
|
5019 window_truncation_on (w));
|
|
|
5020
|
|
|
5021 /* If w->force_start is set, then some function set w->start and we
|
|
|
5022 should display from there and change point, if necessary, to
|
|
|
5023 ensure that it is visible. */
|
|
|
5024 if (w->force_start || inactive_minibuffer)
|
|
|
5025 {
|
|
|
5026 w->force_start = 0;
|
|
|
5027 w->last_modified[DESIRED_DISP] = Qzero;
|
|
|
5028 w->last_facechange[DESIRED_DISP] = Qzero;
|
|
|
5029
|
|
|
5030 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
5031
|
|
|
5032 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
|
|
|
5033 {
|
|
|
5034 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
|
|
|
5035
|
|
70
|
5036 if (selected)
|
|
0
|
5037 BUF_SET_PT (b, pointm);
|
|
|
5038
|
|
|
5039 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
|
|
|
5040 old_buffer);
|
|
|
5041
|
|
|
5042 /* #### BUFU amounts of overkil just to get the cursor
|
|
|
5043 location marked properly. FIX ME FIX ME FIX ME */
|
|
|
5044 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
5045 }
|
|
|
5046
|
|
|
5047 goto regeneration_done;
|
|
|
5048 }
|
|
|
5049
|
|
|
5050 /* If nothing has changed since the last redisplay, then we just
|
|
|
5051 need to make sure that point is still visible. */
|
|
|
5052 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
|
|
|
5053 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
|
|
|
5054 && pointm >= startp
|
|
|
5055 /* This check is to make sure we restore the minibuffer after a
|
|
|
5056 temporary change to the echo area. */
|
|
|
5057 && !(MINI_WINDOW_P (w) && f->buffers_changed)
|
|
|
5058 && !f->frame_changed
|
|
|
5059 && !truncation_changed)
|
|
|
5060 {
|
|
|
5061 /* Check if the cursor has actually moved. */
|
|
|
5062 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
|
|
|
5063 && pointm == marker_position (w->last_point[CURRENT_DISP])
|
|
70
|
5064 && selected
|
|
0
|
5065 && !w->windows_changed
|
|
|
5066 && !f->clip_changed
|
|
|
5067 && !f->extents_changed
|
|
|
5068 && !f->faces_changed
|
|
|
5069 && !f->point_changed
|
|
|
5070 && !f->windows_structure_changed)
|
|
|
5071 {
|
|
|
5072 /* If not, we're done. */
|
|
|
5073 if (f->modeline_changed)
|
|
|
5074 regenerate_modeline (w);
|
|
|
5075
|
|
|
5076 skip_output = 1;
|
|
|
5077 goto regeneration_done;
|
|
|
5078 }
|
|
|
5079 else
|
|
|
5080 {
|
|
|
5081 /* If the new point is visible in the redisplay structures,
|
|
|
5082 then let the output update routines handle it, otherwise
|
|
|
5083 do things the hard way. */
|
|
|
5084 if (!w->windows_changed
|
|
|
5085 && !f->clip_changed
|
|
|
5086 && !f->extents_changed
|
|
|
5087 && !f->faces_changed
|
|
|
5088 && !f->windows_structure_changed)
|
|
|
5089 {
|
|
|
5090 if (point_visible (w, pointm, CURRENT_DISP)
|
|
|
5091 && w->last_point_x[CURRENT_DISP] != -1
|
|
|
5092 && w->last_point_y[CURRENT_DISP] != -1)
|
|
|
5093 {
|
|
|
5094 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
|
|
|
5095 {
|
|
|
5096 /* Always regenerate in case it is displaying
|
|
|
5097 the current line or column. */
|
|
|
5098 regenerate_modeline (w);
|
|
|
5099
|
|
|
5100 skip_output = 1;
|
|
|
5101 goto regeneration_done;
|
|
|
5102 }
|
|
|
5103 }
|
|
70
|
5104 else if (!selected && !f->point_changed)
|
|
0
|
5105 {
|
|
|
5106 if (f->modeline_changed)
|
|
|
5107 regenerate_modeline (w);
|
|
|
5108
|
|
|
5109 skip_output = 1;
|
|
|
5110 goto regeneration_done;
|
|
|
5111 }
|
|
|
5112 }
|
|
|
5113
|
|
|
5114 /* If we weren't able to take the shortcut method, then use
|
|
|
5115 the brute force method. */
|
|
|
5116 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
5117
|
|
|
5118 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
5119 goto regeneration_done;
|
|
|
5120 }
|
|
|
5121 }
|
|
|
5122
|
|
|
5123 /* Check if the starting point is no longer at the beginning of a
|
|
|
5124 line, in which case find a new starting point. We also recenter
|
|
|
5125 if our start position is equal to point-max. Otherwise we'll end
|
|
|
5126 up with a blank window. */
|
|
|
5127 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
|
|
|
5128 && !(startp == BUF_BEGV (b)
|
|
|
5129 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
|
|
|
5130 || (pointm == startp &&
|
|
|
5131 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
|
|
|
5132 startp < marker_position (w->last_start[CURRENT_DISP]))
|
|
|
5133 || (startp == BUF_ZV (b)))
|
|
|
5134 {
|
|
70
|
5135 regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
0
|
5136
|
|
|
5137 goto regeneration_done;
|
|
|
5138 }
|
|
|
5139 /* See if we can update the data structures locally based on
|
|
|
5140 knowledge of what changed in the buffer. */
|
|
|
5141 else if (!w->windows_changed
|
|
|
5142 && !f->clip_changed
|
|
|
5143 && !f->faces_changed
|
|
|
5144 && !f->windows_structure_changed
|
|
|
5145 && !f->frame_changed
|
|
|
5146 && !truncation_changed
|
|
|
5147 && pointm >= startp
|
|
|
5148 && regenerate_window_incrementally (w, startp, pointm))
|
|
|
5149 {
|
|
|
5150 if (f->modeline_changed
|
|
|
5151 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
|
|
|
5152 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
|
|
|
5153 regenerate_modeline (w);
|
|
|
5154
|
|
|
5155 skip_output = 1;
|
|
|
5156 goto regeneration_done;
|
|
|
5157 }
|
|
|
5158 /* #### This is where a check for structure based scrolling would go. */
|
|
|
5159 /* If all else fails, try just regenerating and see what happens. */
|
|
|
5160 else
|
|
|
5161 {
|
|
|
5162 regenerate_window (w, startp, pointm, DESIRED_DISP);
|
|
|
5163
|
|
|
5164 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
5165 goto regeneration_done;
|
|
|
5166 }
|
|
|
5167
|
|
|
5168 /* We still haven't gotten the window regenerated with point
|
|
|
5169 visible. Next we try scrolling a little and see if point comes
|
|
|
5170 back onto the screen. */
|
|
|
5171 if (scroll_step)
|
|
|
5172 {
|
|
70
|
5173 Bufpos bufpos;
|
|
|
5174
|
|
|
5175 bufpos = vmotion (w, startp,
|
|
0
|
5176 (pointm < startp) ? -scroll_step : scroll_step, 0);
|
|
70
|
5177 regenerate_window (w, bufpos, pointm, DESIRED_DISP);
|
|
0
|
5178
|
|
|
5179 if (point_visible (w, pointm, DESIRED_DISP))
|
|
|
5180 goto regeneration_done;
|
|
|
5181 }
|
|
|
5182
|
|
|
5183 /* We still haven't managed to get the screen drawn with point on
|
|
|
5184 the screen, so just center it and be done with it. */
|
|
70
|
5185 regenerate_window_point_center (w, pointm, DESIRED_DISP);
|
|
0
|
5186
|
|
|
5187
|
|
|
5188 regeneration_done:
|
|
|
5189
|
|
|
5190 /* If the window's frame is changed then reset the current display
|
|
|
5191 lines in order to force a full repaint. */
|
|
|
5192 if (f->frame_changed)
|
|
|
5193 {
|
|
|
5194 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
|
|
|
5195
|
|
|
5196 Dynarr_reset (cla);
|
|
|
5197 }
|
|
|
5198
|
|
|
5199 /* Must do this before calling redisplay_output_window because it
|
|
|
5200 sets some markers on the window. */
|
|
|
5201 if (MINI_WINDOW_P (w) && echo_area_active (f))
|
|
|
5202 w->buffer = old_buffer;
|
|
|
5203
|
|
|
5204 /* These also have to be set before calling redisplay_output_window
|
|
|
5205 since it sets the CURRENT_DISP values based on them. */
|
|
|
5206 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
|
|
|
5207 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
|
|
|
5208 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
|
|
|
5209 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
|
|
|
5210
|
|
|
5211 if (!skip_output)
|
|
|
5212 {
|
|
|
5213 Bufpos start = marker_position (w->start[DESIRED_DISP]);
|
|
|
5214 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
|
|
|
5215 ? BUF_ZV (b)
|
|
|
5216 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
|
|
|
5217
|
|
|
5218 update_line_start_cache (w, start, end, pointm, 1);
|
|
|
5219 redisplay_output_window (w);
|
|
|
5220 }
|
|
|
5221
|
|
|
5222 /* #### This should be dependent on face changes and will need to be
|
|
|
5223 somewhere else once tty updates occur on a per-frame basis. */
|
|
|
5224 mark_face_cachels_as_clean (w);
|
|
|
5225
|
|
|
5226 w->windows_changed = 0;
|
|
|
5227 }
|
|
|
5228
|
|
|
5229 /* Call buffer_reset_changes for all buffers present in any window
|
|
|
5230 currently visible in all frames on all devices. #### There has to
|
|
|
5231 be a better way to do this. */
|
|
|
5232
|
|
|
5233 static int
|
|
|
5234 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
|
|
|
5235 {
|
|
|
5236 buffer_reset_changes (XBUFFER (w->buffer));
|
|
|
5237 return 0;
|
|
|
5238 }
|
|
|
5239
|
|
|
5240 static void
|
|
|
5241 reset_buffer_changes (void)
|
|
|
5242 {
|
|
|
5243 Lisp_Object frmcons, devcons, concons;
|
|
|
5244
|
|
|
5245 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
5246 {
|
|
|
5247 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
5248
|
|
70
|
5249 if (FRAME_VISIBLE_P (f))
|
|
0
|
5250 map_windows (f, reset_buffer_changes_mapfun, 0);
|
|
|
5251 }
|
|
|
5252 }
|
|
|
5253
|
|
|
5254 /* Ensure that all windows underneath the given window in the window
|
|
|
5255 hierarchy are correctly displayed. */
|
|
|
5256
|
|
|
5257 static void
|
|
|
5258 redisplay_windows (Lisp_Object window, int skip_selected)
|
|
|
5259 {
|
|
|
5260 for (; !NILP (window) ; window = XWINDOW (window)->next)
|
|
|
5261 {
|
|
|
5262 redisplay_window (window, skip_selected);
|
|
|
5263 }
|
|
|
5264 }
|
|
|
5265
|
|
|
5266 static int
|
|
|
5267 call_redisplay_end_triggers (struct window *w, void *closure)
|
|
|
5268 {
|
|
|
5269 Bufpos lrpos = w->last_redisplay_pos;
|
|
|
5270 w->last_redisplay_pos = 0;
|
|
|
5271 if (!NILP (w->buffer)
|
|
|
5272 && !NILP (w->redisplay_end_trigger)
|
|
|
5273 && lrpos > 0)
|
|
|
5274 {
|
|
|
5275 Bufpos pos;
|
|
|
5276
|
|
|
5277 if (MARKERP (w->redisplay_end_trigger)
|
|
|
5278 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
|
|
|
5279 pos = marker_position (w->redisplay_end_trigger);
|
|
|
5280 else if (INTP (w->redisplay_end_trigger))
|
|
|
5281 pos = XINT (w->redisplay_end_trigger);
|
|
|
5282 else
|
|
|
5283 {
|
|
|
5284 w->redisplay_end_trigger = Qnil;
|
|
|
5285 return 0;
|
|
|
5286 }
|
|
|
5287
|
|
|
5288 if (lrpos >= pos)
|
|
|
5289 {
|
|
|
5290 Lisp_Object window = Qnil;
|
|
|
5291 XSETWINDOW (window, w);
|
|
|
5292 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
|
|
|
5293 Qredisplay_end_trigger_functions,
|
|
|
5294 2, window,
|
|
|
5295 w->redisplay_end_trigger);
|
|
|
5296 w->redisplay_end_trigger = Qnil;
|
|
|
5297 }
|
|
|
5298 }
|
|
|
5299
|
|
|
5300 return 0;
|
|
|
5301 }
|
|
|
5302
|
|
|
5303 /* Ensure that all windows on the given frame are correctly displayed. */
|
|
|
5304
|
|
|
5305 static int
|
|
|
5306 redisplay_frame (struct frame *f, int preemption_check)
|
|
|
5307 {
|
|
|
5308 struct device *d = XDEVICE (f->device);
|
|
|
5309
|
|
|
5310 if (preemption_check)
|
|
|
5311 {
|
|
|
5312 /* The preemption check itself takes a lot of time,
|
|
|
5313 so normally don't do it here. We do it if called
|
|
|
5314 from Lisp, though (`redisplay-frame'). */
|
|
|
5315 int preempted;
|
|
|
5316
|
|
|
5317 REDISPLAY_PREEMPTION_CHECK;
|
|
|
5318 if (preempted)
|
|
|
5319 return 1;
|
|
|
5320 }
|
|
|
5321
|
|
|
5322 /* Before we put a hold on frame size changes, attempt to process
|
|
|
5323 any which are already pending. */
|
|
|
5324 if (f->size_change_pending)
|
|
|
5325 change_frame_size (f, f->new_height, f->new_width, 0);
|
|
|
5326
|
|
|
5327 /* The menubar, toolbar, and icon updates must be done before
|
|
|
5328 hold_frame_size_changes is called and we are officially
|
|
|
5329 'in_display'. They may eval lisp code which may call Fsignal.
|
|
|
5330 If in_display is set Fsignal will abort. */
|
|
|
5331
|
|
|
5332 #ifdef HAVE_MENUBARS
|
|
|
5333 /* Update the menubar. It is done first since it could change
|
|
|
5334 the menubar's visibility. This way we avoid having flashing
|
|
|
5335 caused by an Expose event generated by the visibility change
|
|
|
5336 being handled. */
|
|
|
5337 update_frame_menubars (f);
|
|
|
5338 #endif
|
|
|
5339
|
|
|
5340 #ifdef HAVE_TOOLBARS
|
|
|
5341 /* Update the toolbars. */
|
|
|
5342 update_frame_toolbars (f);
|
|
|
5343 #endif
|
|
|
5344
|
|
|
5345 hold_frame_size_changes ();
|
|
|
5346
|
|
|
5347 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
5348 /* Within this section, we are defenseless and assume that the
|
|
|
5349 following cannot happen:
|
|
|
5350
|
|
|
5351 1) garbage collection
|
|
|
5352 2) Lisp code evaluation
|
|
|
5353 3) frame size changes
|
|
|
5354
|
|
|
5355 We ensure (3) by calling hold_frame_size_changes(), which
|
|
|
5356 will cause any pending frame size changes to get put on hold
|
|
|
5357 till after the end of the critical section. (1) follows
|
|
|
5358 automatically if (2) is met. #### Unfortunately, there are
|
|
|
5359 some places where Lisp code can be called within this section.
|
|
|
5360 We need to remove them.
|
|
|
5361
|
|
|
5362 If Fsignal() is called during this critical section, we
|
|
|
5363 will abort().
|
|
|
5364
|
|
|
5365 If garbage collection is called during this critical section,
|
|
|
5366 we simply return. #### We should abort instead.
|
|
|
5367
|
|
|
5368 #### If a frame-size change does occur we should probably
|
|
|
5369 actually be preempting redisplay. */
|
|
|
5370
|
|
|
5371 /* If we clear the frame we have to force its contents to be redrawn. */
|
|
|
5372 if (f->clear)
|
|
|
5373 f->frame_changed = 1;
|
|
|
5374
|
|
|
5375 /* Erase the frame before outputting its contents. */
|
|
|
5376 if (f->clear)
|
|
|
5377 DEVMETH (d, clear_frame, (f));
|
|
|
5378
|
|
|
5379 /* Do the selected window first. */
|
|
|
5380 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
|
|
|
5381
|
|
|
5382 /* Then do the rest. */
|
|
|
5383 redisplay_windows (f->root_window, 1);
|
|
|
5384
|
|
|
5385 /* We now call the output_end routine for tty frames. We delay
|
|
|
5386 doing so in order to avoid cursor flicker. So much for 100%
|
|
|
5387 encapsulation. */
|
|
|
5388 if (FRAME_TTY_P (f))
|
|
|
5389 DEVMETH (d, output_end, (d));
|
|
|
5390
|
|
|
5391 update_frame_title (f);
|
|
|
5392
|
|
|
5393 f->buffers_changed = 0;
|
|
|
5394 f->clip_changed = 0;
|
|
|
5395 f->extents_changed = 0;
|
|
|
5396 f->faces_changed = 0;
|
|
|
5397 f->frame_changed = 0;
|
|
|
5398 f->icon_changed = 0;
|
|
|
5399 f->menubar_changed = 0;
|
|
|
5400 f->modeline_changed = 0;
|
|
|
5401 f->point_changed = 0;
|
|
|
5402 f->toolbar_changed = 0;
|
|
|
5403 f->windows_changed = 0;
|
|
|
5404 f->windows_structure_changed = 0;
|
|
|
5405 f->window_face_cache_reset = 0;
|
|
|
5406
|
|
|
5407 f->clear = 0;
|
|
|
5408
|
|
|
5409 if (!f->size_change_pending)
|
|
|
5410 f->size_changed = 0;
|
|
|
5411
|
|
|
5412 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
|
|
|
5413
|
|
|
5414 /* Allow frame size changes to occur again.
|
|
|
5415
|
|
|
5416 #### what happens if changes to other frames happen? */
|
|
|
5417 unhold_one_frame_size_changes (f);
|
|
|
5418
|
|
|
5419 map_windows (f, call_redisplay_end_triggers, 0);
|
|
|
5420 return 0;
|
|
|
5421 }
|
|
|
5422
|
|
|
5423 /* Ensure that all frames on the given device are correctly displayed. */
|
|
|
5424
|
|
|
5425 static int
|
|
|
5426 redisplay_device (struct device *d)
|
|
|
5427 {
|
|
|
5428 Lisp_Object frame, frmcons;
|
|
|
5429 int preempted = 0;
|
|
|
5430 int size_change_failed = 0;
|
|
|
5431 struct frame *f;
|
|
|
5432
|
|
|
5433 if (DEVICE_STREAM_P (d)) /* nothing to do */
|
|
|
5434 return 0;
|
|
|
5435
|
|
|
5436 /* It is possible that redisplay has been called before the
|
|
|
5437 device is fully initialized. If so then continue with the
|
|
|
5438 next device. */
|
|
|
5439 if (NILP (DEVICE_SELECTED_FRAME (d)))
|
|
|
5440 return 0;
|
|
|
5441
|
|
|
5442 REDISPLAY_PREEMPTION_CHECK;
|
|
|
5443 if (preempted)
|
|
|
5444 return 1;
|
|
|
5445
|
|
|
5446 /* Always do the selected frame first. */
|
|
|
5447 frame = DEVICE_SELECTED_FRAME (d);
|
|
|
5448
|
|
|
5449 f = XFRAME (frame);
|
|
|
5450
|
|
|
5451 if (f->icon_changed || f->windows_changed)
|
|
|
5452 update_frame_icon (f);
|
|
|
5453
|
|
70
|
5454 if (FRAME_VISIBLE_P (f))
|
|
0
|
5455 {
|
|
|
5456 if (f->buffers_changed || f->clip_changed || f->extents_changed
|
|
|
5457 || f->faces_changed || f->frame_changed || f->menubar_changed
|
|
|
5458 || f->modeline_changed || f->point_changed || f->size_changed
|
|
|
5459 || f->toolbar_changed || f->windows_changed
|
|
|
5460 || f->windows_structure_changed)
|
|
|
5461 {
|
|
|
5462 preempted = redisplay_frame (f, 0);
|
|
|
5463 }
|
|
|
5464
|
|
|
5465 if (preempted)
|
|
|
5466 return 1;
|
|
|
5467
|
|
|
5468 /* If the frame redisplay did not get preempted, then this flag
|
|
|
5469 should have gotten set to 0. It might be possible for that
|
|
|
5470 not to happen if a size change event were to occur at an odd
|
|
|
5471 time. To make sure we don't miss anything we simply don't
|
|
|
5472 reset the top level flags until the condition ends up being
|
|
|
5473 in the right state. */
|
|
|
5474 if (f->size_changed)
|
|
|
5475 size_change_failed = 1;
|
|
|
5476 }
|
|
|
5477
|
|
|
5478 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
5479 {
|
|
|
5480 f = XFRAME (XCAR (frmcons));
|
|
|
5481
|
|
|
5482 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
|
|
|
5483 continue;
|
|
|
5484
|
|
|
5485 if (f->icon_changed || f->windows_changed)
|
|
|
5486 update_frame_icon (f);
|
|
|
5487
|
|
70
|
5488 if (FRAME_VISIBLE_P (f))
|
|
0
|
5489 {
|
|
|
5490 if (f->buffers_changed || f->clip_changed || f->extents_changed
|
|
|
5491 || f->faces_changed || f->frame_changed || f->menubar_changed
|
|
|
5492 || f->modeline_changed || f->point_changed || f->size_changed
|
|
|
5493 || f->toolbar_changed || f->windows_changed
|
|
|
5494 || f->windows_structure_changed)
|
|
|
5495 {
|
|
|
5496 preempted = redisplay_frame (f, 0);
|
|
|
5497 }
|
|
|
5498
|
|
|
5499 if (preempted)
|
|
|
5500 return 1;
|
|
|
5501
|
|
|
5502 if (f->size_change_pending)
|
|
|
5503 size_change_failed = 1;
|
|
|
5504 }
|
|
|
5505 }
|
|
|
5506
|
|
|
5507 /* If we get here then we redisplayed all of our frames without
|
|
|
5508 getting preempted so mark ourselves as clean. */
|
|
|
5509 d->buffers_changed = 0;
|
|
|
5510 d->clip_changed = 0;
|
|
|
5511 d->extents_changed = 0;
|
|
|
5512 d->faces_changed = 0;
|
|
|
5513 d->frame_changed = 0;
|
|
|
5514 d->icon_changed = 0;
|
|
|
5515 d->menubar_changed = 0;
|
|
|
5516 d->modeline_changed = 0;
|
|
|
5517 d->point_changed = 0;
|
|
|
5518 d->toolbar_changed = 0;
|
|
|
5519 d->windows_changed = 0;
|
|
|
5520 d->windows_structure_changed = 0;
|
|
|
5521
|
|
|
5522 if (!size_change_failed)
|
|
|
5523 d->size_changed = 0;
|
|
|
5524
|
|
|
5525 return 0;
|
|
|
5526 }
|
|
|
5527
|
|
|
5528 static Lisp_Object
|
|
|
5529 restore_profiling_redisplay_flag (Lisp_Object val)
|
|
|
5530 {
|
|
|
5531 profiling_redisplay_flag = XINT (val);
|
|
|
5532 return Qnil;
|
|
|
5533 }
|
|
|
5534
|
|
|
5535 /* Ensure that all windows on all frames on all devices are displaying
|
|
|
5536 the current contents of their respective buffers. */
|
|
|
5537
|
|
|
5538 static void
|
|
|
5539 redisplay_without_hooks (void)
|
|
|
5540 {
|
|
|
5541 Lisp_Object devcons, concons;
|
|
|
5542 int size_change_failed = 0;
|
|
|
5543 int count = specpdl_depth ();
|
|
|
5544
|
|
|
5545 if (profiling_active)
|
|
|
5546 {
|
|
|
5547 record_unwind_protect (restore_profiling_redisplay_flag,
|
|
|
5548 make_int (profiling_redisplay_flag));
|
|
|
5549 profiling_redisplay_flag = 1;
|
|
|
5550 }
|
|
|
5551
|
|
|
5552 if (asynch_device_change_pending)
|
|
|
5553 handle_asynch_device_change ();
|
|
|
5554
|
|
|
5555 if (!buffers_changed && !clip_changed && !extents_changed && !faces_changed
|
|
|
5556 && !frame_changed && !icon_changed && !menubar_changed
|
|
|
5557 && !modeline_changed && !point_changed && !size_changed
|
|
|
5558 && !toolbar_changed && !windows_changed && !windows_structure_changed
|
|
|
5559 && !disable_preemption && preemption_count < max_preempts)
|
|
|
5560 goto done;
|
|
|
5561
|
|
|
5562 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
5563 {
|
|
|
5564 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
5565 int preempted;
|
|
|
5566
|
|
|
5567 if (d->buffers_changed || d->clip_changed || d->extents_changed
|
|
|
5568 || d->faces_changed || d->frame_changed
|
|
|
5569 || d->icon_changed || d->menubar_changed
|
|
|
5570 || d->modeline_changed || d->point_changed || d->size_changed
|
|
|
5571 || d->toolbar_changed || d->windows_changed
|
|
|
5572 || d->windows_structure_changed)
|
|
|
5573 {
|
|
|
5574 preempted = redisplay_device (d);
|
|
|
5575
|
|
|
5576 if (preempted)
|
|
|
5577 {
|
|
|
5578 preemption_count++;
|
|
|
5579 RESET_CHANGED_SET_FLAGS;
|
|
|
5580 goto done;
|
|
|
5581 }
|
|
|
5582
|
|
|
5583 /* See comment in redisplay_device. */
|
|
|
5584 if (d->size_changed)
|
|
|
5585 size_change_failed = 1;
|
|
|
5586 }
|
|
|
5587 }
|
|
|
5588 preemption_count = 0;
|
|
|
5589
|
|
|
5590 /* Mark redisplay as accurate */
|
|
|
5591 buffers_changed = 0;
|
|
|
5592 clip_changed = 0;
|
|
|
5593 extents_changed = 0;
|
|
|
5594 frame_changed = 0;
|
|
|
5595 icon_changed = 0;
|
|
|
5596 menubar_changed = 0;
|
|
|
5597 modeline_changed = 0;
|
|
|
5598 point_changed = 0;
|
|
|
5599 toolbar_changed = 0;
|
|
|
5600 windows_changed = 0;
|
|
|
5601 windows_structure_changed = 0;
|
|
|
5602 RESET_CHANGED_SET_FLAGS;
|
|
|
5603
|
|
|
5604 if (faces_changed)
|
|
|
5605 {
|
|
|
5606 mark_all_faces_as_clean ();
|
|
|
5607 faces_changed = 0;
|
|
|
5608 }
|
|
|
5609
|
|
|
5610 if (!size_change_failed)
|
|
|
5611 size_changed = 0;
|
|
|
5612
|
|
|
5613 reset_buffer_changes ();
|
|
|
5614
|
|
|
5615 done:
|
|
|
5616 unbind_to (count, Qnil);
|
|
|
5617 }
|
|
|
5618
|
|
|
5619 void
|
|
|
5620 redisplay (void)
|
|
|
5621 {
|
|
|
5622 if (last_display_warning_tick != display_warning_tick &&
|
|
|
5623 !inhibit_warning_display)
|
|
|
5624 {
|
|
|
5625 /* If an error occurs during this function, oh well.
|
|
|
5626 If we report another warning, we could get stuck in an
|
|
|
5627 infinite loop reporting warnings. */
|
|
|
5628 call0_trapping_errors (0, Qdisplay_warning_buffer);
|
|
|
5629 last_display_warning_tick = display_warning_tick;
|
|
|
5630 }
|
|
|
5631 /* The run_hook_trapping_errors functions are smart enough not
|
|
|
5632 to do any evalling if the hook function is empty, so there
|
|
|
5633 should not be any significant time loss. All places in the
|
|
|
5634 C code that call redisplay() are prepared to handle GCing,
|
|
|
5635 so we should be OK. */
|
|
|
5636 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
5637 run_hook_trapping_errors ("Error in pre-redisplay-hook",
|
|
|
5638 Qpre_redisplay_hook);
|
|
|
5639 #endif
|
|
|
5640
|
|
|
5641 redisplay_without_hooks ();
|
|
|
5642
|
|
|
5643 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
5644 run_hook_trapping_errors ("Error in post-redisplay-hook",
|
|
|
5645 Qpost_redisplay_hook);
|
|
|
5646 #endif
|
|
|
5647 }
|
|
|
5648
|
|
|
5649 /* Inefficiently determine the line number of the line point is on and
|
|
|
5650 return it as a string. Always do this regardless of whether
|
|
|
5651 line_number_mode is true. */
|
|
|
5652
|
|
|
5653 static char window_line_number_buf[100];
|
|
|
5654 static char *
|
|
|
5655 window_line_number (struct window *w, int type)
|
|
|
5656 {
|
|
|
5657 struct device *d = XDEVICE (XFRAME (w->frame)->device);
|
|
|
5658 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5659 Bufpos end =
|
|
70
|
5660 ((w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
|
|
0
|
5661 ? BUF_PT (b)
|
|
|
5662 : marker_position (w->pointm[type]));
|
|
|
5663 int lots = 999999999;
|
|
|
5664 int shortage, line;
|
|
|
5665
|
|
|
5666 scan_buffer (b, '\n', end, 0, -lots, &shortage, 0);
|
|
|
5667 line = lots - shortage + 1;
|
|
|
5668
|
|
|
5669 sprintf (window_line_number_buf, "%d", line);
|
|
|
5670
|
|
|
5671 return (window_line_number_buf);
|
|
|
5672 }
|
|
|
5673
|
|
|
5674 /* Given a character representing an object in a modeline
|
|
|
5675 specification, return a string (stored into the global array
|
|
|
5676 `mode_spec_bufbyte_string') with the information that object
|
|
|
5677 represents.
|
|
|
5678
|
|
|
5679 This function is largely unchanged from previous versions of the
|
|
|
5680 redisplay engine. */
|
|
|
5681
|
|
|
5682 static void
|
|
|
5683 decode_mode_spec (struct window *w, Emchar spec, int type)
|
|
|
5684 {
|
|
|
5685 Lisp_Object obj = Qnil;
|
|
|
5686 CONST char *str = NULL;
|
|
|
5687 struct buffer *b = XBUFFER (w->buffer);
|
|
|
5688
|
|
|
5689 Dynarr_reset (mode_spec_bufbyte_string);
|
|
|
5690
|
|
|
5691 switch (spec)
|
|
|
5692 {
|
|
|
5693 /* print buffer name */
|
|
|
5694 case 'b':
|
|
|
5695 obj = b->name;
|
|
|
5696 break;
|
|
|
5697
|
|
|
5698 /* print visited file name */
|
|
|
5699 case 'f':
|
|
|
5700 obj = b->filename;
|
|
|
5701 break;
|
|
|
5702
|
|
|
5703 /* print the current column */
|
|
|
5704 case 'c':
|
|
|
5705 {
|
|
70
|
5706 int col = current_column (b);
|
|
0
|
5707 int temp = col;
|
|
|
5708 int size = 2;
|
|
|
5709 char *buf;
|
|
|
5710
|
|
|
5711 while (temp >= 10)
|
|
|
5712 {
|
|
|
5713 temp /= 10;
|
|
|
5714 size++;
|
|
|
5715 }
|
|
|
5716
|
|
|
5717 buf = (char *) alloca (size * sizeof (char));
|
|
|
5718 sprintf (buf, "%d", col);
|
|
|
5719
|
|
|
5720 Dynarr_add_many (mode_spec_bufbyte_string,
|
|
|
5721 (CONST Bufbyte *) buf, strlen (buf));
|
|
|
5722
|
|
|
5723 goto decode_mode_spec_done;
|
|
|
5724 }
|
|
|
5725
|
|
70
|
5726 #ifdef MULE
|
|
|
5727 /* print the file coding system */
|
|
|
5728 case 'C':
|
|
|
5729 {
|
|
|
5730 Lisp_Object codesys = b->file_coding_system;
|
|
|
5731 /* Be very careful here not to get an error. */
|
|
|
5732 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
|
|
|
5733 {
|
|
|
5734 codesys = Ffind_coding_system (codesys);
|
|
|
5735 if (CODING_SYSTEMP (codesys))
|
|
|
5736 obj = Fcoding_system_property (codesys, Qmnemonic);
|
|
|
5737 }
|
|
|
5738 }
|
|
|
5739 break;
|
|
|
5740 #endif
|
|
16
|
5741
|
|
0
|
5742 /* print the current line number */
|
|
|
5743 case 'l':
|
|
|
5744 str = window_line_number (w, type);
|
|
|
5745 break;
|
|
|
5746
|
|
|
5747 /* print value of mode-name (obsolete) */
|
|
|
5748 case 'm':
|
|
|
5749 obj = b->mode_name;
|
|
|
5750 break;
|
|
|
5751
|
|
|
5752 /* print Narrow if appropriate */
|
|
|
5753 case 'n':
|
|
|
5754 if (BUF_BEGV (b) > BUF_BEG (b)
|
|
|
5755 || BUF_ZV (b) < BUF_Z (b))
|
|
|
5756 str = " Narrow";
|
|
|
5757 break;
|
|
|
5758
|
|
|
5759 /* print %, * or hyphen, if buffer is read-only, modified or neither */
|
|
|
5760 case '*':
|
|
|
5761 str = (!NILP (b->read_only)
|
|
|
5762 ? "%"
|
|
|
5763 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
5764 ? "*"
|
|
|
5765 : "-"));
|
|
|
5766 break;
|
|
|
5767
|
|
|
5768 /* print * or hyphen -- XEmacs change to allow a buffer to be
|
|
|
5769 read-only but still indicate whether it is modified. */
|
|
|
5770 case '+':
|
|
|
5771 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
5772 ? "*"
|
|
|
5773 : (!NILP (b->read_only)
|
|
|
5774 ? "%"
|
|
|
5775 : "-"));
|
|
|
5776 break;
|
|
|
5777
|
|
|
5778 /* #### defined in 19.29 decode_mode_spec, but not in
|
|
|
5779 modeline-format doc string. */
|
|
|
5780 /* This differs from %* in that it ignores read-only-ness. */
|
|
|
5781 case '&':
|
|
|
5782 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
|
|
|
5783 ? "*"
|
|
|
5784 : "-");
|
|
|
5785 break;
|
|
|
5786
|
|
|
5787 /* print process status */
|
|
|
5788 case 's':
|
|
|
5789 obj = Fget_buffer_process (w->buffer);
|
|
|
5790 if (NILP (obj))
|
|
|
5791 str = GETTEXT ("no process");
|
|
|
5792 else
|
|
|
5793 obj = Fsymbol_name (Fprocess_status (obj));
|
|
|
5794 break;
|
|
|
5795
|
|
|
5796 /* print name of selected frame (only meaningful under X Windows) */
|
|
|
5797 case 'S':
|
|
|
5798 obj = XFRAME (w->frame)->name;
|
|
|
5799 break;
|
|
|
5800
|
|
|
5801 /* indicate TEXT or BINARY */
|
|
|
5802 case 't':
|
|
|
5803 #ifdef MSDOS
|
|
|
5804 str = NILP (b->buffer_file_type) ? "T" : "B";
|
|
|
5805 #else /* not MSDOS */
|
|
|
5806 str = "T";
|
|
|
5807 #endif /* not MSDOS */
|
|
10
|
5808 break;
|
|
0
|
5809
|
|
|
5810 /* print percent of buffer above top of window, or Top, Bot or All */
|
|
|
5811 case 'p':
|
|
|
5812 {
|
|
|
5813 Bufpos pos = marker_position (w->start[type]);
|
|
|
5814 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
5815
|
|
|
5816 /* This had better be while the desired lines are being done. */
|
|
|
5817 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
|
|
|
5818 {
|
|
|
5819 if (pos <= BUF_BEGV (b))
|
|
|
5820 str = "All";
|
|
|
5821 else
|
|
|
5822 str = "Bottom";
|
|
|
5823 }
|
|
|
5824 else if (pos <= BUF_BEGV (b))
|
|
|
5825 str = "Top";
|
|
|
5826 else
|
|
|
5827 {
|
|
|
5828 /* This hard limit is ok since the string it will hold has a
|
|
|
5829 fixed maximum length of 3. But just to be safe... */
|
|
|
5830 char buf[10];
|
|
|
5831
|
|
|
5832 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
|
|
|
5833
|
|
|
5834 /* We can't normally display a 3-digit number, so get us a
|
|
|
5835 2-digit number that is close. */
|
|
|
5836 if (total == 100)
|
|
|
5837 total = 99;
|
|
|
5838
|
|
|
5839 sprintf (buf, "%2d%%", total);
|
|
|
5840 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
|
|
|
5841 strlen (buf));
|
|
|
5842
|
|
|
5843 goto decode_mode_spec_done;
|
|
|
5844 }
|
|
|
5845 break;
|
|
|
5846 }
|
|
|
5847
|
|
|
5848 /* print percent of buffer above bottom of window, perhaps plus
|
|
|
5849 Top, or print Bottom or All */
|
|
|
5850 case 'P':
|
|
|
5851 {
|
|
|
5852 Bufpos toppos = marker_position (w->start[type]);
|
|
|
5853 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
|
|
|
5854 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
|
|
|
5855
|
|
10
|
5856 /* botpos is only accurate as of the last redisplay, so we can
|
|
16
|
5857 only treat it as a hint. In particular, after erase-buffer,
|
|
|
5858 botpos may be negative. */
|
|
10
|
5859 if (botpos < toppos)
|
|
|
5860 botpos = toppos;
|
|
16
|
5861
|
|
0
|
5862 if (botpos >= BUF_ZV (b))
|
|
|
5863 {
|
|
|
5864 if (toppos <= BUF_BEGV (b))
|
|
|
5865 str = "All";
|
|
|
5866 else
|
|
|
5867 str = "Bottom";
|
|
|
5868 }
|
|
|
5869 else
|
|
|
5870 {
|
|
|
5871 /* This hard limit is ok since the string it will hold has a
|
|
|
5872 fixed maximum length of around 6. But just to be safe... */
|
|
|
5873 char buf[10];
|
|
|
5874
|
|
|
5875 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
|
|
|
5876
|
|
|
5877 /* We can't normally display a 3-digit number, so get us a
|
|
|
5878 2-digit number that is close. */
|
|
|
5879 if (total == 100)
|
|
|
5880 total = 99;
|
|
|
5881
|
|
|
5882 if (toppos <= BUF_BEGV (b))
|
|
|
5883 sprintf (buf, "Top%2d%%", total);
|
|
|
5884 else
|
|
|
5885 sprintf (buf, "%2d%%", total);
|
|
|
5886
|
|
|
5887 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
|
|
|
5888 strlen (buf));
|
|
|
5889
|
|
|
5890 goto decode_mode_spec_done;
|
|
|
5891 }
|
|
|
5892 break;
|
|
|
5893 }
|
|
|
5894
|
|
|
5895 /* print % */
|
|
|
5896 case '%':
|
|
|
5897 str = "%";
|
|
|
5898 break;
|
|
|
5899
|
|
|
5900 /* print one [ for each recursive editing level. */
|
|
|
5901 case '[':
|
|
|
5902 {
|
|
|
5903 int i;
|
|
|
5904
|
|
|
5905 if (command_loop_level > 5)
|
|
|
5906 {
|
|
|
5907 str = "[[[... ";
|
|
|
5908 break;
|
|
|
5909 }
|
|
|
5910
|
|
|
5911 for (i = 0; i < command_loop_level; i++)
|
|
|
5912 Dynarr_add (mode_spec_bufbyte_string, '[');
|
|
|
5913
|
|
|
5914 goto decode_mode_spec_done;
|
|
|
5915 }
|
|
|
5916
|
|
|
5917 /* print one ] for each recursive editing level. */
|
|
|
5918 case ']':
|
|
|
5919 {
|
|
|
5920 int i;
|
|
|
5921
|
|
|
5922 if (command_loop_level > 5)
|
|
|
5923 {
|
|
|
5924 str = "...]]]";
|
|
|
5925 break;
|
|
|
5926 }
|
|
|
5927
|
|
|
5928 for (i = 0; i < command_loop_level; i++)
|
|
|
5929 Dynarr_add (mode_spec_bufbyte_string, ']');
|
|
|
5930
|
|
|
5931 goto decode_mode_spec_done;
|
|
|
5932 }
|
|
|
5933
|
|
|
5934 /* print infinitely many dashes -- handle at top level now */
|
|
|
5935 case '-':
|
|
|
5936 break;
|
|
|
5937
|
|
|
5938 }
|
|
|
5939
|
|
|
5940 if (STRINGP (obj))
|
|
16
|
5941 Dynarr_add_many (mode_spec_bufbyte_string,
|
|
|
5942 XSTRING_DATA (obj),
|
|
|
5943 XSTRING_LENGTH (obj));
|
|
0
|
5944 else if (str)
|
|
|
5945 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
|
|
|
5946
|
|
|
5947 decode_mode_spec_done:
|
|
|
5948 Dynarr_add (mode_spec_bufbyte_string, '\0');
|
|
|
5949 }
|
|
|
5950
|
|
16
|
5951 /* Given a display line, free all of its data structures. */
|
|
0
|
5952
|
|
|
5953 static void
|
|
|
5954 free_display_line (struct display_line *dl)
|
|
|
5955 {
|
|
|
5956 int block;
|
|
|
5957
|
|
|
5958 if (dl->display_blocks)
|
|
|
5959 {
|
|
|
5960 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
|
|
|
5961 {
|
|
|
5962 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
5963
|
|
|
5964 Dynarr_free (db->runes);
|
|
|
5965 }
|
|
|
5966
|
|
|
5967 Dynarr_free (dl->display_blocks);
|
|
|
5968 dl->display_blocks = 0;
|
|
|
5969 }
|
|
|
5970
|
|
|
5971 if (dl->left_glyphs)
|
|
|
5972 {
|
|
|
5973 Dynarr_free (dl->left_glyphs);
|
|
|
5974 dl->left_glyphs = 0;
|
|
|
5975 }
|
|
|
5976
|
|
|
5977 if (dl->right_glyphs)
|
|
|
5978 {
|
|
|
5979 Dynarr_free (dl->right_glyphs);
|
|
|
5980 dl->right_glyphs = 0;
|
|
|
5981 }
|
|
|
5982 }
|
|
|
5983
|
|
|
5984
|
|
|
5985 /* Given an array of display lines, free them and all data structures
|
|
|
5986 contained within them. */
|
|
|
5987
|
|
|
5988 static void
|
|
|
5989 free_display_lines (display_line_dynarr *dla)
|
|
|
5990 {
|
|
|
5991 int line;
|
|
|
5992
|
|
|
5993 for (line = 0; line < Dynarr_largest (dla); line++)
|
|
|
5994 {
|
|
|
5995 free_display_line (Dynarr_atp (dla, line));
|
|
|
5996 }
|
|
|
5997
|
|
|
5998 Dynarr_free (dla);
|
|
|
5999 }
|
|
|
6000
|
|
|
6001 /* Call internal free routine for each set of display lines. */
|
|
|
6002
|
|
|
6003 void
|
|
|
6004 free_display_structs (struct window_mirror *mir)
|
|
|
6005 {
|
|
|
6006 if (mir->current_display_lines)
|
|
|
6007 {
|
|
|
6008 free_display_lines (mir->current_display_lines);
|
|
|
6009 mir->current_display_lines = 0;
|
|
|
6010 }
|
|
|
6011
|
|
|
6012 if (mir->desired_display_lines)
|
|
|
6013 {
|
|
|
6014 free_display_lines (mir->desired_display_lines);
|
|
|
6015 mir->desired_display_lines = 0;
|
|
|
6016 }
|
|
|
6017 }
|
|
|
6018
|
|
|
6019
|
|
|
6020 static void
|
|
|
6021 mark_redisplay_structs (display_line_dynarr *dla,
|
|
|
6022 void (*markobj) (Lisp_Object))
|
|
|
6023 {
|
|
|
6024 int line;
|
|
|
6025
|
|
|
6026 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
6027 {
|
|
|
6028 int block, loop;
|
|
|
6029 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6030
|
|
|
6031 for (block = 0; block < Dynarr_length (dl->display_blocks); block++)
|
|
|
6032 {
|
|
|
6033 int rune;
|
|
|
6034 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
|
|
|
6035
|
|
|
6036 for (rune = 0; rune < Dynarr_length (db->runes); rune++)
|
|
|
6037 {
|
|
|
6038 struct rune *rb = Dynarr_atp (db->runes, rune);
|
|
|
6039
|
|
|
6040 if (rb->type == RUNE_DGLYPH)
|
|
|
6041 {
|
|
|
6042 if (!NILP (rb->object.dglyph.glyph))
|
|
|
6043 ((markobj) (rb->object.dglyph.glyph));
|
|
|
6044 if (!NILP (rb->object.dglyph.extent))
|
|
|
6045 ((markobj) (rb->object.dglyph.extent));
|
|
|
6046 }
|
|
|
6047 }
|
|
|
6048 }
|
|
|
6049
|
|
|
6050 for (loop = 0; loop < 2; loop++)
|
|
|
6051 {
|
|
|
6052 glyph_block_dynarr *gba = (loop
|
|
|
6053 ? dl->right_glyphs
|
|
|
6054 : dl->left_glyphs);
|
|
|
6055
|
|
|
6056 if (gba != NULL)
|
|
|
6057 {
|
|
|
6058 for (block = 0; block < Dynarr_length (gba); block++)
|
|
|
6059 {
|
|
|
6060 struct glyph_block *gb = Dynarr_atp (gba, block);
|
|
|
6061
|
|
|
6062 if (!NILP (gb->glyph))
|
|
|
6063 ((markobj) (gb->glyph));
|
|
|
6064 if (!NILP (gb->extent))
|
|
|
6065 ((markobj) (gb->extent));
|
|
|
6066 }
|
|
|
6067 }
|
|
|
6068 }
|
|
|
6069 }
|
|
|
6070 }
|
|
|
6071
|
|
|
6072 static void
|
|
|
6073 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
|
|
|
6074 {
|
|
|
6075 mark_redisplay_structs (mir->current_display_lines, markobj);
|
|
|
6076 mark_redisplay_structs (mir->desired_display_lines, markobj);
|
|
|
6077
|
|
|
6078 if (mir->next)
|
|
|
6079 mark_window_mirror (mir->next, markobj);
|
|
|
6080
|
|
|
6081 if (mir->hchild)
|
|
|
6082 mark_window_mirror (mir->hchild, markobj);
|
|
|
6083 else if (mir->vchild)
|
|
|
6084 mark_window_mirror (mir->vchild, markobj);
|
|
|
6085 }
|
|
|
6086
|
|
|
6087 void
|
|
|
6088 mark_redisplay (void (*markobj)(Lisp_Object))
|
|
|
6089 {
|
|
|
6090 Lisp_Object frmcons, devcons, concons;
|
|
|
6091
|
|
|
6092 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
6093 {
|
|
|
6094 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
6095 update_frame_window_mirror (f);
|
|
|
6096 mark_window_mirror (f->root_mirror, markobj);
|
|
|
6097 }
|
|
|
6098 }
|
|
|
6099
|
|
|
6100 /*****************************************************************************
|
|
|
6101 Line Start Cache Description and Rationale
|
|
|
6102
|
|
|
6103 The traditional scrolling code in Emacs breaks in a variable height world.
|
|
|
6104 It depends on the key assumption that the number of lines that can be
|
|
|
6105 displayed at any given time is fixed. This led to a complete separation
|
|
|
6106 of the scrolling code from the redisplay code. In order to fully support
|
|
|
6107 variable height lines, the scrolling code must actually be tightly
|
|
|
6108 integrated with redisplay. Only redisplay can determine how many lines
|
|
|
6109 will be displayed on a screen for any given starting point.
|
|
|
6110
|
|
|
6111 What is ideally wanted is a complete list of the starting buffer position
|
|
|
6112 for every possible display line of a buffer along with the height of that
|
|
|
6113 display line. Maintaining such a full list would be very expensive. We
|
|
|
6114 settle for having it include information for all areas which we happen to
|
|
|
6115 generate anyhow (i.e. the region currently being displayed) and for those
|
|
|
6116 areas we need to work with.
|
|
|
6117
|
|
|
6118 In order to ensure that the cache accurately represents what redisplay
|
|
|
6119 would actually show, it is necessary to invalidate it in many situations.
|
|
|
6120 If the buffer changes, the starting positions may no longer be correct.
|
|
|
6121 If a face or an extent has changed then the line heights may have altered.
|
|
|
6122 These events happen frequently enough that the cache can end up being
|
|
|
6123 constantly disabled. With this potentially constant invalidation when is
|
|
|
6124 the cache ever useful?
|
|
|
6125
|
|
|
6126 Even if the cache is invalidated before every single usage, it is
|
|
|
6127 necessary. Scrolling often requires knowledge about display lines which
|
|
|
6128 are actually above or below the visible region. The cache provides a
|
|
|
6129 convenient light-weight method of storing this information for multiple
|
|
|
6130 display regions. This knowledge is necessary for the scrolling code to
|
|
|
6131 always obey the First Golden Rule of Redisplay.
|
|
|
6132
|
|
|
6133 If the cache already contains all of the information that the scrolling
|
|
|
6134 routines happen to need so that it doesn't have to go generate it, then we
|
|
|
6135 are able to obey the Third Golden Rule of Redisplay. The first thing we
|
|
|
6136 do to help out the cache is to always add the displayed region. This
|
|
|
6137 region had to be generated anyway, so the cache ends up getting the
|
|
|
6138 information basically for free. In those cases where a user is simply
|
|
|
6139 scrolling around viewing a buffer there is a high probability that this is
|
|
|
6140 sufficient to always provide the needed information. The second thing we
|
|
|
6141 can do is be smart about invalidating the cache.
|
|
|
6142
|
|
|
6143 TODO -- Be smart about invalidating the cache. Potential places:
|
|
|
6144
|
|
|
6145 + Insertions at end-of-line which don't cause line-wraps do not alter the
|
|
|
6146 starting positions of any display lines. These types of buffer
|
|
|
6147 modifications should not invalidate the cache. This is actually a large
|
|
|
6148 optimization for redisplay speed as well.
|
|
|
6149
|
|
|
6150 + Buffer modifications frequently only affect the display of lines at and
|
|
|
6151 below where they occur. In these situations we should only invalidate
|
|
|
6152 the part of the cache starting at where the modification occurs.
|
|
|
6153
|
|
|
6154 In case you're wondering, the Second Golden Rule of Redisplay is not
|
|
|
6155 applicable.
|
|
|
6156 ****************************************************************************/
|
|
|
6157
|
|
|
6158 /* This will get used quite a bit so we don't want to be constantly
|
|
|
6159 allocating and freeing it. */
|
|
|
6160 line_start_cache_dynarr *internal_cache;
|
|
|
6161
|
|
|
6162 /* Makes internal_cache represent the TYPE display structs and only
|
|
|
6163 the TYPE display structs. */
|
|
|
6164
|
|
|
6165 static void
|
|
|
6166 update_internal_cache_list (struct window *w, int type)
|
|
|
6167 {
|
|
|
6168 int line;
|
|
|
6169 display_line_dynarr *dla = window_display_lines (w, type);
|
|
|
6170
|
|
|
6171 Dynarr_reset (internal_cache);
|
|
|
6172 for (line = 0; line < Dynarr_length (dla); line++)
|
|
|
6173 {
|
|
|
6174 struct display_line *dl = Dynarr_atp (dla, line);
|
|
|
6175
|
|
|
6176 if (dl->modeline)
|
|
|
6177 continue;
|
|
|
6178 else
|
|
|
6179 {
|
|
|
6180 struct line_start_cache lsc;
|
|
|
6181
|
|
|
6182 lsc.start = dl->bufpos;
|
|
|
6183 lsc.end = dl->end_bufpos;
|
|
|
6184 lsc.height = dl->ascent + dl->descent;
|
|
|
6185
|
|
|
6186 Dynarr_add (internal_cache, lsc);
|
|
|
6187 }
|
|
|
6188 }
|
|
|
6189 }
|
|
|
6190
|
|
|
6191 /* Reset the line cache if necessary. This should be run at the
|
|
|
6192 beginning of any function which access the cache. */
|
|
|
6193
|
|
|
6194 static void
|
|
|
6195 validate_line_start_cache (struct window *w)
|
|
|
6196 {
|
|
|
6197 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6198 struct frame *f = XFRAME (w->frame);
|
|
|
6199
|
|
|
6200 if (!w->line_cache_validation_override)
|
|
|
6201 {
|
|
|
6202 /* f->extents_changed used to be in here because extent face and
|
|
|
6203 size changes can cause text shifting. However, the extent
|
|
|
6204 covering the region is constantly having its face set and
|
|
|
6205 priority altered by the mouse code. This means that the line
|
|
|
6206 start cache is constanty being invalidated. This is bad
|
|
|
6207 since the mouse code also triggers heavy usage of the cache.
|
|
|
6208 Since it is an unlikely that f->extents being changed
|
|
|
6209 indicates that the cache really needs to be updated and if it
|
|
|
6210 does redisplay will catch it pretty quickly we no longer
|
|
|
6211 invalidate the cache if it is set. This greatly speeds up
|
|
|
6212 dragging out regions with the mouse. */
|
|
|
6213 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
|
|
|
6214 || f->faces_changed
|
|
|
6215 || f->clip_changed)
|
|
|
6216 {
|
|
|
6217 Dynarr_reset (w->line_start_cache);
|
|
|
6218 }
|
|
|
6219 }
|
|
|
6220 }
|
|
|
6221
|
|
|
6222 /* Return the very first buffer position contained in the given
|
|
|
6223 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
6224 cache is valid. */
|
|
|
6225
|
|
|
6226 static Bufpos
|
|
|
6227 line_start_cache_start (struct window *w)
|
|
|
6228 {
|
|
|
6229 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
6230
|
|
|
6231 if (!Dynarr_length (cache))
|
|
|
6232 return -1;
|
|
|
6233 else
|
|
|
6234 return (Dynarr_atp (cache, 0)->start);
|
|
|
6235 }
|
|
|
6236
|
|
|
6237 /* Return the very last buffer position contained in the given
|
|
|
6238 window's cache, or -1 if the cache is empty. Assumes that the
|
|
|
6239 cache is valid. */
|
|
|
6240
|
|
|
6241 static Bufpos
|
|
|
6242 line_start_cache_end (struct window *w)
|
|
|
6243 {
|
|
|
6244 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
6245
|
|
|
6246 if (!Dynarr_length (cache))
|
|
|
6247 return -1;
|
|
|
6248 else
|
|
|
6249 return (Dynarr_atp (cache, Dynarr_length (cache) - 1)->end);
|
|
|
6250 }
|
|
|
6251
|
|
|
6252 /* Return the index of the line POINT is contained within in window
|
|
|
6253 W's line start cache. It will enlarge the cache or move the cache
|
|
|
6254 window in order to have POINT be present in the cache. MIN_PAST is
|
|
|
6255 a guarantee of the number of entries in the cache present on either
|
|
|
6256 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
|
|
|
6257 then it will be treated as 0, but the cache window will not be
|
|
|
6258 allowed to shift. Returns -1 if POINT cannot be found in the cache
|
|
|
6259 for any reason. */
|
|
|
6260
|
|
|
6261 int
|
|
|
6262 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
|
|
|
6263 {
|
|
|
6264 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6265 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
6266 unsigned int top, bottom, pos;
|
|
|
6267
|
|
|
6268 validate_line_start_cache (w);
|
|
|
6269 w->line_cache_validation_override++;
|
|
|
6270
|
|
|
6271 /* Let functions pass in negative values, but we still treat -1
|
|
|
6272 specially. */
|
|
|
6273 /* #### bogosity alert */
|
|
|
6274 if (min_past < 0 && min_past != -1)
|
|
|
6275 min_past = -min_past;
|
|
|
6276
|
|
|
6277 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
|
|
|
6278 || line_start_cache_end (w) < point)
|
|
|
6279 {
|
|
|
6280 int loop;
|
|
|
6281 int win_char_height = window_char_height (w, 1);
|
|
|
6282
|
|
|
6283 /* Occasionally we get here with a 0 height
|
|
|
6284 window. find_next_newline_no_quit will abort if we pass it a
|
|
|
6285 count of 0 so handle that case. */
|
|
|
6286 if (!win_char_height)
|
|
|
6287 win_char_height = 1;
|
|
|
6288
|
|
|
6289 if (!Dynarr_length (cache))
|
|
|
6290 {
|
|
|
6291 Bufpos from = find_next_newline_no_quit (b, point, -1);
|
|
|
6292 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
6293
|
|
|
6294 update_line_start_cache (w, from, to, point, 0);
|
|
|
6295
|
|
|
6296 if (!Dynarr_length (cache))
|
|
|
6297 {
|
|
|
6298 w->line_cache_validation_override--;
|
|
|
6299 return -1;
|
|
|
6300 }
|
|
|
6301 }
|
|
|
6302
|
|
|
6303 assert (Dynarr_length (cache));
|
|
|
6304
|
|
|
6305 loop = 0;
|
|
|
6306 while (line_start_cache_start (w) > point
|
|
|
6307 && (loop < cache_adjustment || min_past == -1))
|
|
|
6308 {
|
|
|
6309 Bufpos from, to;
|
|
|
6310
|
|
|
6311 from = line_start_cache_start (w);
|
|
|
6312 if (from <= BUF_BEGV (b))
|
|
|
6313 break;
|
|
|
6314
|
|
|
6315 from = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
6316 to = line_start_cache_end (w);
|
|
|
6317
|
|
|
6318 update_line_start_cache (w, from, to, point, 0);
|
|
|
6319 loop++;
|
|
|
6320 }
|
|
|
6321
|
|
|
6322 if (line_start_cache_start (w) > point)
|
|
|
6323 {
|
|
|
6324 Bufpos from, to;
|
|
|
6325
|
|
|
6326 from = find_next_newline_no_quit (b, point, -1);
|
|
|
6327 if (from >= BUF_ZV (b))
|
|
|
6328 {
|
|
|
6329 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
6330 from = to;
|
|
|
6331 to = BUF_ZV (b);
|
|
|
6332 }
|
|
|
6333 else
|
|
|
6334 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
6335
|
|
|
6336 update_line_start_cache (w, from, to, point, 0);
|
|
|
6337 }
|
|
|
6338
|
|
|
6339 loop = 0;
|
|
|
6340 while (line_start_cache_end (w) < point
|
|
|
6341 && (loop < cache_adjustment || min_past == -1))
|
|
|
6342 {
|
|
|
6343 Bufpos from, to;
|
|
|
6344
|
|
|
6345 to = line_start_cache_end (w);
|
|
|
6346 if (to >= BUF_ZV (b))
|
|
|
6347 break;
|
|
|
6348
|
|
|
6349 from = line_start_cache_end (w);
|
|
|
6350 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
6351
|
|
|
6352 update_line_start_cache (w, from, to, point, 0);
|
|
|
6353 loop++;
|
|
|
6354 }
|
|
|
6355
|
|
|
6356 if (line_start_cache_end (w) < point)
|
|
|
6357 {
|
|
|
6358 Bufpos from, to;
|
|
|
6359
|
|
|
6360 from = find_next_newline_no_quit (b, point, -1);
|
|
|
6361 if (from >= BUF_ZV (b))
|
|
|
6362 {
|
|
|
6363 to = find_next_newline_no_quit (b, from, -win_char_height);
|
|
|
6364 from = to;
|
|
|
6365 to = BUF_ZV (b);
|
|
|
6366 }
|
|
|
6367 else
|
|
|
6368 to = find_next_newline_no_quit (b, from, win_char_height);
|
|
|
6369
|
|
|
6370 update_line_start_cache (w, from, to, point, 0);
|
|
|
6371 }
|
|
|
6372 }
|
|
|
6373
|
|
|
6374 assert (Dynarr_length (cache));
|
|
|
6375
|
|
|
6376 if (min_past == -1)
|
|
|
6377 min_past = 0;
|
|
|
6378
|
|
|
6379 /* This could happen if the buffer is narrowed. */
|
|
|
6380 if (line_start_cache_start (w) > point
|
|
|
6381 || line_start_cache_end (w) < point)
|
|
|
6382 {
|
|
|
6383 w->line_cache_validation_override--;
|
|
|
6384 return -1;
|
|
|
6385 }
|
|
|
6386
|
|
|
6387 find_point_loop:
|
|
|
6388
|
|
|
6389 top = Dynarr_length (cache) - 1;
|
|
|
6390 bottom = 0;
|
|
|
6391
|
|
|
6392 while (1)
|
|
|
6393 {
|
|
|
6394 unsigned int new_pos;
|
|
|
6395 Bufpos start, end;
|
|
|
6396
|
|
|
6397 pos = (bottom + top + 1) >> 1;
|
|
|
6398 start = Dynarr_atp (cache, pos)->start;
|
|
|
6399 end = Dynarr_atp (cache, pos)->end;
|
|
|
6400
|
|
|
6401 if (point >= start && point <= end)
|
|
|
6402 {
|
|
|
6403 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
|
|
|
6404 {
|
|
|
6405 Bufpos from =
|
|
|
6406 find_next_newline_no_quit (b, line_start_cache_start (w),
|
|
|
6407 -min_past - 1);
|
|
|
6408 Bufpos to = line_start_cache_end (w);
|
|
|
6409
|
|
|
6410 update_line_start_cache (w, from, to, point, 0);
|
|
|
6411 goto find_point_loop;
|
|
|
6412 }
|
|
|
6413 else if ((Dynarr_length (cache) - pos - 1) < min_past
|
|
|
6414 && line_start_cache_end (w) < BUF_ZV (b))
|
|
|
6415 {
|
|
|
6416 Bufpos from = line_start_cache_end (w);
|
|
|
6417 Bufpos to = find_next_newline_no_quit (b, from,
|
|
|
6418 (min_past
|
|
|
6419 ? min_past
|
|
|
6420 : 1));
|
|
|
6421
|
|
|
6422 update_line_start_cache (w, from, to, point, 0);
|
|
|
6423 goto find_point_loop;
|
|
|
6424 }
|
|
|
6425 else
|
|
|
6426 {
|
|
|
6427 w->line_cache_validation_override--;
|
|
|
6428 return pos;
|
|
|
6429 }
|
|
|
6430 }
|
|
|
6431 else if (point > end)
|
|
|
6432 bottom = pos + 1;
|
|
|
6433 else if (point < start)
|
|
|
6434 top = pos - 1;
|
|
|
6435 else
|
|
|
6436 abort ();
|
|
|
6437
|
|
|
6438 new_pos = (bottom + top + 1) >> 1;
|
|
|
6439 if (pos == new_pos)
|
|
|
6440 {
|
|
|
6441 w->line_cache_validation_override--;
|
|
|
6442 return -1;
|
|
|
6443 }
|
|
|
6444 }
|
|
|
6445 }
|
|
|
6446
|
|
|
6447 /* Return a boolean indicating if POINT would be visible in window W
|
|
|
6448 if display of the window was to begin at STARTP. */
|
|
|
6449
|
|
|
6450 int
|
|
|
6451 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
|
|
|
6452 {
|
|
|
6453 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6454 int pixpos = 0;
|
|
|
6455 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
6456 int start_elt;
|
|
|
6457
|
|
|
6458 /* If point is before the intended start it obviously can't be visible. */
|
|
|
6459 if (point < startp)
|
|
|
6460 return 0;
|
|
|
6461
|
|
|
6462 /* If point or start are not in the accessible buffer range, then
|
|
|
6463 fail. */
|
|
|
6464 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
|
|
|
6465 || point < BUF_BEGV (b) || point > BUF_ZV (b))
|
|
|
6466 {
|
|
|
6467 w->line_cache_validation_override--;
|
|
|
6468 return 0;
|
|
|
6469 }
|
|
|
6470
|
|
|
6471 validate_line_start_cache (w);
|
|
|
6472 w->line_cache_validation_override++;
|
|
|
6473
|
|
|
6474 start_elt = point_in_line_start_cache (w, startp, 0);
|
|
|
6475 if (start_elt == -1)
|
|
|
6476 {
|
|
|
6477 w->line_cache_validation_override--;
|
|
|
6478 return 0;
|
|
|
6479 }
|
|
|
6480
|
|
|
6481 assert (line_start_cache_start (w) <= startp
|
|
|
6482 && line_start_cache_end (w) >= startp);
|
|
|
6483
|
|
|
6484 while (1)
|
|
|
6485 {
|
|
|
6486 int height;
|
|
|
6487
|
|
|
6488 /* Expand the cache if necessary. */
|
|
|
6489 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
6490 {
|
|
|
6491 Bufpos old_startp =
|
|
|
6492 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
|
|
|
6493
|
|
|
6494 start_elt = point_in_line_start_cache (w, old_startp,
|
|
|
6495 window_char_height (w, 0));
|
|
|
6496
|
|
|
6497 /* We've already actually processed old_startp, so increment
|
|
|
6498 immediately. */
|
|
|
6499 start_elt++;
|
|
|
6500
|
|
|
6501 /* If this happens we didn't add any extra elements. Bummer. */
|
|
|
6502 if (start_elt == Dynarr_length (w->line_start_cache))
|
|
|
6503 {
|
|
|
6504 w->line_cache_validation_override--;
|
|
|
6505 return 0;
|
|
|
6506 }
|
|
|
6507 }
|
|
|
6508
|
|
|
6509 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
|
|
|
6510
|
|
|
6511 if (pixpos + height > bottom)
|
|
|
6512 {
|
|
|
6513 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
6514 {
|
|
|
6515 w->line_cache_validation_override--;
|
|
|
6516 return 0;
|
|
|
6517 }
|
|
|
6518 }
|
|
|
6519
|
|
|
6520 pixpos += height;
|
|
|
6521 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
|
|
|
6522 {
|
|
|
6523 w->line_cache_validation_override--;
|
|
|
6524 return 1;
|
|
|
6525 }
|
|
|
6526
|
|
|
6527 start_elt++;
|
|
|
6528 }
|
|
|
6529 }
|
|
|
6530
|
|
|
6531 /* For the given window W, if display starts at STARTP, what will be
|
|
|
6532 the buffer position at the beginning or end of the last line
|
|
|
6533 displayed. The end of the last line is also know as the window end
|
|
|
6534 position.
|
|
|
6535
|
|
|
6536 #### With a little work this could probably be reworked as just a
|
|
|
6537 call to start_with_line_at_pixpos. */
|
|
|
6538
|
|
|
6539 static Bufpos
|
|
|
6540 start_end_of_last_line (struct window *w, Bufpos startp, int end)
|
|
|
6541 {
|
|
|
6542 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6543 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
6544 int pixpos = 0;
|
|
|
6545 int bottom = WINDOW_TEXT_HEIGHT (w);
|
|
|
6546 Bufpos cur_start;
|
|
|
6547 int start_elt;
|
|
|
6548
|
|
|
6549 validate_line_start_cache (w);
|
|
|
6550 w->line_cache_validation_override++;
|
|
|
6551
|
|
|
6552 if (startp < BUF_BEGV (b))
|
|
|
6553 startp = BUF_BEGV (b);
|
|
|
6554 else if (startp > BUF_ZV (b))
|
|
|
6555 startp = BUF_ZV (b);
|
|
|
6556 cur_start = startp;
|
|
|
6557
|
|
|
6558 start_elt = point_in_line_start_cache (w, cur_start, 0);
|
|
|
6559 if (start_elt == -1)
|
|
|
6560 abort (); /* this had better never happen */
|
|
|
6561
|
|
|
6562 while (1)
|
|
|
6563 {
|
|
|
6564 int height = Dynarr_atp (cache, start_elt)->height;
|
|
|
6565
|
|
|
6566 cur_start = Dynarr_atp (cache, start_elt)->start;
|
|
|
6567
|
|
|
6568 if (pixpos + height > bottom)
|
|
|
6569 {
|
|
|
6570 /* Adjust for any possible clip. */
|
|
|
6571 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
|
|
|
6572 start_elt--;
|
|
|
6573
|
|
|
6574 if (start_elt < 0)
|
|
|
6575 {
|
|
|
6576 w->line_cache_validation_override--;
|
|
|
6577 if (end)
|
|
|
6578 return (BUF_ZV (b));
|
|
|
6579 else
|
|
|
6580 return (BUF_BEGV (b));
|
|
|
6581 }
|
|
|
6582 else
|
|
|
6583 {
|
|
|
6584 w->line_cache_validation_override--;
|
|
|
6585 if (end)
|
|
|
6586 return Dynarr_atp (cache, start_elt)->end;
|
|
|
6587 else
|
|
|
6588 return Dynarr_atp (cache, start_elt)->start;
|
|
|
6589 }
|
|
|
6590 }
|
|
|
6591
|
|
|
6592 pixpos += height;
|
|
|
6593 start_elt++;
|
|
|
6594 if (start_elt == Dynarr_length (cache))
|
|
|
6595 {
|
|
|
6596 Bufpos from = line_start_cache_end (w);
|
|
|
6597 int win_char_height = window_char_height (w, 0);
|
|
|
6598 Bufpos to = find_next_newline_no_quit (b, from,
|
|
|
6599 (win_char_height
|
|
|
6600 ? win_char_height
|
|
|
6601 : 1));
|
|
|
6602
|
|
|
6603 /* We've hit the end of the bottom so that's what it is. */
|
|
|
6604 if (from >= BUF_ZV (b))
|
|
|
6605 {
|
|
|
6606 w->line_cache_validation_override--;
|
|
|
6607 return (BUF_ZV (b));
|
|
|
6608 }
|
|
|
6609
|
|
|
6610 update_line_start_cache (w, from, to, BUF_PT (b), 0);
|
|
|
6611
|
|
|
6612 /* Updating the cache invalidates any current indexes. */
|
|
|
6613 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
|
|
|
6614 }
|
|
|
6615 }
|
|
|
6616 }
|
|
|
6617
|
|
|
6618 /* For the given window W, if display starts at STARTP, what will be
|
|
|
6619 the buffer position at the beginning of the last line displayed. */
|
|
|
6620
|
|
|
6621 Bufpos
|
|
|
6622 start_of_last_line (struct window *w, Bufpos startp)
|
|
|
6623 {
|
|
|
6624 return start_end_of_last_line (w, startp, 0);
|
|
|
6625 }
|
|
|
6626
|
|
|
6627 /* For the given window W, if display starts at STARTP, what will be
|
|
|
6628 the buffer position at the end of the last line displayed. This is
|
|
|
6629 also know as the window end position. */
|
|
|
6630
|
|
|
6631 Bufpos
|
|
|
6632 end_of_last_line (struct window *w, Bufpos startp)
|
|
|
6633 {
|
|
|
6634 return start_end_of_last_line (w, startp, 1);
|
|
|
6635 }
|
|
|
6636
|
|
|
6637 /* For window W, what does the starting position have to be so that
|
|
|
6638 the line containing POINT will cover pixel position PIXPOS. */
|
|
|
6639
|
|
|
6640 Bufpos
|
|
|
6641 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
|
|
|
6642 {
|
|
|
6643 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6644 int cur_elt;
|
|
70
|
6645 Bufpos cur_pos;
|
|
0
|
6646 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
|
|
|
6647
|
|
|
6648 validate_line_start_cache (w);
|
|
|
6649 w->line_cache_validation_override++;
|
|
|
6650
|
|
|
6651 cur_elt = point_in_line_start_cache (w, point, 0);
|
|
|
6652 /* #### See comment in update_line_start_cache about big minibuffers. */
|
|
|
6653 if (cur_elt < 0)
|
|
|
6654 return point;
|
|
|
6655 while (1)
|
|
|
6656 {
|
|
|
6657 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
6658
|
|
|
6659 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
6660
|
|
|
6661 /* Do not take into account the value of vertical_clip here.
|
|
|
6662 That is the responsibility of the calling functions. */
|
|
|
6663 if (pixheight < 0)
|
|
|
6664 {
|
|
|
6665 w->line_cache_validation_override--;
|
|
70
|
6666 return cur_pos;
|
|
0
|
6667 }
|
|
|
6668
|
|
|
6669 cur_elt--;
|
|
|
6670 if (cur_elt < 0)
|
|
|
6671 {
|
|
|
6672 Bufpos from, to;
|
|
|
6673 int win_char_height;
|
|
|
6674
|
|
|
6675 if (cur_pos <= BUF_BEGV (b))
|
|
|
6676 {
|
|
|
6677 w->line_cache_validation_override--;
|
|
|
6678 return (BUF_BEGV (b));
|
|
|
6679 }
|
|
|
6680
|
|
|
6681 win_char_height = window_char_height (w, 0);
|
|
|
6682 if (!win_char_height)
|
|
|
6683 win_char_height = 1;
|
|
|
6684
|
|
|
6685 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
|
|
|
6686 to = line_start_cache_end (w);
|
|
|
6687 update_line_start_cache (w, from, to, point, 0);
|
|
|
6688
|
|
|
6689 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
|
|
|
6690 assert (cur_elt >= 0);
|
|
|
6691 }
|
|
|
6692 }
|
|
|
6693 }
|
|
|
6694
|
|
|
6695 /* For window W, what does the starting position have to be so that
|
|
|
6696 the line containing point is on display line LINE. If LINE is
|
|
|
6697 positive it is considered to be the number of lines from the top of
|
|
|
6698 the window (0 is the top line). If it is negative the number is
|
|
|
6699 considered to be the number of lines from the bottom (-1 is the
|
|
|
6700 bottom line). */
|
|
|
6701
|
|
|
6702 Bufpos
|
|
|
6703 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
|
|
|
6704 {
|
|
|
6705 validate_line_start_cache (w);
|
|
|
6706 w->line_cache_validation_override++;
|
|
|
6707
|
|
|
6708 if (line >= 0)
|
|
|
6709 {
|
|
|
6710 int cur_elt = point_in_line_start_cache (w, point, line);
|
|
|
6711
|
|
|
6712 if (cur_elt - line < 0)
|
|
|
6713 cur_elt = 0; /* Hit the top */
|
|
|
6714 else
|
|
|
6715 cur_elt -= line;
|
|
|
6716
|
|
|
6717 w->line_cache_validation_override--;
|
|
|
6718 return (Dynarr_atp (w->line_start_cache, cur_elt)->start);
|
|
|
6719 }
|
|
|
6720 else
|
|
|
6721 {
|
|
|
6722 /* The calculated value of pixpos is correct for the bottom line
|
|
|
6723 or what we want when line is -1. Therefore we subtract one
|
|
|
6724 because we have already handled one line. */
|
|
|
6725 int new_line = -line - 1;
|
|
|
6726 int cur_elt = point_in_line_start_cache (w, point, new_line);
|
|
|
6727 int pixpos = WINDOW_TEXT_BOTTOM (w);
|
|
|
6728 Bufpos retval, search_point;
|
|
|
6729
|
|
|
6730 /* If scroll_on_clipped_lines is false, the last "visible" line of
|
|
|
6731 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
|
|
|
6732 If s_o_c_l is true, then we don't want to count a clipped
|
|
|
6733 line, so back up from the bottom by the height of the line
|
|
|
6734 containing point. */
|
|
|
6735 if (scroll_on_clipped_lines)
|
|
|
6736 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
|
|
|
6737 else
|
|
|
6738 pixpos -= 1;
|
|
|
6739
|
|
|
6740 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
|
|
|
6741 {
|
|
|
6742 /* Hit the bottom of the buffer. */
|
|
|
6743 int adjustment =
|
|
|
6744 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
|
|
|
6745 Lisp_Object window = Qnil;
|
|
|
6746 int defheight;
|
|
|
6747
|
|
|
6748 XSETWINDOW (window, w);
|
|
|
6749 default_face_height_and_width (window, &defheight, 0);
|
|
|
6750
|
|
|
6751 cur_elt = Dynarr_length (w->line_start_cache) - 1;
|
|
|
6752
|
|
|
6753 pixpos -= (adjustment * defheight);
|
|
|
6754 if (pixpos < WINDOW_TEXT_TOP (w))
|
|
|
6755 pixpos = WINDOW_TEXT_TOP (w);
|
|
|
6756 }
|
|
|
6757 else
|
|
|
6758 cur_elt = cur_elt + new_line;
|
|
|
6759
|
|
|
6760 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
|
|
|
6761
|
|
|
6762 retval = start_with_line_at_pixpos (w, search_point, pixpos);
|
|
|
6763 w->line_cache_validation_override--;
|
|
|
6764 return retval;
|
|
|
6765 }
|
|
|
6766 }
|
|
|
6767
|
|
|
6768 /* This is used to speed up vertical scrolling by caching the known
|
|
|
6769 buffer starting positions for display lines. This allows the
|
|
|
6770 scrolling routines to avoid costly calls to regenerate_window. If
|
|
|
6771 NO_REGEN is true then it will only add the values in the DESIRED
|
|
|
6772 display structs which are in the given range.
|
|
|
6773
|
|
|
6774 Note also that the FROM/TO values are minimums. It is possible
|
|
|
6775 that this function will actually add information outside of the
|
|
|
6776 lines containing those positions. This can't hurt but it could
|
|
|
6777 possibly help.
|
|
|
6778
|
|
|
6779 #### We currently force the cache to have only 1 contiguous region.
|
|
|
6780 It might help to make the cache a dynarr of caches so that we can
|
|
|
6781 cover more areas. This might, however, turn out to be a lot of
|
|
|
6782 overhead for too little gain. */
|
|
|
6783
|
|
|
6784 static void
|
|
|
6785 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
|
|
|
6786 Bufpos point, int no_regen)
|
|
|
6787 {
|
|
|
6788 struct buffer *b = XBUFFER (w->buffer);
|
|
|
6789 line_start_cache_dynarr *cache = w->line_start_cache;
|
|
|
6790 Bufpos low_bound, high_bound;
|
|
|
6791
|
|
|
6792 validate_line_start_cache (w);
|
|
|
6793 w->line_cache_validation_override++;
|
|
|
6794 updating_line_start_cache = 1;
|
|
|
6795
|
|
|
6796 if (from < BUF_BEGV (b))
|
|
|
6797 from = BUF_BEGV (b);
|
|
|
6798 if (to > BUF_ZV (b))
|
|
|
6799 to = BUF_ZV (b);
|
|
|
6800
|
|
|
6801 if (from > to)
|
|
|
6802 {
|
|
|
6803 updating_line_start_cache = 0;
|
|
|
6804 w->line_cache_validation_override--;
|
|
|
6805 return;
|
|
|
6806 }
|
|
|
6807
|
|
|
6808 if (Dynarr_length (cache))
|
|
|
6809 {
|
|
|
6810 low_bound = line_start_cache_start (w);
|
|
|
6811 high_bound = line_start_cache_end (w);
|
|
|
6812
|
|
|
6813 /* Check to see if the desired range is already in the cache. */
|
|
|
6814 if (from >= low_bound && to <= high_bound)
|
|
|
6815 {
|
|
|
6816 updating_line_start_cache = 0;
|
|
|
6817 w->line_cache_validation_override--;
|
|
|
6818 return;
|
|
|
6819 }
|
|
|
6820
|
|
|
6821 /* Check to make sure that the desired range is adjacent to the
|
|
|
6822 current cache. If not, invalidate the cache. */
|
|
|
6823 if (to < low_bound || from > high_bound)
|
|
|
6824 {
|
|
|
6825 Dynarr_reset (cache);
|
|
|
6826 low_bound = high_bound = -1;
|
|
|
6827 }
|
|
|
6828 }
|
|
|
6829 else
|
|
|
6830 {
|
|
|
6831 low_bound = high_bound = -1;
|
|
|
6832 }
|
|
|
6833
|
|
|
6834 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
|
|
|
6835
|
|
|
6836 /* This could be integrated into the next two sections, but it is easier
|
|
|
6837 to follow what's going on by having it separate. */
|
|
|
6838 if (no_regen)
|
|
|
6839 {
|
|
|
6840 Bufpos start, end;
|
|
|
6841
|
|
|
6842 update_internal_cache_list (w, DESIRED_DISP);
|
|
|
6843 if (!Dynarr_length (internal_cache))
|
|
|
6844 {
|
|
|
6845 updating_line_start_cache = 0;
|
|
|
6846 w->line_cache_validation_override--;
|
|
|
6847 return;
|
|
|
6848 }
|
|
|
6849
|
|
|
6850 start = Dynarr_atp (internal_cache, 0)->start;
|
|
|
6851 end =
|
|
|
6852 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
|
|
|
6853
|
|
|
6854 /* We aren't allowed to generate additional information to fill in
|
|
|
6855 gaps, so if the DESIRED structs don't overlap the cache, reset the
|
|
|
6856 cache. */
|
|
|
6857 if (Dynarr_length (cache))
|
|
|
6858 {
|
|
|
6859 if (end < low_bound || start > high_bound)
|
|
|
6860 Dynarr_reset (cache);
|
|
|
6861
|
|
|
6862 /* #### What should really happen if what we are doing is
|
|
|
6863 extending a line (the last line)? */
|
|
|
6864 if (Dynarr_length (cache) == 1
|
|
|
6865 && Dynarr_length (internal_cache) == 1)
|
|
|
6866 Dynarr_reset (cache);
|
|
|
6867 }
|
|
|
6868
|
|
|
6869 if (!Dynarr_length (cache))
|
|
|
6870 {
|
|
|
6871 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
6872 Dynarr_length (internal_cache));
|
|
|
6873 updating_line_start_cache = 0;
|
|
|
6874 w->line_cache_validation_override--;
|
|
|
6875 return;
|
|
|
6876 }
|
|
|
6877
|
|
|
6878 /* An extra check just in case the calling function didn't pass in
|
|
|
6879 the bounds of the DESIRED structs in the first place. */
|
|
|
6880 if (start >= low_bound && end <= high_bound)
|
|
|
6881 {
|
|
|
6882 updating_line_start_cache = 0;
|
|
|
6883 w->line_cache_validation_override--;
|
|
|
6884 return;
|
|
|
6885 }
|
|
|
6886
|
|
|
6887 /* At this point we know that the internal cache partially overlaps
|
|
|
6888 the main cache. */
|
|
|
6889 if (start < low_bound)
|
|
|
6890 {
|
|
|
6891 int ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
6892 while (ic_elt >= 0)
|
|
|
6893 {
|
|
|
6894 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
|
|
|
6895 break;
|
|
|
6896 else
|
|
|
6897 ic_elt--;
|
|
|
6898 }
|
|
|
6899
|
|
|
6900 if (!(ic_elt >= 0))
|
|
|
6901 {
|
|
|
6902 Dynarr_reset (cache);
|
|
|
6903 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
6904 Dynarr_length (internal_cache));
|
|
|
6905 updating_line_start_cache = 0;
|
|
|
6906 w->line_cache_validation_override--;
|
|
|
6907 return;
|
|
|
6908 }
|
|
|
6909
|
|
|
6910 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
|
|
|
6911 ic_elt + 1);
|
|
|
6912 }
|
|
|
6913
|
|
|
6914 if (end > high_bound)
|
|
|
6915 {
|
|
|
6916 int ic_elt = 0;
|
|
|
6917
|
|
|
6918 while (ic_elt < Dynarr_length (internal_cache))
|
|
|
6919 {
|
|
|
6920 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
|
|
|
6921 break;
|
|
|
6922 else
|
|
|
6923 ic_elt++;
|
|
|
6924 }
|
|
|
6925
|
|
|
6926 if (!(ic_elt < Dynarr_length (internal_cache)))
|
|
|
6927 {
|
|
|
6928 Dynarr_reset (cache);
|
|
|
6929 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
6930 Dynarr_length (internal_cache));
|
|
|
6931 updating_line_start_cache = 0;
|
|
|
6932 w->line_cache_validation_override--;
|
|
|
6933 return;
|
|
|
6934 }
|
|
|
6935
|
|
|
6936 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
|
|
|
6937 Dynarr_length (internal_cache) - ic_elt);
|
|
|
6938 }
|
|
|
6939
|
|
|
6940 updating_line_start_cache = 0;
|
|
|
6941 w->line_cache_validation_override--;
|
|
|
6942 return;
|
|
|
6943 }
|
|
|
6944
|
|
|
6945 if (!Dynarr_length (cache) || from < low_bound)
|
|
|
6946 {
|
|
|
6947 Bufpos startp = find_next_newline_no_quit (b, from, -1);
|
|
|
6948 int marker = 0;
|
|
|
6949 int old_lb = low_bound;
|
|
|
6950
|
|
|
6951 while (startp < old_lb || low_bound == -1)
|
|
|
6952 {
|
|
|
6953 int ic_elt;
|
|
|
6954
|
|
|
6955 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
6956 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
6957
|
|
|
6958 /* If this assert is triggered then regenerate_window failed
|
|
|
6959 to layout a single line. That is not supposed to be
|
|
|
6960 possible because we impose a minimum height on the buffer
|
|
|
6961 and override vertical clip when we are in here. */
|
|
|
6962 /* #### Ah, but it is because the window may temporarily
|
|
|
6963 exist but not have any lines at all if the minibuffer is
|
|
|
6964 real big. Look into that situation better. */
|
|
|
6965 if (!Dynarr_length (internal_cache))
|
|
|
6966 {
|
|
|
6967 if (old_lb == -1 && low_bound == -1)
|
|
|
6968 {
|
|
|
6969 updating_line_start_cache = 0;
|
|
|
6970 w->line_cache_validation_override--;
|
|
|
6971 return;
|
|
|
6972 }
|
|
|
6973
|
|
|
6974 assert (Dynarr_length (internal_cache));
|
|
|
6975 }
|
|
|
6976 assert (startp == Dynarr_atp (internal_cache, 0)->start);
|
|
|
6977
|
|
|
6978 ic_elt = Dynarr_length (internal_cache) - 1;
|
|
|
6979 if (low_bound != -1)
|
|
|
6980 {
|
|
|
6981 while (ic_elt >= 0)
|
|
|
6982 {
|
|
|
6983 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
|
|
|
6984 break;
|
|
|
6985 else
|
|
|
6986 ic_elt--;
|
|
|
6987 }
|
|
|
6988 }
|
|
|
6989 assert (ic_elt >= 0);
|
|
|
6990
|
|
|
6991 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
6992 ic_elt + 1, marker);
|
|
|
6993 marker += (ic_elt + 1);
|
|
|
6994
|
|
|
6995 if (startp < low_bound || low_bound == -1)
|
|
|
6996 low_bound = startp;
|
|
|
6997 startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
|
|
|
6998 if (startp > BUF_ZV (b))
|
|
|
6999 {
|
|
|
7000 updating_line_start_cache = 0;
|
|
|
7001 w->line_cache_validation_override--;
|
|
|
7002 return;
|
|
|
7003 }
|
|
|
7004 }
|
|
|
7005 }
|
|
|
7006
|
|
|
7007 assert (Dynarr_length (cache));
|
|
|
7008 assert (from >= low_bound);
|
|
|
7009
|
|
|
7010 /* Readjust the high_bound to account for any changes made while
|
|
|
7011 correcting the low_bound. */
|
|
|
7012 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7013
|
|
|
7014 if (to > high_bound)
|
|
|
7015 {
|
|
|
7016 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
|
|
|
7017
|
|
|
7018 do
|
|
|
7019 {
|
|
|
7020 regenerate_window (w, startp, point, CMOTION_DISP);
|
|
|
7021 update_internal_cache_list (w, CMOTION_DISP);
|
|
|
7022
|
|
|
7023 /* See comment above about regenerate_window failing. */
|
|
|
7024 assert (Dynarr_length (internal_cache));
|
|
|
7025
|
|
|
7026 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
|
|
|
7027 Dynarr_length (internal_cache));
|
|
|
7028 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
|
|
|
7029 startp = high_bound + 1;
|
|
|
7030 }
|
|
|
7031 while (to > high_bound);
|
|
|
7032 }
|
|
|
7033
|
|
|
7034 updating_line_start_cache = 0;
|
|
|
7035 w->line_cache_validation_override--;
|
|
|
7036 assert (to <= high_bound);
|
|
|
7037 }
|
|
|
7038
|
|
|
7039
|
|
|
7040 /* Given x and y coordinates in characters, relative to a window,
|
|
|
7041 return the pixel location corresponding to those coordinates. The
|
|
|
7042 pixel location returned is the center of the given character
|
|
|
7043 position. The pixel values are generated relative to the window,
|
|
|
7044 not the frame.
|
|
|
7045
|
|
|
7046 The modeline is considered to be part of the window. */
|
|
|
7047
|
|
|
7048 void
|
|
|
7049 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
|
|
|
7050 int *pix_x, int *pix_y)
|
|
|
7051 {
|
|
|
7052 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
|
|
|
7053 int num_disp_lines, modeline;
|
|
|
7054 Lisp_Object window = Qnil;
|
|
|
7055 int defheight, defwidth;
|
|
|
7056
|
|
|
7057 XSETWINDOW (window, w);
|
|
|
7058 default_face_height_and_width (window, &defheight, &defwidth);
|
|
|
7059
|
|
|
7060 /* If we get a bogus value indicating somewhere above or to the left of
|
|
|
7061 the window, use the first window line or character position
|
|
|
7062 instead. */
|
|
|
7063 if (char_y < 0)
|
|
|
7064 char_y = 0;
|
|
|
7065 if (char_x < 0)
|
|
|
7066 char_x = 0;
|
|
|
7067
|
|
|
7068 num_disp_lines = Dynarr_length (dla);
|
|
|
7069 modeline = 0;
|
|
|
7070 if (num_disp_lines)
|
|
|
7071 {
|
|
|
7072 if (Dynarr_atp (dla, 0)->modeline)
|
|
|
7073 {
|
|
|
7074 num_disp_lines--;
|
|
|
7075 modeline = 1;
|
|
|
7076 }
|
|
|
7077 }
|
|
|
7078
|
|
|
7079 /* First check if the y position intersects the display lines. */
|
|
|
7080 if (char_y < num_disp_lines)
|
|
|
7081 {
|
|
|
7082 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
|
|
|
7083 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
7084
|
|
|
7085 *pix_y = (dl->ypos - dl->ascent +
|
|
|
7086 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
|
|
|
7087
|
|
|
7088 if (char_x < Dynarr_length (db->runes))
|
|
|
7089 {
|
|
|
7090 struct rune *rb = Dynarr_atp (db->runes, char_x);
|
|
|
7091
|
|
|
7092 *pix_x = rb->xpos + (rb->width >> 1);
|
|
|
7093 }
|
|
|
7094 else
|
|
|
7095 {
|
|
|
7096 int last_rune = Dynarr_length (db->runes) - 1;
|
|
|
7097 struct rune *rb = Dynarr_atp (db->runes, last_rune);
|
|
|
7098
|
|
|
7099 char_x -= last_rune;
|
|
|
7100
|
|
|
7101 *pix_x = rb->xpos + rb->width;
|
|
|
7102 *pix_x += ((char_x - 1) * defwidth);
|
|
|
7103 *pix_x += (defwidth >> 1);
|
|
|
7104 }
|
|
|
7105 }
|
|
|
7106 else
|
|
|
7107 {
|
|
|
7108 /* It didn't intersect, so extrapolate. #### For now, we include the
|
|
|
7109 modeline in this since we don't have true character positions in
|
|
|
7110 it. */
|
|
|
7111
|
|
|
7112 if (!Dynarr_length (w->face_cachels))
|
|
|
7113 reset_face_cachels (w);
|
|
|
7114
|
|
|
7115 char_y -= num_disp_lines;
|
|
|
7116
|
|
|
7117 if (Dynarr_length (dla))
|
|
|
7118 {
|
|
|
7119 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
|
|
|
7120 *pix_y = dl->ypos + dl->descent - dl->clip;
|
|
|
7121 }
|
|
|
7122 else
|
|
|
7123 *pix_y = WINDOW_TEXT_TOP (w);
|
|
|
7124
|
|
|
7125 *pix_y += (char_y * defheight);
|
|
|
7126 *pix_y += (defheight >> 1);
|
|
|
7127
|
|
|
7128 *pix_x = WINDOW_TEXT_LEFT (w);
|
|
|
7129 /* Don't adjust by one because this is still the unadjusted value. */
|
|
|
7130 *pix_x += (char_x * defwidth);
|
|
|
7131 *pix_x += (defwidth >> 1);
|
|
|
7132 }
|
|
|
7133
|
|
|
7134 if (*pix_x > w->pixel_left + w->pixel_width)
|
|
|
7135 *pix_x = w->pixel_left + w->pixel_width;
|
|
|
7136 if (*pix_y > w->pixel_top + w->pixel_height)
|
|
|
7137 *pix_y = w->pixel_top + w->pixel_height;
|
|
|
7138
|
|
|
7139 *pix_x -= w->pixel_left;
|
|
|
7140 *pix_y -= w->pixel_top;
|
|
|
7141 }
|
|
|
7142
|
|
|
7143 /* Given a display line and a position, determine if there is a glyph
|
|
|
7144 there and return information about it if there is. */
|
|
|
7145
|
|
|
7146 static void
|
|
|
7147 get_position_object (struct display_line *dl, Lisp_Object *obj1,
|
|
|
7148 Lisp_Object *obj2, int x_coord, int *low_x_coord,
|
|
|
7149 int *high_x_coord)
|
|
|
7150 {
|
|
|
7151 struct display_block *db;
|
|
|
7152 int elt;
|
|
|
7153 int block =
|
|
|
7154 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
|
|
|
7155
|
|
|
7156 /* We use get_next_display_block to get the actual display block
|
|
|
7157 that would be displayed at x_coord. */
|
|
|
7158
|
|
|
7159 if (block == NO_BLOCK)
|
|
|
7160 return;
|
|
|
7161 else
|
|
|
7162 db = Dynarr_atp (dl->display_blocks, block);
|
|
|
7163
|
|
|
7164 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
|
|
|
7165 {
|
|
|
7166 struct rune *rb = Dynarr_atp (db->runes, elt);
|
|
|
7167
|
|
|
7168 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
|
|
|
7169 {
|
|
|
7170 if (rb->type == RUNE_DGLYPH)
|
|
|
7171 {
|
|
|
7172 *obj1 = rb->object.dglyph.glyph;
|
|
|
7173 *obj2 = rb->object.dglyph.extent;
|
|
|
7174 }
|
|
|
7175 else
|
|
|
7176 {
|
|
|
7177 *obj1 = Qnil;
|
|
|
7178 *obj2 = Qnil;
|
|
|
7179 }
|
|
|
7180
|
|
|
7181 if (low_x_coord)
|
|
|
7182 *low_x_coord = rb->xpos;
|
|
|
7183 if (high_x_coord)
|
|
|
7184 *high_x_coord = rb->xpos + rb->width;
|
|
|
7185
|
|
|
7186 return;
|
|
|
7187 }
|
|
|
7188 }
|
|
|
7189 }
|
|
|
7190
|
|
|
7191 #define UPDATE_CACHE_RETURN \
|
|
|
7192 do { \
|
|
|
7193 d->pixel_to_glyph_cache.valid = 1; \
|
|
|
7194 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
|
|
|
7195 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
|
|
|
7196 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
|
|
|
7197 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
|
|
|
7198 d->pixel_to_glyph_cache.frame = f; \
|
|
|
7199 d->pixel_to_glyph_cache.col = *col; \
|
|
|
7200 d->pixel_to_glyph_cache.row = *row; \
|
|
|
7201 d->pixel_to_glyph_cache.obj_x = *obj_x; \
|
|
|
7202 d->pixel_to_glyph_cache.obj_y = *obj_y; \
|
|
|
7203 d->pixel_to_glyph_cache.w = *w; \
|
|
|
7204 d->pixel_to_glyph_cache.bufpos = *bufpos; \
|
|
|
7205 d->pixel_to_glyph_cache.closest = *closest; \
|
|
|
7206 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
|
|
|
7207 d->pixel_to_glyph_cache.obj1 = *obj1; \
|
|
|
7208 d->pixel_to_glyph_cache.obj2 = *obj2; \
|
|
|
7209 d->pixel_to_glyph_cache.retval = position; \
|
|
|
7210 RETURN__ position; \
|
|
|
7211 } while (0)
|
|
|
7212
|
|
|
7213 /* Given x and y coordinates in pixels relative to a frame, return
|
|
|
7214 information about what is located under those coordinates.
|
|
|
7215
|
|
|
7216 The return value will be one of:
|
|
|
7217
|
|
|
7218 OVER_TOOLBAR: over one of the 4 frame toolbars
|
|
|
7219 OVER_MODELINE: over a modeline
|
|
|
7220 OVER_BORDER: over an internal border
|
|
|
7221 OVER_NOTHING: over the text area, but not over text
|
|
|
7222 OVER_OUTSIDE: outside of the frame border
|
|
|
7223 OVER_TEXT: over text in the text area
|
|
|
7224
|
|
|
7225 OBJ1 is one of
|
|
|
7226
|
|
|
7227 -- a toolbar button
|
|
|
7228 -- a glyph
|
|
|
7229 -- nil if the coordinates are not over a glyph or a toolbar button.
|
|
|
7230
|
|
|
7231 OBJ2 is one of
|
|
|
7232
|
|
|
7233 -- an extent, if the coordinates are over a glyph in the text area
|
|
|
7234 -- nil otherwise.
|
|
|
7235
|
|
|
7236 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
|
|
|
7237 equivalent coordinates relative to the upper-left corner of the glyph.
|
|
|
7238
|
|
|
7239 If the coordinates are over a character, OBJ_X and OBJ_Y give the
|
|
|
7240 equivalent coordinates relative to the upper-left corner of the character.
|
|
|
7241
|
|
|
7242 Otherwise, OBJ_X and OBJ_Y are undefined.
|
|
|
7243 */
|
|
|
7244
|
|
|
7245 int
|
|
|
7246 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
|
|
|
7247 int *col, int *row, int *obj_x, int *obj_y,
|
|
|
7248 struct window **w, Bufpos *bufpos,
|
|
|
7249 Bufpos *closest, Charcount *modeline_closest,
|
|
|
7250 Lisp_Object *obj1, Lisp_Object *obj2)
|
|
|
7251 {
|
|
|
7252 struct device *d;
|
|
|
7253 struct pixel_to_glyph_translation_cache *cache;
|
|
|
7254 Lisp_Object window;
|
|
|
7255 int frm_left, frm_right, frm_top, frm_bottom;
|
|
|
7256 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
|
|
|
7257 int position = OVER_NOTHING;
|
|
|
7258 int device_check_failed = 0;
|
|
|
7259 display_line_dynarr *dla;
|
|
|
7260
|
|
|
7261 /* This is a safety valve in case this got called with a frame in
|
|
|
7262 the middle of being deleted. */
|
|
|
7263 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
|
|
|
7264 device_check_failed = 1;
|
|
|
7265 else
|
|
|
7266 {
|
|
|
7267 d = XDEVICE (f->device);
|
|
|
7268 cache = &d->pixel_to_glyph_cache;
|
|
|
7269 }
|
|
|
7270
|
|
|
7271 if (!device_check_failed
|
|
|
7272 && cache->valid
|
|
|
7273 && cache->frame == f
|
|
|
7274 && cache->low_x_coord <= x_coord
|
|
|
7275 && cache->high_x_coord > x_coord
|
|
|
7276 && cache->low_y_coord <= y_coord
|
|
|
7277 && cache->high_y_coord > y_coord)
|
|
|
7278 {
|
|
|
7279 *col = cache->col;
|
|
|
7280 *row = cache->row;
|
|
|
7281 *obj_x = cache->obj_x;
|
|
|
7282 *obj_y = cache->obj_y;
|
|
|
7283 *w = cache->w;
|
|
|
7284 *bufpos = cache->bufpos;
|
|
|
7285 *closest = cache->closest;
|
|
|
7286 *modeline_closest = cache->modeline_closest;
|
|
|
7287 *obj1 = cache->obj1;
|
|
|
7288 *obj2 = cache->obj2;
|
|
|
7289
|
|
|
7290 return cache->retval;
|
|
|
7291 }
|
|
|
7292 else
|
|
|
7293 {
|
|
|
7294 *col = 0;
|
|
|
7295 *row = 0;
|
|
|
7296 *obj_x = 0;
|
|
|
7297 *obj_y = 0;
|
|
|
7298 *w = 0;
|
|
|
7299 *bufpos = 0;
|
|
|
7300 *closest = 0;
|
|
|
7301 *modeline_closest = -1;
|
|
|
7302 *obj1 = Qnil;
|
|
|
7303 *obj2 = Qnil;
|
|
|
7304
|
|
|
7305 low_x_coord = x_coord;
|
|
|
7306 high_x_coord = x_coord + 1;
|
|
|
7307 low_y_coord = y_coord;
|
|
|
7308 high_y_coord = y_coord + 1;
|
|
|
7309 }
|
|
|
7310
|
|
|
7311 if (device_check_failed)
|
|
|
7312 return OVER_NOTHING;
|
|
|
7313
|
|
|
7314 frm_left = FRAME_LEFT_BORDER_END (f);
|
|
|
7315 frm_right = FRAME_RIGHT_BORDER_START (f);
|
|
|
7316 frm_top = FRAME_TOP_BORDER_END (f);
|
|
|
7317 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
|
|
|
7318
|
|
|
7319 /* Check if the mouse is outside of the text area actually used by
|
|
|
7320 redisplay. */
|
|
|
7321 if (y_coord < frm_top)
|
|
|
7322 {
|
|
|
7323 if (y_coord >= FRAME_TOP_BORDER_START (f))
|
|
|
7324 {
|
|
|
7325 low_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
7326 high_y_coord = frm_top;
|
|
|
7327 position = OVER_BORDER;
|
|
|
7328 }
|
|
|
7329 else if (y_coord >= 0)
|
|
|
7330 {
|
|
|
7331 low_y_coord = 0;
|
|
|
7332 high_y_coord = FRAME_TOP_BORDER_START (f);
|
|
|
7333 position = OVER_TOOLBAR;
|
|
|
7334 }
|
|
|
7335 else
|
|
|
7336 {
|
|
|
7337 low_y_coord = y_coord;
|
|
|
7338 high_y_coord = 0;
|
|
|
7339 position = OVER_OUTSIDE;
|
|
|
7340 }
|
|
|
7341 }
|
|
|
7342 else if (y_coord >= frm_bottom)
|
|
|
7343 {
|
|
|
7344 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
|
|
|
7345 {
|
|
|
7346 low_y_coord = frm_bottom;
|
|
|
7347 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
7348 position = OVER_BORDER;
|
|
|
7349 }
|
|
|
7350 else if (y_coord < FRAME_PIXHEIGHT (f))
|
|
|
7351 {
|
|
|
7352 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
|
|
|
7353 high_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
7354 position = OVER_TOOLBAR;
|
|
|
7355 }
|
|
|
7356 else
|
|
|
7357 {
|
|
|
7358 low_y_coord = FRAME_PIXHEIGHT (f);
|
|
|
7359 high_y_coord = y_coord;
|
|
|
7360 position = OVER_OUTSIDE;
|
|
|
7361 }
|
|
|
7362 }
|
|
|
7363
|
|
|
7364 if (position != OVER_TOOLBAR && position != OVER_BORDER)
|
|
|
7365 {
|
|
|
7366 if (x_coord < frm_left)
|
|
|
7367 {
|
|
|
7368 if (x_coord >= FRAME_LEFT_BORDER_START (f))
|
|
|
7369 {
|
|
|
7370 low_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
7371 high_x_coord = frm_left;
|
|
|
7372 position = OVER_BORDER;
|
|
|
7373 }
|
|
|
7374 else if (x_coord >= 0)
|
|
|
7375 {
|
|
|
7376 low_x_coord = 0;
|
|
|
7377 high_x_coord = FRAME_LEFT_BORDER_START (f);
|
|
|
7378 position = OVER_TOOLBAR;
|
|
|
7379 }
|
|
|
7380 else
|
|
|
7381 {
|
|
|
7382 low_x_coord = x_coord;
|
|
|
7383 high_x_coord = 0;
|
|
|
7384 position = OVER_OUTSIDE;
|
|
|
7385 }
|
|
|
7386 }
|
|
|
7387 else if (x_coord >= frm_right)
|
|
|
7388 {
|
|
|
7389 if (x_coord < FRAME_RIGHT_BORDER_END (f))
|
|
|
7390 {
|
|
|
7391 low_x_coord = frm_right;
|
|
|
7392 high_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
7393 position = OVER_BORDER;
|
|
|
7394 }
|
|
|
7395 else if (x_coord < FRAME_PIXWIDTH (f))
|
|
|
7396 {
|
|
|
7397 low_x_coord = FRAME_RIGHT_BORDER_END (f);
|
|
|
7398 high_x_coord = FRAME_PIXWIDTH (f);
|
|
|
7399 position = OVER_TOOLBAR;
|
|
|
7400 }
|
|
|
7401 else
|
|
|
7402 {
|
|
|
7403 low_x_coord = FRAME_PIXWIDTH (f);
|
|
|
7404 high_x_coord = x_coord;
|
|
|
7405 position = OVER_OUTSIDE;
|
|
|
7406 }
|
|
|
7407 }
|
|
|
7408 }
|
|
|
7409
|
|
|
7410 #ifdef HAVE_TOOLBARS
|
|
|
7411 if (position == OVER_TOOLBAR)
|
|
|
7412 {
|
|
|
7413 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
|
|
|
7414 *obj2 = Qnil;
|
|
|
7415 *w = 0;
|
|
|
7416 UPDATE_CACHE_RETURN;
|
|
|
7417 }
|
|
|
7418 #endif
|
|
|
7419
|
|
|
7420 /* We still have to return the window the pointer is next to and its
|
|
|
7421 relative y position even if it is outside the x boundary. */
|
|
|
7422 if (x_coord < frm_left)
|
|
|
7423 x_coord = frm_left;
|
|
|
7424 else if (x_coord > frm_right)
|
|
|
7425 x_coord = frm_right;
|
|
|
7426
|
|
|
7427 /* Same in reverse. */
|
|
|
7428 if (y_coord < frm_top)
|
|
|
7429 y_coord = frm_top;
|
|
|
7430 else if (y_coord > frm_bottom)
|
|
|
7431 y_coord = frm_bottom;
|
|
|
7432
|
|
|
7433 /* Find what window the given coordinates are actually in. */
|
|
|
7434 window = f->root_window;
|
|
|
7435 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
|
|
|
7436
|
|
|
7437 /* If we didn't find a window, we're done. */
|
|
|
7438 if (!*w)
|
|
|
7439 {
|
|
|
7440 UPDATE_CACHE_RETURN;
|
|
|
7441 }
|
|
|
7442 else if (position != OVER_NOTHING)
|
|
|
7443 {
|
|
|
7444 *closest = 0;
|
|
|
7445 *modeline_closest = -1;
|
|
|
7446
|
|
|
7447 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
|
|
|
7448 {
|
|
|
7449 *w = 0;
|
|
|
7450 UPDATE_CACHE_RETURN;
|
|
|
7451 }
|
|
|
7452 }
|
|
|
7453
|
|
|
7454 /* Check if the window is a minibuffer but isn't active. */
|
|
|
7455 if (MINI_WINDOW_P (*w) && !minibuf_level)
|
|
|
7456 {
|
|
|
7457 /* Must reset the window value since some callers will ignore
|
|
|
7458 the return value if it is set. */
|
|
|
7459 *w = 0;
|
|
|
7460 UPDATE_CACHE_RETURN;
|
|
|
7461 }
|
|
|
7462
|
|
|
7463 dla = window_display_lines (*w, CURRENT_DISP);
|
|
|
7464
|
|
|
7465 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
|
|
|
7466 {
|
|
|
7467 int really_over_nothing = 0;
|
|
|
7468 struct display_line *dl = Dynarr_atp (dla, *row);
|
|
|
7469
|
|
|
7470 if ((int) (dl->ypos - dl->ascent) <= y_coord
|
|
|
7471 && y_coord <= (int) (dl->ypos + dl->descent))
|
|
|
7472 {
|
|
|
7473 int check_margin_glyphs = 0;
|
|
|
7474 struct display_block *db = get_display_block_from_line (dl, TEXT);
|
|
|
7475 struct rune *rb = 0;
|
|
|
7476
|
|
|
7477 if (x_coord < dl->bounds.left_white
|
|
|
7478 || x_coord >= dl->bounds.right_white)
|
|
|
7479 check_margin_glyphs = 1;
|
|
|
7480
|
|
|
7481 low_y_coord = dl->ypos - dl->ascent;
|
|
|
7482 high_y_coord = dl->ypos + dl->descent + 1;
|
|
|
7483
|
|
|
7484 if (position == OVER_BORDER
|
|
|
7485 || position == OVER_OUTSIDE
|
|
|
7486 || check_margin_glyphs)
|
|
|
7487 {
|
|
|
7488 int x_check, left_bound;
|
|
|
7489
|
|
|
7490 if (check_margin_glyphs)
|
|
|
7491 {
|
|
|
7492 x_check = x_coord;
|
|
|
7493 left_bound = dl->bounds.left_white;
|
|
|
7494 }
|
|
|
7495 else
|
|
|
7496 {
|
|
|
7497 x_check = high_x_coord;
|
|
|
7498 left_bound = frm_left;
|
|
|
7499 }
|
|
|
7500
|
|
|
7501 if (Dynarr_length (db->runes))
|
|
|
7502 {
|
|
|
7503 if (x_check <= left_bound)
|
|
|
7504 {
|
|
|
7505 if (dl->modeline)
|
|
|
7506 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
|
|
|
7507 else
|
|
|
7508 *closest = Dynarr_atp (db->runes, 0)->bufpos;
|
|
|
7509 }
|
|
|
7510 else
|
|
|
7511 {
|
|
|
7512 if (dl->modeline)
|
|
|
7513 *modeline_closest =
|
|
|
7514 Dynarr_atp (db->runes,
|
|
|
7515 Dynarr_length (db->runes) - 1)->bufpos;
|
|
|
7516 else
|
|
|
7517 *closest =
|
|
|
7518 Dynarr_atp (db->runes,
|
|
70
|
7519 Dynarr_length (db->runes) - 1)->bufpos;
|
|
0
|
7520 }
|
|
|
7521
|
|
|
7522 if (dl->modeline)
|
|
|
7523 *modeline_closest += dl->offset;
|
|
|
7524 else
|
|
|
7525 *closest += dl->offset;
|
|
|
7526 }
|
|
|
7527 else
|
|
|
7528 {
|
|
|
7529 /* #### What should be here. */
|
|
|
7530 if (dl->modeline)
|
|
|
7531 *modeline_closest = 0;
|
|
|
7532 else
|
|
|
7533 *closest = 0;
|
|
|
7534 }
|
|
|
7535
|
|
|
7536 if (check_margin_glyphs)
|
|
|
7537 {
|
|
|
7538 if (x_coord < dl->bounds.left_in
|
|
|
7539 || x_coord >= dl->bounds.right_in)
|
|
|
7540 {
|
|
|
7541 /* If we are over the outside margins then we
|
|
|
7542 know the loop over the text block isn't going
|
|
|
7543 to accomplish anything. So we go ahead and
|
|
|
7544 set what information we can right here and
|
|
|
7545 return. */
|
|
|
7546 (*row)--;
|
|
|
7547 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
7548 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
7549 &low_x_coord, &high_x_coord);
|
|
|
7550
|
|
|
7551 UPDATE_CACHE_RETURN;
|
|
|
7552 }
|
|
|
7553 }
|
|
|
7554 else
|
|
|
7555 UPDATE_CACHE_RETURN;
|
|
|
7556 }
|
|
|
7557
|
|
|
7558 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
|
|
|
7559 {
|
|
|
7560 int past_end = (*col == Dynarr_length (db->runes));
|
|
|
7561
|
|
|
7562 if (!past_end)
|
|
|
7563 rb = Dynarr_atp (db->runes, *col);
|
|
|
7564
|
|
|
7565 if (past_end ||
|
|
|
7566 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
|
|
|
7567 {
|
|
|
7568 if (past_end)
|
|
|
7569 {
|
|
|
7570 (*col)--;
|
|
|
7571 rb = Dynarr_atp (db->runes, *col);
|
|
|
7572 }
|
|
|
7573
|
|
|
7574 *bufpos = rb->bufpos + dl->offset;
|
|
|
7575 low_x_coord = rb->xpos;
|
|
|
7576 high_x_coord = rb->xpos + rb->width;
|
|
|
7577
|
|
|
7578 if (rb->type == RUNE_DGLYPH)
|
|
|
7579 {
|
|
|
7580 int elt = *col + 1;
|
|
|
7581
|
|
|
7582 /* Find the first character after the glyph. */
|
|
|
7583 while (elt < Dynarr_length (db->runes))
|
|
|
7584 {
|
|
|
7585 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
|
|
|
7586 {
|
|
|
7587 if (dl->modeline)
|
|
|
7588 *modeline_closest =
|
|
|
7589 (Dynarr_atp (db->runes, elt)->bufpos +
|
|
|
7590 dl->offset);
|
|
|
7591 else
|
|
|
7592 *closest =
|
|
|
7593 (Dynarr_atp (db->runes, elt)->bufpos +
|
|
|
7594 dl->offset);
|
|
|
7595 break;
|
|
|
7596 }
|
|
|
7597
|
|
|
7598 elt++;
|
|
|
7599 }
|
|
|
7600
|
|
|
7601 /* In this case we failed to find a non-glyph
|
|
|
7602 character so we return the last position
|
|
|
7603 displayed on the line. */
|
|
|
7604 if (elt == Dynarr_length (db->runes))
|
|
|
7605 {
|
|
|
7606 if (dl->modeline)
|
|
|
7607 *modeline_closest = dl->end_bufpos + dl->offset;
|
|
|
7608 else
|
|
|
7609 *closest = dl->end_bufpos + dl->offset;
|
|
|
7610 really_over_nothing = 1;
|
|
|
7611 }
|
|
|
7612 }
|
|
|
7613 else
|
|
|
7614 {
|
|
|
7615 if (dl->modeline)
|
|
|
7616 *modeline_closest = rb->bufpos + dl->offset;
|
|
|
7617 else
|
|
|
7618 *closest = rb->bufpos + dl->offset;
|
|
|
7619 }
|
|
|
7620
|
|
|
7621 if (dl->modeline)
|
|
|
7622 {
|
|
|
7623 *row = window_displayed_height (*w);
|
|
|
7624
|
|
|
7625 if (position == OVER_NOTHING)
|
|
|
7626 position = OVER_MODELINE;
|
|
|
7627
|
|
|
7628 if (rb->type == RUNE_DGLYPH)
|
|
|
7629 {
|
|
|
7630 *obj1 = rb->object.dglyph.glyph;
|
|
|
7631 *obj2 = rb->object.dglyph.extent;
|
|
|
7632 }
|
|
|
7633 else if (rb->type == RUNE_CHAR)
|
|
|
7634 {
|
|
|
7635 *obj1 = Qnil;
|
|
|
7636 *obj2 = Qnil;
|
|
|
7637 }
|
|
|
7638 else
|
|
|
7639 {
|
|
|
7640 *obj1 = Qnil;
|
|
|
7641 *obj2 = Qnil;
|
|
|
7642 }
|
|
|
7643
|
|
|
7644 UPDATE_CACHE_RETURN;
|
|
|
7645 }
|
|
|
7646 else if (past_end
|
|
|
7647 || (rb->type == RUNE_CHAR
|
|
|
7648 && rb->object.chr.ch == '\n'))
|
|
|
7649 {
|
|
|
7650 (*row)--;
|
|
|
7651 /* At this point we may have glyphs in the right
|
|
|
7652 inside margin. */
|
|
|
7653 if (check_margin_glyphs)
|
|
|
7654 get_position_object (dl, obj1, obj2, x_coord,
|
|
|
7655 &low_x_coord, &high_x_coord);
|
|
|
7656 UPDATE_CACHE_RETURN;
|
|
|
7657 }
|
|
|
7658 else
|
|
|
7659 {
|
|
|
7660 (*row)--;
|
|
|
7661 if (rb->type == RUNE_DGLYPH)
|
|
|
7662 {
|
|
|
7663 *obj1 = rb->object.dglyph.glyph;
|
|
|
7664 *obj2 = rb->object.dglyph.extent;
|
|
|
7665 }
|
|
|
7666 else if (rb->type == RUNE_CHAR)
|
|
|
7667 {
|
|
|
7668 *obj1 = Qnil;
|
|
|
7669 *obj2 = Qnil;
|
|
|
7670 }
|
|
|
7671 else
|
|
|
7672 {
|
|
|
7673 *obj1 = Qnil;
|
|
|
7674 *obj2 = Qnil;
|
|
|
7675 }
|
|
|
7676
|
|
|
7677 *obj_x = x_coord - rb->xpos;
|
|
|
7678 *obj_y = y_coord - (dl->ypos - dl->ascent);
|
|
|
7679
|
|
|
7680 /* At this point we may have glyphs in the left
|
|
|
7681 inside margin. */
|
|
|
7682 if (check_margin_glyphs)
|
|
|
7683 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
|
|
|
7684
|
|
|
7685 if (position == OVER_NOTHING && !really_over_nothing)
|
|
|
7686 position = OVER_TEXT;
|
|
|
7687
|
|
|
7688 UPDATE_CACHE_RETURN;
|
|
|
7689 }
|
|
|
7690 }
|
|
|
7691 }
|
|
|
7692 }
|
|
|
7693 }
|
|
|
7694
|
|
|
7695 *row = Dynarr_length (dla) - 1;
|
|
|
7696 if (FRAME_WIN_P (f))
|
|
|
7697 {
|
|
|
7698 int bot_elt = Dynarr_length (dla) - 1;
|
|
|
7699
|
|
|
7700 if (bot_elt >= 0)
|
|
|
7701 {
|
|
|
7702 struct display_line *dl = Dynarr_atp (dla, bot_elt);
|
|
|
7703 int adj_area = y_coord - (dl->ypos + dl->descent);
|
|
|
7704 Lisp_Object lwin = Qnil;
|
|
|
7705 int defheight;
|
|
|
7706
|
|
|
7707 XSETWINDOW (lwin, *w);
|
|
|
7708 default_face_height_and_width (lwin, 0, &defheight);
|
|
|
7709
|
|
|
7710 *row += (adj_area / defheight);
|
|
|
7711 }
|
|
|
7712 }
|
|
|
7713
|
|
|
7714 /* #### This should be checked out some more to determine what
|
|
|
7715 should really be going on. */
|
|
|
7716 if (!MARKERP ((*w)->start[CURRENT_DISP]))
|
|
|
7717 *closest = 0;
|
|
|
7718 else
|
|
|
7719 *closest = end_of_last_line (*w,
|
|
|
7720 marker_position ((*w)->start[CURRENT_DISP]));
|
|
|
7721 *col = 0;
|
|
|
7722 UPDATE_CACHE_RETURN;
|
|
|
7723 }
|
|
|
7724 #undef UPDATE_CACHE_RETURN
|
|
|
7725
|
|
|
7726
|
|
|
7727 /***************************************************************************/
|
|
|
7728 /* */
|
|
|
7729 /* Lisp functions */
|
|
|
7730 /* */
|
|
|
7731 /***************************************************************************/
|
|
|
7732
|
|
20
|
7733 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
|
|
0
|
7734 Ensure that all minibuffers are correctly showing the echo area.
|
|
20
|
7735 */
|
|
|
7736 ())
|
|
0
|
7737 {
|
|
|
7738 Lisp_Object devcons, concons;
|
|
|
7739
|
|
|
7740 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
7741 {
|
|
|
7742 struct device *d = XDEVICE (XCAR (devcons));
|
|
|
7743 Lisp_Object frmcons;
|
|
|
7744
|
|
|
7745 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
7746 {
|
|
|
7747 struct frame *f = XFRAME (XCAR (frmcons));
|
|
|
7748
|
|
70
|
7749 if (FRAME_VISIBLE_P (f) && FRAME_HAS_MINIBUF_P (f))
|
|
0
|
7750 {
|
|
|
7751 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
|
|
|
7752 redisplay_window (window, 0);
|
|
|
7753 call_redisplay_end_triggers (XWINDOW (window), 0);
|
|
|
7754 }
|
|
|
7755 }
|
|
|
7756
|
|
|
7757 /* We now call the output_end routine for tty frames. We delay
|
|
|
7758 doing so in order to avoid cursor flicker. So much for 100%
|
|
|
7759 encapsulation. */
|
|
|
7760 if (DEVICE_TTY_P (d))
|
|
|
7761 DEVMETH (d, output_end, (d));
|
|
|
7762 }
|
|
|
7763
|
|
|
7764 return Qnil;
|
|
|
7765 }
|
|
|
7766
|
|
|
7767 static Lisp_Object
|
|
|
7768 restore_disable_preemption_value (Lisp_Object value)
|
|
|
7769 {
|
|
|
7770 disable_preemption = XINT (value);
|
|
|
7771 return Qnil;
|
|
|
7772 }
|
|
|
7773
|
|
20
|
7774 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
|
|
0
|
7775 Clear frame FRAME and output again what is supposed to appear on it.
|
|
|
7776 FRAME defaults to the selected frame if omitted.
|
|
|
7777 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
7778 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
7779 input and is guaranteed to proceed to completion.
|
|
20
|
7780 */
|
|
|
7781 (frame, no_preempt))
|
|
0
|
7782 {
|
|
|
7783 struct frame *f = decode_frame (frame);
|
|
|
7784 int count = specpdl_depth ();
|
|
|
7785
|
|
|
7786 if (!NILP (no_preempt))
|
|
|
7787 {
|
|
|
7788 record_unwind_protect (restore_disable_preemption_value,
|
|
|
7789 make_int (disable_preemption));
|
|
|
7790 disable_preemption++;
|
|
|
7791 }
|
|
|
7792
|
|
|
7793 f->clear = 1;
|
|
|
7794 redisplay_frame (f, 1);
|
|
|
7795
|
|
|
7796 return unbind_to (count, Qnil);
|
|
|
7797 }
|
|
|
7798
|
|
20
|
7799 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
|
|
0
|
7800 Ensure that FRAME's contents are correctly displayed.
|
|
|
7801 This differs from `redraw-frame' in that it only redraws what needs to
|
|
|
7802 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
7803 the frame.
|
|
|
7804 FRAME defaults to the selected frame if omitted.
|
|
|
7805 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
7806 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
7807 input and is guaranteed to proceed to completion.
|
|
20
|
7808 */
|
|
|
7809 (frame, no_preempt))
|
|
0
|
7810 {
|
|
|
7811 struct frame *f = decode_frame (frame);
|
|
|
7812 int count = specpdl_depth ();
|
|
|
7813
|
|
|
7814 if (!NILP (no_preempt))
|
|
|
7815 {
|
|
|
7816 record_unwind_protect (restore_disable_preemption_value,
|
|
|
7817 make_int (disable_preemption));
|
|
|
7818 disable_preemption++;
|
|
|
7819 }
|
|
|
7820
|
|
|
7821 redisplay_frame (f, 1);
|
|
|
7822
|
|
|
7823 return unbind_to (count, Qnil);
|
|
|
7824 }
|
|
|
7825
|
|
20
|
7826 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
|
|
0
|
7827 Clear device DEVICE and output again what is supposed to appear on it.
|
|
|
7828 DEVICE defaults to the selected device if omitted.
|
|
|
7829 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
7830 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
7831 input and is guaranteed to proceed to completion.
|
|
20
|
7832 */
|
|
70
|
7833 (device, no_preempt))
|
|
0
|
7834 {
|
|
|
7835 struct device *d = decode_device (device);
|
|
|
7836 Lisp_Object frmcons;
|
|
|
7837 int count = specpdl_depth ();
|
|
|
7838
|
|
|
7839 if (!NILP (no_preempt))
|
|
|
7840 {
|
|
|
7841 record_unwind_protect (restore_disable_preemption_value,
|
|
|
7842 make_int (disable_preemption));
|
|
|
7843 disable_preemption++;
|
|
|
7844 }
|
|
|
7845
|
|
|
7846 DEVICE_FRAME_LOOP (frmcons, d)
|
|
|
7847 {
|
|
|
7848 XFRAME (XCAR (frmcons))->clear = 1;
|
|
|
7849 }
|
|
|
7850 redisplay_device (d);
|
|
|
7851
|
|
|
7852 return unbind_to (count, Qnil);
|
|
|
7853 }
|
|
|
7854
|
|
20
|
7855 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
|
|
0
|
7856 Ensure that DEVICE's contents are correctly displayed.
|
|
|
7857 This differs from `redraw-device' in that it only redraws what needs to
|
|
|
7858 be updated, as opposed to unconditionally clearing and redrawing
|
|
|
7859 the device.
|
|
|
7860 DEVICE defaults to the selected device if omitted.
|
|
|
7861 Normally, redisplay is preempted as normal if input arrives. However,
|
|
|
7862 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
|
|
|
7863 input and is guaranteed to proceed to completion.
|
|
20
|
7864 */
|
|
|
7865 (device, no_preempt))
|
|
0
|
7866 {
|
|
|
7867 struct device *d = decode_device (device);
|
|
|
7868 int count = specpdl_depth ();
|
|
|
7869
|
|
|
7870 if (!NILP (no_preempt))
|
|
|
7871 {
|
|
|
7872 record_unwind_protect (restore_disable_preemption_value,
|
|
|
7873 make_int (disable_preemption));
|
|
|
7874 disable_preemption++;
|
|
|
7875 }
|
|
|
7876
|
|
|
7877 redisplay_device (d);
|
|
|
7878
|
|
|
7879 return unbind_to (count, Qnil);
|
|
|
7880 }
|
|
|
7881
|
|
|
7882 /* Big lie. Big lie. This will force all modelines to be updated
|
|
|
7883 regardless if the all flag is set or not. It remains in existence
|
|
|
7884 solely for backwards compatibility. */
|
|
20
|
7885 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
|
|
0
|
7886 Force the modeline of the current buffer to be redisplayed.
|
|
|
7887 With optional non-nil ALL, force redisplay of all modelines.
|
|
20
|
7888 */
|
|
|
7889 (all))
|
|
0
|
7890 {
|
|
|
7891 MARK_MODELINE_CHANGED;
|
|
|
7892 return Qnil;
|
|
|
7893 }
|
|
|
7894
|
|
20
|
7895 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
|
|
0
|
7896 Force an immediate update of the cursor on FRAME.
|
|
|
7897 FRAME defaults to the selected frame if omitted.
|
|
20
|
7898 */
|
|
70
|
7899 (frame))
|
|
0
|
7900 {
|
|
|
7901 redisplay_redraw_cursor (decode_frame (frame), 1);
|
|
|
7902 return Qnil;
|
|
|
7903 }
|
|
|
7904
|
|
|
7905
|
|
|
7906 /***************************************************************************/
|
|
|
7907 /* */
|
|
|
7908 /* Lisp-variable change triggers */
|
|
|
7909 /* */
|
|
|
7910 /***************************************************************************/
|
|
|
7911
|
|
|
7912 static void
|
|
|
7913 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
|
|
|
7914 Lisp_Object oldval)
|
|
|
7915 {
|
|
|
7916 /* Nothing to be done? */
|
|
|
7917 }
|
|
|
7918
|
|
|
7919 int
|
|
|
7920 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
|
|
|
7921 Lisp_Object in_object, int flags)
|
|
|
7922 {
|
|
|
7923 /* #### clip_changed should really be renamed something like
|
|
|
7924 global_redisplay_change. */
|
|
|
7925 MARK_CLIP_CHANGED;
|
|
|
7926 return 0;
|
|
|
7927 }
|
|
|
7928
|
|
|
7929 void
|
|
|
7930 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
|
|
|
7931 Lisp_Object locale)
|
|
|
7932 {
|
|
|
7933 MARK_CLIP_CHANGED;
|
|
|
7934 }
|
|
|
7935
|
|
|
7936 static void
|
|
|
7937 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
|
|
|
7938 Lisp_Object oldval)
|
|
|
7939 {
|
|
|
7940 if (XFRAME (w->frame)->init_finished)
|
|
|
7941 Fforce_cursor_redisplay (w->frame);
|
|
|
7942 }
|
|
|
7943
|
|
|
7944 #ifdef MEMORY_USAGE_STATS
|
|
|
7945
|
|
|
7946
|
|
|
7947 /***************************************************************************/
|
|
|
7948 /* */
|
|
|
7949 /* memory usage computation */
|
|
|
7950 /* */
|
|
|
7951 /***************************************************************************/
|
|
|
7952
|
|
|
7953 static int
|
|
|
7954 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
|
|
|
7955 {
|
|
|
7956 int total = 0;
|
|
|
7957
|
|
|
7958 if (dyn)
|
|
|
7959 total += Dynarr_memory_usage (dyn, ovstats);
|
|
|
7960
|
|
|
7961 return total;
|
|
|
7962 }
|
|
|
7963
|
|
|
7964 static int
|
|
|
7965 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
|
|
|
7966 struct overhead_stats *ovstats)
|
|
|
7967 {
|
|
|
7968 int total = 0;
|
|
|
7969
|
|
|
7970 if (dyn)
|
|
|
7971 {
|
|
|
7972 int i;
|
|
|
7973
|
|
|
7974 total += Dynarr_memory_usage (dyn, ovstats);
|
|
|
7975 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
7976 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
|
|
|
7977 }
|
|
|
7978
|
|
|
7979 return total;
|
|
|
7980 }
|
|
|
7981
|
|
|
7982 static int
|
|
|
7983 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
|
|
|
7984 struct overhead_stats *ovstats)
|
|
|
7985 {
|
|
|
7986 int total = 0;
|
|
|
7987
|
|
|
7988 if (dyn)
|
|
|
7989 total += Dynarr_memory_usage (dyn, ovstats);
|
|
|
7990
|
|
|
7991 return total;
|
|
|
7992 }
|
|
|
7993
|
|
|
7994 int
|
|
|
7995 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
|
|
|
7996 struct overhead_stats *ovstats)
|
|
|
7997 {
|
|
|
7998 int total = 0;
|
|
|
7999
|
|
|
8000 if (dyn)
|
|
|
8001 {
|
|
|
8002 int i;
|
|
|
8003
|
|
|
8004 total += Dynarr_memory_usage (dyn, ovstats);
|
|
|
8005 for (i = 0; i < Dynarr_largest (dyn); i++)
|
|
|
8006 {
|
|
|
8007 total +=
|
|
|
8008 compute_display_block_dynarr_usage (Dynarr_at (dyn, i).
|
|
|
8009 display_blocks, ovstats);
|
|
|
8010 total +=
|
|
|
8011 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
|
|
|
8012 left_glyphs, ovstats);
|
|
|
8013 total +=
|
|
|
8014 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
|
|
|
8015 right_glyphs, ovstats);
|
|
|
8016 }
|
|
|
8017 }
|
|
|
8018
|
|
|
8019 return total;
|
|
|
8020 }
|
|
|
8021
|
|
|
8022 int
|
|
|
8023 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
|
|
|
8024 struct overhead_stats *ovstats)
|
|
|
8025 {
|
|
|
8026 int total = 0;
|
|
|
8027
|
|
|
8028 if (dyn)
|
|
|
8029 total += Dynarr_memory_usage (dyn, ovstats);
|
|
|
8030
|
|
|
8031 return total;
|
|
|
8032 }
|
|
|
8033
|
|
|
8034 #endif /* MEMORY_USAGE_STATS */
|
|
|
8035
|
|
|
8036
|
|
|
8037 /***************************************************************************/
|
|
|
8038 /* */
|
|
|
8039 /* initialization */
|
|
|
8040 /* */
|
|
|
8041 /***************************************************************************/
|
|
|
8042
|
|
|
8043 void
|
|
|
8044 init_redisplay (void)
|
|
|
8045 {
|
|
|
8046 disable_preemption = 0;
|
|
|
8047 preemption_count = 0;
|
|
|
8048 max_preempts = INIT_MAX_PREEMPTS;
|
|
|
8049
|
|
|
8050 if (!initialized)
|
|
|
8051 {
|
|
|
8052 cmotion_display_lines = Dynarr_new (struct display_line);
|
|
|
8053 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
|
|
|
8054 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
|
|
|
8055 formatted_string_extent_dynarr = Dynarr_new (struct extent *);
|
|
|
8056 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
|
|
|
8057 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
|
|
|
8058 internal_cache = Dynarr_new (struct line_start_cache);
|
|
|
8059 memset (&formatted_string_display_line, 0, sizeof (struct display_line));
|
|
|
8060 }
|
|
|
8061
|
|
|
8062 /* window system is nil when in -batch mode */
|
|
|
8063 if (!initialized || noninteractive)
|
|
|
8064 return;
|
|
|
8065
|
|
|
8066 /* If the user wants to use a window system, we shouldn't bother
|
|
|
8067 initializing the terminal. This is especially important when the
|
|
|
8068 terminal is so dumb that emacs gives up before and doesn't bother
|
|
|
8069 using the window system.
|
|
|
8070
|
|
|
8071 If the DISPLAY environment variable is set, try to use X, and die
|
|
|
8072 with an error message if that doesn't work. */
|
|
|
8073
|
|
|
8074 #ifdef HAVE_X_WINDOWS
|
|
|
8075 if (!strcmp (display_use, "x"))
|
|
|
8076 {
|
|
|
8077 /* Some stuff checks this way early. */
|
|
|
8078 Vwindow_system = Qx;
|
|
|
8079 Vinitial_window_system = Qx;
|
|
|
8080 return;
|
|
|
8081 }
|
|
|
8082 #endif
|
|
|
8083 #ifdef HAVE_NEXTSTEP
|
|
|
8084 if (!strcmp (display_use, "ns"))
|
|
|
8085 {
|
|
|
8086 Vwindow_system = Qns;
|
|
|
8087 Vinitial_window_system = Qns;
|
|
|
8088 return;
|
|
|
8089 }
|
|
|
8090 #endif
|
|
|
8091
|
|
|
8092 /* If no window system has been specified, try to use the terminal. */
|
|
|
8093 if (!isatty (0))
|
|
|
8094 {
|
|
|
8095 stderr_out ("XEmacs: standard input is not a tty\n");
|
|
|
8096 exit (1);
|
|
|
8097 }
|
|
|
8098
|
|
|
8099 /* Look at the TERM variable */
|
|
|
8100 if (!getenv ("TERM"))
|
|
|
8101 {
|
|
|
8102 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
|
|
|
8103 exit (1);
|
|
|
8104 }
|
|
|
8105
|
|
|
8106 Vinitial_window_system = Qtty;
|
|
|
8107 }
|
|
|
8108
|
|
|
8109 void
|
|
|
8110 syms_of_redisplay (void)
|
|
|
8111 {
|
|
|
8112 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
|
|
|
8113 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
8114 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
|
|
|
8115 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
|
|
|
8116 #endif
|
|
|
8117 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
|
|
|
8118 defsymbol (&Qbar_cursor, "bar-cursor");
|
|
|
8119 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
|
|
|
8120 defsymbol (&Qredisplay_end_trigger_functions,
|
|
|
8121 "redisplay-end-trigger-functions");
|
|
|
8122
|
|
20
|
8123 DEFSUBR (Fredisplay_echo_area);
|
|
|
8124 DEFSUBR (Fredraw_frame);
|
|
|
8125 DEFSUBR (Fredisplay_frame);
|
|
|
8126 DEFSUBR (Fredraw_device);
|
|
|
8127 DEFSUBR (Fredisplay_device);
|
|
|
8128 DEFSUBR (Fredraw_modeline);
|
|
|
8129 DEFSUBR (Fforce_cursor_redisplay);
|
|
0
|
8130 }
|
|
|
8131
|
|
|
8132 void
|
|
|
8133 vars_of_redisplay (void)
|
|
|
8134 {
|
|
|
8135 #if 0
|
|
|
8136 staticpro (&last_arrow_position);
|
|
|
8137 staticpro (&last_arrow_string);
|
|
|
8138 last_arrow_position = Qnil;
|
|
|
8139 last_arrow_string = Qnil;
|
|
|
8140 #endif
|
|
|
8141
|
|
|
8142 updating_line_start_cache = 0;
|
|
|
8143
|
|
|
8144 /* #### Probably temporary */
|
|
|
8145 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
|
|
|
8146 (Temporary) Setting this will impact the performance of the internal
|
|
|
8147 line start cache.
|
|
|
8148 */ );
|
|
|
8149 cache_adjustment = 2;
|
|
|
8150
|
|
|
8151 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
|
|
|
8152 Minimum pixel height for clipped bottom display line.
|
|
|
8153 A clipped line shorter than this won't be displayed.
|
|
|
8154 */ ,
|
|
|
8155 redisplay_variable_changed);
|
|
|
8156 vertical_clip = 5;
|
|
|
8157
|
|
|
8158 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
|
|
|
8159 Minimum visible area for clipped glyphs at right boundary.
|
|
|
8160 Clipped glyphs shorter than this won't be displayed.
|
|
|
8161 Only pixmap glyph instances are currently allowed to be clipped.
|
|
|
8162 */ ,
|
|
|
8163 redisplay_variable_changed);
|
|
|
8164 horizontal_clip = 5;
|
|
|
8165
|
|
|
8166 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
|
|
|
8167 String displayed by modeline-format's \"%m\" specification.
|
|
|
8168 */ );
|
|
|
8169 Vglobal_mode_string = Qnil;
|
|
|
8170
|
|
|
8171 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
|
|
|
8172 Marker for where to display an arrow on top of the buffer text.
|
|
|
8173 This must be the beginning of a line in order to work.
|
|
|
8174 See also `overlay-arrow-string'.
|
|
|
8175 */ , redisplay_variable_changed);
|
|
|
8176 Voverlay_arrow_position = Qnil;
|
|
|
8177
|
|
|
8178 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
|
|
|
8179 String to display as an arrow. See also `overlay-arrow-position'.
|
|
|
8180 */ ,
|
|
|
8181 redisplay_variable_changed);
|
|
|
8182 Voverlay_arrow_string = Qnil;
|
|
|
8183
|
|
|
8184 DEFVAR_INT ("scroll-step", &scroll_step /*
|
|
|
8185 *The number of lines to try scrolling a window by when point moves out.
|
|
|
8186 If that fails to bring point back on frame, point is centered instead.
|
|
|
8187 If this is zero, point is always centered after it moves off screen.
|
|
|
8188 */ );
|
|
|
8189
|
|
|
8190 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
|
|
|
8191 &truncate_partial_width_windows /*
|
|
|
8192 *Non-nil means truncate lines in all windows less than full frame wide.
|
|
|
8193 */ ,
|
|
|
8194 redisplay_variable_changed);
|
|
|
8195 truncate_partial_width_windows = 1;
|
|
|
8196
|
|
|
8197 DEFVAR_BOOL ("visible-bell", &visible_bell /*
|
|
|
8198 *Non-nil means try to flash the frame to represent a bell.
|
|
|
8199 */ );
|
|
|
8200 visible_bell = 0;
|
|
|
8201
|
|
|
8202 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
|
|
|
8203 *Non-nil means no need to redraw entire frame after suspending.
|
|
|
8204 A non-nil value is useful if the terminal can automatically preserve
|
|
|
8205 Emacs's frame display when you reenter Emacs.
|
|
|
8206 It is up to you to set this variable if your terminal can do that.
|
|
|
8207 */ );
|
|
|
8208 no_redraw_on_reenter = 0;
|
|
|
8209
|
|
70
|
8210 /* #### This should be removed in 19.14 */
|
|
0
|
8211 DEFVAR_LISP ("window-system", &Vwindow_system /*
|
|
|
8212 A symbol naming the window-system under which Emacs is running,
|
|
|
8213 such as `x', or nil if emacs is running on an ordinary terminal.
|
|
70
|
8214 This variable is OBSOLETE and will be removed in a future version.
|
|
0
|
8215 */ );
|
|
|
8216 Vwindow_system = Qnil;
|
|
|
8217
|
|
|
8218 /* #### Temporary shit until window-system is eliminated. */
|
|
|
8219 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
|
|
|
8220 DON'T TOUCH
|
|
|
8221 */ );
|
|
|
8222 Vinitial_window_system = Qnil;
|
|
|
8223
|
|
|
8224 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
|
|
|
8225 Non-nil means put cursor in minibuffer, at end of any message there.
|
|
|
8226 */ );
|
|
|
8227 cursor_in_echo_area = 0;
|
|
|
8228
|
|
|
8229 /* #### Shouldn't this be generalized as follows:
|
|
|
8230
|
|
|
8231 if nil, use block cursor.
|
|
|
8232 if a number, use a bar cursor of that width.
|
|
|
8233 Otherwise, use a 1-pixel bar cursor.
|
|
|
8234
|
|
|
8235 #### Or better yet, this variable should be trashed entirely
|
|
|
8236 (use a Lisp-magic variable to maintain compatibility)
|
|
|
8237 and a specifier `cursor-shape' added, which allows a block
|
|
|
8238 cursor, a bar cursor, a flashing block or bar cursor,
|
|
|
8239 maybe a caret cursor, etc. */
|
|
|
8240
|
|
|
8241 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
|
|
|
8242 Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
|
|
|
8243 */ );
|
|
|
8244 Vbar_cursor = Qnil;
|
|
|
8245
|
|
|
8246 #ifndef INHIBIT_REDISPLAY_HOOKS
|
|
|
8247 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
|
|
|
8248 Function or functions to run before every redisplay.
|
|
|
8249 Functions on this hook must be careful to avoid signalling errors!
|
|
|
8250 */ );
|
|
|
8251 Vpre_redisplay_hook = Qnil;
|
|
|
8252
|
|
|
8253 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
|
|
|
8254 Function or functions to run after every redisplay.
|
|
|
8255 Functions on this hook must be careful to avoid signalling errors!
|
|
|
8256 */ );
|
|
|
8257 Vpost_redisplay_hook = Qnil;
|
|
|
8258 #endif
|
|
|
8259
|
|
|
8260 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
|
|
|
8261 Bump this to tell the C code to call `display-warning-buffer'
|
|
|
8262 at next redisplay. You should not normally change this; the function
|
|
|
8263 `display-warning' automatically does this at appropriate times.
|
|
|
8264 */ );
|
|
|
8265 display_warning_tick = 0;
|
|
|
8266
|
|
|
8267 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
|
|
|
8268 Non-nil means inhibit display of warning messages.
|
|
|
8269 You should *bind* this, not set it. Any pending warning messages
|
|
|
8270 will be displayed when the binding no longer applies.
|
|
|
8271 */ );
|
|
|
8272 /* reset to 0 by startup.el after the splash screen has displayed.
|
|
|
8273 This way, the warnings don't obliterate the splash screen. */
|
|
|
8274 inhibit_warning_display = 1;
|
|
|
8275
|
|
|
8276 DEFVAR_LISP ("window-size-change-functions",
|
|
|
8277 &Vwindow_size_change_functions /*
|
|
|
8278 Not currently implemented.
|
|
|
8279 Functions called before redisplay, if window sizes have changed.
|
|
|
8280 The value should be a list of functions that take one argument.
|
|
|
8281 Just before redisplay, for each frame, if any of its windows have changed
|
|
|
8282 size since the last redisplay, or have been split or deleted,
|
|
|
8283 all the functions in the list are called, with the frame as argument.
|
|
|
8284 */ );
|
|
|
8285 Vwindow_size_change_functions = Qnil;
|
|
|
8286
|
|
|
8287 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
|
|
|
8288 Not currently implemented.
|
|
|
8289 Functions to call before redisplaying a window with scrolling.
|
|
|
8290 Each function is called with two arguments, the window
|
|
|
8291 and its new display-start position. Note that the value of `window-end'
|
|
|
8292 is not valid when these functions are called.
|
|
|
8293 */ );
|
|
|
8294 Vwindow_scroll_functions = Qnil;
|
|
|
8295
|
|
|
8296 DEFVAR_LISP ("redisplay-end-trigger-functions",
|
|
|
8297 &Vredisplay_end_trigger_functions /*
|
|
|
8298 See `set-window-redisplay-end-trigger'.
|
|
|
8299 */ );
|
|
|
8300 Vredisplay_end_trigger_functions = Qnil;
|
|
|
8301 }
|
|
|
8302
|
|
|
8303 void
|
|
|
8304 specifier_vars_of_redisplay (void)
|
|
|
8305 {
|
|
|
8306 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
|
|
|
8307 *Width of left margin.
|
|
|
8308 This is a specifier; use `set-specifier' to change it.
|
|
|
8309 */ );
|
|
|
8310 Vleft_margin_width = Fmake_specifier (Qnatnum);
|
|
|
8311 set_specifier_fallback
|
|
|
8312 (Vleft_margin_width,
|
|
|
8313 list1 (Fcons (Qnil, Qzero)));
|
|
|
8314 set_specifier_caching (Vleft_margin_width,
|
|
|
8315 slot_offset (struct window, left_margin_width),
|
|
|
8316 some_window_value_changed,
|
|
|
8317 slot_offset (struct frame, left_margin_width),
|
|
|
8318 margin_width_changed_in_frame);
|
|
|
8319
|
|
|
8320 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
|
|
|
8321 *Width of right margin.
|
|
|
8322 This is a specifier; use `set-specifier' to change it.
|
|
|
8323 */ );
|
|
|
8324 Vright_margin_width = Fmake_specifier (Qnatnum);
|
|
|
8325 set_specifier_fallback
|
|
|
8326 (Vright_margin_width,
|
|
|
8327 list1 (Fcons (Qnil, Qzero)));
|
|
|
8328 set_specifier_caching (Vright_margin_width,
|
|
|
8329 slot_offset (struct window, right_margin_width),
|
|
|
8330 some_window_value_changed,
|
|
|
8331 slot_offset (struct frame, right_margin_width),
|
|
|
8332 margin_width_changed_in_frame);
|
|
|
8333
|
|
|
8334 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
|
|
|
8335 *Minimum ascent height of lines.
|
|
|
8336 This is a specifier; use `set-specifier' to change it.
|
|
|
8337 */ );
|
|
|
8338 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
|
|
|
8339 set_specifier_fallback (Vminimum_line_ascent,
|
|
|
8340 list1 (Fcons (Qnil, Qzero)));
|
|
|
8341 set_specifier_caching (Vminimum_line_ascent,
|
|
|
8342 slot_offset (struct window,
|
|
|
8343 minimum_line_ascent),
|
|
|
8344 some_window_value_changed,
|
|
|
8345 0, 0);
|
|
|
8346
|
|
|
8347 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
|
|
|
8348 *Minimum descent height of lines.
|
|
|
8349 This is a specifier; use `set-specifier' to change it.
|
|
|
8350 */ );
|
|
|
8351 Vminimum_line_descent = Fmake_specifier (Qnatnum);
|
|
|
8352 set_specifier_fallback (Vminimum_line_descent,
|
|
|
8353 list1 (Fcons (Qnil, Qzero)));
|
|
|
8354 set_specifier_caching (Vminimum_line_descent,
|
|
|
8355 slot_offset (struct window,
|
|
|
8356 minimum_line_descent),
|
|
|
8357 some_window_value_changed,
|
|
|
8358 0, 0);
|
|
|
8359
|
|
|
8360 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
|
|
|
8361 *Non-nil means use the left outside margin as extra whitespace when
|
|
|
8362 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
8363 This is a specifier; use `set-specifier' to change it.
|
|
|
8364 */ );
|
|
|
8365 Vuse_left_overflow = Fmake_specifier (Qboolean);
|
|
|
8366 set_specifier_fallback (Vuse_left_overflow,
|
|
|
8367 list1 (Fcons (Qnil, Qnil)));
|
|
|
8368 set_specifier_caching (Vuse_left_overflow,
|
|
|
8369 slot_offset (struct window,
|
|
|
8370 use_left_overflow),
|
|
|
8371 some_window_value_changed,
|
|
|
8372 0, 0);
|
|
|
8373
|
|
|
8374 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
|
|
|
8375 *Non-nil means use the right outside margin as extra whitespace when
|
|
|
8376 displaying 'whitespace or 'inside-margin glyphs.
|
|
|
8377 This is a specifier; use `set-specifier' to change it.
|
|
|
8378 */ );
|
|
|
8379 Vuse_right_overflow = Fmake_specifier (Qboolean);
|
|
|
8380 set_specifier_fallback (Vuse_right_overflow,
|
|
|
8381 list1 (Fcons (Qnil, Qnil)));
|
|
|
8382 set_specifier_caching (Vuse_right_overflow,
|
|
|
8383 slot_offset (struct window,
|
|
|
8384 use_right_overflow),
|
|
|
8385 some_window_value_changed,
|
|
|
8386 0, 0);
|
|
|
8387
|
|
|
8388 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
|
|
|
8389 *Non-nil means the text cursor is visible (this is usually the case).
|
|
|
8390 This is a specifier; use `set-specifier' to change it.
|
|
|
8391 */ );
|
|
|
8392 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
|
|
|
8393 set_specifier_fallback (Vtext_cursor_visible_p,
|
|
|
8394 list1 (Fcons (Qnil, Qt)));
|
|
|
8395 set_specifier_caching (Vtext_cursor_visible_p,
|
|
|
8396 slot_offset (struct window,
|
|
|
8397 text_cursor_visible_p),
|
|
|
8398 text_cursor_visible_p_changed,
|
|
|
8399 0, 0);
|
|
|
8400 }
|
