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